/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-11-23 01:35:56 UTC
  • mto: (7211.10.3 git-empty-dirs)
  • mto: This revision was merged to the branch mainline in revision 7215.
  • Revision ID: jelmer@jelmer.uk-20181123013556-mu7ct9ovl7fozjc2
Update comment about ssl.

Show diffs side-by-side

added added

removed removed

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