/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-12 19:50:45 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110812195045-y86bmaibs3pw5w6d
Updated buffer.getText() calls and ModifierType enums.

Show diffs side-by-side

added added

removed removed

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