← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_xml.py

Nathaniel McCallums patch for urandom friendliness on aix.

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
 
from bzrlib.xml5 import serializer_v5
 
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"/>
 
63
      text_version="mbp@foo-123123" entry_version="mbp@foo-123123"
 
64
      />
64
65
<directory name="subdir"
65
66
           file_id="foo-20050801201819-4139aa4a272f4250"
66
67
           parent_id="TREE_ROOT" 
67
 
           revision="mbp@foo-00"/>
 
68
           entry_version="mbp@foo-00"/>
68
69
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
69
70
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
70
 
      revision="mbp@foo-00"/>
 
71
      entry_version="mbp@foo-00"
 
72
      text_version="mbp@foo-123123"/>
71
73
</inventory>
72
74
"""
73
75
 
89
91
           "Martin Pool <mbp@sourcefrog.net>")
90
92
        eq(rev.inventory_id,
91
93
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
92
 
        eq(len(rev.parent_ids), 1)
93
 
        eq(rev.parent_ids[0],
 
94
        eq(len(rev.parents), 1)
 
95
        eq(rev.parents[0].revision_id,
94
96
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
95
97
 
96
98
    def test_unpack_revision_5(self):
100
102
        eq = self.assertEqual
101
103
        eq(rev.committer,
102
104
           "Martin Pool <mbp@sourcefrog.net>")
103
 
        eq(len(rev.parent_ids), 1)
 
105
        eq(rev.inventory_id,
 
106
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
 
107
        eq(len(rev.parents), 1)
104
108
        eq(rev.timezone, 36000)
105
 
        eq(rev.parent_ids[0],
 
109
        eq(rev.parents[0].revision_id,
106
110
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
107
111
 
108
112
    def test_unpack_inventory_5(self):
113
117
        eq(len(inv), 4)
114
118
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
115
119
        eq(ie.kind, 'file')
116
 
        eq(ie.revision, 'mbp@foo-00')
 
120
        eq(ie.text_version, 'mbp@foo-123123')
 
121
        eq(ie.entry_version, 'mbp@foo-00')
117
122
        eq(ie.name, 'bar')
118
123
        eq(inv[ie.parent_id].kind, 'directory')
119
124
 
126
131
        self.assertEqual(inv, inv2)
127
132
 
128
133
    def test_repack_revision_5(self):
129
 
        """Round-trip revision to XML v5"""
130
134
        inp = StringIO(_revision_v5)
131
135
        rev = serializer_v5.read_revision(inp)
132
136
        outp = StringIO()
133
137
        serializer_v5.write_revision(rev, outp)
134
 
        outfile_contents = outp.getvalue()
135
 
        rev2 = serializer_v5.read_revision(StringIO(outfile_contents))
 
138
        rev2 = serializer_v5.read_revision(StringIO(outp.getvalue()))
136
139
        self.assertEqual(rev, rev2)
137
140
 
138
 
    def test_pack_revision_5(self):
139
 
        """Pack revision to XML v5"""
140
 
        # fixed 20051025, revisions should have final newline
141
 
        rev = serializer_v5.read_revision_from_string(_revision_v5)
142
 
        outp = StringIO()
143
 
        serializer_v5.write_revision(rev, outp)
144
 
        outfile_contents = outp.getvalue()
145
 
        self.assertEqual(outfile_contents[-1], '\n')
146
 
        self.assertEqualDiff(outfile_contents, serializer_v5.write_revision_to_string(rev))