bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2052.3.2
by John Arbash Meinel
 Change Copyright .. by Canonical to Copyright ... Canonical  | 
1  | 
# Copyright (C) 2005 Canonical Ltd
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
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.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
7  | 
#
 | 
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
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.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
12  | 
#
 | 
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
17  | 
from cStringIO import StringIO  | 
|
18  | 
||
| 
1185.31.25
by John Arbash Meinel
 Renamed all of the tests from selftest/foo.py to tests/test_foo.py  | 
19  | 
from bzrlib.tests import TestCase  | 
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
20  | 
from bzrlib.inventory import Inventory, InventoryEntry  | 
| 
1304
by Martin Pool
 - fix up imports of serializer_v4  | 
21  | 
from bzrlib.xml4 import serializer_v4  | 
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
22  | 
import bzrlib.xml5  | 
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
23  | 
|
24  | 
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">  | 
|
25  | 
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
 | 
|
26  | 
<entry file_id="foo-20050801201819-4139aa4a272f4250" kind="directory" name="foo" parent_id="TREE_ROOT" />
 | 
|
27  | 
<entry file_id="bar-20050824000535-6bc48cfad47ed134" kind="file" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" />
 | 
|
28  | 
</inventory>"""
 | 
|
29  | 
||
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
30  | 
|
31  | 
_revision_v4 = """<revision committer="Martin Pool <mbp@sourcefrog.net>"  | 
|
32  | 
    inventory_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 | 
|
33  | 
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
 | 
|
34  | 
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 | 
|
| 
2102.4.1
by John Arbash Meinel
 Switch to using millisecond resolution in Revision XML  | 
35  | 
    timestamp="1125907235.212"
 | 
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
36  | 
    timezone="36000">
 | 
37  | 
<message>- start splitting code for xml (de)serialization away from objects
 | 
|
38  | 
  preparatory to supporting multiple formats by a single library
 | 
|
39  | 
</message>
 | 
|
40  | 
<parents>
 | 
|
41  | 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" revision_sha1="7bdf4cc8c5bdac739f8cf9b10b78cf4b68f915ff" />
 | 
|
42  | 
</parents>
 | 
|
43  | 
</revision>
 | 
|
44  | 
"""
 | 
|
45  | 
||
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
46  | 
_revision_v5 = """<revision committer="Martin Pool <mbp@sourcefrog.net>"  | 
47  | 
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
 | 
|
48  | 
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 | 
|
| 
2102.4.1
by John Arbash Meinel
 Switch to using millisecond resolution in Revision XML  | 
49  | 
    timestamp="1125907235.212"
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
50  | 
    timezone="36000">
 | 
51  | 
<message>- start splitting code for xml (de)serialization away from objects
 | 
|
52  | 
  preparatory to supporting multiple formats by a single library
 | 
|
53  | 
</message>
 | 
|
54  | 
<parents>
 | 
|
55  | 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92"/>
 | 
|
56  | 
</parents>
 | 
|
57  | 
</revision>
 | 
|
58  | 
"""
 | 
|
59  | 
||
| 
1913.1.2
by John Arbash Meinel
 Add direct tests to xml serializer  | 
60  | 
_revision_v5_utc = """\  | 
61  | 
<revision committer="Martin Pool <mbp@sourcefrog.net>"
 | 
|
62  | 
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
 | 
|
63  | 
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
 | 
|
| 
2102.4.1
by John Arbash Meinel
 Switch to using millisecond resolution in Revision XML  | 
64  | 
    timestamp="1125907235.212"
 | 
| 
1913.1.2
by John Arbash Meinel
 Add direct tests to xml serializer  | 
65  | 
    timezone="0">
 | 
66  | 
<message>- start splitting code for xml (de)serialization away from objects
 | 
|
67  | 
  preparatory to supporting multiple formats by a single library
 | 
|
68  | 
</message>
 | 
|
69  | 
<parents>
 | 
|
70  | 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92"/>
 | 
|
71  | 
</parents>
 | 
|
72  | 
</revision>
 | 
|
73  | 
"""
 | 
|
74  | 
||
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
75  | 
_committed_inv_v5 = """<inventory>  | 
76  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 | 
|
77  | 
      name="bar" parent_id="TREE_ROOT" 
 | 
