/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: John Arbash Meinel
  • Date: 2007-10-02 23:08:12 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002230812-h8i6pq8fwvodute4
Start testing with Unicode data.
It seems there is some brokenness with serializing Unicode messages.
But otherwise everything seems to be working.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
81
81
        rev_id1 = tree.commit('one')
82
82
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
83
83
        rev_id2 = tree2.commit('two')
 
84
        rev_id3 = tree2.commit('three')
84
85
        tree3 = tree2.bzrdir.sprout('tree3').open_workingtree()
85
 
        rev_id3 = tree2.commit('three')
86
86
        rev_id4 = tree3.commit('four')
87
87
        rev_id5 = tree3.commit('five')
88
88
        tree.merge_from_branch(tree2.branch)
208
208
        commit_col = dlg._treeview_files.get_column(0)
209
209
        self.assertEqual('Commit', commit_col.get_title())
210
210
        renderer = commit_col.get_cell_renderers()[0]
211
 
        self.assertTrue(renderer.get_property('activatable'))
212
 
 
213
 
        self.assertEqual('Commit all changes',
214
 
                         dlg._commit_all_files_radio.get_label())
215
 
        self.assertTrue(dlg._commit_all_files_radio.get_property('sensitive'))
216
 
        self.assertTrue(dlg._commit_selected_radio.get_property('sensitive'))
 
211
        self.assertTrue(renderer.get_active())
217
212
 
218
213
    def test_pending(self):
219
214
        tree = self.make_branch_and_tree('tree')
233
228
        commit_col = dlg._treeview_files.get_column(0)
234
229
        self.assertEqual('Commit*', commit_col.get_title())
235
230
        renderer = commit_col.get_cell_renderers()[0]
236
 
        self.assertFalse(renderer.get_property('activatable'))
 
231
        self.assertFalse(renderer.get_active())
237
232
 
238
233
        values = [(r[0], r[1], r[2], r[3]) for r in dlg._pending_store]
239
234
        self.assertEqual([(rev_id2, '2007-10-01', 'Joe Foo', 'two')], values)
240
235
 
241
 
        self.assertEqual('Commit all changes*',
242
 
                         dlg._commit_all_files_radio.get_label())
243
 
        self.assertFalse(dlg._commit_all_files_radio.get_property('sensitive'))
244
 
        self.assertFalse(dlg._commit_selected_radio.get_property('sensitive'))
245
 
 
246
236
    def test_pending_multiple(self):
247
237
        tree = self.make_branch_and_tree('tree')
248
238
        rev_id1 = tree.commit('one')
379
369
                          ('a-id', 'a', True, 'a', 'removed'),
380
370
                          ('b-id', 'b', True, 'b/', 'removed'),
381
371
                         ], values)
382
 
        # All Files should be selected
383
 
        self.assertEqual(((0,), None), dlg._treeview_files.get_cursor())
384
 
 
385
 
    def test_filelist_with_selected(self):
386
 
        tree = self.make_branch_and_tree('tree')
387
 
        self.build_tree(['tree/a', 'tree/b/'])
388
 
        tree.add(['a', 'b'], ['a-id', 'b-id'])
389
 
 
390
 
        dlg = commit.CommitDialog(tree, selected='a')
391
 
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
392
 
        self.assertEqual([(None, None, False, 'All Files', ''),
393
 
                          ('a-id', 'a', True, 'a', 'added'),
394
 
                          ('b-id', 'b', False, 'b/', 'added'),
395
 
                         ], values)
396
 
        # This file should also be selected in the file list, rather than the
397
 
        # 'All Files' selection
398
 
        self.assertEqual(((1,), None), dlg._treeview_files.get_cursor())
399
372
 
400
373
    def test_diff_view(self):
401
374
        tree = self.make_branch_and_tree('tree')
411
384
        text = diff_buffer.get_text(diff_buffer.get_start_iter(),
412
385
                                    diff_buffer.get_end_iter()).splitlines(True)
413
386
 
414
 
        self.assertEqual("=== modified file 'a'\n", text[0])
 
387
        self.assertEqual("=== removed file 'b'\n", text[0])
415
388
        self.assertContainsRe(text[1],
 
389
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
390
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[2])
 
391
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[3])
 
392
        self.assertEqual('-contents of tree/b\n', text[4])
 
393
        self.assertEqual('\n', text[5])
 
394
 
 
395
        self.assertEqual("=== modified file 'a'\n", text[6])
 
