/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 brzlib/tests/test_xml.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_xml.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from io import BytesIO
 
17
from cStringIO import StringIO
18
18
 
19
 
from .. import (
 
19
from brzlib import (
20
20
    errors,
21
21
    fifo_cache,
22
 
    )
23
 
from ..bzr import (
24
22
    inventory,
25
23
    xml6,
26
24
    xml7,
27
25
    xml8,
28
26
    )
29
 
from ..bzr.inventory import Inventory
30
 
from . import TestCase
31
 
import breezy.bzr.xml5
 
27
from brzlib.tests import TestCase
 
28
from brzlib.inventory import Inventory
 
29
import brzlib.xml5
32
30
 
33
 
_revision_v5 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
 
31
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
34
32
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
35
33
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
36
34
    timestamp="1125907235.212"
44
42
</revision>
45
43
"""
46
44
 
47
 
_revision_v5_utc = b"""\
 
45
_revision_v5_utc = """\
48
46
<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
49
47
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
50
48
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
59
57
</revision>
60
58
"""
61
59
 
62
 
_committed_inv_v5 = b"""<inventory>
 
60
_committed_inv_v5 = """<inventory>
63
61
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
64
62
      name="bar" parent_id="TREE_ROOT"
65
63
      revision="mbp@foo-123123"
75
73
</inventory>
76
74
"""
77
75
 
78
 
_basis_inv_v5 = b"""<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
 
76
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">
79
77
<file file_id="bar-20050901064931-73b4b1138abc9cd2"
80
78
      name="bar" parent_id="TREE_ROOT"
81
79
      revision="mbp@foo-123123"/>
91
89
 
92
90
 
93
91
# DO NOT REFLOW THIS. Its the exact revision we want.
94
 
_expected_rev_v5 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 
92
_expected_rev_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
95
93
<message>- start splitting code for xml (de)serialization away from objects
96
94
  preparatory to supporting multiple formats by a single library
97
95
</message>
103
101
 
104
102
 
105
103
# DO NOT REFLOW THIS. Its the exact inventory we want.
106
 
_expected_inv_v5 = b"""<inventory format="5">
 
104
_expected_inv_v5 = """<inventory format="5">
107
105
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
108
106
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
109
107
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
111
109
"""
112
110
 
113
111
 
114
 
_expected_inv_v5_root = b"""<inventory file_id="f&lt;" format="5" revision_id="mother!">
 
112
_expected_inv_v5_root = """<inventory file_id="f&lt;" format="5" revision_id="mother!">
115
113
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f&lt;" revision="mbp@foo-123123" text_sha1="A" text_size="1" />
116
114
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f&lt;" revision="mbp@foo-00" />
117
115
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" text_sha1="B" text_size="0" />
119
117
</inventory>
120
118
"""
121
119
 
122
 
_expected_inv_v6 = b"""<inventory format="6" revision_id="rev_outer">
 
120
_expected_inv_v6 = """<inventory format="6" revision_id="rev_outer">
123
121
<directory file_id="tree-root-321" name="" revision="rev_outer" />
124
122
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
125
123
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
127
125
</inventory>
128
126
"""
129
127
 
130
 
_expected_inv_v7 = b"""<inventory format="7" revision_id="rev_outer">
 
128
_expected_inv_v7 = """<inventory format="7" revision_id="rev_outer">
131
129
<directory file_id="tree-root-321" name="" revision="rev_outer" />
132
130
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
133
131
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
136
134
</inventory>
137
135
"""
138
136
 
139
 
_expected_rev_v8 = b"""<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
 
137
_expected_rev_v8 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">
140
138
<message>- start splitting code for xml (de)serialization away from objects
141
139
  preparatory to supporting multiple formats by a single library
142
140
</message>
146
144
</revision>
147
145
"""
148
146
 
149
 
_expected_inv_v8 = b"""<inventory format="8" revision_id="rev_outer">
 
147
_expected_inv_v8 = """<inventory format="8" revision_id="rev_outer">
150
148
<directory file_id="tree-root-321" name="" revision="rev_outer" />
151
149
<directory file_id="dir-id" name="dir" parent_id="tree-root-321" revision="rev_outer" />
152
150
<file file_id="file-id" name="file" parent_id="tree-root-321" revision="rev_outer" text_sha1="A" text_size="1" />
154
152
</inventory>
155
153
"""
156
154
 
157
 
_revision_utf8_v5 = b"""<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
 
155
_revision_utf8_v5 = """<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;"
158
156
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
159
157
    revision_id="erik@b&#229;gfors-02"
160
158
    timestamp="1125907235.212"
167
165
</revision>
168
166
"""
169
167
 
170
 
_expected_rev_v8_complex = b"""<revision committer="Erik B&#229;gfors &lt;erik@foo.net&gt;" format="8" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="erik@b&#229;gfors-02" timestamp="1125907235.212" timezone="36000">
171
 
<message>Include &#181;nicode characters
172
 
</message>
173
 
<parents>
174
 
<revision_ref revision_id="erik@b&#229;gfors-01" />
175
 
<revision_ref revision_id="erik@bagfors-02" />
176
 
</parents>
177
 
<properties><property name="bar" />
178
 
<property name="foo">this has a
179
 
newline in it</property>
180
 
</properties>
181
 
</revision>
182
 
"""
183
 
 
184
 
 
185
 
 
186
 
_inventory_utf8_v5 = b"""<inventory file_id="TRE&#233;_ROOT" format="5"
 
168
_inventory_utf8_v5 = """<inventory file_id="TRE&#233;_ROOT" format="5"
187
169
                                   revision_id="erik@b&#229;gfors-02">
188
170
<file file_id="b&#229;r-01"
189
171
      name="b&#229;r" parent_id="TRE&#233;_ROOT"
199
181
"""
200
182
 
201
183
# Before revision_id was always stored as an attribute
202
 
_inventory_v5a = b"""<inventory format="5">
 
184
_inventory_v5a = """<inventory format="5">
203
185
</inventory>
204
186
"""
205
187
 
206
188
# Before revision_id was always stored as an attribute
207
 
_inventory_v5b = b"""<inventory format="5" revision_id="a-rev-id">
 
189
_inventory_v5b = """<inventory format="5" revision_id="a-rev-id">
208
190
</inventory>
209
191
"""
210
192
 
214
196
 
215
197
    def test_unpack_revision_5(self):
216
198
        """Test unpacking a canned revision v5"""
217
 
        inp = BytesIO(_revision_v5)
218
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
 
199
        inp = StringIO(_revision_v5)
 
200
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
219
201
        eq = self.assertEqual
220
202
        eq(rev.committer,
221
203
           "Martin Pool <mbp@sourcefrog.net>")
222
204
        eq(len(rev.parent_ids), 1)
223
205
        eq(rev.timezone, 36000)
224
206
        eq(rev.parent_ids[0],
225
 
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
207
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
226
208
 
227
209
    def test_unpack_revision_5_utc(self):
228
 
        inp = BytesIO(_revision_v5_utc)
229
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
 
210
        inp = StringIO(_revision_v5_utc)
 
211
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
230
212
        eq = self.assertEqual
231
213
        eq(rev.committer,
232
214
           "Martin Pool <mbp@sourcefrog.net>")
233
215
        eq(len(rev.parent_ids), 1)
234
216
        eq(rev.timezone, 0)
235
217
        eq(rev.parent_ids[0],
236
 
           b"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
 
218
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
237
219
 
238
220
    def test_unpack_inventory_5(self):
239
221
        """Unpack canned new-style inventory"""
240
 
        inp = BytesIO(_committed_inv_v5)
241
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
 
222
        inp = StringIO(_committed_inv_v5)
 
223
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
242
224
        eq = self.assertEqual
243
225
        eq(len(inv), 4)
244
 
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
 
226
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
245
227
        eq(ie.kind, 'file')
246
 
        eq(ie.revision, b'mbp@foo-00')
 
228
        eq(ie.revision, 'mbp@foo-00')
247
229
        eq(ie.name, 'bar')
248
 
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
 
230
        eq(inv[ie.parent_id].kind, 'directory')
249
231
 
250
232
    def test_unpack_basis_inventory_5(self):
251
233
        """Unpack canned new-style inventory"""
252
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
253
 
            breezy.osutils.split_lines(_basis_inv_v5))
 
234
        inp = StringIO(_basis_inv_v5)
 
235
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
254
236
        eq = self.assertEqual
255
237
        eq(len(inv), 4)
256
 
        eq(inv.revision_id,
257
 
           b'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
258
 
        ie = inv.get_entry(b'bar-20050824000535-6bc48cfad47ed134')
 
238
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
 
239
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
259
240
        eq(ie.kind, 'file')
260
 
        eq(ie.revision, b'mbp@foo-00')
 
241
        eq(ie.revision, 'mbp@foo-00')
261
242
        eq(ie.name, 'bar')
262
 
        eq(inv.get_entry(ie.parent_id).kind, 'directory')
 
243
        eq(inv[ie.parent_id].kind, 'directory')
263
244
 
264
245
    def test_unpack_inventory_5a(self):
265
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
266
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id')
267
 
        self.assertEqual(b'test-rev-id', inv.root.revision)
 
246
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
247
                _inventory_v5a, revision_id='test-rev-id')
 
248
        self.assertEqual('test-rev-id', inv.root.revision)
268
249
 
269
250
    def test_unpack_inventory_5a_cache_and_copy(self):
270
251
        # Passing an entry_cache should get populated with the objects
271
252
        # But the returned objects should be copies if return_from_cache is
272
253
        # False
273
254
        entry_cache = fifo_cache.FIFOCache()
274
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
275
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
 
255
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
256
            _inventory_v5a, revision_id='test-rev-id',
276
257
            entry_cache=entry_cache, return_from_cache=False)
277
258
        for entry in inv.iter_just_entries():
278
259
            key = (entry.file_id, entry.revision)
287
268
        # The returned objects should be exact if return_from_cache is
288
269
        # True
289
270
        entry_cache = fifo_cache.FIFOCache()
290
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
291
 
            breezy.osutils.split_lines(_inventory_v5a), revision_id=b'test-rev-id',
 
271
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
272
            _inventory_v5a, revision_id='test-rev-id',
292
273
            entry_cache=entry_cache, return_from_cache=True)
293
274
        for entry in inv.iter_just_entries():
294
275
            key = (entry.file_id, entry.revision)
299
280
                self.assertIs(entry, entry_cache[key])
300
281
 
301
282
    def test_unpack_inventory_5b(self):
302
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
303
 
            breezy.osutils.split_lines(_inventory_v5b), revision_id=b'test-rev-id')
304
 
        self.assertEqual(b'a-rev-id', inv.root.revision)
 
283
        inv = brzlib.xml5.serializer_v5.read_inventory_from_string(
 
284
                _inventory_v5b, revision_id='test-rev-id')
 
285
        self.assertEqual('a-rev-id', inv.root.revision)
305
286
 
306
287
    def test_repack_inventory_5(self):
307
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
308
 
            breezy.osutils.split_lines(_committed_inv_v5))
309
 
        outp = BytesIO()
310
 
        breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
 
288
        inp = StringIO(_committed_inv_v5)
 
289
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
290
        outp = StringIO()
 
291
        brzlib.xml5.serializer_v5.write_inventory(inv, outp)
311
292
        self.assertEqualDiff(_expected_inv_v5, outp.getvalue())
312
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory_from_lines(
313
 
            breezy.osutils.split_lines(outp.getvalue()))
 
293
        inv2 = brzlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
314
294
        self.assertEqual(inv, inv2)
315
295
 
316
296
    def assertRoundTrips(self, xml_string):
317
 
        inp = BytesIO(xml_string)
318
 
        inv = breezy.bzr.xml5.serializer_v5.read_inventory(inp)
319
 
        outp = BytesIO()
320
 
        breezy.bzr.xml5.serializer_v5.write_inventory(inv, outp)
 
297
        inp = StringIO(xml_string)
 
298
        inv = brzlib.xml5.serializer_v5.read_inventory(inp)
 
299
        outp = StringIO()
 
300
        brzlib.xml5.serializer_v5.write_inventory(inv, outp)
321
301
        self.assertEqualDiff(xml_string, outp.getvalue())
322
 
        lines = breezy.bzr.xml5.serializer_v5.write_inventory_to_lines(inv)
 
302
        lines = brzlib.xml5.serializer_v5.write_inventory_to_lines(inv)
323
303
        outp.seek(0)
324
304
        self.assertEqual(outp.readlines(), lines)
325
 
        inv2 = breezy.bzr.xml5.serializer_v5.read_inventory(
326
 
            BytesIO(outp.getvalue()))
 
305
        inv2 = brzlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
327
306
        self.assertEqual(inv, inv2)
328
307
 
329
308
    def tests_serialize_inventory_v5_with_root(self):
331
310
 
332
311
    def check_repack_revision(self, txt):
333
312
        """Check that repacking a revision yields the same information"""
334
 
        inp = BytesIO(txt)
335
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision(inp)
336
 
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
337
 
        rev2 = breezy.bzr.xml5.serializer_v5.read_revision(
338
 
            BytesIO(outfile_contents))
 
313
        inp = StringIO(txt)
 
314
        rev = brzlib.xml5.serializer_v5.read_revision(inp)
 
315
        outp = StringIO()
 
316
        brzlib.xml5.serializer_v5.write_revision(rev, outp)
 
317
        outfile_contents = outp.getvalue()
 
318
        rev2 = brzlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
339
319
        self.assertEqual(rev, rev2)
340
320
 
341
321
    def test_repack_revision_5(self):
348
328
    def test_pack_revision_5(self):
349
329
        """Pack revision to XML v5"""
350
330
        # fixed 20051025, revisions should have final newline
351
 
        rev = breezy.bzr.xml5.serializer_v5.read_revision_from_string(
352
 
            _revision_v5)
353
 
        outfile_contents = breezy.bzr.xml5.serializer_v5.write_revision_to_string(rev)
354
 
        self.assertEqual(outfile_contents[-1:], b'\n')
355
 
        self.assertEqualDiff(
356
 
            outfile_contents,
357
 
            b''.join(breezy.bzr.xml5.serializer_v5.write_revision_to_lines(rev)))
 
331
        rev = brzlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
332
        outp = StringIO()
 
333
        brzlib.xml5.serializer_v5.write_revision(rev, outp)
 
334
        outfile_contents = outp.getvalue()
 
335
        self.assertEqual(outfile_contents[-1], '\n')
 
336
        self.assertEqualDiff(outfile_contents, brzlib.xml5.serializer_v5.write_revision_to_string(rev))
358
337
        self.assertEqualDiff(outfile_contents, _expected_rev_v5)
359
338
 
360
339
    def test_empty_property_value(self):
361
340
        """Create an empty property value check that it serializes correctly"""
362
 
        s_v5 = breezy.bzr.xml5.serializer_v5
 
341
        s_v5 = brzlib.xml5.serializer_v5
363
342
        rev = s_v5.read_revision_from_string(_revision_v5)
364
 
        props = {'empty': '', 'one': 'one'}
 
343
        outp = StringIO()
 
344
        props = {'empty':'', 'one':'one'}
365
345
        rev.properties = props
366
 
        txt = b''.join(s_v5.write_revision_to_lines(rev))
 
346
        txt = s_v5.write_revision_to_string(rev)
367
347
        new_rev = s_v5.read_revision_from_string(txt)
368
348
        self.assertEqual(props, new_rev.properties)
369
349
 
370
350
    def get_sample_inventory(self):
371
 
        inv = Inventory(b'tree-root-321', revision_id=b'rev_outer')
372
 
        inv.add(inventory.InventoryFile(b'file-id', 'file', b'tree-root-321'))
373
 
        inv.add(inventory.InventoryDirectory(b'dir-id', 'dir',
374
 
                                             b'tree-root-321'))
375
 
        inv.add(inventory.InventoryLink(b'link-id', 'link', b'tree-root-321'))
376
 
        inv.get_entry(b'tree-root-321').revision = b'rev_outer'
377
 
        inv.get_entry(b'dir-id').revision = b'rev_outer'
378
 
        inv.get_entry(b'file-id').revision = b'rev_outer'
379
 
        inv.get_entry(b'file-id').text_sha1 = b'A'
380
 
        inv.get_entry(b'file-id').text_size = 1
381
 
        inv.get_entry(b'link-id').revision = b'rev_outer'
382
 
        inv.get_entry(b'link-id').symlink_target = 'a'
 
351
        inv = Inventory('tree-root-321', revision_id='rev_outer')
 
352
        inv.add(inventory.InventoryFile('file-id', 'file', 'tree-root-321'))
 
353
        inv.add(inventory.InventoryDirectory('dir-id', 'dir',
 
354
                                             'tree-root-321'))
 
355
        inv.add(inventory.InventoryLink('link-id', 'link', 'tree-root-321'))
 
356
        inv['tree-root-321'].revision = 'rev_outer'
 
357
        inv['dir-id'].revision = 'rev_outer'
 
358
        inv['file-id'].revision = 'rev_outer'
 
359
        inv['file-id'].text_sha1 = 'A'
 
360
        inv['file-id'].text_size = 1
 
361
        inv['link-id'].revision = 'rev_outer'
 
362
        inv['link-id'].symlink_target = 'a'
383
363
        return inv
384
364
 
385
365
    def test_roundtrip_inventory_v7(self):
386
366
        inv = self.get_sample_inventory()
387
 
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
388
 
                                        b'rev_outer', b'rev_inner'))
 
367
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
 
368
                                        'rev_outer', 'rev_inner'))
 
369
        txt = xml7.serializer_v7.write_inventory_to_string(inv)
389
370
        lines = xml7.serializer_v7.write_inventory_to_lines(inv)
390
 
        self.assertEqualDiff(_expected_inv_v7, b''.join(lines))
391
 
        inv2 = xml7.serializer_v7.read_inventory_from_lines(lines)
 
371
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
372
        self.assertEqualDiff(_expected_inv_v7, txt)
 
373
        inv2 = xml7.serializer_v7.read_inventory_from_string(txt)
392
374
        self.assertEqual(5, len(inv2))
393
375
        for path, ie in inv.iter_entries():
394
 
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
 
376
            self.assertEqual(ie, inv2[ie.file_id])
395
377
 
396
378
    def test_roundtrip_inventory_v6(self):
397
379
        inv = self.get_sample_inventory()
 
380
        txt = xml6.serializer_v6.write_inventory_to_string(inv)
398
381
        lines = xml6.serializer_v6.write_inventory_to_lines(inv)
399
 
        self.assertEqualDiff(_expected_inv_v6, b''.join(lines))
400
 
        inv2 = xml6.serializer_v6.read_inventory_from_lines(lines)
 
382
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
383
        self.assertEqualDiff(_expected_inv_v6, txt)
 
384
        inv2 = xml6.serializer_v6.read_inventory_from_string(txt)
401
385
        self.assertEqual(4, len(inv2))
402
386
        for path, ie in inv.iter_entries():
403
 
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
 
387
            self.assertEqual(ie, inv2[ie.file_id])
404
388
 
405
389
    def test_wrong_format_v7(self):
406
390
        """Can't accidentally open a file with wrong serializer"""
407
 
        s_v6 = breezy.bzr.xml6.serializer_v6
 
391
        s_v6 = brzlib.xml6.serializer_v6
408
392
        s_v7 = xml7.serializer_v7
409
393
        self.assertRaises(errors.UnexpectedInventoryFormat,
410
 
                          s_v7.read_inventory_from_lines,
411
 
                          breezy.osutils.split_lines(_expected_inv_v5))
 
394
                          s_v7.read_inventory_from_string, _expected_inv_v5)
