1
# Copyright (C) 2004 - 2006 Aaron Bentley
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
22
from bzrlib.iterablefile import IterableFile
23
from bzrlib.patches import (MalformedLine,
37
class PatchesTester(unittest.TestCase):
38
def datafile(self, filename):
39
data_path = os.path.join(os.path.dirname(__file__),
40
"test_patches_data", filename)
41
return file(data_path, "rb")
43
def testValidPatchHeader(self):
44
"""Parse a valid patch header"""
45
lines = "--- orig/commands.py\n+++ mod/dommands.py\n".split('\n')
46
(orig, mod) = get_patch_names(lines.__iter__())
47
assert(orig == "orig/commands.py")
48
assert(mod == "mod/dommands.py")
50
def testInvalidPatchHeader(self):
51
"""Parse an invalid patch header"""
52
lines = "-- orig/commands.py\n+++ mod/dommands.py".split('\n')
53
self.assertRaises(MalformedPatchHeader, get_patch_names,
56
def testValidHunkHeader(self):
57
"""Parse a valid hunk header"""
58
header = "@@ -34,11 +50,6 @@\n"
59
hunk = hunk_from_header(header);
60
assert (hunk.orig_pos == 34)
61
assert (hunk.orig_range == 11)
62
assert (hunk.mod_pos == 50)
63
assert (hunk.mod_range == 6)
64
assert (str(hunk) == header)
66
def testValidHunkHeader2(self):
67
"""Parse a tricky, valid hunk header"""
68
header = "@@ -1 +0,0 @@\n"
69
hunk = hunk_from_header(header);
70
assert (hunk.orig_pos == 1)
71
assert (hunk.orig_range == 1)
72
assert (hunk.mod_pos == 0)
73
assert (hunk.mod_range == 0)
74
assert (str(hunk) == header)
76
def makeMalformed(self, header):
77
self.assertRaises(MalformedHunkHeader, hunk_from_header, header)
79
def testInvalidHeader(self):
80
"""Parse an invalid hunk header"""
81
self.makeMalformed(" -34,11 +50,6 \n")
82
self.makeMalformed("@@ +50,6 -34,11 @@\n")
83
self.makeMalformed("@@ -34,11 +50,6 @@")
84
self.makeMalformed("@@ -34.5,11 +50,6 @@\n")
85
self.makeMalformed("@@-34,11 +50,6@@\n")
86
self.makeMalformed("@@ 34,11 50,6 @@\n")
87
self.makeMalformed("@@ -34,11 @@\n")
88
self.makeMalformed("@@ -34,11 +50,6.5 @@\n")
89
self.makeMalformed("@@ -34,11 +50,-6 @@\n")
91
def lineThing(self,text, type):
92
line = parse_line(text)
93
assert(isinstance(line, type))
94
assert(str(line)==text)
96
def makeMalformedLine(self, text):
97
self.assertRaises(MalformedLine, parse_line, text)
99
def testValidLine(self):
100
"""Parse a valid hunk line"""
101
self.lineThing(" hello\n", ContextLine)
102
self.lineThing("+hello\n", InsertLine)
103
self.lineThing("-hello\n", RemoveLine)
105
def testMalformedLine(self):
106
"""Parse invalid valid hunk lines"""
107
self.makeMalformedLine("hello\n")
109
def compare_parsed(self, patchtext):
110
lines = patchtext.splitlines(True)
111
patch = parse_patch(lines.__iter__())
113
i = difference_index(patchtext, pstr)
115
print "%i: \"%s\" != \"%s\"" % (i, patchtext[i], pstr[i])
116
self.assertEqual (patchtext, str(patch))
119
"""Test parsing a whole patch"""
120
patchtext = self.datafile("patchtext.patch").read()
121
self.compare_parsed(patchtext)
124
"""Handle patches missing half the position, range tuple"""
126
"""--- orig/__vavg__.cl
129
__qbpsbezng__ = "erfgehpgherqgrkg ra"
130
+__qbp__ = Na nygreangr Nepu pbzznaqyvar vagresnpr
132
self.compare_parsed(patchtext)
134
def testLineLookup(self):
136
"""Make sure we can accurately look up mod line from orig"""
137
patch = parse_patch(self.datafile("diff"))
138
orig = list(self.datafile("orig"))
139
mod = list(self.datafile("mod"))
141
for i in range(len(orig)):
142
mod_pos = patch.pos_in_mod(i)
144
removals.append(orig[i])
146
assert(mod[mod_pos]==orig[i])
147
rem_iter = removals.__iter__()
148
for hunk in patch.hunks:
149
for line in hunk.lines:
150
if isinstance(line, RemoveLine):
151
next = rem_iter.next()
152
if line.contents != next:
153
sys.stdout.write(" orig:%spatch:%s" % (next,
155
assert(line.contents == next)
156
self.assertRaises(StopIteration, rem_iter.next)
158
def testPatching(self):
159
"""Test a few patch files, and make sure they work."""
161
('diff-2', 'orig-2', 'mod-2'),
162
('diff-3', 'orig-3', 'mod-3'),
163
('diff-4', 'orig-4', 'mod-4'),
164
('diff-5', 'orig-5', 'mod-5'),
165
('diff-6', 'orig-6', 'mod-6'),
167
for diff, orig, mod in files:
168
patch = self.datafile(diff)
169
orig_lines = list(self.datafile(orig))
170
mod_lines = list(self.datafile(mod))
172
patched_file = IterableFile(iter_patched(orig_lines, patch))
175
for patch_line in patched_file:
176
self.assertEqual(patch_line, mod_lines[count])
178
self.assertEqual(count, len(mod_lines))
180
def testFirstLineRenumber(self):
181
"""Make sure we handle lines at the beginning of the hunk"""
182
patch = parse_patch(self.datafile("insert_top.patch"))
183
assert (patch.pos_in_mod(0)==1)
186
patchesTestSuite = unittest.makeSuite(PatchesTester,'test')
187
runner = unittest.TextTestRunner(verbosity=0)
188
return runner.run(patchesTestSuite)
191
if __name__ == "__main__":
added
removed
bzrlib/tests/test_patches.py
