bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
1  | 
# Copyright (C) 2005 by 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"
 | 
|
35  | 
    timestamp="1125907235.211783886"
 | 
|
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"
 | 
|
49  | 
    timestamp="1125907235.211783886"
 | 
|
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  | 
||
60  | 
_committed_inv_v5 = """<inventory>  | 
|
61  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 | 
|
62  | 
      name="bar" parent_id="TREE_ROOT" 
 | 
|
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
63  | 
      revision="mbp@foo-123123"/>
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
64  | 
<directory name="subdir"
 | 
65  | 
           file_id="foo-20050801201819-4139aa4a272f4250"
 | 
|
66  | 
           parent_id="TREE_ROOT" 
 | 
|
| 
1092.2.21
by Robert Collins
 convert name_version to revision in inventory entries  | 
67  | 
           revision="mbp@foo-00"/>
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
68  | 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 | 
69  | 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 | 
|
| 
1092.2.22
by Robert Collins
 text_version and name_version unification looking reasonable  | 
70  | 
      revision="mbp@foo-00"/>
 | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
71  | 
</inventory>
 | 
72  | 
"""
 | 
|
73  | 
||
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
74  | 
_basis_inv_v5 = """<inventory revision_id="mbp@sourcefrog.net-20050905063503-43948f59fa127d92">  | 
75  | 
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
 | 
|
76  | 
      name="bar" parent_id="TREE_ROOT" 
 | 
|
77  | 
      revision="mbp@foo-123123"/>
 | 
|
78  | 
<directory name="subdir"
 | 
|
79  | 
           file_id="foo-20050801201819-4139aa4a272f4250"
 | 
|
80  | 
           parent_id="TREE_ROOT" 
 | 
|
81  | 
           revision="mbp@foo-00"/>
 | 
|
82  | 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 | 
|
83  | 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 | 
|
84  | 
      revision="mbp@foo-00"/>
 | 
|
85  | 
</inventory>
 | 
|
86  | 
"""
 | 
|
87  | 
||
| 
1886.1.1
by John Arbash Meinel
 Fix bug #47782,  | 
88  | 
|
| 
1181
by Martin Pool
 - add test for deserialization from a canned XML inventory  | 
89  | 
class TestSerializer(TestCase):  | 
90  | 
"""Test XML serialization"""  | 
|
91  | 
def test_canned_inventory(self):  | 
|
92  | 
"""Test unpacked a canned inventory v4 file."""  | 
|
93  | 
inp = StringIO(_working_inventory_v4)  | 
|
94  | 
inv = serializer_v4.read_inventory(inp)  | 
|
95  | 
self.assertEqual(len(inv), 4)  | 
|
96  | 
self.assert_('bar-20050901064931-73b4b1138abc9cd2' in inv)  | 
|
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
97  | 
|
98  | 
def test_unpack_revision(self):  | 
|
99  | 
"""Test unpacking a canned revision v4"""  | 
|
100  | 
inp = StringIO(_revision_v4)  | 
|
101  | 
rev = serializer_v4.read_revision(inp)  | 
|
102  | 
eq = self.assertEqual  | 
|
103  | 
eq(rev.committer,  | 
|
104  | 
"Martin Pool <mbp@sourcefrog.net>")  | 
|
105  | 
eq(rev.inventory_id,  | 
|
106  | 
"mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
107  | 
eq(len(rev.parent_ids), 1)  | 
108  | 
eq(rev.parent_ids[0],  | 
|
| 
1182
by Martin Pool
 - more disentangling of xml storage format from objects  | 
109  | 
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
110  | 
|
111  | 
def test_unpack_revision_5(self):  | 
|
112  | 
"""Test unpacking a canned revision v5"""  | 
|
113  | 
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  | 
114  | 
rev = bzrlib.xml5.serializer_v5.read_revision(inp)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
115  | 
eq = self.assertEqual  | 
116  | 
eq(rev.committer,  | 
|
117  | 
"Martin Pool <mbp@sourcefrog.net>")  | 
|
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
118  | 
eq(len(rev.parent_ids), 1)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
119  | 
eq(rev.timezone, 36000)  | 
| 
1313
by Martin Pool
 - rename to Revision.parent_ids to avoid confusion with old usage  | 
120  | 
eq(rev.parent_ids[0],  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
121  | 
"mbp@sourcefrog.net-20050905063503-43948f59fa127d92")  | 
122  | 
||
123  | 
def test_unpack_inventory_5(self):  | 
|
124  | 
"""Unpack canned new-style inventory"""  | 
|
125  | 
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  | 
126  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
127  | 
eq = self.assertEqual  | 
128  | 
eq(len(inv), 4)  | 
|
129  | 
ie = inv['bar-20050824000535-6bc48cfad47ed134']  | 
|
130  | 
eq(ie.kind, 'file')  | 
|
| 
1092.2.21
by Robert Collins
 convert name_version to revision in inventory entries  | 
131  | 
eq(ie.revision, 'mbp@foo-00')  | 
| 
1183
by Martin Pool
 - implement version 5 xml storage, and tests  | 
132  | 
eq(ie.name, 'bar')  | 
133  | 
eq(inv[ie.parent_id].kind, 'directory')  | 
|
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
134  | 
|
| 
1638.1.2
by Robert Collins
 Change the basis-inventory file to not have the revision-id in the file name.  | 
135  | 
def test_unpack_basis_inventory_5(self):  | 
136  | 
"""Unpack canned new-style inventory"""  | 
|
137  | 
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  | 
138  | 
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.  | 
139  | 
eq = self.assertEqual  | 
140  | 
eq(len(inv), 4)  | 
|
141  | 
eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')  | 
|
142  | 
ie = inv['bar-20050824000535-6bc48cfad47ed134']  | 
|
143  | 
eq(ie.kind, 'file')  | 
|
144  | 
eq(ie.revision, 'mbp@foo-00')  | 
|
145  | 
eq(ie.name, 'bar')  | 
|
146  | 
eq(inv[ie.parent_id].kind, 'directory')  | 
|
147  | 
||
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
148  | 
def test_repack_inventory_5(self):  | 
149  | 
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  | 
150  | 
inv = bzrlib.xml5.serializer_v5.read_inventory(inp)  | 
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
151  | 
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  | 
152  | 
bzrlib.xml5.serializer_v5.write_inventory(inv, outp)  | 
153  | 
inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))  | 
|
| 
1184
by Martin Pool
 - fix v5 packing of inventory entries  | 