|
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
78  | 
      revision="mbp@foo-123123"/>
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
79  | 
<directory name="subdir"
 | 
80  | 
           file_id="foo-20050801201819-4139aa4a272f4250"
 | 
|
81  | 
           parent_id="TREE_ROOT" 
 | 
|
| 
1092.2.21
by Robert Collins
 convert name_version to revision in inventory entries  | 
82  | 
           revision="mbp@foo-00"/>
 | 
| 
1934.1.3
by John Arbash Meinel
 [merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences  | 
83  | 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" 
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
84  | 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 | 
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
85  | 
      revision="mbp@foo-00"/>
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
86  | 
</inventory>
 | 
87  | 
"""
 | 
|
88  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
89  | 
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">  | 
90  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 | 
|
91  | 
      name="bar" parent_id="TREE_ROOT" 
 | 
|
92  | 
      revision="mbp@foo-123123"/>
 | 
|
93  | 
<directory name="subdir"
 | 
|
94  | 
           file_id="foo-20050801201819-4139aa4a272f4250"
 | 
|
95  | 
           parent_id="TREE_ROOT" 
 | 
|
96  | 
           revision="mbp@foo-00"/>
 | 
|
97  | 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 | 
|
98  | 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 | 
|
99  | 
      revision="mbp@foo-00"/>
 | 
|
100  | 
</inventory>
 | 
|
101  | 
"""
 | 
|
102  | 
||
| 
1886.1.1
by John Arbash Meinel
 Fix bug #47782,  | 
103  | 
|
| 
1934.1.3
by John Arbash Meinel
 [merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences  | 
104  | 
# DO NOT REFLOW THIS. Its the exact revision we want.
 | 
| 
2102.4.1
by John Arbash Meinel
 Switch to using millisecond resolution in Revision XML  | 
105  | 
_expected_rev_v5 = """<revision committer="Martin Pool <mbp@sourcefrog.net>" format="5" inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41" revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9" timestamp="1125907235.212" timezone="36000">  | 
| 
1934.1.3
by John Arbash Meinel
 [merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences  | 
106  | 
<message>- start splitting code for xml (de)serialization away from objects
 | 
107  | 
  preparatory to supporting multiple formats by a single library
 | 
|
108  | 
</message>
 | 
|
109  | 
<parents>
 | 
|
110  | 
<revision_ref revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92" />
 | 
|
111  | 
</parents>
 | 
|
112  | 
</revision>
 | 
|
113  | 
"""
 | 
|
114  | 
||
115  | 
||
116  | 
# DO NOT REFLOW THIS. Its the exact inventory we want.
 | 
|
117  | 
_expected_inv_v5 = """<inventory format="5">  | 
|
118  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" revision="mbp@foo-123123" />
 | 
|
119  | 
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" revision="mbp@foo-00" />
 | 
|
120  | 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
 | 
|
121  | 
</inventory>
 | 
|
122  | 
"""
 | 
|
123  | 
||
124  | 
||
125  | 
_expected_inv_v5_root = """<inventory file_id="f<" format="5" revision_id="mother!">  | 
|
126  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" name="bar" parent_id="f<" revision="mbp@foo-123123" />
 | 
|
127  | 
<directory file_id="foo-20050801201819-4139aa4a272f4250" name="subdir" parent_id="f<" revision="mbp@foo-00" />
 | 
|
128  | 
<file executable="yes" file_id="bar-20050824000535-6bc48cfad47ed134" name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" revision="mbp@foo-00" />
 | 
|
129  | 
</inventory>
 | 
|
130  | 
"""
 | 
|
131  | 
||
132  | 
||
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
133  | 
_revision_utf8_v5 = """<revision committer="Erik Bågfors <erik@foo.net>"  | 
134  | 
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
 | 
|
135  | 
    revision_id="erik@bågfors-02"
 | 
|
136  | 
    timestamp="1125907235.212"
 | 
|
137  | 
    timezone="36000">
 | 
|
138  | 
<message>Include µnicode characters
 | 
|
139  | 
</message>
 | 
|
140  | 
<parents>
 | 
|
141  | 
<revision_ref revision_id="erik@bågfors-01"/>
 | 
|
142  | 
</parents>
 | 
|
143  | 
</revision>
 | 
|
144  | 
"""
 | 
|
145  | 
||
146  | 
_inventory_utf8_v5 = """<inventory file_id="TREé_ROOT" format="5"  | 
|
147  | 
                                   revision_id="erik@bågfors-02">
 | 
|
148  | 
<file file_id="bår-01"
 | 
|
| 
2294.1.9
by John Arbash Meinel
 Minor performance improvement, use None as signal rather than ROOT_ID  | 
149  | 
      name="bår" parent_id="TREé_ROOT"
 | 
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
150  | 
      revision="erik@bågfors-01"/>
 | 
151  | 
<directory name="sµbdir"
 | 
|
152  | 
           file_id="sµbdir-01"
 | 
|
| 
2294.1.9
by John Arbash Meinel
 Minor performance improvement, use None as signal rather than ROOT_ID  | 
153  | 
           parent_id="TREé_ROOT"
 | 
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
154  | 
           revision="erik@bågfors-01"/>
 | 
155  | 
<file executable="yes" file_id="bår-02"
 | 
|
156  | 
      name="bår" parent_id="sµbdir-01"
 | 
|
157  | 
      revision="erik@bågfors-02"/>
 | 
|
158  | 
</inventory>
 | 
|
159  | 
"""
 | 
|
160  | 
||
161  | 
||
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
162  | 
class TestSerializer(TestCase):  | 
163  | 
"""Test XML serialization"""  | 
|
164  | 
def test_canned_inventory(self):  | 
|
165  | 
"""Test unpacked a canned inventory v4 file."""  | 
|
166  | 
inp = StringIO(_working_inventory_v4)  | 
|
167  | 
inv = serializer_v4.read_inventory(inp)  | 
|
168  | 
self.assertEqual(len(inv), 4)  | 
|
169  | 
self.assert_('bar-20050901064931-73b4b1138abc9cd2' in inv)  | 
|
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
170  | 
|
171  | 
def test_unpack_revision(self):  | 
|
172  | 
"""Test unpacking a canned revision v4"""  | 
|
173  | 
inp = StringIO(_revision_v4)  | 
|
174  | 
rev = serializer_v4.read_revision(inp)  | 
|
175  | 
eq = self.assertEqual  | 
|
176  | 
eq(rev.committer,  | 
|
177  | 
"Martin Pool <mbp@sourcefrog.net>")  | 
|
178  | 
eq(rev.inventory_id,  | 
|
179  | 
"mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
180  | 
eq(len(rev.parent_ids), 1)  | 
181  | 
eq(rev.parent_ids[0],  | 
|
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
182  | 
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
183  | 
|
184  | 
def test_unpack_revision_5(self):  | 
|
185  | 
"""Test unpacking a canned revision v5"""  | 
|
186  | 
inp = StringIO(_revision_v5)  | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
187  | 
rev = bzrlib.xml5.serializer_v5.read_revision(inp)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
188  | 
eq = self.assertEqual  | 
189  | 
eq(rev.committer,  | 
|
190  | 
"Martin Pool <mbp@sourcefrog.net>")  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
191  | 
eq(len(rev.parent_ids), 1)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
192  | 
eq(rev.timezone, 36000)  | 
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
193  | 
eq(rev.parent_ids[0],  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
194  | 
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")  | 
195  | 
||
| 
1913.1.2
by John Arbash Meinel
 Add direct tests to xml serializer  | 
196  | 
def test_unpack_revision_5_utc(self):  | 
197  | 
inp = StringIO(_revision_v5_utc)  | 
|
198  | 
rev = bzrlib.xml5.serializer_v5.read_revision(inp)  | 
|
199  | 
eq = self.assertEqual  | 
|
200  | 
eq(rev.committer,  | 
|
201  | 
"Martin Pool <mbp@sourcefrog.net>")  | 
|
202  | 
eq(len(rev.parent_ids), 1)  | 
|
203  | 
eq(rev.timezone, 0)  | 
|
204  | 
eq(rev.parent_ids[0],  | 
|
205  | 
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")  | 
|
206  | 
||
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
207  | 
def test_unpack_inventory_5(self):  | 
208  | 
"""Unpack canned new-style inventory"""  | 
|
209  | 
inp = StringIO(_committed_inv_v5)  | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
210  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
211  | 
eq = self.assertEqual  | 
212  | 
eq(len(inv), 4)  | 
|
213  | 
ie = inv['bar-20050824000535-6bc48cfad47ed134']  | 
|
214  | 
eq(ie.kind, 'file')  | 
|
| 
1092.2.21
by Robert Collins
 convert name_version to revision in inventory entries  | 
215  | 
eq(ie.revision, 'mbp@foo-00')  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
216  | 
eq(ie.name, 'bar')  | 
217  | 
eq(inv[ie.parent_id].kind, 'directory')  | 
|
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
218  | 
|
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
219  | 
def test_unpack_basis_inventory_5(self):  | 
220  | 
"""Unpack canned new-style inventory"""  | 
|
221  | 
inp = StringIO(_basis_inv_v5)  | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
222  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
223  | 
eq = self.assertEqual  | 
224  | 
eq(len(inv), 4)  | 
|
225  | 
eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')  | 
|
226  | 
ie = inv['bar-20050824000535-6bc48cfad47ed134']  | 
|
227  | 
eq(ie.kind, 'file')  | 
|
228  | 
eq(ie.revision, 'mbp@foo-00')  | 
|
229  | 
eq(ie.name, 'bar')  | 
|
230  | 
eq(inv[ie.parent_id].kind, 'directory')  | 
|
231  | 
||
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
232  | 
def test_repack_inventory_5(self):  | 
233  | 
inp = StringIO(_committed_inv_v5)  | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
234  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
235  | 
outp = StringIO()  | 
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
236  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, outp)  | 
| 
1934.1.3
by John Arbash Meinel
 [merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences  | 
237  | 
self.assertEqualDiff(_expected_inv_v5, outp.getvalue())  | 
238  | 
inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))  | 
|
239  | 
self.assertEqual(inv, inv2)  | 
|
240  | 
||
241  | 
def assertRoundTrips(self, xml_string):  | 
|
242  | 
inp = StringIO(xml_string)  | 
|
243  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
|
244  | 
outp = StringIO()  | 
|
245  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, outp)  | 
|
246  | 
self.assertEqualDiff(xml_string, outp.getvalue())  | 
|
247  | 
inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))  | 
|
248  | 
self.assertEqual(inv, inv2)  | 
|
249  | 
||
250  | 
def tests_serialize_inventory_v5_with_root(self):  | 
|
251  | 
self.assertRoundTrips(_expected_inv_v5_root)  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
252  | 
|
| 
1913.1.2
by John Arbash Meinel
 Add direct tests to xml serializer  | 
253  | 
def check_repack_revision(self, txt):  | 
254  | 
"""Check that repacking a revision yields the same information"""  | 
|
255  | 
inp = StringIO(txt)  | 
|
256  | 
rev = bzrlib.xml5.serializer_v5.read_revision(inp)  | 
|
257  | 
outp = StringIO()  | 
|
258  | 
bzrlib.xml5.serializer_v5.write_revision(rev, outp)  | 
|
259  | 
outfile_contents = outp.getvalue()  | 
|
260  | 
rev2 = bzrlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))  | 
|
261  | 
self.assertEqual(rev, rev2)  | 
|
262  | 
||
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
263  | 
def test_repack_revision_5(self):  | 
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
264  | 
"""Round-trip revision to XML v5"""  | 
| 
1913.1.2
by John Arbash Meinel
 Add direct tests to xml serializer  | 
