[Checkins] SVN: BTrees/branches/pure_python/ Test pure-Python OI entities everywhere.
Tres Seaver
cvs-admin at zope.org
Mon Nov 12 22:48:43 UTC 2012
Log message for revision 128266:
Test pure-Python OI entities everywhere.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/check.py
U BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/check.py
===================================================================
--- BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:42 UTC (rev 128265)
+++ BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:42 UTC (rev 128266)
@@ -35,6 +35,7 @@
from BTrees.OOBTree import OOBTree, OOBucket, OOSet, OOTreeSet
from BTrees.OOBTree import OOBTreePy, OOBucketPy, OOSetPy, OOTreeSetPy
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
Modified: BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py 2012-11-12 22:48:42 UTC (rev 128265)
+++ BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py 2012-11-12 22:48:42 UTC (rev 128266)
@@ -38,6 +38,13 @@
return OIBTree
+class OIBTreePyInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OIBTreePy
+ return OIBTreePy
+
+
class OITreeSetInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
def _getTargetClass(self):
@@ -45,6 +52,13 @@
return OITreeSet
+class OITreeSetPyInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OITreeSetPy
+ return OITreeSetPy
+
+
class OIBucketTest(MappingBase, unittest.TestCase):
def _getTargetClass(self):
@@ -52,6 +66,13 @@
return OIBucket
+class OIBucketPyTest(MappingBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OIBucketPy
+ return OIBucketPy
+
+
class OITreeSetTest(NormalSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -59,6 +80,13 @@
return OITreeSet
+class OITreeSetPyTest(NormalSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OITreeSetPy
+ return OITreeSetPy
+
+
class OISetTest(ExtendedSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -66,6 +94,13 @@
return OISet
+class OISetPyTest(ExtendedSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OISetPy
+ return OISetPy
+
+
class OIBTreeTest(BTreeTests, unittest.TestCase):
def _makeOne(self):
@@ -73,10 +108,10 @@
return OIBTree()
-class OIBTreeTest(BTreeTests, unittest.TestCase):
+class OIBTreePyTest(BTreeTests, unittest.TestCase):
def _makeOne(self):
- from BTrees.OIBTree import OIBTree
- return OIBTree()
+ from BTrees.OIBTree import OIBTreePy
+ return OIBTreePy()
if using64bits:
@@ -88,11 +123,16 @@
def getTwoKeys(self):
return object(), object()
-class TestOIBTrees(TypeTest, unittest.TestCase):
- def _makeOne(self):
- from BTrees.OIBTree import OIBTree
- return OIBTree()
+ class OIBTreePyTest(BTreeTests, TestLongIntValues, unittest.TestCase):
+ def _makeOne(self):
+ from BTrees.OIBTree import OIBTreePy
+ return OIBTreePy()
+ def getTwoKeys(self):
+ return object(), object()
+
+class _TestOIBTreesBase(TypeTest):
+
def _stringraises(self):
self._makeOne()[1] = 'c'
@@ -113,16 +153,34 @@
self.assertEqual(b.keys()[0], 30)
+class TestOIBTrees(_TestOIBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.OIBTree import OIBTree
+ return OIBTree()
+
+
+class TestOIBTreesPy(_TestOIBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.OIBTree import OIBTreePy
+ return OIBTreePy()
+
+
class PureOI(SetResult, unittest.TestCase):
+
def union(self, *args):
from BTrees.OIBTree import union
return union(*args)
+
def intersection(self, *args):
from BTrees.OIBTree import intersection
return intersection(*args)
+
def difference(self, *args):
from BTrees.OIBTree import difference
return difference(*args)
+
def builders(self):
from BTrees.OIBTree import OIBTree
from BTrees.OIBTree import OIBucket
@@ -131,22 +189,51 @@
return OISet, OITreeSet, makeBuilder(OIBTree), makeBuilder(OIBucket)
+class PureOIPy(SetResult, unittest.TestCase):
+
+ def union(self, *args):
+ from BTrees.OIBTree import unionPy
+ return unionPy(*args)
+
+ def intersection(self, *args):
+ from BTrees.OIBTree import intersectionPy
+ return intersectionPy(*args)
+
+ def difference(self, *args):
+ from BTrees.OIBTree import differencePy
+ return differencePy(*args)
+
+ def builders(self):
+ from BTrees.OIBTree import OIBTreePy
+ from BTrees.OIBTree import OIBucketPy
+ from BTrees.OIBTree import OITreeSetPy
+ from BTrees.OIBTree import OISetPy
+ return (OISetPy, OITreeSetPy,
+ makeBuilder(OIBTreePy), makeBuilder(OIBucketPy))
+
+
class TestWeightedOI(Weighted, unittest.TestCase):
+
def weightedUnion(self):
from BTrees.OIBTree import weightedUnion
return weightedUnion
+
def weightedIntersection(self):
from BTrees.OIBTree import weightedIntersection
return weightedIntersection
+
def union(self):
from BTrees.OIBTree import union
return union
+
def intersection(self):
from BTrees.OIBTree import intersection
return intersection
+
def mkbucket(self, *args):
from BTrees.OIBTree import OIBucket as mkbucket
return mkbucket(*args)
+
def builders(self):
from BTrees.OIBTree import OIBTree
from BTrees.OIBTree import OIBucket
@@ -155,6 +242,37 @@
return OIBucket, OIBTree, itemsToSet(OISet), itemsToSet(OITreeSet)
+class TestWeightedOIPy(Weighted, unittest.TestCase):
+
+ def weightedUnion(self):
+ from BTrees.OIBTree import weightedUnionPy
+ return weightedUnionPy
+
+ def weightedIntersection(self):
+ from BTrees.OIBTree import weightedIntersectionPy
+ return weightedIntersectionPy
+
+ def union(self):
+ from BTrees.OIBTree import unionPy
+ return unionPy
+
+ def intersection(self):
+ from BTrees.OIBTree import intersectionPy
+ return intersectionPy
+
+ def mkbucket(self, *args):
+ from BTrees.OIBTree import OIBucketPy as mkbucket
+ return mkbucket(*args)
+
+ def builders(self):
+ from BTrees.OIBTree import OIBTreePy
+ from BTrees.OIBTree import OIBucketPy
+ from BTrees.OIBTree import OITreeSetPy
+ from BTrees.OIBTree import OISetPy
+ return (OIBucketPy, OIBTreePy,
+ itemsToSet(OISetPy), itemsToSet(OITreeSetPy))
+
+
class OIBucketConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -162,6 +280,13 @@
return OIBucket
+class OIBucketConflictTestsPy(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OIBucketPy
+ return OIBucketPy
+
+
class OISetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -169,6 +294,13 @@
return OISet
+class OISetConflictTestsPy(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OISetPy
+ return OISetPy
+
+
class OIBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -176,6 +308,13 @@
return OIBTree
+class OIBTreeConflictTestsPy(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OIBTreePy
+ return OIBTreePy
+
+
class OITreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -183,6 +322,13 @@
return OITreeSet
+class OITreeSetConflictTestsPy(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.OIBTree import OITreeSetPy
+ return OITreeSetPy
+
+
class OIModuleTest(ModuleTest, unittest.TestCase):
prefix = 'OI'
@@ -207,17 +353,30 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(OIBTreeInternalKeyTest),
+ unittest.makeSuite(OIBTreePyInternalKeyTest),
unittest.makeSuite(OITreeSetInternalKeyTest),
+ unittest.makeSuite(OITreeSetPyInternalKeyTest),
unittest.makeSuite(OIBucketTest),
+ unittest.makeSuite(OIBucketPyTest),
unittest.makeSuite(OITreeSetTest),
+ unittest.makeSuite(OITreeSetPyTest),
unittest.makeSuite(OISetTest),
+ unittest.makeSuite(OISetPyTest),
unittest.makeSuite(OIBTreeTest),
+ unittest.makeSuite(OIBTreePyTest),
unittest.makeSuite(TestOIBTrees),
+ unittest.makeSuite(TestOIBTreesPy),
unittest.makeSuite(PureOI),
+ unittest.makeSuite(PureOIPy),
unittest.makeSuite(TestWeightedOI),
+ unittest.makeSuite(TestWeightedOIPy),
unittest.makeSuite(OIBucketConflictTests),
+ unittest.makeSuite(OIBucketConflictTestsPy),
unittest.makeSuite(OISetConflictTests),
+ unittest.makeSuite(OISetConflictTestsPy),
unittest.makeSuite(OIBTreeConflictTests),
+ unittest.makeSuite(OIBTreeConflictTestsPy),
unittest.makeSuite(OITreeSetConflictTests),
+ unittest.makeSuite(OITreeSetConflictTestsPy),
unittest.makeSuite(OIModuleTest),
))
More information about the checkins
mailing list