/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: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

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,
215
215
 
216
216
        commit_col = dlg._treeview_files.get_column(0)
217
217
        self.assertEqual('Commit', commit_col.get_title())
218
 
        renderer = commit_col.get_cell_renderers()[0]
 
218
        renderer = commit_col.get_cells()[0]
219
219
        self.assertTrue(renderer.get_property('activatable'))
220
220
 
221
221
        self.assertEqual('Commit all changes',
240
240
 
241
241
        commit_col = dlg._treeview_files.get_column(0)
242
242
        self.assertEqual('Commit*', commit_col.get_title())
243
 
        renderer = commit_col.get_cell_renderers()[0]
 
243
        renderer = commit_col.get_cells()[0]
244
244
        self.assertFalse(renderer.get_property('activatable'))
245
245
 
246
246
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
388
388
                          ('b-id', 'b', True, 'b/', 'removed'),
389
389
                         ], values)
390
390
        # All Files should be selected
391
 
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
 
391
        self.assertEqual(
 
392
            (Gtk.TreePath(path=0), None), dlg._treeview_files.get_cursor())
392
393
 
393
394
    def test_filelist_with_selected(self):
394
395
        tree = self.make_branch_and_tree('tree')
403
404
                         ], values)
404
405
        # This file should also be selected in the file list, rather than the
405
406
        # 'All Files' selection
406
 
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
 
407
        self.assertEqual(
 
408
            (Gtk.TreePath(path=1), None), dlg._treeview_files.get_cursor())
407
409
 
408
410
    def test_diff_view(self):
409
411
        tree = self.make_branch_and_tree('tree')
417
419
        dlg = commit.CommitDialog(tree)
418
420
        diff_buffer = dlg._diff_view.buffer
419
421
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
420
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
422
                                    diff_buffer.get_end_iter(),
 
423
                                    True).splitlines(True)
421
424
 
422
425
        self.assertEqual("=== modified file 'a'\n", text[0])
423
426
        self.assertContainsRe(text[1],
468
471
        self.assertFalse(dlg._file_message_expander.get_expanded())
469
472
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
470
473
 
471
 
        dlg._treeview_files.set_cursor((1,))
 
474
        dlg._treeview_files.set_cursor(
 
475
            Gtk.TreePath(path=1), None, False)
472
476
        self.assertEqual('Diff for a', dlg._diff_label.get_text())
473
477
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
474
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
478
                                    diff_buffer.get_end_iter(),
 
479
                                    True).splitlines(True)
475
480
        self.assertEqual("=== added file 'a'\n", text[0])
476
481
        self.assertContainsRe(text[1],
477
482
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
485
490
        self.assertTrue(dlg._file_message_expander.get_expanded())
486
491
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
487
492
 
488
 
        dlg._treeview_files.set_cursor((2,))
 
493
        dlg._treeview_files.set_cursor(
 
494
            Gtk.TreePath(path=2), None, False)
489
495
        self.assertEqual('Diff for b', dlg._diff_label.get_text())
490
496
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
491
 
                                    diff_buffer.get_end_iter()).splitlines(True)
 
497
                                    diff_buffer.get_end_iter(),
 
498
                                    True).splitlines(True)
492
499
        self.assertEqual("=== added file 'b'\n", text[0])