265  | 
self.check_repack_revision(_revision_v5)  | 
266  | 
||
267  | 
def test_repack_revision_5_utc(self):  | 
|
268  | 
self.check_repack_revision(_revision_v5_utc)  | 
|
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
269  | 
|
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
270  | 
def test_pack_revision_5(self):  | 
271  | 
"""Pack revision to XML v5"""  | 
|
272  | 
        # fixed 20051025, revisions should have final newline
 | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
273  | 
rev = bzrlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)  | 
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
274  | 
outp = StringIO()  | 
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
275  | 
bzrlib.xml5.serializer_v5.write_revision(rev, outp)  | 
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
276  | 
outfile_contents = outp.getvalue()  | 
277  | 
self.assertEqual(outfile_contents[-1], '\n')  | 
|
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
278  | 
self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))  | 
| 
1934.1.3
by John Arbash Meinel
 [merge] robert's custom XML serializer, and cleanup for benchmarks and iter_entries() differences  | 
279  | 
self.assertEqualDiff(outfile_contents, _expected_rev_v5)  | 
| 
1886.1.1
by John Arbash Meinel
 Fix bug #47782,  | 
280  | 
|
281  | 
def test_empty_property_value(self):  | 
|
282  | 
"""Create an empty property value check that it serializes correctly"""  | 
|
283  | 
s_v5 = bzrlib.xml5.serializer_v5  | 
|
284  | 
rev = s_v5.read_revision_from_string(_revision_v5)  | 
|
285  | 
outp = StringIO()  | 
|
286  | 
props = {'empty':'', 'one':'one'}  | 
|
287  | 
rev.properties = props  | 
|
288  | 
txt = s_v5.write_revision_to_string(rev)  | 
|
289  | 
new_rev = s_v5.read_revision_from_string(txt)  | 
|
290  | 
self.assertEqual(props, new_rev.properties)  | 
|
| 
2249.5.4
by John Arbash Meinel
 When reading XML, always return utf-8 revision ids.  | 
