/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_textmerge.py

Implemented reprocess for weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_textmerge.py
28
28
        lines_b = "z\nb\nx\nd\ne\ne\nf\ng\ny\n".splitlines(True)
29
29
        expected = "<\na\n=\nz\n>\nb\n<\nc\n=\nx\n>\nd\n<\n=\ne\n>\ne\nf\n"\
30
30
                   "g\n<\nh\n=\ny\n>\n"
31
 
        mlines = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n').merge_lines()
32
 
        self.assertEqualDiff(''.join(mlines), expected)
 
31
        m2 = Merge2(lines_a, lines_b, '<\n', '>\n', '=\n')
 
32
        mlines= m2.merge_lines()
 
33
        self.assertEqualDiff(''.join(mlines), expected)
 
34
        mlines= m2.merge_lines(reprocess=True)
 
35
        self.assertEqualDiff(''.join(mlines), expected)
 
36
 
 
37
    def test_reprocess(self):
 
38
        struct = [('a', 'b'), ('c',), ('def','geh'), ('i',)]
 
39
        expect = [('a', 'b'), ('c',), ('d', 'g'), ('e',), ('f', 'h'), ('i',)]
 
40
        result = Merge2.reprocess_struct(struct)
 
41
        self.assertEqual(list(result), expect)