/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

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