291  | 
|
292  | 
def test_revision_ids_are_utf8(self):  | 
|
293  | 
"""Parsed revision_ids should all be utf-8 strings, not unicode."""  | 
|
294  | 
s_v5 = bzrlib.xml5.serializer_v5  | 
|
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
295  | 
rev = s_v5.read_revision_from_string(_revision_utf8_v5)  | 
296  | 
self.assertEqual('erik@b\xc3\xa5gfors-02', rev.revision_id)  | 
|
| 
2249.5.4
by John Arbash Meinel
 When reading XML, always return utf-8 revision ids.  | 
297  | 
self.assertIsInstance(rev.revision_id, str)  | 
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
298  | 
self.assertEqual(['erik@b\xc3\xa5gfors-01'], rev.parent_ids)  | 
| 
2249.5.4
by John Arbash Meinel
 When reading XML, always return utf-8 revision ids.  | 
299  | 
for parent_id in rev.parent_ids:  | 
300  | 
self.assertIsInstance(parent_id, str)  | 
|
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
301  | 
self.assertEqual(u'Include \xb5nicode characters\n', rev.message)  | 
302  | 
self.assertIsInstance(rev.message, unicode)  | 
|
| 
2249.5.4
by John Arbash Meinel
 When reading XML, always return utf-8 revision ids.  | 