412
395
        self.assertRaises(errors.UnexpectedInventoryFormat,
413
 
                          s_v6.read_inventory_from_lines,
414
 
                          breezy.osutils.split_lines(_expected_inv_v7))
 
396
                          s_v6.read_inventory_from_string, _expected_inv_v7)
415
397
 
416
398
    def test_tree_reference(self):
417
 
        s_v5 = breezy.bzr.xml5.serializer_v5
418
 
        s_v6 = breezy.bzr.xml6.serializer_v6
 
399
        s_v5 = brzlib.xml5.serializer_v5
 
400
        s_v6 = brzlib.xml6.serializer_v6
419
401
        s_v7 = xml7.serializer_v7
420
 
        inv = Inventory(b'tree-root-321', revision_id=b'rev-outer')
421
 
        inv.root.revision = b'root-rev'
422
 
        inv.add(inventory.TreeReference(b'nested-id', 'nested', b'tree-root-321',
423
 
                                        b'rev-outer', b'rev-inner'))
424
 
        self.assertRaises(errors.UnsupportedInventoryKind,
425
 
                          s_v5.write_inventory_to_lines, inv)
426
 
        self.assertRaises(errors.UnsupportedInventoryKind,
427
 
                          s_v6.write_inventory_to_lines, inv)
428
 
        lines = s_v7.write_inventory_to_chunks(inv)
