/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-29 14:12:30 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110829141230-6nv7h0oxjrojb1y1
Updated hacking doc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
1
 
# Copyright (C) 2007, 2008, 2009, 2011, 2012, 2013 John Arbash Meinel <john@arbash-meinel.com>
 
1
# Copyright (C) 2007, 2008 John Arbash Meinel <john@arbash-meinel.com>
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Test the Commit functionality."""
18
18
 
19
19
import os
20
 
import subprocess
21
 
from tempfile import NamedTemporaryFile
22
20
 
23
21
from gi.repository import Gtk
24
22
 
28
26
    uncommit,
29
27
    )
30
28
try:
31
 
    from bzrlib.tests.features import UnicodeFilenameFeature
32
 
except ImportError: # bzr < 2.5
33
 
    from bzrlib.tests import UnicodeFilenameFeature
34
 
from bzrlib import bencode
 
29
    from bzrlib import bencode
 
30
except ImportError:
 
31
    from bzrlib.util import bencode
35
32
 
36
 
from bzrlib.plugins.gtk import (
37
 
    commit,
38
 
    commitmsgs,
39
 
    )
40
 
from bzrlib.plugins.gtk.commitmsgs import SavedCommitMessagesManager
41
 
from bzrlib.plugins.gtk.tests import MockMethod
 
33
from bzrlib.plugins.gtk import commit
42
34
 
43
35
 
44
36
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
50
42
        tree = self.make_branch_and_tree('.')
51
43
        tree.commit('one')
52
44
 
53
 
        self.addCleanup(tree.lock_read().unlock)
54
 
        self.assertEquals([], list(commit.pending_revisions(tree)))
 
45
        self.assertIs(None, commit.pending_revisions(tree))
55
46
 
56
47
    def test_pending_revisions_simple(self):
57
48
        tree = self.make_branch_and_tree('tree')
61
52
        tree.merge_from_branch(tree2.branch)
62
53
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
63
54
 
64
 
        self.addCleanup(tree.lock_read().unlock)
65
 
        pending_revisions = list(commit.pending_revisions(tree))
 
55
        pending_revisions = commit.pending_revisions(tree)
66
56
        # One primary merge
67
57
        self.assertEqual(1, len(pending_revisions))
68
58
        # Revision == rev_id2
80
70
        tree.merge_from_branch(tree2.branch)
81
71
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
82
72
 
83
 
        self.addCleanup(tree.lock_read().unlock)
84
 
        pending_revisions = list(commit.pending_revisions(tree))
 
73
        pending_revisions = commit.pending_revisions(tree)
85
74
        # One primary merge
86
75
        self.assertEqual(1, len(pending_revisions))
87
76
        # Revision == rev_id2
104
93
        tree.merge_from_branch(tree3.branch, force=True)
105
94
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
106
95
 
107
 
        self.addCleanup(tree.lock_read().unlock)
108
 
        pending_revisions = list(commit.pending_revisions(tree))
 
96
        pending_revisions = commit.pending_revisions(tree)
109
97
        # Two primary merges
110
98
        self.assertEqual(2, len(pending_revisions))
111
99
        # Revision == rev_id2
148
136
 
149
137
class TestCommitDialogSimple(tests.TestCaseWithTransport):
150
138
 
151
 
    def test_init(self):
152
 
        MockMethod.bind(self, CommitDialogNoWidgets, 'setup_params')
153
 
        MockMethod.bind(self, CommitDialogNoWidgets, 'construct')
154
 
        MockMethod.bind(self, CommitDialogNoWidgets, 'fill_in_data')
155
 
 
156
 
        tree = self.make_branch_and_tree('tree')
157
 
        rev_id = tree.commit('first')
158
 
        dlg = CommitDialogNoWidgets(tree)
159
 
        self.assertIs(tree, dlg._wt)
160
 
        self.assertIs(None, dlg._selected)
161
 
        self.assertTrue(dlg._enable_per_file_commits)
162
 
        self.assertTrue(dlg._commit_all_changes)
163
 
        self.assertIs(None, dlg.committed_revision_id)
164
 
        self.assertIs(None, dlg._last_selected_file)
165
 
        self.assertIsInstance(
166
 
            dlg._saved_commit_messages_manager, SavedCommitMessagesManager)
167
 
        self.assertTrue(CommitDialogNoWidgets.setup_params.called)
168
 
        self.assertTrue(CommitDialogNoWidgets.construct.called)
169
 
        self.assertTrue(CommitDialogNoWidgets.fill_in_data.called)
170
 
 
171
139
    def test_setup_parameters_no_pending(self):
172
140
        tree = self.make_branch_and_tree('tree')
173
141
        rev_id = tree.commit('first')
174
142
 
175
143
        dlg = CommitDialogNoWidgets(tree)
176
144
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
177
 
        self.assertEquals([], dlg._pending)
 
145
        self.assertIs(None, dlg._pending)
178
146
        self.assertFalse(dlg._is_checkout)
179
147
 
180
148
    def test_setup_parameters_checkout(self):
185
153
 
186
154
        dlg = CommitDialogNoWidgets(tree2)
187
155
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
188
 
        self.assertEquals([], dlg._pending)
 
156
        self.assertIs(None, dlg._pending)
189
157
        self.assertTrue(dlg._is_checkout)
190
158
 
191
159
    def test_setup_parameters_pending(self):
216
184
        self.assertEqual([], delta.removed)
217
185
        self.assertEqual([(u'a', 'a-id', 'file')], delta.added)
218
186
 
219
 
    def test_on_treeview_files_cursor_changed_no_selection(self):
220
 
        MockMethod.bind(self, CommitDialogNoWidgets, '_update_per_file_info')
221
 
        tree = self.make_branch_and_tree('tree')
222
 
        rev_id = tree.commit('first')
223
 
        dlg = CommitDialogNoWidgets(tree)
224
 
        treeview = Gtk.TreeView()
225
 
        dlg._on_treeview_files_cursor_changed(treeview)
226
 
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
227
 
 
228
 
    def test_on_treeview_files_cursor_changed_with_destroyed_treeview(self):
229
 
        MockMethod.bind(self, CommitDialogNoWidgets, '_update_per_file_info')
230
 
        tree = self.make_branch_and_tree('tree')
231
 
        rev_id = tree.commit('first')
232
 
        dlg = CommitDialogNoWidgets(tree)
233
 
        treeview = Gtk.TreeView()
234
 
        treeview.destroy()
235
 
        dlg._on_treeview_files_cursor_changed(treeview)
236
 
        self.assertFalse(CommitDialogNoWidgets._update_per_file_info.called)
237
 
 
238
 
    def test_get_line_height(self):
239
 
        tree = self.make_branch_and_tree('tree')
240
 
        dlg = CommitDialogNoWidgets(tree)
241
 
        textview = Gtk.TextView()
242
 
        line_height = dlg.get_line_height(textview)
243
 
        self.assertIsInstance(line_height, int)
244
 
 
245
187
 
246
188
class TestCommitDialog(tests.TestCaseWithTransport):
247
189
 
346
288
 
347
289
        dlg = commit.CommitDialog(tree)
348
290
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
349
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
291
        self.assertEqual([(None, None, True, 'All Files', ''),
350
292
                          ('a-id', 'a', True, 'a', 'added'),
351
293
                          ('b-id', 'b', True, 'b/', 'added'),
352
294
                          ('c-id', 'b/c', True, 'b/c', 'added'),
363
305
 
364
306
        dlg = commit.CommitDialog(tree)
365
307
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
366
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
308
        self.assertEqual([(None, None, True, 'All Files', ''),
367
309
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
368
310
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed'),
369
311
                         ], values)
378
320
 
379
321
        dlg = commit.CommitDialog(tree)
380
322
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
381
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
323
        self.assertEqual([(None, None, True, 'All Files', ''),
382
324
                          ('a-id', 'a', True, 'a', 'modified'),
383
325
                         ], values)
384
326
 
398
340
 
399
341
        dlg = commit.CommitDialog(tree)
400
342
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
401
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
343
        self.assertEqual([(None, None, True, 'All Files', ''),
402
344
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
403
345
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed and modified'),
404
346
                          ('c-id', 'd/c', True, 'd/c', 'modified'),
421
363
 
422
364
        dlg = commit.CommitDialog(tree)
423
365
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
424
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
366
        self.assertEqual([(None, None, True, 'All Files', ''),
425
367
                          ('a-id', 'a', True, 'a => a/', 'kind changed'),
426
368
                          # ('b-id', 'c', True, 'b => c/', 'renamed and modified'),
427
369
                         ], values)
437
379
 
438
380
        dlg = commit.CommitDialog(tree)
439
381
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
440
 
        self.assertEqual([("", "", True, 'All Files', ''),
 
382
        self.assertEqual([(None, None, True, 'All Files', ''),
441
383
                          ('a-id', 'a', True, 'a', 'removed'),
442
384
                          ('b-id', 'b', True, 'b/', 'removed'),
443
385
                         ], values)
452
394
 
453
395
        dlg = commit.CommitDialog(tree, selected='a')
454
396
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
455
 
        self.assertEqual([("", "", False, 'All Files', ''),
 
397
        self.assertEqual([(None, None, False, 'All Files', ''),
456
398
                          ('a-id', 'a', True, 'a', 'added'),
457
399
                          ('b-id', 'b', False, 'b/', 'added'),
458
400
                         ], values)
636
578
        tree.add(['a', 'b'], ['a-id', 'b-id'])
637
579
 
638
580
        dlg = commit.CommitDialog(tree)
639
 
        self.assertEqual([("", "", True),
 
581
        self.assertEqual([(None, None, True),
640
582
                          ('a-id', 'a', True),
641
583
                          ('b-id', 'b', True),
642
584
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
651
593
 
652
594
        # Toggle a single entry should set just that entry to False
653
595
        dlg._toggle_commit(None, 1, dlg._files_store)
654
 
        self.assertEqual([("", "", True),
 
596
        self.assertEqual([(None, None, True),
655
597
                          ('a-id', 'a', False),
656
598
                          ('b-id', 'b', True),
657
599
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
658
600
 
659
601
        # Toggling the main entry should set all entries
660
602
        dlg._toggle_commit(None, 0, dlg._files_store)
661
 
        self.assertEqual([("", "", False),
 
603
        self.assertEqual([(None, None, False),
662
604
                          ('a-id', 'a', False),
663
605
                          ('b-id', 'b', False),
664
606
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
665
607
 
666
608
        dlg._toggle_commit(None, 2, dlg._files_store)
667
 
        self.assertEqual([("", "", False),
 
609
        self.assertEqual([(None, None, False),
668
610
                          ('a-id', 'a', False),
669
611
                          ('b-id', 'b', True),
670
612
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
671
613
 
672
614
        dlg._toggle_commit(None, 0, dlg._files_store)
673
 
        self.assertEqual([("", "", True),
 
615
        self.assertEqual([(None, None, True),
674
616
                          ('a-id', 'a', True),
675
617
                          ('b-id', 'b', True),
676
618
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
1108
1050
                         bencode.bdecode(file_info.encode('UTF-8')))
1109
1051
 
1110
1052
    def test_commit_unicode_messages(self):
1111
 
        self.requireFeature(UnicodeFilenameFeature)
 
1053
        self.requireFeature(tests.UnicodeFilenameFeature)
1112
1054
 
1113
1055
        tree = self.make_branch_and_tree('tree')
1114
1056
        tree.branch.get_config().set_user_option('per_file_commits', 'true')
1182
1124
        super(TestSavedCommitMessages, self).setUp()
1183
1125
        # Install our hook
1184
1126
        branch.Branch.hooks.install_named_hook(
1185
 
            'post_uncommit', commitmsgs.save_commit_messages, None)
 
1127
            'post_uncommit', commit.save_commit_messages, None)
1186
1128
 
1187
1129
    def _get_file_info_dict(self, rank):
1188
 
        file_info = [dict(path='a', file_id='a-id',
1189
 
                          message='a {msg} %d' % rank),
1190
 
                     dict(path='b', file_id='b-id',
1191
 
                          message='b msg %d' % rank)]
 
1130
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
 
1131
                     dict(path='b', file_id='b-id', message='b msg %d' % rank)]
1192
1132
        return file_info
1193
1133
 
1194
1134
    def _get_file_info_revprops(self, rank):
1196
1136
        return {'file-info': bencode.bencode(file_info_prop).decode('UTF-8')}
1197
1137
 
1198
1138
    def _get_commit_message(self):
1199
 
        return self.config.get_user_option(
1200
 
            'gtk_global_commit_message', expand=False)
 
1139
        return self.config.get_user_option('gtk_global_commit_message')
1201
1140
 
1202
1141
    def _get_file_commit_messages(self):
1203
 
        return self.config.get_user_option(
1204
 
            'gtk_file_commit_messages', expand=False)
 
1142
        return self.config.get_user_option('gtk_file_commit_messages')
1205
1143
 
1206
1144
 
1207
1145
class TestUncommitHook(TestSavedCommitMessages):
1223
1161
    def test_uncommit_one_by_one(self):
1224
1162
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1225
1163
        self.assertEquals(u'three', self._get_commit_message())
1226
 
        self.assertEquals(u'd4:a-id9:a {msg} 34:b-id7:b msg 3e',
 
1164
        self.assertEquals(u'd4:a-id7:a msg 34:b-id7:b msg 3e',
1227
1165
                          self._get_file_commit_messages())
1228
1166
 
1229
1167
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1230
1168
        self.assertEquals(u'two\n******\nthree', self._get_commit_message())
1231
 
        self.assertEquals(u'd4:a-id26:a {msg} 2\n******\na {msg} 3'
 
1169
        self.assertEquals(u'd4:a-id22:a msg 2\n******\na msg 3'
1232
1170
                          '4:b-id22:b msg 2\n******\nb msg 3e',
1233
1171
                          self._get_file_commit_messages())
1234
1172
 
1235
1173
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1236
1174
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1237
1175
                          self._get_commit_message())
1238
 
        self.assertEquals(
1239
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1240
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1241
 
            self._get_file_commit_messages())
 
1176
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1177
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1178
                          self._get_file_commit_messages())
1242
1179
 
1243
1180
    def test_uncommit_all_at_once(self):
1244
1181
        uncommit.uncommit(self.tree.branch, tree=self.tree, revno=1)
1245
1182
        self.assertEquals(u'one\n******\ntwo\n******\nthree',
1246
1183
                          self._get_commit_message())
1247
 
        self.assertEquals(
1248
 
            u'd4:a-id43:a {msg} 1\n******\na {msg} 2\n******\na {msg} 3'
1249
 
            '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
1250
 
            self._get_file_commit_messages())
 
1184
        self.assertEquals(u'd4:a-id37:a msg 1\n******\na msg 2\n******\na msg 3'
 
1185
                          '4:b-id37:b msg 1\n******\nb msg 2\n******\nb msg 3e',
 
1186
                          self._get_file_commit_messages())
1251
1187
 
1252
1188
 
1253
1189
class TestReusingSavedCommitMessages(TestSavedCommitMessages, QuestionHelpers):
1261
1197
        self.tree.add(['a'], ['a-id'])
1262
1198
        self.tree.add(['b'], ['b-id'])
1263
1199
        rev1 = self.tree.commit('one', revprops=self._get_file_info_revprops(1))
1264
 
        rev2 = self.tree.commit('two{x}',
1265
 
                                revprops=self._get_file_info_revprops(2))
 
1200
        rev2 = self.tree.commit('two', revprops=self._get_file_info_revprops(2))
1266
1201
        uncommit.uncommit(self.tree.branch, tree=self.tree)
1267
1202
        self.build_tree_contents([('tree/a', 'new a content\n'),
1268
1203
                                  ('tree/b', 'new b content'),])
1277
1212
 
1278
1213
    def test_setup_saved_messages(self):
1279
1214
        # Check the initial setup
1280
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1281
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1215
        self.assertEquals(u'two', self._get_commit_message())
 
1216
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1282
1217
                          self._get_file_commit_messages())
1283
1218
 
1284
1219
    def test_messages_are_reloaded(self):
1285
1220
        dlg = self._get_commit_dialog(self.tree)
1286
 
        self.assertEquals(u'two{x}', dlg._get_global_commit_message())
 
1221
        self.assertEquals(u'two', dlg._get_global_commit_message())
1287
1222
        self.assertEquals(([u'a', u'b'],
1288
1223
                           [{ 'path': 'a',
1289
 
                             'file_id': 'a-id', 'message': 'a {msg} 2',},
 
1224
                             'file_id': 'a-id', 'message': 'a msg 2',},
1290
1225
                           {'path': 'b',
1291
1226
                            'file_id': 'b-id', 'message': 'b msg 2',}],),
1292
1227
                          dlg._get_specific_files())
1301
1236
        dlg = self._get_commit_dialog(self.tree)
1302
1237
        self._set_question_yes(dlg) # Save messages
1303
1238
        dlg._do_cancel()
1304
 
        self.assertEquals(u'two{x}', self._get_commit_message())
1305
 
        self.assertEquals(u'd4:a-id9:a {msg} 24:b-id7:b msg 2e',
 
1239
        self.assertEquals(u'two', self._get_commit_message())
 
1240
        self.assertEquals(u'd4:a-id7:a msg 24:b-id7:b msg 2e',
1306
1241
                          self._get_file_commit_messages())
1307
1242
 
1308
1243
    def test_messages_are_cleared_on_cancel_if_required(self):
1312
1247
        self.assertEquals(u'', self._get_commit_message())
1313
1248
        self.assertEquals(u'de',
1314
1249
                          self._get_file_commit_messages())
1315
 
 
1316
 
 
1317
 
class BzrHandlePatchTestCase(tests.TestCase):
1318
 
 
1319
 
    def setUp(self):
1320
 
        top = os.path.abspath(os.path.join(
1321
 
            os.path.dirname(__file__), os.pardir))
1322
 
        self.script = os.path.join(top, 'bzr-handle-patch')
1323
 
        self.env = dict(os.environ)
1324
 
        self.env['BZR_PLUGINS_AT'] = 'gtk@%s' % top
1325
 
        self.patch = NamedTemporaryFile()
1326
 
        self.patch.write('\n'.join([
1327
 
            "=== added file '_test.txt'",
1328
 
            "--- _test.txt      1970-01-01 00:00:00 +0000",
1329
 
            "+++ _test.txt      2012-02-03 20:00:34 +0000",
1330
 
            "@@ -0,0 +1,1 @@",
1331
 
            "+hello",
1332
 
            ]))
1333
 
        self.patch.flush()
1334
 
        super(BzrHandlePatchTestCase, self).setUp()
1335
 
 
1336
 
    def test_smoketest(self):
1337
 
        # This is a smoke test to verify the process starts.
1338
 
        bzr_notify = subprocess.Popen(
1339
 
            [self.script, self.patch.name, 'test'],
1340
 
            stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=self.env)
1341
 
        stdout, stderr = bzr_notify.communicate()
1342
 
        self.assertEqual('', stdout)
1343
 
        self.assertEqual('', stderr)