def test_take_patch(self):
p1 = ('add', '', [(1, 1)])
p2 = ('add', '', [(1, -1)])
c = Conflict(p1, p2)
self.assertRaises(Exception, c.take_patch)
c.take = 'f'
self.assertEqual(c.take_patch(), p1)
c.take = 's'
self.assertEqual(c.take_patch(), p2)
def test_unify(self):
u = Unifier()
p1 = ('add', 'foo', [(0, 0)])
p2 = ('add', 'foo', [(0, 1)])
c = Conflict(p1, p2)
c.take = 'f'
u.unify([p1], [p2], [c])
self.assertEqual(u.unified_patches, [p1])
def test_unify(self):
u = Unifier()
p1 = ("add", "foo", [(0, 0)])
p2 = ("add", "foo", [(0, 1)])
c = Conflict(p1, p2)
c.take = "f"
u.unify([p1], [p2], [c])
self.assertEqual(u.unified_patches, [p1])