429
 
        inv2 = s_v7.read_inventory_from_lines(lines)
430
 
        self.assertEqual(b'tree-root-321',
431
 
                         inv2.get_entry(b'nested-id').parent_id)
432
 
        self.assertEqual(b'rev-outer', inv2.get_entry(b'nested-id').revision)
433
 
        self.assertEqual(
434
 
            b'rev-inner', inv2.get_entry(b'nested-id').reference_revision)
 
402
        inv = Inventory('tree-root-321', revision_id='rev-outer')
 
403
        inv.root.revision = 'root-rev'
 
404
        inv.add(inventory.TreeReference('nested-id', 'nested', 'tree-root-321',
 
405
                                        'rev-outer', 'rev-inner'))
 
406
        self.assertRaises(errors.UnsupportedInventoryKind,
 
407
                          s_v5.write_inventory_to_string, inv)
 
408
        self.assertRaises(errors.UnsupportedInventoryKind,
 
409
                          s_v6.write_inventory_to_string, inv)
 
410
        txt = s_v7.write_inventory_to_string(inv)
 
411
        lines = s_v7.write_inventory_to_lines(inv)
 
412
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
413
        inv2 = s_v7.read_inventory_from_string(txt)
 
414
        self.assertEqual('tree-root-321', inv2['nested-id'].parent_id)
 
