1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
from bzrlib.selftest import TestCase
from bzrlib.diff import internal_diff
from cStringIO import StringIO
def udiff_lines(old, new):
output = StringIO()
internal_diff('old', old, 'new', new, output)
output.seek(0, 0)
return output.readlines()
class TestDiff(TestCase):
def test_add_nl(self):
"""diff generates a valid diff for patches that add a newline"""
lines = udiff_lines(['boo'], ['boo\n'])
self.check_patch(lines)
self.assertEquals(lines[4], '\\ No newline at end of file\n')
## "expected no-nl, got %r" % lines[4]
def test_add_nl_2(self):
"""diff generates a valid diff for patches that change last line and
add a newline.
"""
lines = udiff_lines(['boo'], ['goo\n'])
self.check_patch(lines)
self.assertEquals(lines[4], '\\ No newline at end of file\n')
## "expected no-nl, got %r" % lines[4]
def test_remove_nl(self):
"""diff generates a valid diff for patches that change last line and
add a newline.
"""
lines = udiff_lines(['boo\n'], ['boo'])
self.check_patch(lines)
self.assertEquals(lines[5], '\\ No newline at end of file\n')
## "expected no-nl, got %r" % lines[5]
def check_patch(self, lines):
self.assert_(len(lines) > 1)
## "Not enough lines for a file header for patch:\n%s" % "".join(lines)
self.assert_(lines[0].startswith ('---'))
## 'No orig line for patch:\n%s' % "".join(lines)
self.assert_(lines[1].startswith ('+++'))
## 'No mod line for patch:\n%s' % "".join(lines)
self.assert_(len(lines) > 2)
## "No hunks for patch:\n%s" % "".join(lines)
self.assert_(lines[2].startswith('@@'))
## "No hunk header for patch:\n%s" % "".join(lines)
self.assert_('@@' in lines[2][2:])
## "Unterminated hunk header for patch:\n%s" % "".join(lines)
class TestCDVDiffLib(TestCase):
def test_matching_blocks(self):
from bzrlib.cdvdifflib import SequenceMatcher
def chk_blocks(a, b, matching):
# difflib always adds a signature of the total
# length, with no matching entries at the end
matching = matching + [(len(a), len(b), 0)]
s = SequenceMatcher(None, a, b)
self.assertEquals(s.get_matching_blocks(), matching)
chk_blocks('', '', [])
chk_blocks([], [], [])
chk_blocks('abcd', 'abcd', [(0, 0, 4)])
chk_blocks('abcd', 'abce', [(0, 0, 3)])
chk_blocks('eabc', 'abce', [(1, 0, 3)])
chk_blocks('eabce', 'abce', [(1, 0, 4)])
chk_blocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
chk_blocks('abcde', 'abXde', [(0, 0, 2), (3, 3, 2)])
|