/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

Fix some more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
19
19
    InventoryDirectory,
20
20
    InventoryFile,
21
21
    )
 
22
from bzrlib.revision import (
 
23
    Revision,
 
24
    )
22
25
 
23
26
from dulwich.objects import (
24
27
    Blob,
50
53
                            "git-v1:"
51
54
                            "c6a4d8f1fa4ac650748e647c4b1b368f589a7356"))
52
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
 
53
63
 
54
64
class FileidTests(tests.TestCase):
55
65
 
81
91
        c.commit_timezone = 60 * 5
82
92
        c.author_timezone = 60 * 3
83
93
        c.author = "Author"
84
 
        c.serialize()
85
 
        rev = BzrGitMappingv1().import_commit(c)
 
94
        mapping = BzrGitMappingv1()
 
95
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
86
96
        self.assertEquals("Some message", rev.message)
87
97
        self.assertEquals("Committer", rev.committer)
88
98
        self.assertEquals("Author", rev.properties['author'])
103
113
        c.author_timezone = 60 * 3
104
114
        c.author = u"Authér".encode("iso8859-1")
105
115
        c.encoding = "iso8859-1"
106
 
        c.serialize()
107
 
        rev = BzrGitMappingv1().import_commit(c)
 
116
        mapping = BzrGitMappingv1()
 
117
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
108
118
        self.assertEquals(u"Authér", rev.properties['author'])
109
119
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
110
120
        self.assertTrue("git-implicit-encoding" not in rev.properties)
119
129
        c.commit_timezone = 60 * 5
120
130
        c.author_timezone = 60 * 3
121
131
        c.author = u"Authér".encode("latin1")
122
 
        c.serialize()
123
 
        rev = BzrGitMappingv1().import_commit(c)
 
132
        mapping = BzrGitMappingv1()
 
133
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
124
134
        self.assertEquals(u"Authér", rev.properties['author'])
125
135
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
126
136
        self.assertTrue("git-explicit-encoding" not in rev.properties)
135
145
        c.commit_timezone = 60 * 5
136
146
        c.author_timezone = 60 * 3
137
147
        c.author = u"Authér".encode("utf-8")
138
 
        c.serialize()
139
 
        rev = BzrGitMappingv1().import_commit(c)
 
148
        mapping = BzrGitMappingv1()
 
149
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
140
150
        self.assertEquals(u"Authér", rev.properties['author'])
141
151
        self.assertTrue("git-explicit-encoding" not in rev.properties)
142
152
        self.assertTrue("git-implicit-encoding" not in rev.properties)
143
153
 
144
154
 
 
155
class RoundtripRevisionsFromBazaar(tests.TestCase):
 
156
 
 
157
    def setUp(self):
 
158
        super(RoundtripRevisionsFromBazaar, self).setUp()
 
159
        self.mapping = BzrGitMappingv1()
 
160
        self._parent_map = {}
 
161
        self._lookup_parent = self._parent_map.__getitem__
 
162
 
 
163
    def assertRoundtripRevision(self, orig_rev):
 
164
        commit = self.mapping.export_commit(orig_rev, "mysha",
 
165
            self._lookup_parent, True)
 
166
        rev = self.mapping.import_commit(commit,
 
167
            self.mapping.revision_id_foreign_to_bzr)
 
168
        if self.mapping.roundtripping:
 
169
            self.assertEquals(orig_rev.revision_id, rev.revision_id)
 
170
            self.assertEquals(orig_rev.properties, rev.properties)
 
171
            self.assertEquals(orig_rev.committer, rev.committer)
 
172
            self.assertEquals(orig_rev.timestamp, rev.timestamp)
 
173
            self.assertEquals(orig_rev.timezone, rev.timezone)
 
174
            self.assertEquals(orig_rev.message, rev.message)
 
175
            self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
 
176
 
 
177
    def test_simple_commit(self):
 
178
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
 
179
        r.message = "MyCommitMessage"
 
180
        r.parent_ids = []
 
181
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
182
        r.timestamp = 453543543
 
183
        r.timezone = 0
 
184
        r.properties = {}
 
185
        self.assertRoundtripRevision(r)
 
186
 
 
187
    def test_revision_id(self):
 
188
        r = Revision("myrevid")
 
189
        r.message = "MyCommitMessage"
 
190
        r.parent_ids = []
 
191
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
192
        r.timestamp = 453543543
 
193
        r.timezone = 0
 
194
        r.properties = {}
 