396
        self.assertContainsRe(text[7],
416
397
            r"--- a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
417
 
        self.assertContainsRe(text[2],
418
 
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
419
 
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[3])
420
 
        self.assertEqual('-contents of tree/a\n', text[4])
421
 
        self.assertEqual('+new contents for a\n', text[5])
422
 
        self.assertEqual('\n', text[6])
423
 
 
424
 
        self.assertEqual("=== removed file 'b'\n", text[7])
425
398
        self.assertContainsRe(text[8],
426
 
            r"--- b\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
427
 
        self.assertEqual('+++ b\t1970-01-01 00:00:00 +0000\n', text[9])
428
 
        self.assertEqual('@@ -1,1 +0,0 @@\n', text[10])
429
 
        self.assertEqual('-contents of tree/b\n', text[11])
 
399
            r"\+\+\+ a\t\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d [+-]\d\d\d\d")
 
400
        self.assertEqual('@@ -1,1 +1,1 @@\n', text[9])
 
401
        self.assertEqual('-contents of tree/a\n', text[10])
 
402
        self.assertEqual('+new contents for a\n', text[11])
430
403
        self.assertEqual('\n', text[12])
431
404
 
432
405
        self.assertEqual('Diff for All Files', dlg._diff_label.get_text())
433
406
 
434
 
    def test_commit_partial_toggle(self):
435
 
        tree = self.make_branch_and_tree('tree')
436
 
        self.build_tree(['tree/a', 'tree/b'])
437
 
        tree.add(['a', 'b'], ['a-id', 'b-id'])
438
 
 
439
 
        dlg = commit.CommitDialog(tree)
440
 
        checked_col = dlg._treeview_files.get_column(0)
441
 
        self.assertFalse(checked_col.get_property('visible'))
442
 
        self.assertTrue(dlg._commit_all_changes)
443
 
 
444
 
        dlg._commit_selected_radio.set_active(True)
445
 
        self.assertTrue(checked_col.get_property('visible'))
446
 
        self.assertFalse(dlg._commit_all_changes)
447
 
 
448
407
    def test_file_selection(self):
449
408
        """Several things should happen when a file has been selected."""
450
409
        tree = self.make_branch_and_tree('tree')
451
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
452
410
        self.build_tree(['tree/a', 'tree/b'])
453
411
        tree.add(['a', 'b'], ['a-id', 'b-id'])
454
412
 
504
462
    def test_file_selection_message(self):
505
463
        """Selecting a file should bring up its commit message."""
506
464
        tree = self.make_branch_and_tree('tree')
507
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
508
465
        self.build_tree(['tree/a', 'tree/b/'])
509
466
        tree.add(['a', 'b'], ['a-id', 'b-id'])
510
467
 
609
566
        dlg = commit.CommitDialog(tree)
610
567
        self.assertEqual((['a', 'b'], []), dlg._get_specific_files())
611
568
 
612
 
        dlg._commit_selected_radio.set_active(True)
613
569
        dlg._toggle_commit(None, 0, dlg._files_store)
614
570
        self.assertEqual(([], []), dlg._get_specific_files())
615
571
 
618
574
 
619
575
    def test_specific_files_with_messages(self):
620
576
        tree = self.make_branch_and_tree('tree')
621
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
622
577
        self.build_tree(['tree/a_file', 'tree/b_dir/'])
623
578
        tree.add(['a_file', 'b_dir'], ['1a-id', '0b-id'])
624
579
 
625
580
        dlg = commit.CommitDialog(tree)
626
 
        dlg._commit_selected_radio.set_active(True)
627
581
        self.assertEqual((['a_file', 'b_dir'], []), dlg._get_specific_files())
628
582
 
629
583
        dlg._treeview_files.set_cursor((1,))
830
784
        tree.add(['a', 'b'], ['a-id', 'b-id'])
831
785
 
832
786
        dlg = commit.CommitDialog(tree)
833
 
        dlg._commit_selected_radio.set_active(True) # enable partial
834
787
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
835
788
 
836
789
        dlg._set_global_commit_message('Committing just "a"\n')
845
798
                                       if path] # Ignore the root entry
846
799
        self.assertEqual([('a', 'a-id')], entries)
847
800
 
848
 
    def test_commit_partial_no_partial(self):
849
 
        """Ignore the checkboxes if committing all files."""
850
 
        tree = self.make_branch_and_tree('tree')
851
 
        rev_id1 = tree.commit('one')
852
 
        self.build_tree(['tree/a', 'tree/b'])
853
 
        tree.add(['a', 'b'], ['a-id', 'b-id'])
854
 
 
855
 
        dlg = commit.CommitDialog(tree)
856
 
        dlg._commit_selected_radio.set_active(True) # enable partial
857
 
        dlg._toggle_commit(None, 2, dlg._files_store) # unset 'b'
858
 
 
859
 
        # Switch back to committing all changes
860
 
        dlg._commit_all_files_radio.set_active(True)
861
 
 
862
 
        dlg._set_global_commit_message('Committing everything\n')
863
 
        dlg._do_commit()
864
 
 
865
 
        rev_id2 = dlg.committed_revision_id
866
 
        self.assertIsNot(None, rev_id2)
867
 
        self.assertEqual(rev_id2, tree.last_revision())
868
 
 
869
 
        rt = tree.branch.repository.revision_tree(rev_id2)
870
 
        entries = [(path, ie.file_id) for path, ie in rt.iter_entries_by_dir()
871
 
                                       if path] # Ignore the root entry
