← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testdiff.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-08-05 02:53:57 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050805025357-9d90b2e4c066eb4b
Switched from text-id to hashcache for merge optimization

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testdiff.py
1
 
from bzrlib.selftest import TestCase
 
1
from bzrlib.selftest import TestBase
2
2
from bzrlib.diff import internal_diff
3
3
from cStringIO import StringIO
4
4
def udiff_lines(old, new):
21
21
    assert '@@' in lines[2][2:], \
22
22
        "Unterminated hunk header for patch:\n%s" % "".join(lines)
23
23
 
24
 
class TestDiff(TestCase):
25
 
    def test_add_nl(self):
26
 
        """diff generates a valid diff for patches that add a newline"""
 
24
class AddNL(TestBase):
 
25
    """
 
26
    diff generates a valid diff for patches that add a newline
 
27
    """
 
28
    def runTest(self):
27
29
        lines = udiff_lines(['boo'], ['boo\n'])
28
30
        check_patch(lines)
29
31
        assert lines[4] == '\\ No newline at end of file\n', \
30
32
            "expected no-nl, got %r" % lines[4]
31
33
 
32
 
    def test_add_nl_2(self):
33
 
        """diff generates a valid diff for patches that change last line and
34
 
        add a newline.
35
 
        """
 
34
 
 
35
class AddNL2(TestBase):
 
36
    """
 
37
    diff generates a valid diff for patches that change last line and add a
 
38
    newline
 
39
    """
 
40
    def runTest(self):
36
41
        lines = udiff_lines(['boo'], ['goo\n'])
37
42
        check_patch(lines)
38
43
        assert lines[4] == '\\ No newline at end of file\n', \
39
44
            "expected no-nl, got %r" % lines[4]
40
45
 
41
 
    def test_remove_nl(self):
42
 
        """diff generates a valid diff for patches that change last line and
43
 
        add a newline.
44
 
        """
 
46
class RemoveNL(TestBase):
 
47
    """
 
48
    diff generates a valid diff for patches that change last line and add a
 
49
    newline
 
50
    """
 
51
    def runTest(self):
45
52
        lines = udiff_lines(['boo\n'], ['boo'])
46
53
        check_patch(lines)
47
54
        assert lines[5] == '\\ No newline at end of file\n', \
48
55
            "expected no-nl, got %r" % lines[5]
 
56
 
 
57
TEST_CLASSES = [
 
58
    AddNL, 
 
59
    AddNL2, 
 
60
    RemoveNL,
 
61
]