/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
 
90
96
        c.commit_timezone = 60 * 5
91
97
        c.author_timezone = 60 * 3
92
98
        c.author = "Author"
93
 
        rev = BzrGitMappingv1().import_commit(c)
 
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)
94
104
        self.assertEquals("Some message", rev.message)
95
105
        self.assertEquals("Committer", rev.committer)
96
106
        self.assertEquals("Author", rev.properties['author'])
111
121
        c.author_timezone = 60 * 3
112
122
        c.author = u"Authér".encode("iso8859-1")
113
123
        c.encoding = "iso8859-1"
114
 
        rev = BzrGitMappingv1().import_commit(c)
 
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)
115
129
        self.assertEquals(u"Authér", rev.properties['author'])
116
130
        self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"])
117
131
        self.assertTrue("git-implicit-encoding" not in rev.properties)
126
140
        c.commit_timezone = 60 * 5
127
141
        c.author_timezone = 60 * 3
128
142
        c.author = u"Authér".encode("latin1")
129
 
        rev = BzrGitMappingv1().import_commit(c)
 
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)
130
148
        self.assertEquals(u"Authér", rev.properties['author'])
131
149
        self.assertEquals("latin1", rev.properties["git-implicit-encoding"])
132
150
        self.assertTrue("git-explicit-encoding" not in rev.properties)
141
159
        c.commit_timezone = 60 * 5
142
160
        c.author_timezone = 60 * 3
143
161
        c.author = u"Authér".encode("utf-8")
144
 
        rev = BzrGitMappingv1().import_commit(c)
 
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)
145
167
        self.assertEquals(u"Authér", rev.properties['author'])
146
168
        self.assertTrue("git-explicit-encoding" not in rev.properties)
147
169
        self.assertTrue("git-implicit-encoding" not in rev.properties)
157
179
 
158
180
    def assertRoundtripRevision(self, orig_rev):
159
181
        commit = self.mapping.export_commit(orig_rev, "mysha",
160
 
            self._lookup_parent, True)
161
 
        rev = self.mapping.import_commit(commit)
162
 
        self.assertEquals(orig_rev.revision_id, rev.revision_id)
163
 
        self.assertEquals(orig_rev.properties, rev.properties)
164
 
        self.assertEquals(orig_rev.committer, rev.committer)
165
 
        self.assertEquals(orig_rev.timestamp, rev.timestamp)
166
 
        self.assertEquals(orig_rev.timezone, rev.timezone)
167
 
        self.assertEquals(orig_rev.message, rev.message)
168
 
        self.assertEquals(list(orig_rev.parent_ids), list(rev.parent_ids))
 
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)
169
198
 
170
199
    def test_simple_commit(self):
171
200
        r = Revision(self.mapping.revision_id_foreign_to_bzr("edf99e6c56495c620f20d5dacff9859ff7119261"))
221
250
        raise NotImplementedError(self.assertRoundtripBlob)
222
251
 
223
252
    def assertRoundtripCommit(self, commit1):
224
 
        rev = self.mapping.import_commit(commit1)
 
253
        rev, roundtrip_revid, verifiers = self.mapping.import_commit(
 
254
            commit1, self.mapping.revision_id_foreign_to_bzr)
225
255
        commit2 = self.mapping.export_commit(rev, "12341212121212", None,
226
 
            True)
 
256
            True, None)
227
257
        self.assertEquals(commit1.committer, commit2.committer)
228
258
        self.assertEquals(commit1.commit_time, commit2.commit_time)
229
259
        self.assertEquals(commit1.commit_timezone, commit2.commit_timezone)