/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: 2012-07-09 15:23:26 UTC
  • mto: This revision was merged to the branch mainline in revision 794.
  • Revision ID: jelmer@samba.org-20120709152326-dzxb8zoz0btull7n
https://launchpad.net/bugs/714767
https://launchpad.net/bugs/949798
https://launchpad.net/bugs/998994
https://launchpad.net/bugs/342135
https://launchpad.net/bugs/342136
https://launchpad.net/bugs/394536
Remove bzr-notify.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
17
17
"""Test the Commit functionality."""
18
18
 
19
19
import os
 
20
import subprocess
 
21
from tempfile import NamedTemporaryFile
20
22
 
21
23
from gi.repository import Gtk
22
24
 
29
31
    from bzrlib.tests.features import UnicodeFilenameFeature
30
32
except ImportError: # bzr < 2.5
31
33
    from bzrlib.tests import UnicodeFilenameFeature
32
 
try:
33
 
    from bzrlib import bencode
34
 
except ImportError:
35
 
    from bzrlib.util import bencode
 
34
from bzrlib import bencode
36
35
 
37
 
from bzrlib.plugins.gtk import commit
 
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
38
42
 
39
43
 
40
44
# TODO: All we need is basic ancestry code to test this, we shouldn't need a
46
50
        tree = self.make_branch_and_tree('.')
47
51
        tree.commit('one')
48
52
 
49
 
        self.assertIs(None, commit.pending_revisions(tree))
 
53
        self.addCleanup(tree.lock_read().unlock)
 
54
        self.assertEquals([], list(commit.pending_revisions(tree)))
50
55
 
51
56
    def test_pending_revisions_simple(self):
52
57
        tree = self.make_branch_and_tree('tree')
56
61
        tree.merge_from_branch(tree2.branch)
57
62
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
58
63
 
59
 
        pending_revisions = commit.pending_revisions(tree)
 
64
        self.addCleanup(tree.lock_read().unlock)
 
65
        pending_revisions = list(commit.pending_revisions(tree))
60
66
        # One primary merge
61
67
        self.assertEqual(1, len(pending_revisions))
62
68
        # Revision == rev_id2
74
80
        tree.merge_from_branch(tree2.branch)
75
81
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
76
82
 
77
 
        pending_revisions = commit.pending_revisions(tree)
 
83
        self.addCleanup(tree.lock_read().unlock)
 
84
        pending_revisions = list(commit.pending_revisions(tree))
78
85
        # One primary merge
79
86
        self.assertEqual(1, len(pending_revisions))
80
87
        # Revision == rev_id2
97
104
        tree.merge_from_branch(tree3.branch, force=True)
98
105
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
99
106
 
100
 
        pending_revisions = commit.pending_revisions(tree)
 
107
        self.addCleanup(tree.lock_read().unlock)
 
108
        pending_revisions = list(commit.pending_revisions(tree))
101
109
        # Two primary merges
102
110
        self.assertEqual(2, len(pending_revisions))
103
111
        # Revision == rev_id2
140
148
 
141
149
class TestCommitDialogSimple(tests.TestCaseWithTransport):
142
150
 
 
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
 
143
171
    def test_setup_parameters_no_pending(self):
144
172
        tree = self.make_branch_and_tree('tree')
145
173
        rev_id = tree.commit('first')
146
174
 
147
175
        dlg = CommitDialogNoWidgets(tree)
148
176
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
149
 
        self.assertIs(None, dlg._pending)
 
177
        self.assertEquals([], dlg._pending)
150
178
        self.assertFalse(dlg._is_checkout)
151
179
 
152
180
    def test_setup_parameters_checkout(self):
157
185
 
158
186
        dlg = CommitDialogNoWidgets(tree2)
159
187
        self.assertEqual(rev_id, dlg._basis_tree.get_revision_id())
160
 
        self.assertIs(None, dlg._pending)
 
188
        self.assertEquals([], dlg._pending)
161
189
        self.assertTrue(dlg._is_checkout)
162
190
 
163
191
    def test_setup_parameters_pending(self):
188
216
        self.assertEqual([], delta.removed)
189
217
        self.assertEqual([(u'a', 'a-id', 'file')], delta.added)
190
218
 
 
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
 
191
245
 
192
246
class TestCommitDialog(tests.TestCaseWithTransport):
193
247
 
292
346
 
293
347
        dlg = commit.CommitDialog(tree)
