15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from cStringIO import StringIO
20
from gi.repository import Gtk
28
from bzrlib.tests.features import UnicodeFilenameFeature
29
except ImportError: # bzr < 2.5
30
from bzrlib.tests import UnicodeFilenameFeature
31
from bzrlib.merge_directive import MergeDirective2
33
from bzrlib.plugins.gtk.diff import (
40
iter_changes_to_status,
41
MergeDirectiveController,
43
from bzrlib.plugins.gtk.tests import MockMethod
47
=== modified file 'tests/test_diff.py'
48
--- tests/test_diff.py 2008-03-11 13:18:28 +0000
49
+++ tests/test_diff.py 2008-05-08 22:44:02 +0000
52
from bzrlib import tests
54
-from bzrlib.plugins.gtk.diff import DiffView, iter_changes_to_status
55
+from bzrlib.plugins.gtk.diff import (
58
+ iter_changes_to_status,
62
class TestDiffViewSimple(tests.TestCase):
66
class FakeDiffFileView(DiffFileView):
71
class DiffFileViewTestCase(tests.TestCase):
73
def test_init_construct(self):
74
view = FakeDiffFileView()
75
self.assertIsNot(None, view.buffer)
76
self.assertIsNot(None, view.sourceview)
77
self.assertIs(False, view.sourceview.props.editable)
78
font_desc = view.sourceview.get_style_context().get_font(
79
Gtk.StateFlags.NORMAL)
80
self.assertIn('Monospace', font_desc.get_family())
82
def test_init_construct_have_gtksourceview(self):
83
if not have_gtksourceview:
85
view = FakeDiffFileView()
86
self.assertEqual('Diff', view.buffer.get_language().get_name())
87
self.assertIs(True, view.buffer.get_highlight_syntax())
21
from bzrlib import tests
23
from bzrlib.plugins.gtk.diff import DiffView, iter_changes_to_status
26
class TestDiffViewSimple(tests.TestCase):
28
def test_parse_colordiffrc(self):
32
# now a comment and a blank line
35
# another comment preceded by whitespace
40
'diffstuff': '#ffff00',
42
parsed_colors = DiffView.parse_colordiffrc(StringIO(colordiffrc))
43
self.assertEqual(colors, parsed_colors)
90
46
class TestDiffView(tests.TestCaseWithTransport):
92
48
def test_unicode(self):
93
self.requireFeature(UnicodeFilenameFeature)
49
from bzrlib.tests.test_diff import UnicodeFilename
50
self.requireFeature(UnicodeFilename)
95
52
tree = self.make_branch_and_tree('tree')
96
53
self.build_tree([u'tree/\u03a9'])
116
class FakeDiffWidget(DiffWidget):
121
class TestDiffWidget(tests.TestCaseWithTransport):
123
def test_treeview_cursor_cb(self):
124
widget = FakeDiffWidget()
125
widget.set_diff_text_sections(
126
[('', None, 'patch1'), ('a', 'a', 'patch2')])
127
widget.treeview.set_cursor(Gtk.TreePath(path=1), None, False)
128
widget._treeview_cursor_cb(None)
129
self.assertTrue('patch2', widget.diff_view.buffer.props.text)
131
def test_treeview_cursor_cb_with_destroyed_treeview(self):
132
widget = FakeDiffWidget()
133
widget.set_diff_text_sections(
134
[('', None, 'patch1'), ('a', 'a', 'patch2')])
135
MockMethod.bind(self, widget.diff_view, 'show_diff')
136
widget.treeview.destroy()
137
widget._treeview_cursor_cb(None)
138
self.assertFalse(widget.diff_view.show_diff.called)
141
class FakeDiffWindow(DiffWindow):
146
class DiffWindowTestCase(tests.TestCaseWithTransport):
149
window = DiffWindow()
150
self.assertEqual('bzr diff', window.props.title)
151
self.assertEqual(0, window.props.border_width)
153
def test_init_construct_without_operations(self):
154
window = DiffWindow()
155
widgets = window.vbox.get_children()
156
self.assertEqual(2, len(widgets))
157
self.assertIsInstance(widgets[0], Gtk.MenuBar)
158
self.assertIsInstance(widgets[1], DiffWidget)
160
def test_init_construct_with_operations(self):
161
method = MockMethod()
162
window = DiffWindow(operations=[('title', method)])
163
widgets = window.vbox.get_children()
164
self.assertEqual(3, len(widgets))
165
self.assertIsInstance(widgets[0], Gtk.MenuBar)
166
self.assertIsInstance(widgets[1], Gtk.HButtonBox)
167
self.assertIsInstance(widgets[2], DiffWidget)
169
def test_get_menu_bar(self):
170
window = DiffWindow()
171
menu_bar = window._get_menu_bar()
172
self.assertIsNot(None, menu_bar)
173
menus = menu_bar.get_children()
174
self.assertEqual(1, len(menus))
175
self.assertEqual('_View', menus[0].props.label)
176
sub_menu = menus[0].get_submenu()
177
self.assertIsNot(None, sub_menu)
178
items = sub_menu.get_children()
179
self.assertEqual(1, len(items))
180
menus[0].get_submenu().get_children()[0].props.label
181
self.assertEqual('Wrap _Long Lines', items[0].props.label)
183
def test_get_button_bar_with_none(self):
184
window = DiffWindow()
185
self.assertIs(None, window._get_button_bar(None))
187
def test_get_button_bar_with_operations(self):
188
window = DiffWindow()
189
method = MockMethod()
190
button_bar = window._get_button_bar([('title', method)])
191
self.assertIsNot(None, button_bar)
192
buttons = button_bar.get_children()
193
self.assertEqual(1, len(buttons))
194
self.assertEqual('title', buttons[0].props.label)
195
buttons[0].emit('clicked')
196
self.assertIs(True, method.called)
200
class MockDiffWidget(object):
202
def set_diff_text_sections(self, sections):
203
self.sections = list(sections)
206
class MockWindow(object):
209
self.diff = MockDiffWidget()
210
self.merge_successful = False
212
def set_title(self, title):
215
def _get_save_path(self, basename):
218
def _get_merge_target(self):
224
def _merge_successful(self):
225
self.merge_successful = True
227
def _conflicts(self):
228
self.conflicts = True
230
def _handle_error(self, e):
231
self.handled_error = e
234
class TestDiffController(tests.TestCaseWithTransport):
236
def get_controller(self):
237
window = MockWindow()
238
return DiffController('load-path', eg_diff.splitlines(True), window)
240
def test_get_diff_sections(self):
241
controller = self.get_controller()
242
controller = DiffController('.', eg_diff.splitlines(True),
244
sections = list(controller.get_diff_sections())
245
self.assertEqual('Complete Diff', sections[0][0])
246
self.assertIs(None, sections[0][1])
247
self.assertEqual(eg_diff, sections[0][2])
249
self.assertEqual('tests/test_diff.py', sections[1][0])
250
self.assertEqual('tests/test_diff.py', sections[1][1])
251
self.assertEqual(''.join(eg_diff.splitlines(True)[1:]),
254
def test_initialize_window(self):
255
controller = self.get_controller()
256
controller.initialize_window(controller.window)
257
self.assertEqual(2, len(controller.window.diff.sections))
258
self.assertEqual('load-path - diff', controller.window.title)
260
def test_perform_save(self):
261
self.build_tree_contents([('load-path', 'foo')])
262
controller = self.get_controller()
263
controller.perform_save(None)
264
self.assertFileEqual('foo', 'save-path')
267
class TestMergeDirectiveController(tests.TestCaseWithTransport):
269
def make_this_other_directive(self):
270
this = self.make_branch_and_tree('this')
271
this.commit('first commit')
272
other = this.bzrdir.sprout('other').open_workingtree()
273
self.build_tree_contents([('other/foo', 'bar')])
275
other.commit('second commit')
278
directive = MergeDirective2.from_objects(other.branch.repository,
279
other.last_revision(), 0,
283
return this, other, directive
285
def make_merged_window(self, directive):
286
window = MockWindow()
287
controller = MergeDirectiveController('directive', directive, window)
288
controller.perform_merge(window)
291
def test_perform_merge_success(self):
292
this, other, directive = self.make_this_other_directive()
293
window = self.make_merged_window(directive)
294
self.assertTrue(window.merge_successful)
295
self.assertEqual(other.last_revision(), this.get_parent_ids()[1])
296
self.assertFileEqual('bar', 'this/foo')
298
def test_perform_merge_conflicts(self):
299
this, other, directive = self.make_this_other_directive()
300
self.build_tree_contents([('this/foo', 'bar')])
302
this.commit('message')
303
window = self.make_merged_window(directive)
304
self.assertFalse(window.merge_successful)
305
self.assertTrue(window.conflicts)
306
self.assertEqual(other.last_revision(), this.get_parent_ids()[1])
307
self.assertFileEqual('bar', 'this/foo')
309
def test_perform_merge_uncommitted_changes(self):
310
this, other, directive = self.make_this_other_directive()
311
self.build_tree_contents([('this/foo', 'bar')])
313
window = self.make_merged_window(directive)
314
self.assertIsInstance(window.handled_error, errors.UncommittedChanges)
317
72
class Test_IterChangesToStatus(tests.TestCaseWithTransport):
319
74
def assertStatusEqual(self, expected, tree):
410
165
[('a-id', 'a', 'removed', 'a'),
411
166
('b-id', 'b', 'removed', 'b/'),
414
def test_status_missing_file(self):
415
this = self.make_branch_and_tree('this')
416
self.build_tree(['this/foo'])
417
this.add(['foo'], ['foo-id'])
420
other = this.bzrdir.sprout('other').open_workingtree()
422
os.remove('this/foo')
423
this.remove('foo', force=True)
424
this.commit('remove')
426
f = open('other/foo', 'wt')
428
f.write('Modified\n')
431
other.commit('modified')
433
this.merge_from_branch(other.branch)
434
conflicts.resolve(this)
436
self.assertStatusEqual(
437
[('foo-id', 'foo.OTHER', 'missing', 'foo.OTHER'),],
440
def test_status_missing_directory(self):
441
this = self.make_branch_and_tree('this')
442
self.build_tree(['this/foo/', 'this/foo/bar'])
443
this.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
446
other = this.bzrdir.sprout('other').open_workingtree()
448
os.remove('this/foo/bar')
450
this.remove('foo', force=True)
451
this.commit('remove')
453
f = open('other/foo/bar', 'wt')
455
f.write('Modified\n')
458
other.commit('modified')
460
this.merge_from_branch(other.branch)
461
conflicts.resolve(this)
463
self.assertStatusEqual(
464
[('foo-id', u'foo', 'added', u'foo/'),
465
('bar-id', u'foo/bar.OTHER', 'missing', u'foo/bar.OTHER'),],
added
removed
tests/test_diff.py
