/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tests/test_mapping.py

  • Committer: Jelmer Vernooij
  • Date: 2010-05-01 22:29:16 UTC
  • mto: (0.200.912 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20100501222916-9cksxfudsnw9ypmn
make sure file ids are roundtripped properly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
53
53
                            "git-v1:"
54
54
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
55
55
 
56
 
    def test_is_control_file(self):
57
 
        mapping = BzrGitMappingv1()
58
 
        if mapping.roundtripping:
59
 
            self.assertTrue(mapping.is_control_file(".bzrdummy"))
60
 
            self.assertTrue(mapping.is_control_file(".bzrfileids"))
61
 
        self.assertFalse(mapping.is_control_file(".bzrfoo"))
62
 
 
63
 
    def test_generate_file_id(self):
64
 
        mapping = BzrGitMappingv1()
65
 
        self.assertIsInstance(mapping.generate_file_id("la"), str)
66
 
        self.assertIsInstance(mapping.generate_file_id(u"é"), str)
67
 
 
68
56
 
69
57
class FileidTests(tests.TestCase):
70
58
 
96
84
        c.commit_timezone = 60 * 5
97
85
        c.author_timezone = 60 * 3
98
86
        c.author = "Author"
99
 
        mapping = BzrGitMappingv1()
100
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
101
 
            mapping.revision_id_foreign_to_bzr)
102
 
        self.assertEquals(None, roundtrip_revid)
103
 
        self.assertEquals({}, verifiers)
 
87
        rev, file_ids = BzrGitMappingv1().import_commit(c)
104
88
        self.assertEquals("Some message", rev.message)
105
89
        self.assertEquals("Committer", rev.committer)
106
90
        self.assertEquals("Author", rev.properties['author'])
121
105
        c.author_timezone = 60 * 3
122
106
        c.author = u"Authér".encode("iso8859-1")
123
107
        c.encoding = "iso8859-1"
124
 
        mapping = BzrGitMappingv1()
125
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
126
 
            mapping.revision_id_foreign_to_bzr)
127
 
        self.assertEquals(None, roundtrip_revid)
128
 
        self.assertEquals({}, verifiers)
 
108
        rev, file_ids = BzrGitMappingv1().import_commit(c)
129
109
        self.assertEquals(u"Authér", rev.properties['author'])
130
110
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
131
111
        self.assertTrue("git-implicit-encoding" not in rev.properties)
140
120
        c.commit_timezone = 60 * 5
141
121
        c.author_timezone = 60 * 3
142
122
        c.author = u"Authér".encode("latin1")
143
 
        mapping = BzrGitMappingv1()
144
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
145
 
            mapping.revision_id_foreign_to_bzr)
146
 
        self.assertEquals(None, roundtrip_revid)
147
 
        self.assertEquals({}, verifiers)
 
123
        rev, file_ids = BzrGitMappingv1().import_commit(c)
148
124
        self.assertEquals(u"Authér", rev.properties['author'])
149
125
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
150
126
        self.assertTrue("git-explicit-encoding" not in rev.properties)
159
135
        c.commit_timezone = 60 * 5
160
136
        c.author_timezone = 60 * 3
161
137
        c.author = u"Authér".encode("utf-8")
162
 
        mapping = BzrGitMappingv1()
163
 
        rev, roundtrip_revid, verifiers = mapping.import_commit(c,
164
 
            mapping.revision_id_foreign_to_bzr)
165
 
        self.assertEquals(None, roundtrip_revid)
166
 
        self.assertEquals({}, verifiers)
 
138
        rev, file_ids = BzrGitMappingv1().import_commit(c)
167
139
        self.assertEquals(u"Authér", rev.properties['author'])
168
140
        self.assertTrue("git-explicit-encoding" not in rev.properties)
169
141
        self.assertTrue("git-implicit-encoding" not in rev.properties)
177
149
        self._parent_map = {}
178
150
        self._lookup_parent = self._parent_map.__getitem__
179
151
 
180
 
    def assertRoundtripRevision(self, orig_rev):
 
152
    def assertRoundtripRevision(self, orig_rev, orig_file_ids):
181
153
        commit = self.mapping.export_commit(orig_rev, "mysha",
182
 
            self._lookup_parent, True, "testamentsha")
183
 
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
184
 
            commit, self.mapping.revision_id_foreign_to_bzr)
185
 
        self.assertEquals(rev.revision_id,
186
 
            self.mapping.revision_id_foreign_to_bzr(commit.id))
187
 
        if self.mapping.roundtripping:
188
 
            self.assertEquals({"testament3-sha1": "testamentsha"} , verifiers)
189
 
            self.assertEquals(orig_rev.revision_id, roundtrip_revid)
190
 
            self.assertEquals(orig_rev.properties, rev.properties)
191
 
            self.assertEquals(orig_rev.committer, rev.committer)
192
 
            self.assertEquals(orig_rev.timestamp, rev.timestamp)
193
 
            self.assertEquals(orig_rev.timezone, rev.timezone)
194
 
            self.assertEquals(orig_rev.message, rev.message)