415
        self.assertEqual('rev-outer', inv2['nested-id'].revision)
 
416
        self.assertEqual('rev-inner', inv2['nested-id'].reference_revision)
435
417
 
436
418
    def test_roundtrip_inventory_v8(self):
437
419
        inv = self.get_sample_inventory()
438
 
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
439
 
        inv2 = xml8.serializer_v8.read_inventory_from_lines(lines)
 
420
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
 
421
        inv2 = xml8.serializer_v8.read_inventory_from_string(txt)
440
422
        self.assertEqual(4, len(inv2))
441
423
        for path, ie in inv.iter_entries():
442
 
            self.assertEqual(ie, inv2.get_entry(ie.file_id))
 
424
            self.assertEqual(ie, inv2[ie.file_id])
443
425
 
444
426
    def test_inventory_text_v8(self):
445
427
        inv = self.get_sample_inventory()
 
428
        txt = xml8.serializer_v8.write_inventory_to_string(inv)
446
429
        lines = xml8.serializer_v8.write_inventory_to_lines(inv)
447
 
        self.assertEqualDiff(_expected_inv_v8, b''.join(lines))
 
430
        self.assertEqual(brzlib.osutils.split_lines(txt), lines)
 
431
        self.assertEqualDiff(_expected_inv_v8, txt)
