← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_xml.py

  • Committer: Martin Pool
  • Date: 2006-06-04 22:04:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1797.
  • Revision ID: mbp@sourcefrog.net-20060604220420-6bab3e2b6ebe013e
Cleanup more exception-formatting code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
19
 
from bzrlib.selftest import TestCase
 
19
from bzrlib.tests import TestCase
20
20
from bzrlib.inventory import Inventory, InventoryEntry
21
 
from bzrlib.xml import serializer_v4
22
 
from bzrlib.xml5 import serializer_v5
 
21
from bzrlib.xml4 import serializer_v4
 
22
import bzrlib.xml5
23
23
 
24
24
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
25
25
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
44
44
"""
45
45
 
46
46
_revision_v5 = """<revision committer="Martin Pool &lt;mbp@sourcefrog.net&gt;"
47
 
    inventory_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
48
47
    inventory_sha1="e79c31c1deb64c163cf660fdedd476dd579ffd41"
49
48
    revision_id="mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9"
50
49
    timestamp="1125907235.211783886"
61
60
_committed_inv_v5 = """<inventory>
62
61
<file file_id="bar-20050901064931-73b4b1138abc9cd2" 
63
62
      name="bar" parent_id="TREE_ROOT" 
64
 
      text_version="mbp@foo-123123" entry_version="mbp@foo-123123"
65
 
      />
66
 
<directory name="subdir"
67
 
           file_id="foo-20050801201819-4139aa4a272f4250"
68
 
           parent_id="TREE_ROOT" 
69
 
           entry_version="mbp@foo-00"/>
70
 
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
71
 
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
72
 
      entry_version="mbp@foo-00"
73
 
      text_version="mbp@foo-123123"/>
 
63
      revision="mbp@foo-123123"/>
 
64
<directory name="subdir"
 
65
           file_id="foo-20050801201819-4139aa4a272f4250"
 
66
           parent_id="TREE_ROOT" 
 
67
           revision="mbp@foo-00"/>
 
68
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
 
69
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
 
70
      revision="mbp@foo-00"/>
 
71
</inventory>
 
72
"""
 
73
 
 
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"/>
74
85
</inventory>
75
86
"""
76
87
 
92
103
           "Martin Pool <mbp@sourcefrog.net>")
93
104
        eq(rev.inventory_id,
94
105
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
95
 
        eq(len(rev.parents), 1)
96
 
        eq(rev.parents[0].revision_id,
 
106
        eq(len(rev.parent_ids), 1)
 
107
        eq(rev.parent_ids[0],
97
108
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
98
109
 
99
110
    def test_unpack_revision_5(self):
100
111
        """Test unpacking a canned revision v5"""
101
112
        inp = StringIO(_revision_v5)
102
 
        rev = serializer_v5.read_revision(inp)
 
113
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
103
114
        eq = self.assertEqual
104
115
        eq(rev.committer,
105
116
           "Martin Pool <mbp@sourcefrog.net>")
106
 
        eq(rev.inventory_id,
107
 
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
108
 
        eq(len(rev.parents), 1)
 
117
        eq(len(rev.parent_ids), 1)
109
118
        eq(rev.timezone, 36000)
110
 
        eq(rev.parents[0].revision_id,
 
119
        eq(rev.parent_ids[0],
111
120
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
112
121
 
113
122
    def test_unpack_inventory_5(self):
114
123
        """Unpack canned new-style inventory"""
115
124
        inp = StringIO(_committed_inv_v5)
116
 
        inv = serializer_v5.read_inventory(inp)
117
 
        eq = self.assertEqual
118
 
        eq(len(inv), 4)
119
 
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
120
 
        eq(ie.kind, 'file')
121
 
        eq(ie.text_version, 'mbp@foo-123123')
122
 
        eq(ie.entry_version, 'mbp@foo-00')
 
125
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
 
126
        eq = self.assertEqual
 
127
        eq(len(inv), 4)
 
128
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
129
        eq(ie.kind, 'file')
 
130
        eq(ie.revision, 'mbp@foo-00')
 
131
        eq(ie.name, 'bar')
 
132
        eq(inv[ie.parent_id].kind, 'directory')
 
133
 
 
134
    def test_unpack_basis_inventory_5(self):
 
135
        """Unpack canned new-style inventory"""
 
136
        inp = StringIO(_basis_inv_v5)
 
137
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
 
138
        eq = self.assertEqual
 
139
        eq(len(inv), 4)
 
140
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
 
141
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
 
142
        eq(ie.kind, 'file')
 
143
        eq(ie.revision, 'mbp@foo-00')
123
144
        eq(ie.name, 'bar')
124
145
        eq(inv[ie.parent_id].kind, 'directory')
125
146
 
126
147
    def test_repack_inventory_5(self):
127
148
        inp = StringIO(_committed_inv_v5)
128
 
        inv = serializer_v5.read_inventory(inp)
 
149
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
129
150
        outp = StringIO()
130
 
        serializer_v5.write_inventory(inv, outp)
131
 
        inv2 = serializer_v5.read_inventory(StringIO(outp.getvalue()))
 
151
        bzrlib.xml5.serializer_v5.write_inventory(inv, outp)
 
152
        inv2 = bzrlib.xml5.serializer_v5.read_inventory(StringIO(outp.getvalue()))
132
153
        self.assertEqual(inv, inv2)
133
154
 
134
155
    def test_repack_revision_5(self):
 
156
        """Round-trip revision to XML v5"""
135
157
        inp = StringIO(_revision_v5)
136
 
        rev = serializer_v5.read_revision(inp)
 
158
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
137
159
        outp = StringIO()
138
 
        serializer_v5.write_revision(rev, outp)
139
 
        rev2 = serializer_v5.read_revision(StringIO(outp.getvalue()))
 
160
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
 
161
        outfile_contents = outp.getvalue()
 
162
        rev2 = bzrlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
140
163
        self.assertEqual(rev, rev2)
141
164
 
 
165
    def test_pack_revision_5(self):
 
166
        """Pack revision to XML v5"""
 
167
        # fixed 20051025, revisions should have final newline
 
168
        rev = bzrlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
 
169
        outp = StringIO()
 
170
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
 
171
        outfile_contents = outp.getvalue()
 
172
        self.assertEqual(outfile_contents[-1], '\n')
 
173
        self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))