--- a/tests/test-simplemerge.py Fri Apr 27 01:30:29 2018 -0400
+++ b/tests/test-simplemerge.py Fri Apr 27 10:21:24 2018 -0400
@@ -128,20 +128,20 @@
['aaa', 'bbb'],
['aaa', 'bbb'])
- self.assertEquals(m3.find_unconflicted(),
- [(0, 2)])
+ self.assertEqual(m3.find_unconflicted(),
+ [(0, 2)])
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 2,
- 0, 2,
- 0, 2),
- (2, 2, 2, 2, 2, 2)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 2,
+ 0, 2,
+ 0, 2),
+ (2, 2, 2, 2, 2, 2)])
- self.assertEquals(list(m3.merge_regions()),
- [('unchanged', 0, 2)])
+ self.assertEqual(list(m3.merge_regions()),
+ [('unchanged', 0, 2)])
- self.assertEquals(list(m3.merge_groups()),
- [('unchanged', ['aaa', 'bbb'])])
+ self.assertEqual(list(m3.merge_groups()),
+ [('unchanged', ['aaa', 'bbb'])])
def test_front_insert(self):
m3 = Merge3(['zz'],
@@ -150,17 +150,17 @@
# todo: should use a sentinel at end as from get_matching_blocks
# to match without zz
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 1, 2, 3, 0, 1),
- (1, 1, 3, 3, 1, 1)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 1, 2, 3, 0, 1),
+ (1, 1, 3, 3, 1, 1)])
- self.assertEquals(list(m3.merge_regions()),
- [('a', 0, 2),
- ('unchanged', 0, 1)])
+ self.assertEqual(list(m3.merge_regions()),
+ [('a', 0, 2),
+ ('unchanged', 0, 1)])
- self.assertEquals(list(m3.merge_groups()),
- [('a', ['aaa', 'bbb']),
- ('unchanged', ['zz'])])
+ self.assertEqual(list(m3.merge_groups()),
+ [('a', ['aaa', 'bbb']),
+ ('unchanged', ['zz'])])
def test_null_insert(self):
m3 = Merge3([],
@@ -168,14 +168,14 @@
[])
# todo: should use a sentinel at end as from get_matching_blocks
# to match without zz
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 0, 2, 2, 0, 0)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 0, 2, 2, 0, 0)])
- self.assertEquals(list(m3.merge_regions()),
- [('a', 0, 2)])
+ self.assertEqual(list(m3.merge_regions()),
+ [('a', 0, 2)])
- self.assertEquals(list(m3.merge_lines()),
- ['aaa', 'bbb'])
+ self.assertEqual(list(m3.merge_lines()),
+ ['aaa', 'bbb'])
def test_no_conflicts(self):
"""No conflicts because only one side changed"""
@@ -183,42 +183,42 @@
['aaa', '111', 'bbb'],
['aaa', 'bbb'])
- self.assertEquals(m3.find_unconflicted(),
- [(0, 1), (1, 2)])
+ self.assertEqual(m3.find_unconflicted(),
+ [(0, 1), (1, 2)])
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 1, 0, 1, 0, 1),
- (1, 2, 2, 3, 1, 2),
- (2, 2, 3, 3, 2, 2)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 1, 0, 1, 0, 1),
+ (1, 2, 2, 3, 1, 2),
+ (2, 2, 3, 3, 2, 2)])
- self.assertEquals(list(m3.merge_regions()),
- [('unchanged', 0, 1),
- ('a', 1, 2),
- ('unchanged', 1, 2)])
+ self.assertEqual(list(m3.merge_regions()),
+ [('unchanged', 0, 1),
+ ('a', 1, 2),
+ ('unchanged', 1, 2)])
def test_append_a(self):
m3 = Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'],
['aaa\n', 'bbb\n'])
- self.assertEquals(''.join(m3.merge_lines()),
- 'aaa\nbbb\n222\n')
+ self.assertEqual(''.join(m3.merge_lines()),
+ 'aaa\nbbb\n222\n')
def test_append_b(self):
m3 = Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'])
- self.assertEquals(''.join(m3.merge_lines()),
- 'aaa\nbbb\n222\n')
+ self.assertEqual(''.join(m3.merge_lines()),
+ 'aaa\nbbb\n222\n')
def test_append_agreement(self):
m3 = Merge3(['aaa\n', 'bbb\n'],
['aaa\n', 'bbb\n', '222\n'],
['aaa\n', 'bbb\n', '222\n'])
- self.assertEquals(''.join(m3.merge_lines()),
- 'aaa\nbbb\n222\n')
+ self.assertEqual(''.join(m3.merge_lines()),
+ 'aaa\nbbb\n222\n')
def test_append_clash(self):
m3 = Merge3(['aaa\n', 'bbb\n'],
@@ -230,14 +230,14 @@
start_marker='<<',
mid_marker='--',
end_marker='>>')
- self.assertEquals(''.join(ml),
- 'aaa\n'
- 'bbb\n'
- '<< a\n'
- '222\n'
- '--\n'
- '333\n'
- '>> b\n'
+ self.assertEqual(''.join(ml),
+ 'aaa\n'
+ 'bbb\n'
+ '<< a\n'
+ '222\n'
+ '--\n'
+ '333\n'
+ '>> b\n'
)
def test_insert_agreement(self):
@@ -250,7 +250,7 @@
start_marker='<<',
mid_marker='--',
end_marker='>>')
- self.assertEquals(''.join(ml), 'aaa\n222\nbbb\n')
+ self.assertEqual(''.join(ml), 'aaa\n222\nbbb\n')
def test_insert_clash(self):
@@ -259,31 +259,31 @@
['aaa\n', '111\n', 'bbb\n'],
['aaa\n', '222\n', 'bbb\n'])
- self.assertEquals(m3.find_unconflicted(),
- [(0, 1), (1, 2)])
+ self.assertEqual(m3.find_unconflicted(),
+ [(0, 1), (1, 2)])
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 1, 0, 1, 0, 1),
- (1, 2, 2, 3, 2, 3),
- (2, 2, 3, 3, 3, 3)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 1, 0, 1, 0, 1),
+ (1, 2, 2, 3, 2, 3),
+ (2, 2, 3, 3, 3, 3)])
- self.assertEquals(list(m3.merge_regions()),
- [('unchanged', 0, 1),
- ('conflict', 1, 1, 1, 2, 1, 2),
- ('unchanged', 1, 2)])
+ self.assertEqual(list(m3.merge_regions()),
+ [('unchanged', 0, 1),
+ ('conflict', 1, 1, 1, 2, 1, 2),
+ ('unchanged', 1, 2)])
- self.assertEquals(list(m3.merge_groups()),
- [('unchanged', ['aaa\n']),
- ('conflict', [], ['111\n'], ['222\n']),
- ('unchanged', ['bbb\n']),
- ])
+ self.assertEqual(list(m3.merge_groups()),
+ [('unchanged', ['aaa\n']),
+ ('conflict', [], ['111\n'], ['222\n']),
+ ('unchanged', ['bbb\n']),
+ ])
ml = m3.merge_lines(name_a='a',
name_b='b',
start_marker='<<',
mid_marker='--',
end_marker='>>')
- self.assertEquals(''.join(ml),
+ self.assertEqual(''.join(ml),
'''aaa
<< a
111
@@ -299,13 +299,13 @@
['aaa', '111', 'bbb'],
['aaa', '222', 'bbb'])
- self.assertEquals(m3.find_unconflicted(),
- [(0, 1), (2, 3)])
+ self.assertEqual(m3.find_unconflicted(),
+ [(0, 1), (2, 3)])
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 1, 0, 1, 0, 1),
- (2, 3, 2, 3, 2, 3),
- (3, 3, 3, 3, 3, 3)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 1, 0, 1, 0, 1),
+ (2, 3, 2, 3, 2, 3),
+ (3, 3, 3, 3, 3, 3)])
def test_replace_multi(self):
"""Replacement with regions of different size."""
@@ -313,14 +313,14 @@
['aaa', '111', '111', '111', 'bbb'],
['aaa', '222', '222', '222', '222', 'bbb'])
- self.assertEquals(m3.find_unconflicted(),
- [(0, 1), (3, 4)])
+ self.assertEqual(m3.find_unconflicted(),
+ [(0, 1), (3, 4)])
- self.assertEquals(list(m3.find_sync_regions()),
- [(0, 1, 0, 1, 0, 1),
- (3, 4, 4, 5, 5, 6),
- (4, 4, 5, 5, 6, 6)])
+ self.assertEqual(list(m3.find_sync_regions()),
+ [(0, 1, 0, 1, 0, 1),
+ (3, 4, 4, 5, 5, 6),
+ (4, 4, 5, 5, 6, 6)])
def test_merge_poem(self):
"""Test case from diff3 manual"""
@@ -328,7 +328,7 @@
ml = list(m3.merge_lines('LAO', 'TAO'))
self.log('merge result:')
self.log(''.join(ml))
- self.assertEquals(ml, MERGED_RESULT)
+ self.assertEqual(ml, MERGED_RESULT)
def test_binary(self):
with self.assertRaises(error.Abort):
@@ -342,7 +342,7 @@
this_text.splitlines(True))
m_lines = m3.merge_lines('OTHER', 'THIS')
self.assertEqual('<<<<<<< OTHER\r\nc\r\n=======\r\nb\r\n'
- '>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
+ '>>>>>>> THIS\r\n'.splitlines(True), list(m_lines))
def test_mac_text(self):
base_text = 'a\r'
@@ -352,7 +352,7 @@
this_text.splitlines(True))
m_lines = m3.merge_lines('OTHER', 'THIS')
self.assertEqual('<<<<<<< OTHER\rc\r=======\rb\r'
- '>>>>>>> THIS\r'.splitlines(True), list(m_lines))
+ '>>>>>>> THIS\r'.splitlines(True), list(m_lines))
if __name__ == '__main__':
# hide the timer