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

  • Committer: Richard Wilbur
  • Date: 2016-02-04 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6618.
  • Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt  (Only differences were in whitespace.)  Thanks to Petr Stodulka for pointing out the discrepancy.

Show diffs side-by-side

added added

removed removed

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