872
 
        self.assertEqual([('a', 'a-id'), ('b', 'b-id')], entries)
873
 
 
874
801
    def test_commit_no_messages(self):
875
802
        tree = self.make_branch_and_tree('tree')
876
803
        rev_id1 = tree.commit('one')
884
811
        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
885
812
        self.failIf('file-info' in rev.properties)
886
813
 
887
 
    def test_commit_disabled_messages(self):
888
 
        tree = self.make_branch_and_tree('tree')
889
 
        rev_id1 = tree.commit('one')
890
 
 
891
 
        self.build_tree(['tree/a', 'tree/b'])
892
 
        tree.add(['a', 'b'], ['a-id', 'b-id'])
893
 
 
894
 
        dlg = commit.CommitDialog(tree)
895
 
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
896
 
        self.assertEqual('Commit Message',
897
 
                         dlg._global_message_label.get_text())
898
 
 
899
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
900
 
        dlg = commit.CommitDialog(tree)
901
 
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
902
 
        self.assertEqual('Global Commit Message',
903
 
                         dlg._global_message_label.get_text())
904
 
 
905
 
        tree.branch.get_config().set_user_option('per_file_commits', 'on')
906
 
        dlg = commit.CommitDialog(tree)
907
 
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
908
 
        self.assertEqual('Global Commit Message',
909
 
                         dlg._global_message_label.get_text())
910
 
 
911
 
        tree.branch.get_config().set_user_option('per_file_commits', 'y')
912
 
        dlg = commit.CommitDialog(tree)
913
 
        self.assertTrue(dlg._file_message_expander.get_property('visible'))
914
 
        self.assertEqual('Global Commit Message',
915
 
                         dlg._global_message_label.get_text())
916
 
 
917
 
        tree.branch.get_config().set_user_option('per_file_commits', 'n')
918
 
        dlg = commit.CommitDialog(tree)
919
 
        self.assertFalse(dlg._file_message_expander.get_property('visible'))
920
 
        self.assertEqual('Commit Message',
921
 
                         dlg._global_message_label.get_text())
922
 
 
923
814
    def test_commit_specific_files_with_messages(self):
924
815
        tree = self.make_branch_and_tree('tree')
925
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
926
816
        rev_id1 = tree.commit('one')
927
817
        self.build_tree(['tree/a', 'tree/b'])
928
818
        tree.add(['a', 'b'], ['a-id', 'b-id'])
929
819
 
930
820
        dlg = commit.CommitDialog(tree)
931
 
        dlg._commit_selected_radio.set_active(True) # enable partial
932
821
        dlg._treeview_files.set_cursor((1,))
933
822
        dlg._set_file_commit_message('Message for A\n')
934
823
        dlg._treeview_files.set_cursor((2,))
953
842
 
954
843
    def test_commit_messages_after_merge(self):
955
844
        tree = self.make_branch_and_tree('tree')
956
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
957
845
        rev_id1 = tree.commit('one')
958
846
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
959
847
        self.build_tree(['tree2/a', 'tree2/b'])
985
873
                         ], bencode.bdecode(file_info))
986
874
 
987
875
    def test_commit_unicode_messages(self):
988
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
876
        from bzrlib.tests.test_diff import UnicodeFilename
 
877
        self.requireFeature(UnicodeFilename)
989
878
 
990
879
        tree = self.make_branch_and_tree('tree')
991
 
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
992
880
        self.build_tree(['tree/a', u'tree/\u03a9'])
993
881
        tree.add(['a', u'\u03a9'], ['a-id', 'omega-id'])
994
882
 
1009
897
        dlg._do_commit()
1010
898
 
1011
899
        rev = tree.branch.repository.get_revision(dlg.committed_revision_id)
1012
 
        file_info = rev.properties['file-info'].encode('UTF-8')
 
900
        file_info = rev.properties['file-info']
1013
901
        value = ('ld7:file_id4:a-id'
1014
902
                   '7:message16:Test \xc3\xban\xc3\xacc\xc3\xb6de\n'
1015
903
                   '4:path1:a'
1019
907
                   '4:path2:\xce\xa9'
1020
908
                  'e'
1021
909
                 'e')
 
910
        self.expectFailure('bencode and unicode does not mix properly with'
 
911
                           ' Revision XML serialization.',
 
912
                           self.assertEqual, value, file_info)
1022
913
        self.assertEqual(value, file_info)
1023
914
        file_info_decoded = bencode.bdecode(file_info)
1024
915
        for d in file_info_decoded:
1025
 
            d['path'] = d['path'].decode('UTF-8')
1026
 
            d['message'] = d['message'].decode('UTF-8')
 
916
            d['path'] = d['path'].decode('utf8')
 
917
            d['message'] = d['message'].decode('utf8')
1027
918
 
1028
919
        self.assertEqual([{'path':u'a', 'file_id':'a-id',
1029
920
                           'message':u'Test \xfan\xecc\xf6de\n'},