← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_inv.py

  • Committer: Martin Pool
  • Date: 2008-04-24 07:22:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3415.
  • Revision ID: mbp@sourcefrog.net-20080424072253-opmjij7xfy38w27f
Remove every assert statement from bzrlib!

Depending on the context they are:

 * turned into an explicit if/raise of either AssertionError 
   or something more specific -- particularly where they protect
   programming interfaces, complex invariants, or data file integrity
 * removed, if they're redundant with a later check, not protecting
   a meaningful invariant
 * turned into a selftest method on tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_inv.py
29
29
from bzrlib.uncommit import uncommit
30
30
 
31
31
 
32
 
class TestEntryDiffing(TestCaseWithTree):
33
 
 
34
 
    def setUp(self):
35
 
        super(TestEntryDiffing, self).setUp()
36
 
        self.wt = self.make_branch_and_tree('.')
37
 
        self.branch = self.wt.branch
38
 
        open('file', 'wb').write('foo\n')
39
 
        open('binfile', 'wb').write('foo\n')
40
 
        self.wt.add(['file'], ['fileid'])
41
 
        self.wt.add(['binfile'], ['binfileid'])
42
 
        if has_symlinks():
43
 
            os.symlink('target1', 'symlink')
44
 
            self.wt.add(['symlink'], ['linkid'])
45
 
        self.wt.commit('message_1', rev_id = '1')
46
 
        open('file', 'wb').write('bar\n')
47
 
        open('binfile', 'wb').write('x' * 1023 + '\x00\n')
48
 
        if has_symlinks():
49
 
            os.unlink('symlink')
50
 
            os.symlink('target2', 'symlink')
51
 
        self.tree_1 = self.branch.repository.revision_tree('1')
52
 
        self.inv_1 = self.branch.repository.get_inventory('1')
53
 
        self.file_1 = self.inv_1['fileid']
54
 
        self.file_1b = self.inv_1['binfileid']
55
 
        self.tree_2 = self.workingtree_to_test_tree(self.wt)
56
 
        self.tree_2.lock_read()
57
 
        self.addCleanup(self.tree_2.unlock)
58
 
        self.inv_2 = self.tree_2.inventory
59
 
        self.file_2 = self.inv_2['fileid']
60
 
        self.file_2b = self.inv_2['binfileid']
61
 
        if has_symlinks():
62
 
            self.link_1 = self.inv_1['linkid']
63
 
            self.link_2 = self.inv_2['linkid']
64
 
 
65
 
    def test_file_diff_deleted(self):
66
 
        output = StringIO()
67
 
        self.applyDeprecated(one_zero,
68
 
                             self.file_1.diff,
69
 
                             internal_diff,
70
 
                             "old_label", self.tree_1,
71
 
                             "/dev/null", None, None,
72
 
                             output)
73
 
        self.assertEqual(output.getvalue(), "--- old_label\n"
74
 
                                            "+++ /dev/null\n"
75
 
                                            "@@ -1,1 +0,0 @@\n"
76
 
                                            "-foo\n"
77
 
                                            "\n")
78
 
 
79
 
    def test_file_diff_added(self):
80
 
        output = StringIO()
81
 
        self.applyDeprecated(one_zero,
82
 
                             self.file_1.diff,
83
 
                             internal_diff,
84
 
                             "new_label", self.tree_1,
85
 
                             "/dev/null", None, None,
86
 
                             output, reverse=True)
87
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
88
 
                                            "+++ new_label\n"
89
 
                                            "@@ -0,0 +1,1 @@\n"
90
 
                                            "+foo\n"
91
 
                                            "\n")
92
 
 
93
 
    def test_file_diff_changed(self):
94
 
        output = StringIO()
95
 
        self.applyDeprecated(one_zero,
96
 
                             self.file_1.diff,
97
 
                             internal_diff,
98
 
                             "/dev/null", self.tree_1,
99
 
                             "new_label", self.file_2, self.tree_2,
100
 
                             output)
101
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
102
 
                                            "+++ new_label\n"
103
 
                                            "@@ -1,1 +1,1 @@\n"
104
 
                                            "-foo\n"
105
 
                                            "+bar\n"
106
 
                                            "\n")
107
 
        
108
 
    def test_file_diff_binary(self):
109
 
        output = StringIO()
110
 
        self.applyDeprecated(one_zero,
111
 
                             self.file_1.diff,
112
 
                             internal_diff,
113
 
                             "/dev/null", self.tree_1,
114
 
                             "new_label", self.file_2b, self.tree_2,
115
 
                             output)
116
 
        self.assertEqual(output.getvalue(), 
117
 
                         "Binary files /dev/null and new_label differ\n")
118
 
 
119
 
    def test_link_diff_deleted(self):
120
 
        self.requireFeature(SymlinkFeature)
121
 
        output = StringIO()
122
 
        self.applyDeprecated(one_zero,
123
 
                             self.link_1.diff,
124
 
                             internal_diff, "old_label",
125
 
                             self.tree_1, "/dev/null", None, None,
126
 
                             output)
127
 
        self.assertEqual(output.getvalue(),
128
 
                         "=== target was 'target1'\n")
129
 
 
130
 
    def test_link_diff_added(self):
131
 
        self.requireFeature(SymlinkFeature)
132
 
        output = StringIO()
133
 
        self.applyDeprecated(one_zero,
134
 
                             self.link_1.diff,
135
 
                             internal_diff,
136
 
                             "new_label", self.tree_1,
137
 
                             "/dev/null", None, None,
138
 
                             output, reverse=True)
139
 
        self.assertEqual(output.getvalue(),
140
 
                         "=== target is 'target1'\n")
141
 
 
142
 
    def test_link_diff_changed(self):
143
 
        self.requireFeature(SymlinkFeature)
144
 
        output = StringIO()
145
 
        self.applyDeprecated(one_zero,
146
 
                             self.link_1.diff,
147
 
                             internal_diff,
148
 
                             "/dev/null", self.tree_1,
149
 
                             "new_label", self.link_2, self.tree_2,
150
 
                             output)
151
 
        self.assertEqual(output.getvalue(),
152
 
                         "=== target changed 'target1' => 'target2'\n")
153
 
 
154
 
 
155
32
class TestPreviousHeads(TestCaseWithTree):
156
33
 
157
34
    def setUp(self):