493
500
        self.assertContainsRe(text[1],
494
501
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
502
509
        self.assertTrue(dlg._file_message_expander.get_expanded())
503
510
        self.assertTrue(dlg._file_message_expander.get_property('sensitive'))
504
511
 
505
 
        dlg._treeview_files.set_cursor((0,))
 
512
        dlg._treeview_files.set_cursor(
 
513
            Gtk.TreePath(path=0), None, False)
506
514
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
507
515
        self.assertEqual('File commit message',
508
516
                         dlg._file_message_expander.get_label())
518
526
 
519
527
        def get_file_text():
520
528
            buf = dlg._file_message_text_view.get_buffer()
521
 
            return buf.get_text(buf.get_start_iter(), buf.get_end_iter())
 
529
            return buf.get_text(
 
530
                buf.get_start_iter(), buf.get_end_iter(), True)
522
531
 
523
532
        def get_saved_text(path):
524
533
            """Get the saved text for a given record."""
531
540
        self.assertFalse(dlg._file_message_expander.get_property('sensitive'))
532
541
        self.assertEqual('', get_file_text())
533
542
 
534
 
        dlg._treeview_files.set_cursor((1,))
 
543
        dlg._treeview_files.set_cursor(
 
544
            Gtk.TreePath(path=1), None, False)
535
545
        self.assertEqual('Commit message for a',
536
546
                         dlg._file_message_expander.get_label())
537
547
        self.assertTrue(dlg._file_message_expander.get_expanded())
544
554
        # We should have updated the ListStore with the new file commit info
545
555
        self.assertEqual('Some text\nfor a\n', get_saved_text(1))
546
556
 
547
 
        dlg._treeview_files.set_cursor((2,))
 
557
        dlg._treeview_files.set_cursor(
 
558
            Gtk.TreePath(path=2), None, False)
548
559
        self.assertEqual('Commit message for b/',
549
560
                         dlg._file_message_expander.get_label())
550
561
        self.assertTrue(dlg._file_message_expander.get_expanded())
555
566
        dlg._set_file_commit_message('More text\nfor b\n')
556
567
        # Now switch back to 'a'. The message should be saved, and the buffer
557
568
        # should be updated with the other text
558
 
        dlg._treeview_files.set_cursor((1,))
 
569
        dlg._treeview_files.set_cursor(
 
570
            Gtk.TreePath(path=1), None, False)
559
571
        self.assertEqual('More text\nfor b\n', get_saved_text(2))
560
572
        self.assertEqual('Commit message for a',
561
573
                         dlg._file_message_expander.get_label())
581
593
        #       do with. So instead, we just call toggle directly, and assume
582
594
        #       that toggle is hooked in correctly
583
595
        # column = dlg._treeview_files.get_column(0)
584
 
        # renderer = column.get_cell_renderers()[0]
 
596
        # renderer = column.get_cells()[0]
585
597
 
586
598
        # Toggle a single entry should set just that entry to False
587
599
        dlg._toggle_commit(None, 1, dlg._files_store)
634
646
        dlg._commit_selected_radio.set_active(True)
635
647
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
636
648
 
637
 
        dlg._treeview_files.set_cursor((1,))
 
649
        dlg._treeview_files.set_cursor(
 
650
            Gtk.TreePath(path=1), None, False)
638
651
        dlg._set_file_commit_message('Test\nmessage\nfor a_file\n')
639
 
        dlg._treeview_files.set_cursor((2,))
 
652
        dlg._treeview_files.set_cursor(
 
653
            Gtk.TreePath(path=2), None, False)
640
654
        dlg._set_file_commit_message('message\nfor b_dir\n')
641
655
 
642
656
        self.assertEqual((['a_file', 'b_dir'],
662
676
        dlg._commit_selected_radio.set_active(True)
663
677
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
664
678
 
665
 
        dlg._treeview_files.set_cursor((1,))
 
679
        dlg._treeview_files.set_cursor(
 
680
            Gtk.TreePath(path=1), None, False)
666
681
        dlg._set_file_commit_message('Test\r\nmessage\rfor a_file\n')
667
 
        dlg._treeview_files.set_cursor((2,))
 
682
        dlg._treeview_files.set_cursor(
 
683
            Gtk.TreePath(path=2), None, False)
668
684
        dlg._set_file_commit_message('message\r\nfor\nb_dir\r')
669
685
 
670
686
        self.assertEqual((['a_file', 'b_dir'],
683
699
        def _question_yes(*args, **kwargs):
684
700
            self.questions.append(args)
685
701
            self.questions.append('YES')
686
 
            return gtk.RESPONSE_YES
 
702
            return Gtk.ResponseType.YES
687
703
        dlg._question_dialog = _question_yes
688
704
 
689
705
    def _set_question_no(self, dlg):
692
708
        def _question_no(*args, **kwargs):
693
709
            self.questions.append(args)
694
710
            self.questions.append('NO')
695
 
            return gtk.RESPONSE_NO
 
711
            return Gtk.ResponseType.NO
696
712
        dlg._question_dialog = _question_no
697
713
 
698
714
 
977
993
 
978
994
        dlg = commit.CommitDialog(tree)
979
995
        dlg._commit_selected_radio.set_active(True) # enable partial
980
 
        dlg._treeview_files.set_cursor((1,))
 
996
        dlg._treeview_files.set_cursor(
 
997
            Gtk.TreePath(path=1), None, False)
981
998
        dlg._set_file_commit_message('Message for A\n')
982
 
        dlg._treeview_files.set_cursor((2,))
 
999
        dlg._treeview_files.set_cursor(
 
1000
            Gtk.TreePath(path=2), None, False)
983
1001
        dlg._set_file_commit_message('Message for B\n')
984
1002
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
985
1003
        dlg._set_global_commit_message('Commit just "a"')
1012
1030
        tree.merge_from_branch(tree2.branch)
1013
1031
 
1014
1032
        dlg = commit.CommitDialog(tree)
1015
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1033
        dlg._treeview_files.set_cursor(
 
1034
            Gtk.TreePath(path=1), None, False) # 'a'
1016
1035
        dlg._set_file_commit_message('Message for A\n')
1017
1036
        # No message for 'B'
1018
1037
        dlg._set_global_commit_message('Merging from "tree2"\n')
1043
1062
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
1044
1063
 
1045
1064
        dlg = commit.CommitDialog(tree)
1046
 
        dlg._treeview_files.set_cursor((1,)) # 'a'
 
1065
        dlg._treeview_files.set_cursor(
 
1066
            Gtk.TreePath(path=1), None, False) # 'a'
1047
1067
        dlg._set_file_commit_message(u'Test \xfan\xecc\xf6de\n')
1048
 
        dlg._treeview_files.set_cursor((2,)) # omega
 
1068
        dlg._treeview_files.set_cursor(
 
1069
            Gtk.TreePath(path=2), None, False) # omega
1049
1070
        dlg._set_file_commit_message(u'\u03a9 is the end of all things.\n')
1050
1071
        dlg._set_global_commit_message(u'\u03a9 and \xfan\xecc\xf6de\n')
1051
1072