/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 18:35:08 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110827183508-ugqbp58na4mtt1no
Updated the pixbuf calls to gtk3.

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,
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_cell_renderers()[0]
 
214
        renderer = commit_col.get_cells()[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_cell_renderers()[0]
 
239
        renderer = commit_col.get_cells()[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(((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')
413
415
        dlg = commit.CommitDialog(tree)
414
416
        diff_buffer = dlg._diff_view.buffer
415
417
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
416
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
418
                                    diff_buffer.get_end_iter(),
 
419
                                    True).splitlines(True)
417
420
 
418
421
        self.assertEqual("=== modified file 'a'\n", text[0])
419
422
        self.assertContainsRe(text[1],
464
467
        self.assertFalse(dlg._file_message_expander.get_expanded())
465
468
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
466
469
 
467
 
        dlg._treeview_files.set_cursor((1,))
 
470
        dlg._treeview_files.set_cursor(
 
471
            Gtk.TreePath(path=1), None, False)
468
472
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
469
473
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
470
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
474
                                    diff_buffer.get_end_iter(),
 
475
                                    True).splitlines(True)
471
476
        self.assertEqual("=== added file 'a'\n", text[0])
472
477
        self.assertContainsRe(text[1],
473
478
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
481
486
        self.assertTrue(dlg._file_message_expander.get_expanded())
482
487
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
483
488
 
484
 
        dlg._treeview_files.set_cursor((2,))
 
489
        dlg._treeview_files.set_cursor(
 
490
            Gtk.TreePath(path=2), None, False)
485
491
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
486
492
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
487
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
493
                                    diff_buffer.get_end_iter(),
 
494
                                    True).splitlines(True)
488
495
        self.assertEqual("=== added file 'b'\n", text[0])
489
496
        self.assertContainsRe(text[1],
490
497
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
498
505
        self.assertTrue(dlg._file_message_expander.get_expanded())
499
506
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
500
507
 
501
 
        dlg._treeview_files.set_cursor((0,))
 
508
        dlg._treeview_files.set_cursor(
 
509
            Gtk.TreePath(path=0), None, False)
502
510
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
503
511
        self.assertEqual('File commit message',
504
512
                         dlg._file_message_expander.get_label())
514
522
 
515
523
        def get_file_text():
516
524
            buf = dlg._file_message_text_view.get_buffer()
517
 
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
525
            return buf.get_text(
 
526
                buf.get_start_iter(), buf.get_end_iter(), True)
518
527
 
519
528
        def get_saved_text(path):
520
529
            """Get the saved text for a given record."""
527
536
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
528
537
        self.assertEqual('', get_file_text())
529
538
 
530
 
        dlg._treeview_files.set_cursor((1,))
 
539
        dlg._treeview_files.set_cursor(
 
540
            Gtk.TreePath(path=1), None, False)
531
541
        self.assertEqual('Commit message for a',
532
542
                         dlg._file_message_expander.get_label())
533
543
        self.assertTrue(dlg._file_message_expander.get_expanded())
540
550
        # We should have updated the ListStore with the new file commit info
541
551
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
542
552
 
543
 
        dlg._treeview_files.set_cursor((2,))
 
553
        dlg._treeview_files.set_cursor(
 
554
            Gtk.TreePath(path=2), None, False)
544
555
        self.assertEqual('Commit message for b/',
545
556
                         dlg._file_message_expander.get_label())
546
557
        self.assertTrue(dlg._file_message_expander.get_expanded())
551
562
        dlg._set_file_commit_message('More text\nfor b\n')
552
563
        # Now switch back to 'a'. The message should be saved, and the buffer
553
564
        # should be updated with the other text
554
 
        dlg._treeview_files.set_cursor((1,))
 
565
        dlg._treeview_files.set_cursor(
 
566
            Gtk.TreePath(path=1), None, False)
555
567
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
556
568
        self.assertEqual('Commit message for a',
557
569
                         dlg._file_message_expander.get_label())
577
589
        #       do with. So instead, we just call toggle directly, and assume
578
590
        #       that toggle is hooked in correctly
579
591
        # column = dlg._treeview_files.get_column(0)
580
 
        # renderer = column.get_cell_renderers()[0]
 
592
        # renderer = column.get_cells()[0]
581
593
 
582
594
        # Toggle a single entry should set just that entry to False
583
595
        dlg._toggle_commit(None, 1, dlg._files_store)
630
642
        dlg._commit_selected_radio.set_active(True)
631
643
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
632
644
 
633
 
        dlg._treeview_files.set_cursor((1,))
 
645
        dlg._treeview_files.set_cursor(
 
646
            Gtk.TreePath(path=1), None, False)
634
647
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
635
 
        dlg._treeview_files.set_cursor((2,))
 
648
        dlg._treeview_files.set_cursor(
 
649
            Gtk.TreePath(path=2), None, False)
636
650
        dlg._set_file_commit_message('message\nfor b_dir\n')
637
651
 
638
652
        self.assertEqual((['a_file', 'b_dir'],
658
672
        dlg._commit_selected_radio.set_active(True)
659
673
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
660
674
 
661
 
        dlg._treeview_files.set_cursor((1,))
 
675
        dlg._treeview_files.set_cursor(
 
676
            Gtk.TreePath(path=1), None, False)
662
677
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
663
 
        dlg._treeview_files.set_cursor((2,))
 
678
        dlg._treeview_files.set_cursor(
 
679
            Gtk.TreePath(path=2), None, False)
664
680
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
665
681
 
666
682
        self.assertEqual((['a_file', 'b_dir'],
679
695
        def _question_yes(*args, **kwargs):
680
696
            self.questions.append(args)
681
697
            self.questions.append('YES')
682
 
            return gtk.RESPONSE_YES
 
698
            return Gtk.ResponseType.YES
683
699
        dlg._question_dialog = _question_yes
684
700
 
685
701
    def _set_question_no(self, dlg):
688
704
        def _question_no(*args, **kwargs):
689
705
            self.questions.append(args)
690
706
            self.questions.append('NO')
691
 
            return gtk.RESPONSE_NO
 
707
            return Gtk.ResponseType.NO
692
708
        dlg._question_dialog = _question_no
693
709
 
694
710
 
973
989
 
974
990
        dlg = commit.CommitDialog(tree)
975
991
        dlg._commit_selected_radio.set_active(True) # enable partial
976
 
        dlg._treeview_files.set_cursor((1,))
 
992
        dlg._treeview_files.set_cursor(
 
993
            Gtk.TreePath(path=1), None, False)
977
994
        dlg._set_file_commit_message('Message for A\n')
978
 
        dlg._treeview_files.set_cursor((2,))
 
995
        dlg._treeview_files.set_cursor(
 
996
            Gtk.TreePath(path=2), None, False)
979
997
        dlg._set_file_commit_message('Message for B\n')
980
998
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
981
999
        dlg._set_global_commit_message('Commit just "a"')
1008
1026
        tree.merge_from_branch(tree2.branch)
1009
1027
 
1010
1028
        dlg = commit.CommitDialog(tree)
1011
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1029
        dlg._treeview_files.set_cursor(
 
1030
            Gtk.TreePath(path=1), None, False) # 'a'
1012
1031
        dlg._set_file_commit_message('Message for A\n')
1013
1032
        # No message for 'B'
1014
1033
        dlg._set_global_commit_message('Merging from "tree2"\n')
1039
1058
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1040
1059
 
1041
1060
        dlg = commit.CommitDialog(tree)
1042
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1061
        dlg._treeview_files.set_cursor(
 
1062
            Gtk.TreePath(path=1), None, False) # 'a'
1043
1063
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1044
 
        dlg._treeview_files.set_cursor((2,)) # omega
 
1064
        dlg._treeview_files.set_cursor(
 
1065
            Gtk.TreePath(path=2), None, False) # omega
1045
1066
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1046
1067
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1047
1068