/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-09-07 16:01:14 UTC
  • mto: This revision was merged to the branch mainline in revision 741.
  • Revision ID: sinzui.is@verizon.net-20110907160114-ytbap2x584bh1ehw
Fixed long lines created by conversion script. removed checks for obsolete methods.

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