← 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: Aaron Bentley
  • Date: 2006-06-03 16:23:09 UTC
  • mfrom: (1736 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060603162309-c975ca9ea9fea344
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_xml.py
19
19
from bzrlib.tests import TestCase
20
20
from bzrlib.inventory import Inventory, InventoryEntry
21
21
from bzrlib.xml4 import serializer_v4
22
 
from bzrlib.xml5 import serializer_v5
 
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" />
110
110
    def test_unpack_revision_5(self):
111
111
        """Test unpacking a canned revision v5"""
112
112
        inp = StringIO(_revision_v5)
113
 
        rev = serializer_v5.read_revision(inp)
 
113
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
114
114
        eq = self.assertEqual
115
115
        eq(rev.committer,
116
116
           "Martin Pool <mbp@sourcefrog.net>")
122
122
    def test_unpack_inventory_5(self):
123
123
        """Unpack canned new-style inventory"""
124
124
        inp = StringIO(_committed_inv_v5)
125
 
        inv = serializer_v5.read_inventory(inp)
 
125
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
126
126
        eq = self.assertEqual
127
127
        eq(len(inv), 4)
128
128
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
134
134
    def test_unpack_basis_inventory_5(self):
135
135
        """Unpack canned new-style inventory"""
136
136
        inp = StringIO(_basis_inv_v5)
137
 
        inv = serializer_v5.read_inventory(inp)
 
137
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
138
138
        eq = self.assertEqual
139
139
        eq(len(inv), 4)
140
140
        eq(inv.revision_id, 'mbp@sourcefrog.net-20050905063503-43948f59fa127d92')
146
146
 
147
147
    def test_repack_inventory_5(self):
148
148
        inp = StringIO(_committed_inv_v5)
149
 
        inv = serializer_v5.read_inventory(inp)
 
149
        inv = bzrlib.xml5.serializer_v5.read_inventory(inp)
150
150
        outp = StringIO()
151
 
        serializer_v5.write_inventory(inv, outp)
152
 
        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()))
153
153
        self.assertEqual(inv, inv2)
154
154
 
155
155
    def test_repack_revision_5(self):
156
156
        """Round-trip revision to XML v5"""
157
157
        inp = StringIO(_revision_v5)
158
 
        rev = serializer_v5.read_revision(inp)
 
158
        rev = bzrlib.xml5.serializer_v5.read_revision(inp)
159
159
        outp = StringIO()
160
 
        serializer_v5.write_revision(rev, outp)
 
160
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
161
161
        outfile_contents = outp.getvalue()
162
 
        rev2 = serializer_v5.read_revision(StringIO(outfile_contents))
 
162
        rev2 = bzrlib.xml5.serializer_v5.read_revision(StringIO(outfile_contents))
163
163
        self.assertEqual(rev, rev2)
164
164
 
165
165
    def test_pack_revision_5(self):
166
166
        """Pack revision to XML v5"""
167
167
        # fixed 20051025, revisions should have final newline
168
 
        rev = serializer_v5.read_revision_from_string(_revision_v5)
 
168
        rev = bzrlib.xml5.serializer_v5.read_revision_from_string(_revision_v5)
169
169
        outp = StringIO()
170
 
        serializer_v5.write_revision(rev, outp)
 
170
        bzrlib.xml5.serializer_v5.write_revision(rev, outp)
171
171
        outfile_contents = outp.getvalue()
172
172
        self.assertEqual(outfile_contents[-1], '\n')
173
 
        self.assertEqualDiff(outfile_contents, serializer_v5.write_revision_to_string(rev))
 
173
        self.assertEqualDiff(outfile_contents, bzrlib.xml5.serializer_v5.write_revision_to_string(rev))