← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_xml.py

  • Committer: Aaron Bentley
  • Date: 2005-09-21 15:33:23 UTC
  • mto: (1185.1.37)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050921153323-5db674d572d7649d
Fixed bug in distance-from-root graph operation

Show diffs side-by-side

added added

removed removed

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