294
348
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
295
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
349
        self.assertEqual([("", "", True, 'All Files', ''),
296
350
                          ('a-id', 'a', True, 'a', 'added'),
297
351
                          ('b-id', 'b', True, 'b/', 'added'),
298
352
                          ('c-id', 'b/c', True, 'b/c', 'added'),
309
363
 
310
364
        dlg = commit.CommitDialog(tree)
311
365
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
312
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
366
        self.assertEqual([("", "", True, 'All Files', ''),
313
367
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
314
368
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed'),
315
369
                         ], values)
324
378
 
325
379
        dlg = commit.CommitDialog(tree)
326
380
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
327
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
381
        self.assertEqual([("", "", True, 'All Files', ''),
328
382
                          ('a-id', 'a', True, 'a', 'modified'),
329
383
                         ], values)
330
384
 
344
398
 
345
399
        dlg = commit.CommitDialog(tree)
346
400
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
347
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
401
        self.assertEqual([("", "", True, 'All Files', ''),
348
402
                          ('b-id', 'd', True, 'b/ => d/', 'renamed'),
349
403
                          ('a-id', 'd/a', True, 'a => d/a', 'renamed and modified'),
350
404
                          ('c-id', 'd/c', True, 'd/c', 'modified'),
367
421
 
368
422
        dlg = commit.CommitDialog(tree)
369
423
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
370
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
424
        self.assertEqual([("", "", True, 'All Files', ''),
371
425
                          ('a-id', 'a', True, 'a => a/', 'kind changed'),
372
426
                          # ('b-id', 'c', True, 'b => c/', 'renamed and modified'),
373
427
                         ], values)
383
437
 
384
438
        dlg = commit.CommitDialog(tree)
385
439
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
386
 
        self.assertEqual([(None, None, True, 'All Files', ''),
 
440
        self.assertEqual([("", "", True, 'All Files', ''),
387
441
                          ('a-id', 'a', True, 'a', 'removed'),
388
442
                          ('b-id', 'b', True, 'b/', 'removed'),
389
443
                         ], values)
398
452
 
399
453
        dlg = commit.CommitDialog(tree, selected='a')
400
454
        values = [(r[0], r[1], r[2], r[3], r[4]) for r in dlg._files_store]
401
 
        self.assertEqual([(None, None, False, 'All Files', ''),
 
455
        self.assertEqual([("", "", False, 'All Files', ''),
402
456
                          ('a-id', 'a', True, 'a', 'added'),
403
457
                          ('b-id', 'b', False, 'b/', 'added'),
404
458
                         ], values)
582
636
        tree.add(['a', 'b'], ['a-id', 'b-id'])
583
637
 
584
638
        dlg = commit.CommitDialog(tree)
585
 
        self.assertEqual([(None, None, True),
 
639
        self.assertEqual([("", "", True),
586
640
                          ('a-id', 'a', True),
587
641
                          ('b-id', 'b', True),
588
642
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
597
651
 
598
652
        # Toggle a single entry should set just that entry to False
599
653
        dlg._toggle_commit(None, 1, dlg._files_store)
600
 
        self.assertEqual([(None, None, True),
 
654
        self.assertEqual([("", "", True),
601
655
                          ('a-id', 'a', False),
602
656
                          ('b-id', 'b', True),
603
657
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
604
658
 
605
659
        # Toggling the main entry should set all entries
606
660
        dlg._toggle_commit(None, 0, dlg._files_store)
607
 
        self.assertEqual([(None, None, False),
 
661
        self.assertEqual([("", "", False),
608
662
                          ('a-id', 'a', False),
609
663
                          ('b-id', 'b', False),
610
664
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
611
665
 
612
666
        dlg._toggle_commit(None, 2, dlg._files_store)
613
 
        self.assertEqual([(None, None, False),
 
667
        self.assertEqual([("", "", False),
614
668
                          ('a-id', 'a', False),
615
669
                          ('b-id', 'b', True),
616
670
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
617
671
 
618
672
        dlg._toggle_commit(None, 0, dlg._files_store)
619
 
        self.assertEqual([(None, None, True),
 
673
        self.assertEqual([("", "", True),
620
674
                          ('a-id', 'a', True),
621
675
                          ('b-id', 'b', True),
622
676
                         ], [(r[0], r[1], r[2]) for r in dlg._files_store])
1128
1182
        super(TestSavedCommitMessages, self).setUp()
1129
1183
        # Install our hook
1130
1184
        branch.Branch.hooks.install_named_hook(
1131
 
            'post_uncommit', commit.save_commit_messages, None)
 
1185
            'post_uncommit', commitmsgs.save_commit_messages, None)
1132
1186
 
1133
1187
    def _get_file_info_dict(self, rank):
1134
1188
        file_info = [dict(path='a', file_id='a-id', message='a msg %d' % rank),
1251
1305
        self.assertEquals(u'', self._get_commit_message())
1252
1306
        self.assertEquals(u'de',
1253
1307
                          self._get_file_commit_messages())
 
1308
 
 
1309
 
 
1310
class BzrHandlePatchTestCase(tests.TestCase):
 
1311
 
 
1312
    def setUp(self):
 
1313
        top = os.path.abspath(os.path.join(
 
1314
            os.path.dirname(__file__), os.pardir))
 
1315
        self.script = os.path.join(top, 'bzr-handle-patch')
 
1316
        self.env = dict(os.environ)
 
1317
        self.env['BZR_PLUGINS_AT'] = 'gtk@%s' % top
 
1318
        self.patch = NamedTemporaryFile()
 
1319
        self.patch.write('\n'.join([
 
1320
            "=== added file '_test.txt'",
 
1321
            "--- _test.txt      1970-01-01 00:00:00 +0000",
 
1322
            "+++ _test.txt      2012-02-03 20:00:34 +0000",
 
1323
            "@@ -0,0 +1,1 @@",
 
1324
            "+hello",
 
1325
            ]))
 
1326
        self.patch.flush()
 
1327
        super(BzrHandlePatchTestCase, self).setUp()
 
1328
 
 
1329
    def test_smoketest(self):
 
1330
        # This is a smoke test to verify the process starts.
 
1331
        bzr_notify = subprocess.Popen(
 
1332
            [self.script, self.patch.name, 'test'],
 
1333
            stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=self.env)
 
1334
        stdout, stderr = bzr_notify.communicate()
 
1335
        self.assertEqual('', stdout)
 
1336
        self.assertEqual('', stderr)