← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_xml.py

Merge in format-5 work - release bzr 0.1rc1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_xml.py
18
18
 
19
19
from bzrlib.selftest import TestCase
20
20
from bzrlib.inventory import Inventory, InventoryEntry
21
 
from bzrlib.xml import serializer_v4, serializer_v5
 
21
from bzrlib.xml4 import serializer_v4
 
22
from bzrlib.xml5 import serializer_v5
22
23
 
23
24
_working_inventory_v4 = """<inventory file_id="TREE_ROOT">
24
25
<entry file_id="bar-20050901064931-73b4b1138abc9cd2" kind="file" name="bar" parent_id="TREE_ROOT" />
43
44
"""
44
45
 
45
46
_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
 
      text_version="mbp@foo-123123" entry_version="mbp@foo-123123"
64
 
      />
 
63
      revision="mbp@foo-123123"/>
65
64
<directory name="subdir"
66
65
           file_id="foo-20050801201819-4139aa4a272f4250"
67
66
           parent_id="TREE_ROOT" 
68
 
           entry_version="mbp@foo-00"/>
 
67
           revision="mbp@foo-00"/>
69
68
<file file_id="bar-20050824000535-6bc48cfad47ed134" 
70
69
      name="bar" parent_id="foo-20050801201819-4139aa4a272f4250" 
71
 
      entry_version="mbp@foo-00"
72
 
      text_version="mbp@foo-123123"/>
 
70
      revision="mbp@foo-00"/>
73
71
</inventory>
74
72
"""
75
73
 
91
89
           "Martin Pool <mbp@sourcefrog.net>")
92
90
        eq(rev.inventory_id,
93
91
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
94
 
        eq(len(rev.parents), 1)
95
 
        eq(rev.parents[0].revision_id,
 
92
        eq(len(rev.parent_ids), 1)
 
93
        eq(rev.parent_ids[0],
96
94
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
97
95
 
98
96
    def test_unpack_revision_5(self):
102
100
        eq = self.assertEqual
103
101
        eq(rev.committer,
104
102
           "Martin Pool <mbp@sourcefrog.net>")
105
 
        eq(rev.inventory_id,
106
 
           "mbp@sourcefrog.net-20050905080035-e0439293f8b6b9f9")
107
 
        eq(len(rev.parents), 1)
 
103
        eq(len(rev.parent_ids), 1)
108
104
        eq(rev.timezone, 36000)
109
 
        eq(rev.parents[0].revision_id,
 
105
        eq(rev.parent_ids[0],
110
106
           "mbp@sourcefrog.net-20050905063503-43948f59fa127d92")
111
107
 
112
108
    def test_unpack_inventory_5(self):
117
113
        eq(len(inv), 4)
118
114
        ie = inv['bar-20050824000535-6bc48cfad47ed134']
119
115
        eq(ie.kind, 'file')
120
 
        eq(ie.text_version, 'mbp@foo-123123')
121
 
        eq(ie.entry_version, 'mbp@foo-00')
 
116
        eq(ie.revision, 'mbp@foo-00')
122
117
        eq(ie.name, 'bar')
123
118
        eq(inv[ie.parent_id].kind, 'directory')
124
119