← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-19 06:14:38 UTC
  • mfrom: (1704.2.23 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060519061438-6300caf3926c3cff
(mbp) small fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
61
61
        
62
62
        self.assert_('src-id' in inv)
63
63
 
64
 
    def test_iter_entries(self):
65
 
        inv = Inventory()
66
 
        
67
 
        for args in [('src', 'directory', 'src-id'), 
68
 
                     ('doc', 'directory', 'doc-id'), 
69
 
                     ('src/hello.c', 'file', 'hello-id'),
70
 
                     ('src/bye.c', 'file', 'bye-id'),
71
 
                     ('Makefile', 'file', 'makefile-id')]:
72
 
            inv.add_path(*args)
73
64
 
74
 
        self.assertEqual([
75
 
            ('Makefile', 'makefile-id'),
76
 
            ('doc', 'doc-id'),
77
 
            ('src', 'src-id'),
78
 
            ('src/bye.c', 'bye-id'),
79
 
            ('src/hello.c', 'hello-id'),
80
 
            ], [(path, ie.file_id) for path, ie in inv.iter_entries()])
81
 
            
82
65
    def test_version(self):
83
66
        """Inventory remembers the text's version."""
84
67
        inv = Inventory()
151
134
        link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
152
135
        self.failIf(link.has_text())
153
136
 
154
 
    def test_make_entry(self):
155
 
        self.assertIsInstance(inventory.make_entry("file", "name", ROOT_ID),
156
 
            inventory.InventoryFile)
157
 
        self.assertIsInstance(inventory.make_entry("symlink", "name", ROOT_ID),
158
 
            inventory.InventoryLink)
159
 
        self.assertIsInstance(inventory.make_entry("directory", "name", ROOT_ID),
160
 
            inventory.InventoryDirectory)
161
137
 
162
138
class TestEntryDiffing(TestCaseWithTransport):
163
139
 
196
172
                          "old_label", self.tree_1,
197
173
                          "/dev/null", None, None,
198
174
                          output)
199
 
        self.assertEqual(output.getvalue(), "--- old_label\n"
200
 
                                            "+++ /dev/null\n"
 
175
        self.assertEqual(output.getvalue(), "--- old_label\t\n"
 
176
                                            "+++ /dev/null\t\n"
201
177
                                            "@@ -1,1 +0,0 @@\n"
202
178
                                            "-foo\n"
203
179
                                            "\n")
208
184
                          "new_label", self.tree_1,
209
185
                          "/dev/null", None, None,
210
186
                          output, reverse=True)
211
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
212
 
                                            "+++ new_label\n"
 
187
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
188
                                            "+++ new_label\t\n"
213
189
                                            "@@ -0,0 +1,1 @@\n"
214
190
                                            "+foo\n"
215
191
                                            "\n")
220
196
                          "/dev/null", self.tree_1, 
221
197
                          "new_label", self.file_2, self.tree_2,
222
198
                          output)
223
 
        self.assertEqual(output.getvalue(), "--- /dev/null\n"
224
 
                                            "+++ new_label\n"
 
199
        self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
 
200
                                            "+++ new_label\t\n"
225
201
                                            "@@ -1,1 +1,1 @@\n"
226
202
                                            "-foo\n"
227
203
                                            "+bar\n"