/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: Curtis Hovey
  • Date: 2011-09-04 20:04:03 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110904200403-t38t3o2q1j600dho
Added missing tests for BranchTreeModel and CellRendererGraph.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
18
18
 
19
19
import os
20
20
 
21
 
import gtk
 
21
from gi.repository import Gtk
22
22
 
23
23
from bzrlib import (
24
24
    branch,
25
 
    revision,
26
25
    tests,
27
26
    uncommit,
28
27
    )
29
28
try:
 
29
    from bzrlib.tests.features import UnicodeFilenameFeature
 
30
except ImportError: # bzr < 2.5
 
31
    from bzrlib.tests import UnicodeFilenameFeature
 
32
try:
30
33
    from bzrlib import bencode
31
34
except ImportError:
32
35
    from bzrlib.util import bencode
212
215
 
213
216
        commit_col = dlg._treeview_files.get_column(0)
214
217
        self.assertEqual('Commit', commit_col.get_title())
215
 
        renderer = commit_col.get_cell_renderers()[0]
 
218
        renderer = commit_col.get_cells()[0]
216
219
        self.assertTrue(renderer.get_property('activatable'))
217
220
 
218
221
        self.assertEqual('Commit all changes',
237
240
 
238
241
        commit_col = dlg._treeview_files.get_column(0)
239
242
        self.assertEqual('Commit*', commit_col.get_title())
240
 
        renderer = commit_col.get_cell_renderers()[0]
 
243
        renderer = commit_col.get_cells()[0]
241
244
        self.assertFalse(renderer.get_property('activatable'))
242
245
 
243
246
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
385
388
                          ('b-id', 'b', True, 'b/', 'removed'),
386
389
                         ], values)
387
390
        # All Files should be selected
388
 
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
 
391
        self.assertEqual(
 
392
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
389
393
 
390
394
    def test_filelist_with_selected(self):
391
395
        tree = self.make_branch_and_tree('tree')
400
404
                         ], values)
401
405
        # This file should also be selected in the file list, rather than the
402
406
        # 'All Files' selection
403
 
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
 
407
        self.assertEqual(
 
408
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
404
409
 
405
410
    def test_diff_view(self):
406
411
        tree = self.make_branch_and_tree('tree')
414
419
        dlg = commit.CommitDialog(tree)
415
420
        diff_buffer = dlg._diff_view.buffer
416
421
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
417
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
422
                                    diff_buffer.get_end_iter(),
 
423
                                    True).splitlines(True)
418
424
 
419
425
        self.assertEqual("=== modified file 'a'\n", text[0])
420
426
        self.assertContainsRe(text[1],
465
471
        self.assertFalse(dlg._file_message_expander.get_expanded())
466
472
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
467
473
 
468
 
        dlg._treeview_files.set_cursor((1,))
 
474
        dlg._treeview_files.set_cursor(
 
475
            Gtk.TreePath(path=1), None, False)
469
476
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
470
477
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
471
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
478
                                    diff_buffer.get_end_iter(),
 
479
                                    True).splitlines(True)
472
480
        self.assertEqual("=== added file 'a'\n", text[0])
473
481
        self.assertContainsRe(text[1],
474
482
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
482
490
        self.assertTrue(dlg._file_message_expander.get_expanded())
483
491
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
484
492
 
485
 
        dlg._treeview_files.set_cursor((2,))
 
493
        dlg._treeview_files.set_cursor(
 
494
            Gtk.TreePath(path=2), None, False)
486
495
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
487
496
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
488
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
497
                                    diff_buffer.get_end_iter(),
 
498
                                    True).splitlines(True)
489
499
        self.assertEqual("=== added file 'b'\n", text[0])
