/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

Use dictionary with verifiers rather than requiring testament3-sha1 everywhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
60
60
            self.assertTrue(mapping.is_control_file(".bzrfileids"))
61
61
        self.assertFalse(mapping.is_control_file(".bzrfoo"))
62
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
 
63
68
 
64
69
class FileidTests(tests.TestCase):
65
70
 
92
97
        c.author_timezone = 60 * 3
93
98
        c.author = "Author"
94
99
        mapping = BzrGitMappingv1()
95
 
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
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)
96
104
        self.assertEquals("Some message", rev.message)
97
105
        self.assertEquals("Committer", rev.committer)
98
106
        self.assertEquals("Author", rev.properties['author'])
114
122
        c.author = u"Authér".encode("iso8859-1")
115
123
        c.encoding = "iso8859-1"
116
124
        mapping = BzrGitMappingv1()
117
 
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
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)
118
129
        self.assertEquals(u"Authér", rev.properties['author'])
119
130
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
120
131
        self.assertTrue("git-implicit-encoding" not in rev.properties)
130
141
        c.author_timezone = 60 * 3
131
142
        c.author = u"Authér".encode("latin1")
132
143
        mapping = BzrGitMappingv1()
133
 
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
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)
134
148
        self.assertEquals(u"Authér", rev.properties['author'])
135
149
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
136
150
        self.assertTrue("git-explicit-encoding" not in rev.properties)
146
160
        c.author_timezone = 60 * 3
147
161
        c.author = u"Authér".encode("utf-8")
148
162
        mapping = BzrGitMappingv1()
149
 
        rev = mapping.import_commit(c, mapping.revision_id_foreign_to_bzr)
 
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)
150
167
        self.assertEquals(u"Authér", rev.properties['author'])
151
168
        self.assertTrue("git-explicit-encoding" not in rev.properties)
152
169
        self.assertTrue("git-implicit-encoding" not in rev.properties)
162
179
 
163
180
    def assertRoundtripRevision(self, orig_rev):
164
181
        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)
 
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))
168
187
        if self.mapping.roundtripping:
169
 
            self.assertEquals(orig_rev.revision_id, rev.revision_id)
 
188
            self.assertEquals({"testament3-sha1": "testamentsha"} , verifiers)
 
189
            self.assertEquals(orig_rev.revision_id, roundtrip_revid)
170
190
            self.assertEquals(orig_rev.properties, rev.properties)
171
191
            self.assertEquals(orig_rev.committer, rev.committer)
172
192
            self.assertEquals(orig_rev.timestamp, rev.timestamp)
173
193
            self.assertEquals(orig_rev.timezone, rev.timezone)
174
194
            self.assertEquals(orig_rev.message, rev.message)
175
195
            self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
 
196
        else:
 
197
            self.assertEquals({}, verifiers)
176
198
 
177
199
    def test_simple_commit(self):
178
200
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
228
250
        raise NotImplementedError(self.assertRoundtripBlob)
229
251
 
230
252
    def assertRoundtripCommit(self, commit1):
231
 
        rev = self.mapping.import_commit(commit1,
232
 
            self.mapping.revision_id_foreign_to_bzr)
 
253
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
 
254
            commit1, self.mapping.revision_id_foreign_to_bzr)
233
255
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
234
 
            True)
 
256
            True, None)
235
257
        self.assertEquals(commit1.committer, commit2.committer)
236
258
        self.assertEquals(commit1.commit_time, commit2.commit_time)
237
259
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)