/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-08-27 15:31:00 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827153100-ofzge4s4u64bynxq
Always pass a Gtk.TreePath instead of an int or tuple.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
384
384
                          ('b-id', 'b', True, 'b/', 'removed'),
385
385
                         ], values)
386
386
        # All Files should be selected
387
 
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
 
387
        self.assertEqual(
 
388
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
388
389
 
389
390
    def test_filelist_with_selected(self):
390
391
        tree = self.make_branch_and_tree('tree')
399
400
                         ], values)
400
401
        # This file should also be selected in the file list, rather than the
401
402
        # 'All Files' selection
402
 
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
 
403
        self.assertEqual(
 
404
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
403
405
 
404
406
    def test_diff_view(self):
405
407
        tree = self.make_branch_and_tree('tree')
465
467
        self.assertFalse(dlg._file_message_expander.get_expanded())
466
468
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
467
469
 
468
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
470
        dlg._treeview_files.set_cursor(
 
471
            Gtk.TreePath(path=1), None, False)
469
472
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
470
473
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
471
474
                                    diff_buffer.get_end_iter(),
483
486
        self.assertTrue(dlg._file_message_expander.get_expanded())
484
487
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
485
488
 
486
 
        dlg._treeview_files.set_cursor((2,), None, False)
 
489
        dlg._treeview_files.set_cursor(
 
490
            Gtk.TreePath(path=2), None, False)
487
491
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
488
492
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
489
493
                                    diff_buffer.get_end_iter(),
501
505
        self.assertTrue(dlg._file_message_expander.get_expanded())
502
506
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
503
507
 
504
 
        dlg._treeview_files.set_cursor((0,), None, False)
 
508
        dlg._treeview_files.set_cursor(
 
509
            Gtk.TreePath(path=0), None, False)
505
510
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
506
511
        self.assertEqual('File commit message',
507
512
                         dlg._file_message_expander.get_label())
531
536
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
532
537
        self.assertEqual('', get_file_text())
533
538
 
534
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
539
        dlg._treeview_files.set_cursor(
 
540
            Gtk.TreePath(path=1), None, False)
535
541
        self.assertEqual('Commit message for a',
536
542
                         dlg._file_message_expander.get_label())
537
543
        self.assertTrue(dlg._file_message_expander.get_expanded())
544
550
        # We should have updated the ListStore with the new file commit info
545
551
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
546
552
 
547
 
        dlg._treeview_files.set_cursor((2,), None, False)
 
553
        dlg._treeview_files.set_cursor(
 
554
            Gtk.TreePath(path=2), None, False)
548
555
        self.assertEqual('Commit message for b/',
549
556
                         dlg._file_message_expander.get_label())
550
557
        self.assertTrue(dlg._file_message_expander.get_expanded())
555
562
        dlg._set_file_commit_message('More text\nfor b\n')
556
563
        # Now switch back to 'a'. The message should be saved, and the buffer
557
564
        # should be updated with the other text
558
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
565
        dlg._treeview_files.set_cursor(
 
566
            Gtk.TreePath(path=1), None, False)
559
567
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
560
568
        self.assertEqual('Commit message for a',
561
569
                         dlg._file_message_expander.get_label())
634
642
        dlg._commit_selected_radio.set_active(True)
635
643
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
636
644
 
637
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
645
        dlg._treeview_files.set_cursor(
 
646
            Gtk.TreePath(path=1), None, False)
638
647
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
639
 
        dlg._treeview_files.set_cursor((2,), None, False)
 
648
        dlg._treeview_files.set_cursor(
 
649
            Gtk.TreePath(path=2), None, False)
640
650
        dlg._set_file_commit_message('message\nfor b_dir\n')
641
651
 
642
652
        self.assertEqual((['a_file', 'b_dir'],
662
672
        dlg._commit_selected_radio.set_active(True)
663
673
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
664
674
 
665
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
675
        dlg._treeview_files.set_cursor(
 
676
            Gtk.TreePath(path=1), None, False)
666
677
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
667
 
        dlg._treeview_files.set_cursor((2,), None, False)
 
678
        dlg._treeview_files.set_cursor(
 
679
            Gtk.TreePath(path=2), None, False)
668
680
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
669
681
 
670
682
        self.assertEqual((['a_file', 'b_dir'],
977
989
 
978
990
        dlg = commit.CommitDialog(tree)
979
991
        dlg._commit_selected_radio.set_active(True) # enable partial
980
 
        dlg._treeview_files.set_cursor((1,), None, False)
 
992
        dlg._treeview_files.set_cursor(
 
993
            Gtk.TreePath(path=1), None, False)
981
994
        dlg._set_file_commit_message('Message for A\n')
982
 
        dlg._treeview_files.set_cursor((2,), None, False)
 
995
        dlg._treeview_files.set_cursor(
 
996
            Gtk.TreePath(path=2), None, False)
983
997
        dlg._set_file_commit_message('Message for B\n')
984
998
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
985
999
        dlg._set_global_commit_message('Commit just "a"')
1012
1026
        tree.merge_from_branch(tree2.branch)
1013
1027
 
1014
1028
        dlg = commit.CommitDialog(tree)
1015
 
        dlg._treeview_files.set_cursor((1,), None, False) # 'a'
 
1029
        dlg._treeview_files.set_cursor(
 
1030
            Gtk.TreePath(path=1), None, False) # 'a'
1016
1031
        dlg._set_file_commit_message('Message for A\n')
1017
1032
        # No message for 'B'
1018
1033
        dlg._set_global_commit_message('Merging from "tree2"\n')
1043
1058
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1044
1059
 
1045
1060
        dlg = commit.CommitDialog(tree)
1046
 
        dlg._treeview_files.set_cursor((1,), None, False) # 'a'
 
1061
        dlg._treeview_files.set_cursor(
 
1062
            Gtk.TreePath(path=1), None, False) # 'a'
1047
1063
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1048
 
        dlg._treeview_files.set_cursor((2,), None, False) # omega
 
1064
        dlg._treeview_files.set_cursor(
 
1065
            Gtk.TreePath(path=2), None, False) # omega
1049
1066
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1050
1067
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1051
1068