490
500
        self.assertContainsRe(text[1],
491
501
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
499
509
        self.assertTrue(dlg._file_message_expander.get_expanded())
500
510
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
501
511
 
502
 
        dlg._treeview_files.set_cursor((0,))
 
512
        dlg._treeview_files.set_cursor(
 
513
            Gtk.TreePath(path=0), None, False)
503
514
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
504
515
        self.assertEqual('File commit message',
505
516
                         dlg._file_message_expander.get_label())
515
526
 
516
527
        def get_file_text():
517
528
            buf = dlg._file_message_text_view.get_buffer()
518
 
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
529
            return buf.get_text(
 
530
                buf.get_start_iter(), buf.get_end_iter(), True)
519
531
 
520
532
        def get_saved_text(path):
521
533
            """Get the saved text for a given record."""
528
540
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
529
541
        self.assertEqual('', get_file_text())
530
542
 
531
 
        dlg._treeview_files.set_cursor((1,))
 
543
        dlg._treeview_files.set_cursor(
 
544
            Gtk.TreePath(path=1), None, False)
532
545
        self.assertEqual('Commit message for a',
533
546
                         dlg._file_message_expander.get_label())
534
547
        self.assertTrue(dlg._file_message_expander.get_expanded())
541
554
        # We should have updated the ListStore with the new file commit info
542
555
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
543
556
 
544
 
        dlg._treeview_files.set_cursor((2,))
 
557
        dlg._treeview_files.set_cursor(
 
558
            Gtk.TreePath(path=2), None, False)
545
559
        self.assertEqual('Commit message for b/',
546
560
                         dlg._file_message_expander.get_label())
547
561
        self.assertTrue(dlg._file_message_expander.get_expanded())
552
566
        dlg._set_file_commit_message('More text\nfor b\n')
553
567
        # Now switch back to 'a'. The message should be saved, and the buffer
554
568
        # should be updated with the other text
555
 
        dlg._treeview_files.set_cursor((1,))
 
569
        dlg._treeview_files.set_cursor(
 
570
            Gtk.TreePath(path=1), None, False)
556
571
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
557
572
        self.assertEqual('Commit message for a',
558
573
                         dlg._file_message_expander.get_label())
578
593
        #       do with. So instead, we just call toggle directly, and assume
579
594
        #       that toggle is hooked in correctly
580
595
        # column = dlg._treeview_files.get_column(0)
581
 
        # renderer = column.get_cell_renderers()[0]
 
596
        # renderer = column.get_cells()[0]
582
597
 
583
598
        # Toggle a single entry should set just that entry to False
584
599
        dlg._toggle_commit(None, 1, dlg._files_store)
631
646
        dlg._commit_selected_radio.set_active(True)
632
647
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
633
648
 
634
 
        dlg._treeview_files.set_cursor((1,))
 
649
        dlg._treeview_files.set_cursor(
 
650
            Gtk.TreePath(path=1), None, False)
635
651
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
636
 
        dlg._treeview_files.set_cursor((2,))
 
652
        dlg._treeview_files.set_cursor(
 
653
            Gtk.TreePath(path=2), None, False)
637
654
        dlg._set_file_commit_message('message\nfor b_dir\n')
638
655
 
639
656
        self.assertEqual((['a_file', 'b_dir'],
659
676
        dlg._commit_selected_radio.set_active(True)
660
677
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
661
678
 
662
 
        dlg._treeview_files.set_cursor((1,))
 
679
        dlg._treeview_files.set_cursor(
 
680
            Gtk.TreePath(path=1), None, False)
663
681
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
664
 
        dlg._treeview_files.set_cursor((2,))
 
682
        dlg._treeview_files.set_cursor(
 
683
            Gtk.TreePath(path=2), None, False)
665
684
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
666
685
 
667
686
        self.assertEqual((['a_file', 'b_dir'],
680
699
        def _question_yes(*args, **kwargs):
681
700
            self.questions.append(args)
682
701
            self.questions.append('YES')
683
 
            return gtk.RESPONSE_YES
 
702
            return Gtk.ResponseType.YES
684
703
        dlg._question_dialog = _question_yes
685
704
 
686
705
    def _set_question_no(self, dlg):
689
708
        def _question_no(*args, **kwargs):
690
709
            self.questions.append(args)
691
710
            self.questions.append('NO')
692
 
            return gtk.RESPONSE_NO
 
711
            return Gtk.ResponseType.NO
693
712
        dlg._question_dialog = _question_no
694
713
 
695
714
 
974
993
 
975
994
        dlg = commit.CommitDialog(tree)
976
995
        dlg._commit_selected_radio.set_active(True) # enable partial
977
 
        dlg._treeview_files.set_cursor((1,))
 
996
        dlg._treeview_files.set_cursor(
 
997
            Gtk.TreePath(path=1), None, False)
978
998
        dlg._set_file_commit_message('Message for A\n')
979
 
        dlg._treeview_files.set_cursor((2,))
 
999
        dlg._treeview_files.set_cursor(
 
1000
            Gtk.TreePath(path=2), None, False)
980
1001
        dlg._set_file_commit_message('Message for B\n')
981
1002
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
982
1003
        dlg._set_global_commit_message('Commit just "a"')
1009
1030
        tree.merge_from_branch(tree2.branch)
1010
1031
 
1011
1032
        dlg = commit.CommitDialog(tree)
1012
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1033
        dlg._treeview_files.set_cursor(
 
1034
            Gtk.TreePath(path=1), None, False) # 'a'
1013
1035
        dlg._set_file_commit_message('Message for A\n')
1014
1036
        # No message for 'B'
1015
1037
        dlg._set_global_commit_message('Merging from "tree2"\n')
1032
1054
                         bencode.bdecode(file_info.encode('UTF-8')))
1033
1055
 
1034
1056
    def test_commit_unicode_messages(self):
1035
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
1057
        self.requireFeature(UnicodeFilenameFeature)
1036
1058
 
1037
1059
        tree = self.make_branch_and_tree('tree')
1038
1060
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
1040
1062
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1041
1063
 
1042
1064
        dlg = commit.CommitDialog(tree)
1043
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1065
        dlg._treeview_files.set_cursor(
 
1066
            Gtk.TreePath(path=1), None, False) # 'a'
1044
1067
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1045
 
        dlg._treeview_files.set_cursor((2,)) # omega
 
1068
        dlg._treeview_files.set_cursor(
 
1069
            Gtk.TreePath(path=2), None, False) # omega
1046
1070
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1047
1071
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1048
1072