303  | 
|
304  | 
        # ie.revision should either be None or a utf-8 revision id
 | 
|
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
305  | 
inv = s_v5.read_inventory_from_string(_inventory_utf8_v5)  | 
306  | 
rev_id_1 = u'erik@b\xe5gfors-01'.encode('utf8')  | 
|
307  | 
rev_id_2 = u'erik@b\xe5gfors-02'.encode('utf8')  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
308  | 
fid_root = u'TRE\xe9_ROOT'.encode('utf8')  | 
309  | 
fid_bar1 = u'b\xe5r-01'.encode('utf8')  | 
|
310  | 
fid_sub = u's\xb5bdir-01'.encode('utf8')  | 
|
311  | 
fid_bar2 = u'b\xe5r-02'.encode('utf8')  | 
|
| 
2294.1.6
by John Arbash Meinel
 Include parent_id checks in the xml serializer tests.  | 
312  | 
expected = [(u'', fid_root, None, None),  | 
313  | 
(u'b\xe5r', fid_bar1, fid_root, rev_id_1),  | 
|
314  | 
(u's\xb5bdir', fid_sub, fid_root, rev_id_1),  | 
|
315  | 
(u's\xb5bdir/b\xe5r', fid_bar2, fid_sub, rev_id_2),  | 
|
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
316  | 
                   ]
 | 