448
432
 
449
433
    def test_revision_text_v6(self):
450
434
        """Pack revision to XML v6"""
451
 
        rev = breezy.bzr.xml6.serializer_v6.read_revision_from_string(
 
435
        rev = brzlib.xml6.serializer_v6.read_revision_from_string(
452
436
            _expected_rev_v5)
453
 
        serialized = breezy.bzr.xml6.serializer_v6.write_revision_to_lines(
454
 
            rev)
455
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
 
437
        serialized = brzlib.xml6.serializer_v6.write_revision_to_string(rev)
 
438
        self.assertEqualDiff(serialized, _expected_rev_v5)
456
439
 
457
440
    def test_revision_text_v7(self):
458
441
        """Pack revision to XML v7"""
459
 
        rev = breezy.bzr.xml7.serializer_v7.read_revision_from_string(
 
442
        rev = brzlib.xml7.serializer_v7.read_revision_from_string(
460
443
            _expected_rev_v5)
461
 
        serialized = breezy.bzr.xml7.serializer_v7.write_revision_to_lines(
462
 
            rev)
463
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v5)
 
444
        serialized = brzlib.xml7.serializer_v7.write_revision_to_string(rev)
 
445
        self.assertEqualDiff(serialized, _expected_rev_v5)
464
446
 
465
447
    def test_revision_text_v8(self):
466
448
        """Pack revision to XML v8"""
467
 
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
 
449
        rev = brzlib.xml8.serializer_v8.read_revision_from_string(
468
450
            _expected_rev_v8)
469
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
470
 
            rev)
