[Checkins] SVN: BTrees/branches/pure_python/ Move LF-related set-op tests into LO test module.
Tres Seaver
cvs-admin at zope.org
Sun Nov 11 18:55:53 UTC 2012
Log message for revision 128226:
Move LF-related set-op tests into LO test module.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/tests/testSetOps.py
U BTrees/branches/pure_python/BTrees/tests/test_LFBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/tests/testSetOps.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/testSetOps.py 2012-11-11 18:55:52 UTC (rev 128225)
+++ BTrees/branches/pure_python/BTrees/tests/testSetOps.py 2012-11-11 18:55:52 UTC (rev 128226)
@@ -53,23 +53,6 @@
from BTrees.OIBTree import OISet
return OISet, OITreeSet, makeBuilder(OIBTree), makeBuilder(OIBucket)
-class PureLF(SetResult, unittest.TestCase):
- def union(self, *args):
- from BTrees.LFBTree import union
- return union(*args)
- def intersection(self, *args):
- from BTrees.LFBTree import intersection
- return intersection(*args)
- def difference(self, *args):
- from BTrees.LFBTree import difference
- return difference(*args)
- def builders(self):
- from BTrees.LFBTree import LFBTree
- from BTrees.LFBTree import LFBucket
- from BTrees.LFBTree import LFTreeSet
- from BTrees.LFBTree import LFSet
- return LFSet, LFTreeSet, makeBuilder(LFBTree), makeBuilder(LFBucket)
-
class PureOL(SetResult, unittest.TestCase):
def union(self, *args):
from BTrees.OLBTree import union
@@ -87,26 +70,6 @@
from BTrees.OLBTree import OLSet
return OLSet, OLTreeSet, makeBuilder(OLBTree), makeBuilder(OLBucket)
-class TestLFMultiUnion(MultiUnion, unittest.TestCase):
- def multiunion(self, *args):
- from BTrees.LFBTree import multiunion
- return multiunion(*args)
- def union(self, *args):
- from BTrees.LFBTree import union
- return union(*args)
- def mkset(self, *args):
- from BTrees.LFBTree import LFSet as mkset
- return mkset(*args)
- def mktreeset(self, *args):
- from BTrees.LFBTree import LFTreeSet as mktreeset
- return mktreeset(*args)
- def mkbucket(self, *args):
- from BTrees.LFBTree import LFBucket as mkbucket
- return mkbucket(*args)
- def mkbtree(self, *args):
- from BTrees.LFBTree import LFBTree as mkbtree
- return mkbtree(*args)
-
# Check that various special module functions are and aren't imported from
# the expected BTree modules.
class TestImports(unittest.TestCase):
@@ -244,9 +207,6 @@
def test_suite():
return unittest.TestSuite((
- unittest.makeSuite(TestLFMultiUnion),
- unittest.makeSuite(PureLF),
-
unittest.makeSuite(PureOO),
unittest.makeSuite(PureOI),
Modified: BTrees/branches/pure_python/BTrees/tests/test_LFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_LFBTree.py 2012-11-11 18:55:52 UTC (rev 128225)
+++ BTrees/branches/pure_python/BTrees/tests/test_LFBTree.py 2012-11-11 18:55:52 UTC (rev 128226)
@@ -13,15 +13,17 @@
##############################################################################
import unittest
-from BTrees.tests.common import BTreeTests
-from BTrees.tests.common import ExtendedSetTests
-from BTrees.tests.common import I_SetsBase
-from BTrees.tests.common import InternalKeysMappingTest
-from BTrees.tests.common import InternalKeysSetTest
-from BTrees.tests.common import MappingBase
-from BTrees.tests.common import ModuleTest
-from BTrees.tests.common import NormalSetTests
-from BTrees.tests.common import TestLongIntKeys
+from .common import BTreeTests
+from .common import ExtendedSetTests
+from .common import InternalKeysMappingTest
+from .common import InternalKeysSetTest
+from .common import MappingBase
+from .common import ModuleTest
+from .common import MultiUnion
+from .common import NormalSetTests
+from .common import SetResult
+from .common import TestLongIntKeys
+from .common import makeBuilder
class LFBTreeInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
@@ -82,6 +84,45 @@
return 0.5, 1.5
+class TestLFMultiUnion(MultiUnion, unittest.TestCase):
+ def multiunion(self, *args):
+ from BTrees.LFBTree import multiunion
+ return multiunion(*args)
+ def union(self, *args):
+ from BTrees.LFBTree import union
+ return union(*args)
+ def mkset(self, *args):
+ from BTrees.LFBTree import LFSet as mkset
+ return mkset(*args)
+ def mktreeset(self, *args):
+ from BTrees.LFBTree import LFTreeSet as mktreeset
+ return mktreeset(*args)
+ def mkbucket(self, *args):
+ from BTrees.LFBTree import LFBucket as mkbucket
+ return mkbucket(*args)
+ def mkbtree(self, *args):
+ from BTrees.LFBTree import LFBTree as mkbtree
+ return mkbtree(*args)
+
+
+class PureLF(SetResult, unittest.TestCase):
+ def union(self, *args):
+ from BTrees.LFBTree import union
+ return union(*args)
+ def intersection(self, *args):
+ from BTrees.LFBTree import intersection
+ return intersection(*args)
+ def difference(self, *args):
+ from BTrees.LFBTree import difference
+ return difference(*args)
+ def builders(self):
+ from BTrees.LFBTree import LFBTree
+ from BTrees.LFBTree import LFBucket
+ from BTrees.LFBTree import LFTreeSet
+ from BTrees.LFBTree import LFSet
+ return LFSet, LFTreeSet, makeBuilder(LFBTree), makeBuilder(LFBucket)
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(LFBTreeInternalKeyTest),
@@ -91,4 +132,7 @@
unittest.makeSuite(LFSetTest),
unittest.makeSuite(LFModuleTest),
unittest.makeSuite(LFBTreeTest),
+
+ unittest.makeSuite(TestLFMultiUnion),
+ unittest.makeSuite(PureLF),
))
More information about the checkins
mailing list