317  | 
self.assertEqual(rev_id_2, inv.revision_id)  | 
|
318  | 
self.assertIsInstance(inv.revision_id, str)  | 
|
319  | 
||
320  | 
actual = list(inv.iter_entries_by_dir())  | 
|
| 
2294.1.6
by John Arbash Meinel
 Include parent_id checks in the xml serializer tests.  | 
321  | 
for ((exp_path, exp_file_id, exp_parent_id, exp_rev_id),  | 
322  | 
(act_path, act_ie)) in zip(expected, actual):  | 
|
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
323  | 
self.assertEqual(exp_path, act_path)  | 
324  | 
self.assertIsInstance(act_path, unicode)  | 
|
325  | 
self.assertEqual(exp_file_id, act_ie.file_id)  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
326  | 
self.assertIsInstance(act_ie.file_id, str)  | 
| 
2294.1.6
by John Arbash Meinel
 Include parent_id checks in the xml serializer tests.  | 
327  | 
self.assertEqual(exp_parent_id, act_ie.parent_id)  | 
328  | 
if exp_parent_id is not None:  | 
|
| 
2294.1.10
by John Arbash Meinel
 Switch all apis over to utf8 file ids. All tests pass  | 
329  | 
self.assertIsInstance(act_ie.parent_id, str)  | 
| 
2294.1.5
by John Arbash Meinel
 Fix Inventory.iter_entries_by_dir to return Unicode paths,  | 
330  | 
self.assertEqual(exp_rev_id, act_ie.revision)  | 
331  | 
if exp_rev_id is not None:  | 
|
332  | 
self.assertIsInstance(act_ie.revision, str)  | 
|
333  | 
||
334  | 
self.assertEqual(len(expected), len(actual))  | 
|
| 
2249.5.10
by John Arbash Meinel
 Make sure xml5 can handle unicode or utf8 strings  | 
335  | 
|
336  | 
||
337  | 
class TestEncodeAndEscape(TestCase):  | 
|
338  | 
"""Whitebox testing of the _encode_and_escape function."""  | 
|
339  | 
||
340  | 
def setUp(self):  | 
|
341  | 
        # Keep the cache clear before and after the test
 | 
|
342  | 
bzrlib.xml5._ensure_utf8_re()  | 
|
343  | 
bzrlib.xml5._clear_cache()  | 
|
344  | 
self.addCleanup(bzrlib.xml5._clear_cache)  | 
|
345  | 
||
346  | 
def test_simple_ascii(self):  | 
|
347  | 
        # _encode_and_escape always appends a final ", because these parameters
 | 
|
348  | 
        # are being used in xml attributes, and by returning it now, we have to
 | 
|
349  | 
        # do fewer string operations later.
 | 
|
350  | 
val = bzrlib.xml5._encode_and_escape('foo bar')  | 
|
351  | 
self.assertEqual('foo bar"', val)  | 
|
352  | 
        # The second time should be cached
 | 
|
353  | 
val2 = bzrlib.xml5._encode_and_escape('foo bar')  | 
|
354  | 
self.assertIs(val2, val)  | 
|
355  | 
||
356  | 
def test_ascii_with_xml(self):  | 
|
357  | 
self.assertEqual('&'"<>"',  | 
|
358  | 
bzrlib.xml5._encode_and_escape('&\'"<>'))  | 
|
359  | 
||
360  | 
def test_utf8_with_xml(self):  | 
|
361  | 
        # u'\xb5\xe5&\u062c'
 | 
|
362  | 
utf8_str = '\xc2\xb5\xc3\xa5&\xd8\xac'  | 
|
363  | 
self.assertEqual('µå&ج"',  | 
|
364  | 
bzrlib.xml5._encode_and_escape(utf8_str))  | 
|
365  | 
||
366  | 
def test_unicode(self):  | 
|
367  | 
uni_str = u'\xb5\xe5&\u062c'  | 
|
368  | 
self.assertEqual('µå&ج"',  | 
|
369  | 
bzrlib.xml5._encode_and_escape(uni_str))  |