471
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8)
472
 
 
473
 
    def test_revision_text_v8_complex(self):
474
 
        """Pack revision to XML v8"""
475
 
        rev = breezy.bzr.xml8.serializer_v8.read_revision_from_string(
476
 
            _expected_rev_v8_complex)
477
 
        serialized = breezy.bzr.xml8.serializer_v8.write_revision_to_lines(
478
 
            rev)
479
 
        self.assertEqualDiff(b''.join(serialized), _expected_rev_v8_complex)
 
451
        serialized = brzlib.xml8.serializer_v8.write_revision_to_string(rev)
 
452
        self.assertEqualDiff(serialized, _expected_rev_v8)
480
453
 
481
454
    def test_revision_ids_are_utf8(self):
482
455
        """Parsed revision_ids should all be utf-8 strings, not unicode."""
483
 
        s_v5 = breezy.bzr.xml5.serializer_v5
 
456
        s_v5 = brzlib.xml5.serializer_v5
484
457
        rev = s_v5.read_revision_from_string(_revision_utf8_v5)
485
 
        self.assertEqual(b'erik@b\xc3\xa5gfors-02', rev.revision_id)
486
 
        self.assertIsInstance(rev.revision_id, bytes)
487
 
        self.assertEqual([b'erik@b\xc3\xa5gfors-01'], rev.parent_ids)
 
