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

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 21:42:57 UTC
  • mto: This revision was merged to the branch mainline in revision 6859.
  • Revision ID: jelmer@jelmer.uk-20180218214257-jpevutp1wa30tz3v
Update TODO to reference Breezy, not Bazaar.

Show diffs side-by-side

added added

removed removed

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