[Checkins] SVN: BTrees/branches/pure_python/ Test pure-Python OL entities everywhere.
Tres Seaver
cvs-admin at zope.org
Mon Nov 12 22:48:43 UTC 2012
Log message for revision 128267:
Test pure-Python OL entities everywhere.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/check.py
U BTrees/branches/pure_python/BTrees/tests/test_OLBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/check.py
===================================================================
--- BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:42 UTC (rev 128266)
+++ BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:43 UTC (rev 128267)
@@ -32,17 +32,18 @@
that doesn't exist in the actual BTree).
"""
-from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
-from BTrees.OOBTree import OOBTreePy, OOBucketPy, OOSetPy, OOTreeSetPy
+from BTrees.IFBTree import IFBTree, IFBucket, IFSet, IFTreeSet
+from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
+from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
+from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
+from BTrees.LLBTree import LLBTree, LLBucket, LLSet, LLTreeSet
+from BTrees.LOBTree import LOBTree, LOBucket, LOSet, LOTreeSet
from BTrees.OIBTree import OIBTree, OIBucket, OISet, OITreeSet
from BTrees.OIBTree import OIBTreePy, OIBucketPy, OISetPy, OITreeSetPy
-from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
-from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
-from BTrees.IFBTree import IFBTree, IFBucket, IFSet, IFTreeSet
from BTrees.OLBTree import OLBTree, OLBucket, OLSet, OLTreeSet
-from BTrees.LOBTree import LOBTree, LOBucket, LOSet, LOTreeSet
-from BTrees.LLBTree import LLBTree, LLBucket, LLSet, LLTreeSet
-from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
+from BTrees.OLBTree import OLBTreePy, OLBucketPy, OLSetPy, OLTreeSetPy
+from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
+from BTrees.OOBTree import OOBTreePy, OOBucketPy, OOSetPy, OOTreeSetPy
from BTrees.utils import positive_id
from BTrees.utils import oid_repr
Modified: BTrees/branches/pure_python/BTrees/tests/test_OLBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_OLBTree.py 2012-11-12 22:48:42 UTC (rev 128266)
+++ BTrees/branches/pure_python/BTrees/tests/test_OLBTree.py 2012-11-12 22:48:43 UTC (rev 128267)
@@ -36,6 +36,13 @@
return OLBTree
+class OLBTreePyInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLBTreePy
+ return OLBTreePy
+
+
class OLTreeSetInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
def _getTargetClass(self):
@@ -43,6 +50,13 @@
return OLTreeSet
+class OLTreeSetPyInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLTreeSetPy
+ return OLTreeSetPy
+
+
class OLBucketTest(MappingBase, unittest.TestCase):
def _getTargetClass(self):
@@ -50,6 +64,13 @@
return OLBucket
+class OLBucketPyTest(MappingBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLBucketPy
+ return OLBucketPy
+
+
class OLTreeSetTest(NormalSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -57,6 +78,13 @@
return OLTreeSet
+class OLTreeSetPyTest(NormalSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLTreeSetPy
+ return OLTreeSetPy
+
+
class OLSetTest(ExtendedSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -64,6 +92,13 @@
return OLSet
+class OLSetPyTest(ExtendedSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLSetPy
+ return OLSetPy
+
+
class OLBTreeTest(BTreeTests, TestLongIntValues, unittest.TestCase):
def _makeOne(self):
@@ -74,16 +109,30 @@
return object(), object()
+class OLBTreePyTest(BTreeTests, TestLongIntValues, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.OLBTree import OLBTreePy
+ return OLBTreePy()
+
+ def getTwoKeys(self):
+ return object(), object()
+
+
class PureOL(SetResult, unittest.TestCase):
+
def union(self, *args):
from BTrees.OLBTree import union
return union(*args)
+
def intersection(self, *args):
from BTrees.OLBTree import intersection
return intersection(*args)
+
def difference(self, *args):
from BTrees.OLBTree import difference
return difference(*args)
+
def builders(self):
from BTrees.OLBTree import OLBTree
from BTrees.OLBTree import OLBucket
@@ -92,22 +141,51 @@
return OLSet, OLTreeSet, makeBuilder(OLBTree), makeBuilder(OLBucket)
+class PureOLPy(SetResult, unittest.TestCase):
+
+ def union(self, *args):
+ from BTrees.OLBTree import unionPy
+ return unionPy(*args)
+
+ def intersection(self, *args):
+ from BTrees.OLBTree import intersectionPy
+ return intersectionPy(*args)
+
+ def difference(self, *args):
+ from BTrees.OLBTree import differencePy
+ return differencePy(*args)
+
+ def builders(self):
+ from BTrees.OLBTree import OLBTreePy
+ from BTrees.OLBTree import OLBucketPy
+ from BTrees.OLBTree import OLTreeSetPy
+ from BTrees.OLBTree import OLSetPy
+ return (OLSetPy, OLTreeSetPy,
+ makeBuilder(OLBTreePy), makeBuilder(OLBucketPy))
+
+
class TestWeightedOL(Weighted, unittest.TestCase):
+
def weightedUnion(self):
from BTrees.OLBTree import weightedUnion
return weightedUnion
+
def weightedIntersection(self):
from BTrees.OLBTree import weightedIntersection
return weightedIntersection
+
def union(self):
from BTrees.OLBTree import union
return union
+
def intersection(self):
from BTrees.OLBTree import intersection
return intersection
+
def mkbucket(self, *args):
from BTrees.OLBTree import OLBucket as mkbucket
return mkbucket(*args)
+
def builders(self):
from BTrees.OLBTree import OLBTree
from BTrees.OLBTree import OLBucket
@@ -116,6 +194,37 @@
return OLBucket, OLBTree, itemsToSet(OLSet), itemsToSet(OLTreeSet)
+class TestWeightedOLPy(Weighted, unittest.TestCase):
+
+ def weightedUnion(self):
+ from BTrees.OLBTree import weightedUnionPy
+ return weightedUnionPy
+
+ def weightedIntersection(self):
+ from BTrees.OLBTree import weightedIntersectionPy
+ return weightedIntersectionPy
+
+ def union(self):
+ from BTrees.OLBTree import unionPy
+ return unionPy
+
+ def intersection(self):
+ from BTrees.OLBTree import intersectionPy
+ return intersectionPy
+
+ def mkbucket(self, *args):
+ from BTrees.OLBTree import OLBucketPy as mkbucket
+ return mkbucket(*args)
+
+ def builders(self):
+ from BTrees.OLBTree import OLBTreePy
+ from BTrees.OLBTree import OLBucketPy
+ from BTrees.OLBTree import OLTreeSetPy
+ from BTrees.OLBTree import OLSetPy
+ return (OLBucketPy, OLBTreePy,
+ itemsToSet(OLSetPy), itemsToSet(OLTreeSetPy))
+
+
class OLBucketConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -123,6 +232,13 @@
return OLBucket
+class OLBucketPyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLBucketPy
+ return OLBucketPy
+
+
class OLSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -130,6 +246,13 @@
return OLSet
+class OLSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLSetPy
+ return OLSetPy
+
+
class OLBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -137,6 +260,13 @@
return OLBTree
+class OLBTreePyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLBTreePy
+ return OLBTreePy
+
+
class OLTreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -144,6 +274,13 @@
return OLTreeSet
+class OLTreeSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OLBTree import OLTreeSetPy
+ return OLTreeSetPy
+
+
class OLModuleTest(ModuleTest, unittest.TestCase):
prefix = 'OL'
@@ -168,16 +305,28 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(OLBTreeInternalKeyTest),
+ unittest.makeSuite(OLBTreePyInternalKeyTest),
unittest.makeSuite(OLTreeSetInternalKeyTest),
+ unittest.makeSuite(OLTreeSetPyInternalKeyTest),
unittest.makeSuite(OLBucketTest),
+ unittest.makeSuite(OLBucketPyTest),
unittest.makeSuite(OLTreeSetTest),
+ unittest.makeSuite(OLTreeSetPyTest),
unittest.makeSuite(OLSetTest),
+ unittest.makeSuite(OLSetPyTest),
unittest.makeSuite(OLBTreeTest),
+ unittest.makeSuite(OLBTreePyTest),
unittest.makeSuite(PureOL),
+ unittest.makeSuite(PureOLPy),
unittest.makeSuite(TestWeightedOL),
+ unittest.makeSuite(TestWeightedOLPy),
unittest.makeSuite(OLBucketConflictTests),
+ unittest.makeSuite(OLBucketPyConflictTests),
unittest.makeSuite(OLSetConflictTests),
+ unittest.makeSuite(OLSetPyConflictTests),
unittest.makeSuite(OLBTreeConflictTests),
+ unittest.makeSuite(OLBTreePyConflictTests),
unittest.makeSuite(OLTreeSetConflictTests),
+ unittest.makeSuite(OLTreeSetPyConflictTests),
unittest.makeSuite(OLModuleTest),
))
More information about the checkins
mailing list