458
        self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)
 
459
        self.assertIsInstance(rev.revision_id, str)
 
460
        self.assertEqual(['erik@b\xc3\xa5gfors-01'], rev.parent_ids)
488
461
        for parent_id in rev.parent_ids:
489
 
            self.assertIsInstance(parent_id, bytes)
 
462
            self.assertIsInstance(parent_id, str)
490
463
        self.assertEqual(u'Include \xb5nicode characters\n', rev.message)
491
 
        self.assertIsInstance(rev.message, str)
 
464
        self.assertIsInstance(rev.message, unicode)
492
465
 
493
466
        # ie.revision should either be None or a utf-8 revision id
494
 
        inv = s_v5.read_inventory_from_lines(breezy.osutils.split_lines(_inventory_utf8_v5))
 
467
        inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)
495
468
        rev_id_1 = u'erik@b\xe5gfors-01'.encode('utf8')
496
469
        rev_id_2 = u'erik@b\xe5gfors-02'.encode('utf8')
497
470
        fid_root = u'TRE\xe9_ROOT'.encode('utf8')
502
475
                    (u'b\xe5r', fid_bar1, fid_root, rev_id_1),
503
476
                    (u's\xb5bdir', fid_sub, fid_root, rev_id_1),
504
477
                    (u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),
505
 
                    ]
 
478
                   ]
506
479
        self.assertEqual(rev_id_2, inv.revision_id)
507
 
        self.assertIsInstance(inv.revision_id, bytes)
 
480
        self.assertIsInstance(inv.revision_id, str)
508
481
 
509
482
        actual = list(inv.iter_entries_by_dir())
510
483
        for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),
511
484
             (act_path, act_ie)) in zip(expected, actual):
512
485
            self.assertEqual(exp_path, act_path)
513
 
            self.assertIsInstance(act_path, str)
 
486
            self.assertIsInstance(act_path, unicode)
514
487
            self.assertEqual(exp_file_id, act_ie.file_id)
515
 
            self.assertIsInstance(act_ie.file_id, bytes)
 
