← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_patches.py

  • Committer: Ian Clatworthy
  • Date: 2007-03-22 01:02:07 UTC
  • mto: (2370.2.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2371.
  • Revision ID: ian.clatworthy@internode.on.net-20070322010207-r8xcwjshipoahmcx
Minor corrections to HACKING

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_patches.py
1
 
# Copyright (C) 2005-2010 Aaron Bentley, Canonical Ltd
 
1
# Copyright (C) 2004 - 2006 Aaron Bentley, Canonical Ltd
 
2
# <aaron.bentley@utoronto.ca>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
12
13
#
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
 
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
 
 
19
import unittest
18
20
import os.path
19
21
 
20
 
from bzrlib.tests import TestCase
21
 
 
22
22
from bzrlib.iterablefile import IterableFile
23
 
from bzrlib.patches import (MalformedLine,
24
 
                            MalformedHunkHeader,
25
 
                            MalformedPatchHeader,
26
 
                            BinaryPatch,
27
 
                            BinaryFiles,
28
 
                            Patch,
29
 
                            ContextLine,
 
23
from bzrlib.patches import (MalformedLine, 
 
24
                            MalformedHunkHeader, 
 
25
                            MalformedPatchHeader, 
 
26
                            ContextLine, 
30
27
                            InsertLine,
31
 
                            RemoveLine,
32
 
                            difference_index,
 
28
                            RemoveLine, 
 
29
                            difference_index, 
33
30
                            get_patch_names,
34
 
                            hunk_from_header,
35
 
                            iter_patched,
36
 
                            iter_patched_from_hunks,
 
31
                            hunk_from_header, 
 
32
                            iter_patched, 
37
33
                            parse_line,
38
34
                            parse_patch,
39
 
                            parse_patches,
40
 
                            NO_NL)
41
 
 
42
 
 
43
 
class PatchesTester(TestCase):
44
 
 
 
35
                            parse_patches)
 
36
 
 
37
 
 
38
class PatchesTester(unittest.TestCase):
45
39
    def datafile(self, filename):
46
 
        data_path = os.path.join(os.path.dirname(__file__),
 
40
        data_path = os.path.join(os.path.dirname(__file__), 
47
41
                                 "test_patches_data", filename)
48
42
        return file(data_path, "rb")
49
43
 
50
 
    def data_lines(self, filename):
51
 
        datafile = self.datafile(filename)
52
 
        try:
53
 
            return datafile.readlines()
54
 
        finally:
55
 
            datafile.close()
56
 
 
57
 
    def test_parse_patches_leading_noise(self):
58
 
        # https://bugs.launchpad.net/bzr/+bug/502076
59
 
        # https://code.launchpad.net/~toshio/bzr/allow-dirty-patches/+merge/18854
60
 
        lines = ["diff -pruN commands.py",
61
 
                 "--- orig/commands.py",
62
 
                 "+++ mod/dommands.py"]
63
 
        bits = parse_patches(iter(lines), allow_dirty=True)
64
 
 
65
 
    def test_preserve_dirty_head(self):
66
 
        """Parse a patch containing a dirty header, and preserve lines"""
67
 
        lines = ["=== added directory 'foo/bar'\n",
68
 
                 "=== modified file 'orig/commands.py'\n",
69
 
                 "--- orig/commands.py\n",
70
 
                 "+++ mod/dommands.py\n",
71
 
                 "=== modified file 'orig/another.py'\n",
72
 
                 "--- orig/another.py\n",
73
 
                 "+++ mod/another.py\n"]
74
 
        patches = parse_patches(
75
 
            lines.__iter__(), allow_dirty=True, keep_dirty=True)
76
 
        self.assertLength(2, patches)
77
 
        self.assertEqual(patches[0]['dirty_head'],
78
 
                         ["=== added directory 'foo/bar'\n",
79
 
                          "=== modified file 'orig/commands.py'\n"])
80
 
        self.assertEqual(patches[0]['patch'].get_header().splitlines(True),
81
 
                         ["--- orig/commands.py\n", "+++ mod/dommands.py\n"])
82
 
        self.assertEqual(patches[1]['dirty_head'],
83
 
                         ["=== modified file 'orig/another.py'\n"])
84
 
        self.assertEqual(patches[1]['patch'].get_header().splitlines(True),
85
 
                         ["--- orig/another.py\n", "+++ mod/another.py\n"])
86
 
 
87
44
    def testValidPatchHeader(self):
88
45
        """Parse a valid patch header"""
89
46
        lines = "--- orig/commands.py\n+++ mod/dommands.py\n".split('\n')
90
47
        (orig, mod) = get_patch_names(lines.__iter__())
91
 
        self.assertEqual(orig, "orig/commands.py")
92
 
        self.assertEqual(mod, "mod/dommands.py")
 
48
        assert(orig == "orig/commands.py")
 
49
        assert(mod == "mod/dommands.py")
93
50
 
94
51
    def testInvalidPatchHeader(self):
95
52
        """Parse an invalid patch header"""
100
57
    def testValidHunkHeader(self):
101
58
        """Parse a valid hunk header"""
102
59
        header = "@@ -34,11 +50,6 @@\n"
103
 
        hunk = hunk_from_header(header)
104
 
        self.assertEqual(hunk.orig_pos, 34)
105
 
        self.assertEqual(hunk.orig_range, 11)
106
 
        self.assertEqual(hunk.mod_pos, 50)
107
 
        self.assertEqual(hunk.mod_range, 6)
108
 
        self.assertEqual(str(hunk), header)
 
60
        hunk = hunk_from_header(header);
 
61
        assert (hunk.orig_pos == 34)
 
62
        assert (hunk.orig_range == 11)
 
63
        assert (hunk.mod_pos == 50)
 
64
        assert (hunk.mod_range == 6)
 
65
        assert (str(hunk) == header)
109
66
 
110
67
    def testValidHunkHeader2(self):
111
68
        """Parse a tricky, valid hunk header"""
112
69
        header = "@@ -1 +0,0 @@\n"
113
 
        hunk = hunk_from_header(header)
114
 
        self.assertEqual(hunk.orig_pos, 1)
115
 
        self.assertEqual(hunk.orig_range, 1)
116
 
        self.assertEqual(hunk.mod_pos, 0)
117
 
        self.assertEqual(hunk.mod_range, 0)
118
 
        self.assertEqual(str(hunk), header)
119
 
 
120
 
    def testPDiff(self):
121
 
        """Parse a hunk header produced by diff -p"""
122
 
        header = "@@ -407,7 +292,7 @@ bzr 0.18rc1  2007-07-10\n"
123
 
        hunk = hunk_from_header(header)
124
 
        self.assertEqual('bzr 0.18rc1  2007-07-10', hunk.tail)
125
 
        self.assertEqual(header, str(hunk))
 
70
        hunk = hunk_from_header(header);
 
71
        assert (hunk.orig_pos == 1)
 
72
        assert (hunk.orig_range == 1)
 
73
        assert (hunk.mod_pos == 0)
 
74
        assert (hunk.mod_range == 0)
 
75
        assert (str(hunk) == header)
126
76
 
127
77
    def makeMalformed(self, header):
128
78
        self.assertRaises(MalformedHunkHeader, hunk_from_header, header)
139
89
        self.makeMalformed("@@ -34,11 +50,6.5 @@\n")
140
90
        self.makeMalformed("@@ -34,11 +50,-6 @@\n")
141
91
 
142
 
    def lineThing(self, text, type):
 
92
    def lineThing(self,text, type):
143
93
        line = parse_line(text)
144
 
        self.assertIsInstance(line, type)
145
 
        self.assertEqual(str(line), text)
 
94
        assert(isinstance(line, type))
 
95
        assert(str(line)==text)
146
96
 
147
97
    def makeMalformedLine(self, text):
148
98
        self.assertRaises(MalformedLine, parse_line, text)
152
102
        self.lineThing(" hello\n", ContextLine)
153
103
        self.lineThing("+hello\n", InsertLine)
154
104
        self.lineThing("-hello\n", RemoveLine)
155
 
 
 
105
    
156
106
    def testMalformedLine(self):
157
107
        """Parse invalid valid hunk lines"""
158
108
        self.makeMalformedLine("hello\n")
159
 
 
160
 
    def testMalformedLineNO_NL(self):
161
 
        """Parse invalid '\ No newline at end of file' in hunk lines"""
162
 
        self.makeMalformedLine(NO_NL)
163
 
 
 
109
    
164
110
    def compare_parsed(self, patchtext):
165
111
        lines = patchtext.splitlines(True)
166
112
        patch = parse_patch(lines.__iter__())
168
114
        i = difference_index(patchtext, pstr)
169
115
        if i is not None:
170
116
            print "%i: \"%s\" != \"%s\"" % (i, patchtext[i], pstr[i])
171
 
        self.assertEqual(patchtext, str(patch))
 
117
        self.assertEqual (patchtext, str(patch))
172
118
 
173
119
    def testAll(self):
174
120
        """Test parsing a whole patch"""
175
121
        patchtext = self.datafile("patchtext.patch").read()
176
122
        self.compare_parsed(patchtext)
177
123
 
178
 
    def test_parse_binary(self):
179
 
        """Test parsing a whole patch"""
180
 
        patches = parse_patches(self.data_lines("binary.patch"))
181
 
        self.assertIs(BinaryPatch, patches[0].__class__)
182
 
        self.assertIs(Patch, patches[1].__class__)
183
 
        self.assertContainsRe(patches[0].oldname, '^bar\t')
184
 
        self.assertContainsRe(patches[0].newname, '^qux\t')
185
 
        self.assertContainsRe(str(patches[0]),
186
 
                              'Binary files bar\t.* and qux\t.* differ\n')
187
 
 
188
 
    def test_parse_binary_after_normal(self):
189
 
        patches = parse_patches(self.data_lines("binary-after-normal.patch"))
190
 
        self.assertIs(BinaryPatch, patches[1].__class__)
191
 
        self.assertIs(Patch, patches[0].__class__)
192
 
        self.assertContainsRe(patches[1].oldname, '^bar\t')
193
 
        self.assertContainsRe(patches[1].newname, '^qux\t')
194
 
        self.assertContainsRe(str(patches[1]),
195
 
                              'Binary files bar\t.* and qux\t.* differ\n')
196
 
 
197
 
    def test_roundtrip_binary(self):
198
 
        patchtext = ''.join(self.data_lines("binary.patch"))
199
 
        patches = parse_patches(patchtext.splitlines(True))
200
 
        self.assertEqual(patchtext, ''.join(str(p) for p in patches))
201
 
 
202
124
    def testInit(self):
203
125
        """Handle patches missing half the position, range tuple"""
204
126
        patchtext = \
222
144
            if mod_pos is None:
223
145
                removals.append(orig[i])
224
146
                continue
225
 
            self.assertEqual(mod[mod_pos], orig[i])
 
147
            assert(mod[mod_pos]==orig[i])
226
148
        rem_iter = removals.__iter__()
227
149
        for hunk in patch.hunks:
228
150
            for line in hunk.lines:
231
153
                    if line.contents != next:
232
154
                        sys.stdout.write(" orig:%spatch:%s" % (next,
233
155
                                         line.contents))
234
 
                    self.assertEqual(line.contents, next)
 
156
                    assert(line.contents == next)
235
157
        self.assertRaises(StopIteration, rem_iter.next)
236
158
 
237
159
    def testPatching(self):
242
164
            ('diff-4', 'orig-4', 'mod-4'),
243
165
            ('diff-5', 'orig-5', 'mod-5'),
244
166
            ('diff-6', 'orig-6', 'mod-6'),
245
 
            ('diff-7', 'orig-7', 'mod-7'),
246
167
        ]
247
168
        for diff, orig, mod in files:
248
169
            patch = self.datafile(diff)
250
171
            mod_lines = list(self.datafile(mod))
251
172
 
252
173
            patched_file = IterableFile(iter_patched(orig_lines, patch))
253
 
            count = 0
254
 
            for patch_line in patched_file:
255
 
                self.assertEqual(patch_line, mod_lines[count])
256
 
                count += 1
257
 
            self.assertEqual(count, len(mod_lines))
258
 
 
259
 
    def test_iter_patched_binary(self):
260
 
        binary_lines = self.data_lines('binary.patch')
261
 
        e = self.assertRaises(BinaryFiles, iter_patched, [], binary_lines)
262
 
 
263
 
    def test_iter_patched_from_hunks(self):
264
 
        """Test a few patch files, and make sure they work."""
265
 
        files = [
266
 
            ('diff-2', 'orig-2', 'mod-2'),
267
 
            ('diff-3', 'orig-3', 'mod-3'),
268
 
            ('diff-4', 'orig-4', 'mod-4'),
269
 
            ('diff-5', 'orig-5', 'mod-5'),
270
 
            ('diff-6', 'orig-6', 'mod-6'),
271
 
            ('diff-7', 'orig-7', 'mod-7'),
272
 
        ]
273
 
        for diff, orig, mod in files:
274
 
            parsed = parse_patch(self.datafile(diff))
275
 
            orig_lines = list(self.datafile(orig))
276
 
            mod_lines = list(self.datafile(mod))
277
 
            iter_patched = iter_patched_from_hunks(orig_lines, parsed.hunks)
278
 
            patched_file = IterableFile(iter_patched)
 
174
            lines = []
279
175
            count = 0
280
176
            for patch_line in patched_file:
281
177
                self.assertEqual(patch_line, mod_lines[count])
285
181
    def testFirstLineRenumber(self):
286
182
        """Make sure we handle lines at the beginning of the hunk"""
287
183
        patch = parse_patch(self.datafile("insert_top.patch"))
288
 
        self.assertEqual(patch.pos_in_mod(0), 1)
 
184
        assert (patch.pos_in_mod(0)==1)
289
185
 
290
186
    def testParsePatches(self):
291
187
        """Make sure file names can be extracted from tricky unified diffs"""
321
217
        patch_files = []
322
218
        for patch in patches:
323
219
            patch_files.append((patch.oldname, patch.newname))
324
 
        self.assertEqual(patch_files, filenames)
325
 
 
326
 
    def testStatsValues(self):
327
 
        """Test the added, removed and hunks values for stats_values."""
328
 
        patch = parse_patch(self.datafile("diff"))
329
 
        self.assertEqual((299, 407, 48), patch.stats_values())
 
220
        assert (patch_files == filenames)
 
221
            
 
222
def test():
 
223
    patchesTestSuite = unittest.makeSuite(PatchesTester,'test')
 
224
    runner = unittest.TextTestRunner(verbosity=0)
 
225
    return runner.run(patchesTestSuite)
 
226
 
 
227
 
 
228
if __name__ == "__main__":
 
229
    test()