154  | 
self.assertEqual(inv, inv2)  | 
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
155  | 
|
156  | 
def test_repack_revision_5(self):  | 
|
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
157  | 
"""Round-trip revision to XML v5"""  | 
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
158  | 
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  | 
159  | 
rev = bzrlib.xml5.serializer_v5.read_revision(inp)  | 
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
160  | 
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  | 
161  | 
bzrlib.xml5.serializer_v5.write_revision(rev, outp)  | 
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
162  | 
outfile_contents = outp.getvalue()  | 
| 
1732.1.26
by John Arbash Meinel
 Switch to using bzrlib.xml5.serializer_v5 so that a plugin can override it if we want  | 
163  | 
rev2 = bzrlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))  | 
| 
1185
by Martin Pool
 - add xml round-trip test for revisions  | 
164  | 
self.assertEqual(rev, rev2)  | 
165  | 
||
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
166  | 
def test_pack_revision_5(self):  | 
167  | 
"""Pack revision to XML v5"""  | 
|
168  | 
        # 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  | 
169  | 
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  | 
170  | 
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  | 
171  | 
bzrlib.xml5.serializer_v5.write_revision(rev, outp)  | 
| 
1185.16.123
by Martin Pool
 Fix syntax of serializer_v5.pack_revision_to_string  | 
172  | 
outfile_contents = outp.getvalue()  | 
173  | 
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  | 
174  | 
self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))  | 
| 
1886.1.1
by John Arbash Meinel
 Fix bug #47782,  | 
175  | 
|
176  | 
def test_empty_property_value(self):  | 
|
177  | 
"""Create an empty property value check that it serializes correctly"""  | 
|
178  | 
s_v5 = bzrlib.xml5.serializer_v5  | 
|
179  | 
rev = s_v5.read_revision_from_string(_revision_v5)  | 
|
180  | 
outp = StringIO()  | 
|
181  | 
props = {'empty':'', 'one':'one'}  | 
|
182  | 
rev.properties = props  | 
|
183  | 
txt = s_v5.write_revision_to_string(rev)  | 
|
184  | 
new_rev = s_v5.read_revision_from_string(txt)  | 
|
185  | 
self.assertEqual(props, new_rev.properties)  |