195
        self.assertRoundtripRevision(r)
 
196
 
 
197
    def test_ghost_parent(self):
 
198
        r = Revision("myrevid")
 
199
        r.message = "MyCommitMessage"
 
200
        r.parent_ids = ["iamaghost"]
 
201
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
202
        r.timestamp = 453543543
 
203
        r.timezone = 0
 
204
        r.properties = {}
 
205
        self.assertRoundtripRevision(r)
 
206
 
 
207
    def test_custom_property(self):
 
208
        r = Revision("myrevid")
 
209
        r.message = "MyCommitMessage"
 
210
        r.parent_ids = []
 
211
        r.properties = {"fool": "bar"}
 
212
        r.committer = "Jelmer Vernooij <jelmer@apache.org>"
 
213
        r.timestamp = 453543543
 
214
        r.timezone = 0
 
215
        self.assertRoundtripRevision(r)
 
216
 
 
217
 
145
218
class RoundtripRevisionsFromGit(tests.TestCase):
146
219
 
147
220
    def setUp(self):
155
228
        raise NotImplementedError(self.assertRoundtripBlob)
156
229
 
157
230
    def assertRoundtripCommit(self, commit1):
158
 
        commit1.serialize()
159
 
        rev = self.mapping.import_commit(commit1)
160
 
        commit2 = self.mapping.export_commit(rev, "12341212121212", None)
 
231
        rev = self.mapping.import_commit(commit1,
 
232
            self.mapping.revision_id_foreign_to_bzr)
 
233
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
 
234
            True)
161
235
        self.assertEquals(commit1.committer, commit2.committer)
162
236
        self.assertEquals(commit1.commit_time, commit2.commit_time)
163
237
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)
179
253
        c.author = "Author <author>"
180
254
        self.assertRoundtripCommit(c)
181
255
 
 
256
    def test_commit_zero_utc_timezone(self):
 
257
        c = Commit()
 
258
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
 
259
        c.message = "Some message"
 
260
        c.committer = "Committer <Committer>"
 
261
        c.commit_time = 4
 
262
        c.commit_timezone = 0
 
263
        c._commit_timezone_neg_utc = True
 
264
        c.author_time = 5
 
265
        c.author_timezone = 60 * 2
 
266
        c.author = "Author <author>"
 
267
        self.assertRoundtripCommit(c)
 
268
 
182
269
    def test_commit_encoding(self):
183
270
        c = Commit()
184
271
        c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba"
197
284
 
198
285
    def test_empty(self):
199
286
        ie = InventoryDirectory('foo', 'foo', 'foo')
200
 
        t = directory_to_tree(ie, None, {})
 
287
        t = directory_to_tree(ie, None, {}, None)
201
288
        self.assertEquals(None, t)
202
289
 
203
290
    def test_empty_dir(self):
204
291
        ie = InventoryDirectory('foo', 'foo', 'foo')
205
292
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
206
293
        ie.children['bar'] = child_ie
207
 
        t = directory_to_tree(ie, lambda x: None, {})
 
294
        t = directory_to_tree(ie, lambda x: None, {}, None)
208
295
        self.assertEquals(None, t)
209
296
 
 
297
    def test_empty_dir_dummy_files(self):
 
298
        ie = InventoryDirectory('foo', 'foo', 'foo')
 
299
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
 
300
        ie.children['bar'] = child_ie
 
301
        t = directory_to_tree(ie, lambda x: None, {}, ".mydummy")
 
302
        self.assertTrue(".mydummy" in t)
 
303
 
210
304
    def test_empty_root(self):
211
305
        ie = InventoryDirectory('foo', 'foo', None)
212
306
        child_ie = InventoryDirectory('bar', 'bar', 'bar')
213
307
        ie.children['bar'] = child_ie
214
 
        t = directory_to_tree(ie, lambda x: None, {})
 
308
        t = directory_to_tree(ie, lambda x: None, {}, None)
215
309
        self.assertEquals(Tree(), t)
216
310
 
217
311
    def test_with_file(self):
219
313
        child_ie = InventoryFile('bar', 'bar', 'bar')
220
314
        ie.children['bar'] = child_ie
221
315
        b = Blob.from_string("bla")
222
 
        t1 = directory_to_tree(ie, lambda x: b.id, {})
 
316
        t1 = directory_to_tree(ie, lambda x: b.id, {}, None)
223
317
        t2 = Tree()
224
318
        t2.add(0100644, "bar", b.id)
225
319
        self.assertEquals(t1, t2)