/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-03 01:25:04 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110903012504-0jr4diz9033g5df2
Menu fixes.

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