/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_diff.py

Rename cdv => patience

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_diff.py
271
271
'''.splitlines(True)
272
272
, [(0,0,1), (1, 4, 2), (9, 19, 1), (12, 23, 3)])
273
273
 
274
 
    def test_cdv_unified_diff(self):
 
274
    def test_patience_unified_diff(self):
275
275
        txt_a = ['hello there\n',
276
276
                 'world\n',
277
277
                 'how are you today?\n']
304
304
                           ' e\n',
305
305
                           ' f\n']
306
306
                          , list(unified_diff(txt_a, txt_b)))
307
 
        # And the cdv diff
 
307
        # And the patience diff
308
308
        self.assertEquals(['---  \n',
309
309
                           '+++  \n',
310
310
                           '@@ -4,6 +4,11 @@\n',
326
326
 
327
327
class TestCDVDiffLibFiles(TestCaseInTempDir):
328
328
 
329
 
    def test_cdv_unified_diff_files(self):
 
329
    def test_patience_unified_diff_files(self):
330
330
        txt_a = ['hello there\n',
331
331
                 'world\n',
332
332
                 'how are you today?\n']
367
367
                           ' f\n']
368
368
                          , list(unified_diff_files('a2', 'b2')))
369
369
 
370
 
        # And the cdv diff
 
370
        # And the patience diff
371
371
        self.assertEquals(['--- a2 \n',
372
372
                           '+++ b2 \n',
373
373
                           '@@ -4,6 +4,11 @@\n',