← Back to branch summary

~bzr/ubuntu/maverick/bzr-svn/bzr-ppa

« back to all changes in this revision

Viewing changes to tests/test_mapping.py

  • Committer: Jelmer Vernooij
  • Date: 2008-05-11 19:29:26 UTC
  • mfrom: (220.36.144 0.4)
  • Revision ID: jelmer@samba.org-20080511192926-7mh02j45r25qmzkz
Merge 0.4 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_mapping.py
21
21
from mapping import (generate_revision_metadata, parse_revision_metadata, 
22
22
                     parse_revid_property, parse_merge_property, 
23
23
                     BzrSvnMappingv1, BzrSvnMappingv2, 
24
 
                     BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps,
25
 
                     BzrSvnMappingv4, BzrSvnMappingv3Hybrid, parse_revision_id)
26
 
from scheme import NoBranchingScheme
 
24
                     BzrSvnMappingv4, parse_revision_id)
 
25
from mapping3 import (BzrSvnMappingv3FileProps, BzrSvnMappingv3RevProps, 
 
26
                      BzrSvnMappingv3Hybrid)
 
27
from mapping3.scheme import NoBranchingScheme
27
28
 
28
29
from bzrlib.errors import InvalidRevisionId
29
30
from bzrlib.tests import (TestCase, adapt_tests, TestNotApplicable)
123
124
        self.assertEqual(("bla", "bloe"), parse_merge_property("bla\tbloe"))
124
125
 
125
126
 
126
 
class MappingTestAdapter:
 
127
class MappingTestAdapter(object):
127
128
    def test_roundtrip_revision(self):
128
129
        revid = self.mapping.generate_revision_id("myuuid", 42, "path")
129
130
        (uuid, path, revnum, mapping) = self.mapping.parse_revision_id(revid)
142
143
        self.assertEquals(fileids, 
143
144
                self.mapping.import_fileid_map(revprops, fileprops))
144
145
 
 
146
    def test_message(self):
 
147
        if not self.mapping.supports_roundtripping():
 
148
            raise TestNotApplicable
 
149
        (revprops, fileprops) = self.mapping.export_revision("branchp", 432432432.0, 0, "somebody", 
 
150
                                     {"arevprop": "val"}, "arevid", 4, ["merge1"], dict())
 
151
        try:
 
152
            self.mapping.export_message("My Commit message", revprops, fileprops)
 
153
        except NotImplementedError:
 
154
            raise TestNotApplicable
 
155
        targetrev = Revision(None)
 
156
        self.mapping.import_revision(revprops, fileprops, targetrev)
 
157
        self.assertEquals("My Commit message", targetrev.message)
 
158
 
145
159
    def test_revision(self):
146
160
        if not self.mapping.supports_roundtripping():
147
161
            raise TestNotApplicable
268
282
        self.mapping = BzrSvnMappingv4()
269
283
 
270
284
 
271
 
class ParseRevisionIdTests:
 
285
class ParseRevisionIdTests(object):
272
286
    def test_current(self):
273
287
        self.assertEqual(("uuid", "trunk", 1, BzrSvnMappingv3FileProps(TrunkBranchingScheme())), 
274
288
                parse_revision_id("svn-v3-trunk0:uuid:trunk:1"))