def xtest_diff_array_nested_update_conflict(self):
a = ['boo', ['foo', 'bar']]
b = ['boo', ['foo', 'baz']]
c = ['boo', ['foo', 'bazzz']]
conflict = Conflict(Diff(a, b), Diff(a, c))
# self.assertEquals(('baz', 'bazzz'), conflict[1].update)
self.assertEquals({1: ('baz', 'bazzz')}, conflict.update)
def test_diff_dict_remove_conflict(self):
a = {'roses': 'red', 'violets': 'blue'}
b = {'roses': 'red', 'violets': 'magenta'}
c = {'roses': 'red'}
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertEquals({'violets': ('magenta', None)}, conflict.update)
self.assertEquals({'violets': (None, 'blue')}, conflict.remove)
def test_diff_array_append_conflict(self):
a = ['foo']
b = ['foo', 'bar']
c = ['foo', 'baz']
conflict = Conflict(Diff(a, b), Diff(a, c))
# self.assertEquals(('bar', 'baz'), conflict[1].append)
self.assertEquals({1: ('bar', 'baz')}, conflict.append)
def test_diff_array_remove_conflict(self):
a = ['foo', 'bar']
b = ['foo', 'baz']
c = ['foo']
conflict = Conflict(Diff(a, b), Diff(a, c))
# self.assertEquals(('baz', None), conflict[1].update)
# self.assertEquals((None, 'bar'), conflict[1].remove)
self.assertEquals({1: ('baz', None)}, conflict.update)
self.assertEquals({1: (None, 'bar')}, conflict.remove)
def test_diff_dict_update_conflict(self):
a = {'roses': 'red'}
b = {'roses': 'blue'}
c = {'roses': 'white'}
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertEquals({'roses': ('blue', 'white')}, conflict.update)
def test_diff_dict_append_conflict(self):
a = {'roses': 'red'}
b = {'roses': 'red', 'violets': 'blue'}
c = {'roses': 'red', 'violets': 'magenta'}
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertEquals({'violets': ('blue', 'magenta')}, conflict.append)
def xtest_diff_array_nested_append_conflict(self):
a = ['boo', ['foo']]
b = ['boo', ['foo', 'bar']]
c = ['boo', ['foo', 'baz']]
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertEquals({1: ('bar', 'baz')}, conflict.update[1].append)
def test_diff_scalar_replace_conflict(self):
a = 'foo'
b = 'bar'
c = 'baz'
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertEquals(('bar', 'baz'), conflict.replace)
def xtest_diff_scalar_replace_no_conflict(self):
a = 'foo'
b = 'bar'
c = 'bar'
conflict = Conflict(Diff(a, b), Diff(a, c))
self.assertFalse(conflict)