195
 
            self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
196
 
        else:
197
 
            self.assertEquals({}, verifiers)
 
154
            self._lookup_parent, True, orig_file_ids)
 
155
        rev, file_ids = self.mapping.import_commit(commit)
 
156
        self.assertEquals(orig_file_ids, file_ids)
 
157
        self.assertEquals(orig_rev.revision_id, rev.revision_id)
 
158
        self.assertEquals(orig_rev.properties, rev.properties)
 
159
        self.assertEquals(orig_rev.committer, rev.committer)
 
160
        self.assertEquals(orig_rev.timestamp, rev.timestamp)
 
161
        self.assertEquals(orig_rev.timezone, rev.timezone)
 
162
        self.assertEquals(orig_rev.message, rev.message)
 
163
        self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
198
164
 
199
165
    def test_simple_commit(self):
200
166
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
204
170
        r.timestamp = 453543543
205
171
        r.timezone = 0
206
172
        r.properties = {}
207
 
        self.assertRoundtripRevision(r)
 
173
        self.assertRoundtripRevision(r, {})
208
174
 
209
175
    def test_revision_id(self):
210
176
        r = Revision("myrevid")
214
180
        r.timestamp = 453543543
215
181
        r.timezone = 0
216
182
        r.properties = {}
217
 
        self.assertRoundtripRevision(r)
 
183
        self.assertRoundtripRevision(r, {})
218
184
 
219
185
    def test_ghost_parent(self):
220
186
        r = Revision("myrevid")
224
190
        r.timestamp = 453543543
225
191
        r.timezone = 0
226
192
        r.properties = {}
227
 
        self.assertRoundtripRevision(r)
 
193
        self.assertRoundtripRevision(r, {})
228
194
 
229
195
    def test_custom_property(self):
230
196
        r = Revision("myrevid")
234
200
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
235
201
        r.timestamp = 453543543
236
202
        r.timezone = 0
237
 
        self.assertRoundtripRevision(r)
 
203
        self.assertRoundtripRevision(r, {})
 
204
 
 
205
    def test_file_ids(self):
 
206
        r = Revision("myrevid")
 
207
        r.message = "MyCommitMessage"
 
208
        r.parent_ids = []
 
209
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
210
        r.timestamp = 453543543
 
211
        r.timezone = 0
 
212
        r.properties = {}
 
213
        self.assertRoundtripRevision(r, {"foo/bar": "fileid"})
238
214
 
239
215
 
240
216
class RoundtripRevisionsFromGit(tests.TestCase):
250
226
        raise NotImplementedError(self.assertRoundtripBlob)
251
227
 
252
228
    def assertRoundtripCommit(self, commit1):
253
 
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
254
 
            commit1, self.mapping.revision_id_foreign_to_bzr)
 
229
        rev, file_ids = self.mapping.import_commit(commit1)
255
230
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
256
 
            True, None)
 
231
            True, file_ids)
257
232
        self.assertEquals(commit1.committer, commit2.committer)
258
233
        self.assertEquals(commit1.commit_time, commit2.commit_time)
259
234
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
306
281
 
307
282
    def test_empty(self):
308
283
        ie = InventoryDirectory('foo', 'foo', 'foo')
309
 
        t = directory_to_tree(ie, None, {}, None)
 
284
        t = directory_to_tree(ie, None, {})
310
285
        self.assertEquals(None, t)
311
286
 
312
287
    def test_empty_dir(self):
313
288
        ie = InventoryDirectory('foo', 'foo', 'foo')
314
289
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
315
290
        ie.children['bar'] = child_ie
316
 
        t = directory_to_tree(ie, lambda x: None, {}, None)
 
291
        t = directory_to_tree(ie, lambda x: None, {})
317
292
        self.assertEquals(None, t)
318
293
 
319
 
    def test_empty_dir_dummy_files(self):
320
 
        ie = InventoryDirectory('foo', 'foo', 'foo')
321
 
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
322
 
        ie.children['bar'] = child_ie
323
 
        t = directory_to_tree(ie, lambda x: None, {}, ".mydummy")
324
 
        self.assertTrue(".mydummy" in t)
325
 
 
326
294
    def test_empty_root(self):
327
295
        ie = InventoryDirectory('foo', 'foo', None)
328
296
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
329
297
        ie.children['bar'] = child_ie
330
 
        t = directory_to_tree(ie, lambda x: None, {}, None)
 
298
        t = directory_to_tree(ie, lambda x: None, {})
331
299
        self.assertEquals(Tree(), t)
332
300
 
333
301
    def test_with_file(self):
335
303
        child_ie = InventoryFile('bar', 'bar', 'bar')
336
304
        ie.children['bar'] = child_ie
337
305
        b = Blob.from_string("bla")
338
 
        t1 = directory_to_tree(ie, lambda x: b.id, {}, None)
 
306
        t1 = directory_to_tree(ie, lambda x: b.id, {})
339
307
        t2 = Tree()
340
308
        t2.add(0100644, "bar", b.id)
341
309
        self.assertEquals(t1, t2)