/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: David Planella
  • Date: 2011-03-06 08:24:07 UTC
  • mfrom: (718 trunk)
  • mto: This revision was merged to the branch mainline in revision 719.
  • Revision ID: david.planella@ubuntu.com-20110306082407-y9zwkjje5oue9egw
Added preliminary internationalization support. Merged from trunk.

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