488
            self.assertIsInstance(act_ie.file_id, str)
516
489
            self.assertEqual(exp_parent_id, act_ie.parent_id)
517
490
            if exp_parent_id is not None:
518
 
                self.assertIsInstance(act_ie.parent_id, bytes)
 
491
                self.assertIsInstance(act_ie.parent_id, str)
519
492
            self.assertEqual(exp_rev_id, act_ie.revision)
520
493
            if exp_rev_id is not None:
521
 
                self.assertIsInstance(act_ie.revision, bytes)
 
494
                self.assertIsInstance(act_ie.revision, str)
522
495
 
523
496
        self.assertEqual(len(expected), len(actual))
524
497
 
525
 
    def test_serialization_error(self):
526
 
        s_v5 = breezy.bzr.xml5.serializer_v5
527
 
        e = self.assertRaises(
528
 
            errors.UnexpectedInventoryFormat,
529
 
            s_v5.read_inventory_from_lines, [b"<Notquitexml"])
530
 
        self.assertEqual(str(e), "unclosed token: line 1, column 0")
531
 
 
532
498
 
533
499
class TestEncodeAndEscape(TestCase):
534
500
    """Whitebox testing of the _encode_and_escape function."""
536
502
    def setUp(self):
537
503
        super(TestEncodeAndEscape, self).setUp()
538
504
        # Keep the cache clear before and after the test
539
 
        breezy.bzr.xml_serializer._clear_cache()
540
 
        self.addCleanup(breezy.bzr.xml_serializer._clear_cache)
 
505
        brzlib.xml_serializer._clear_cache()
 
506
        self.addCleanup(brzlib.xml_serializer._clear_cache)
541
507
 
542
508
    def test_simple_ascii(self):
543
509
        # _encode_and_escape always appends a final ", because these parameters
544
510
        # are being used in xml attributes, and by returning it now, we have to
545
511
        # do fewer string operations later.
546
 
        val = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
547
 
        self.assertEqual(b'foo bar', val)
 
512
        val = brzlib.xml_serializer.encode_and_escape('foo bar')
 
513
        self.assertEqual('foo bar"', val)
548
514
        # The second time should be cached
549
 
        val2 = breezy.bzr.xml_serializer.encode_and_escape('foo bar')
 
515
        val2 = brzlib.xml_serializer.encode_and_escape('foo bar')
550
516
        self.assertIs(val2, val)
551
517
 
552
518
    def test_ascii_with_xml(self):
553
 
        self.assertEqual(b'&amp;&apos;&quot;&lt;&gt;',
554
 
                         breezy.bzr.xml_serializer.encode_and_escape('&\'"<>'))
 
519
        self.assertEqual('&amp;&apos;&quot;&lt;&gt;"',
 
520
                         brzlib.xml_serializer.encode_and_escape('&\'"<>'))
555
521
 
556
522
    def test_utf8_with_xml(self):
557
523
        # u'\xb5\xe5&\u062c'
558
 
        utf8_str = b'\xc2\xb5\xc3\xa5&\xd8\xac'
559
 
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
560
 
                         breezy.bzr.xml_serializer.encode_and_escape(utf8_str))
 
524
        utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'
 
525
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
 
526
                         brzlib.xml_serializer.encode_and_escape(utf8_str))
561
527
 
562
528
    def test_unicode(self):
563
529
        uni_str = u'\xb5\xe5&\u062c'
564
 
        self.assertEqual(b'&#181;&#229;&amp;&#1580;',
565
 
                         breezy.bzr.xml_serializer.encode_and_escape(uni_str))
 
530
        self.assertEqual('&#181;&#229;&amp;&#1580;"',
 
531
                         brzlib.xml_serializer.encode_and_escape(uni_str))
566
532
 
567
533
 
568
534
class TestMisc(TestCase):
569
535
 
570
536
    def test_unescape_xml(self):
571
537
        """We get some kind of error when malformed entities are passed"""
572
 
        self.assertRaises(KeyError, breezy.bzr.xml8._unescape_xml, b'foo&bar;')
 
538
        self.assertRaises(KeyError, brzlib.xml8._unescape_xml, 'foo&bar;')