1
# Copyright (C) 2004 - 2008 Aaron Bentley, Canonical Ltd
2
# <aaron.bentley@utoronto.ca>
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21
from bzrlib.tests import TestCase
23
from bzrlib.iterablefile import IterableFile
24
from bzrlib.patches import (MalformedLine,
34
iter_patched_from_hunks,
40
class PatchesTester(TestCase):
42
def datafile(self, filename):
43
data_path = os.path.join(os.path.dirname(__file__),
44
"test_patches_data", filename)
45
return file(data_path, "rb")
47
def testValidPatchHeader(self):
48
"""Parse a valid patch header"""
49
lines = "--- orig/commands.py\n+++ mod/dommands.py\n".split('\n')
50
(orig, mod) = get_patch_names(lines.__iter__())
51
self.assertEqual(orig, "orig/commands.py")
52
self.assertEqual(mod, "mod/dommands.py")
54
def testInvalidPatchHeader(self):
55
"""Parse an invalid patch header"""
56
lines = "-- orig/commands.py\n+++ mod/dommands.py".split('\n')
57
self.assertRaises(MalformedPatchHeader, get_patch_names,
60
def testValidHunkHeader(self):
61
"""Parse a valid hunk header"""
62
header = "@@ -34,11 +50,6 @@\n"
63
hunk = hunk_from_header(header);
64
self.assertEqual(hunk.orig_pos, 34)
65
self.assertEqual(hunk.orig_range, 11)
66
self.assertEqual(hunk.mod_pos, 50)
67
self.assertEqual(hunk.mod_range, 6)
68
self.assertEqual(str(hunk), header)
70
def testValidHunkHeader2(self):
71
"""Parse a tricky, valid hunk header"""
72
header = "@@ -1 +0,0 @@\n"
73
hunk = hunk_from_header(header);
74
self.assertEqual(hunk.orig_pos, 1)
75
self.assertEqual(hunk.orig_range, 1)
76
self.assertEqual(hunk.mod_pos, 0)
77
self.assertEqual(hunk.mod_range, 0)
78
self.assertEqual(str(hunk), header)
81
"""Parse a hunk header produced by diff -p"""
82
header = "@@ -407,7 +292,7 @@ bzr 0.18rc1 2007-07-10\n"
83
hunk = hunk_from_header(header)
84
self.assertEqual('bzr 0.18rc1 2007-07-10', hunk.tail)
85
self.assertEqual(header, str(hunk))
87
def makeMalformed(self, header):
88
self.assertRaises(MalformedHunkHeader, hunk_from_header, header)
90
def testInvalidHeader(self):
91
"""Parse an invalid hunk header"""
92
self.makeMalformed(" -34,11 +50,6 \n")
93
self.makeMalformed("@@ +50,6 -34,11 @@\n")
94
self.makeMalformed("@@ -34,11 +50,6 @@")
95
self.makeMalformed("@@ -34.5,11 +50,6 @@\n")
96
self.makeMalformed("@@-34,11 +50,6@@\n")
97
self.makeMalformed("@@ 34,11 50,6 @@\n")
98
self.makeMalformed("@@ -34,11 @@\n")
99
self.makeMalformed("@@ -34,11 +50,6.5 @@\n")
100
self.makeMalformed("@@ -34,11 +50,-6 @@\n")
102
def lineThing(self,text, type):
103
line = parse_line(text)
104
self.assertIsInstance(line, type)
105
self.assertEqual(str(line), text)
107
def makeMalformedLine(self, text):
108
self.assertRaises(MalformedLine, parse_line, text)
110
def testValidLine(self):
111
"""Parse a valid hunk line"""
112
self.lineThing(" hello\n", ContextLine)
113
self.lineThing("+hello\n", InsertLine)
114
self.lineThing("-hello\n", RemoveLine)
116
def testMalformedLine(self):
117
"""Parse invalid valid hunk lines"""
118
self.makeMalformedLine("hello\n")
120
def compare_parsed(self, patchtext):
121
lines = patchtext.splitlines(True)
122
patch = parse_patch(lines.__iter__())
124
i = difference_index(patchtext, pstr)
126
print "%i: \"%s\" != \"%s\"" % (i, patchtext[i], pstr[i])
127
self.assertEqual (patchtext, str(patch))
130
"""Test parsing a whole patch"""
131
patchtext = self.datafile("patchtext.patch").read()
132
self.compare_parsed(patchtext)
135
"""Handle patches missing half the position, range tuple"""
137
"""--- orig/__vavg__.cl
140
__qbpsbezng__ = "erfgehpgherqgrkg ra"
141
+__qbp__ = Na nygreangr Nepu pbzznaqyvar vagresnpr
143
self.compare_parsed(patchtext)
145
def testLineLookup(self):
147
"""Make sure we can accurately look up mod line from orig"""
148
patch = parse_patch(self.datafile("diff"))
149
orig = list(self.datafile("orig"))
150
mod = list(self.datafile("mod"))
152
for i in range(len(orig)):
153
mod_pos = patch.pos_in_mod(i)
155
removals.append(orig[i])
157
self.assertEqual(mod[mod_pos], orig[i])
158
rem_iter = removals.__iter__()
159
for hunk in patch.hunks:
160
for line in hunk.lines:
161
if isinstance(line, RemoveLine):
162
next = rem_iter.next()
163
if line.contents != next:
164
sys.stdout.write(" orig:%spatch:%s" % (next,
166
self.assertEqual(line.contents, next)
167
self.assertRaises(StopIteration, rem_iter.next)
169
def testPatching(self):
170
"""Test a few patch files, and make sure they work."""
172
('diff-2', 'orig-2', 'mod-2'),
173
('diff-3', 'orig-3', 'mod-3'),
174
('diff-4', 'orig-4', 'mod-4'),
175
('diff-5', 'orig-5', 'mod-5'),
176
('diff-6', 'orig-6', 'mod-6'),
178
for diff, orig, mod in files:
179
patch = self.datafile(diff)
180
orig_lines = list(self.datafile(orig))
181
mod_lines = list(self.datafile(mod))
183
patched_file = IterableFile(iter_patched(orig_lines, patch))
186
for patch_line in patched_file:
187
self.assertEqual(patch_line, mod_lines[count])
189
self.assertEqual(count, len(mod_lines))
191
def test_iter_patched_from_hunks(self):
192
"""Test a few patch files, and make sure they work."""
194
('diff-2', 'orig-2', 'mod-2'),
195
('diff-3', 'orig-3', 'mod-3'),
196
('diff-4', 'orig-4', 'mod-4'),
197
('diff-5', 'orig-5', 'mod-5'),
198
('diff-6', 'orig-6', 'mod-6'),
200
for diff, orig, mod in files:
201
parsed = parse_patch(self.datafile(diff))
202
orig_lines = list(self.datafile(orig))
203
mod_lines = list(self.datafile(mod))
204
iter_patched = iter_patched_from_hunks(orig_lines, parsed.hunks)
205
patched_file = IterableFile(iter_patched)
208
for patch_line in patched_file:
209
self.assertEqual(patch_line, mod_lines[count])
211
self.assertEqual(count, len(mod_lines))
213
def testFirstLineRenumber(self):
214
"""Make sure we handle lines at the beginning of the hunk"""
215
patch = parse_patch(self.datafile("insert_top.patch"))
216
self.assertEqual(patch.pos_in_mod(0), 1)
218
def testParsePatches(self):
219
"""Make sure file names can be extracted from tricky unified diffs"""
246
filenames = [('orig-7', 'mod-7'),
248
patches = parse_patches(patchtext.splitlines(True))
250
for patch in patches:
251
patch_files.append((patch.oldname, patch.newname))
252
self.assertEqual(patch_files, filenames)
added
removed
bzrlib/tests/test_patches.py
