/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-01 22:04:43 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071001220443-q4jqupexf5wx2sqa
Start checking the diff view is correct.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
338
338
        self.assertEqual([('a-id', 'a', True, 'a', 'removed'),
339
339
                          ('b-id', 'b', True, 'b/', 'removed'),
340
340
                         ], values)
 
341
 
 
342
    def test_diff_view(self):
 
343
        tree = self.make_branch_and_tree('tree')
 
344
        self.build_tree(['tree/a', 'tree/b'])
 
345
        tree.add(['a', 'b'], ['a-id', 'b-id'])
 
346
        tree.commit('one')
 
347
 
 
348
        self.build_tree_contents([('tree/a', 'new contents for a\n')])
 
349
        tree.remove('b')
 
350
 
 
351
        dlg = commit.CommitDialog(tree)
 
352
        diff_buffer = dlg._diff_view.buffer
 
353
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
 
354
                                    diff_buffer.get_end_iter()).splitlines(True)
 
355
 
 
356
        self.assertEqual("=== removed file 'b'\n", text[0])
 
357
        self.assertContainsRe(text[1],
 
358
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
359
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
 
360
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
 
361
        self.assertEqual('-contents of tree/b\n', text[4])
 
362
        self.assertEqual('\n', text[5])
 
363
 
 
364
        self.assertEqual("=== modified file 'a'\n", text[6])
 
365
        self.assertContainsRe(text[7],
 
366
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
367
        self.assertContainsRe(text[8],
 
368
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
369
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
 
370
        self.assertEqual('-contents of tree/a\n', text[10])
 
371
        self.assertEqual('+new contents for a\n', text[11])
 
372
        self.assertEqual('\n', text[12])
 
373
 
 
374
        self.assertEqual('Diff for whole tree', dlg._diff_label.get_text())