/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-30 17:30:52 UTC
  • mfrom: (7464.3.2 drop-roundtripping)
  • Revision ID: breezy.the.bot@gmail.com-20200130173052-fedd479i21ci93dr
Drop more roundtripping support in Git.

Merged from https://code.launchpad.net/~jelmer/brz/drop-roundtripping/+merge/378336

Show diffs side-by-side

added added

removed removed

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