[Checkins] SVN: BTrees/branches/pure_python/ Test pure-Python II entities everywhere.
Tres Seaver
cvs-admin at zope.org
Tue Nov 13 17:39:04 UTC 2012
Log message for revision 128275:
Test pure-Python II entities everywhere.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/check.py
U BTrees/branches/pure_python/BTrees/tests/test_IIBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/check.py
===================================================================
--- BTrees/branches/pure_python/BTrees/check.py 2012-11-13 17:39:02 UTC (rev 128274)
+++ BTrees/branches/pure_python/BTrees/check.py 2012-11-13 17:39:04 UTC (rev 128275)
@@ -35,6 +35,7 @@
from BTrees.IFBTree import IFBTree, IFBucket, IFSet, IFTreeSet
from BTrees.IFBTree import IFBTreePy, IFBucketPy, IFSetPy, IFTreeSetPy
from BTrees.IIBTree import IIBTree, IIBucket, IISet, IITreeSet
+from BTrees.IIBTree import IIBTreePy, IIBucketPy, IISetPy, IITreeSetPy
from BTrees.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
from BTrees.LLBTree import LLBTree, LLBucket, LLSet, LLTreeSet
Modified: BTrees/branches/pure_python/BTrees/tests/test_IIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_IIBTree.py 2012-11-13 17:39:02 UTC (rev 128274)
+++ BTrees/branches/pure_python/BTrees/tests/test_IIBTree.py 2012-11-13 17:39:04 UTC (rev 128275)
@@ -39,7 +39,14 @@
from BTrees.IIBTree import IIBTree
return IIBTree
+
+class IIBTreePyInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IIBTreePy
+ return IIBTreePy
+
+
class IITreeSetInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
def _getTargetClass(self):
@@ -47,6 +54,13 @@
return IITreeSet
+class IITreeSetPyInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IITreeSetPy
+ return IITreeSetPy
+
+
class IIBucketTest(MappingBase, unittest.TestCase):
def _getTargetClass(self):
@@ -54,6 +68,13 @@
return IIBucket
+class IIBucketPyTest(MappingBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IIBucketPy
+ return IIBucketPy
+
+
class IITreeSetTest(NormalSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -61,6 +82,13 @@
return IITreeSet
+class IITreeSetPyTest(NormalSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IITreeSetPy
+ return IITreeSetPy
+
+
class IISetTest(ExtendedSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -68,12 +96,15 @@
return IISet
-class IIBTreeTest(BTreeTests, unittest.TestCase):
+class IISetPyTest(ExtendedSetTests, unittest.TestCase):
- def _makeOne(self):
- from BTrees.IIBTree import IIBTree
- return IIBTree()
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IISetPy
+ return IISetPy
+
+class _IIBTreeTestBase(BTreeTests):
+
def testIIBTreeOverflow(self):
good = set()
b = self._makeOne()
@@ -97,23 +128,45 @@
self.assertEqual(sorted(good), sorted(b))
+class IIBTreeTest(_IIBTreeTestBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IIBTree
+ return IIBTree()
+
+
+class IIBTreeTestPy(_IIBTreeTestBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IIBTreePy
+ return IIBTreePy()
+
+
if using64bits:
class IIBTreeTest(BTreeTests, TestLongIntKeys, TestLongIntValues,
unittest.TestCase):
+
def _makeOne(self):
from BTrees.IIBTree import IIBTree
return IIBTree()
+
def getTwoValues(self):
return 1, 2
+ class IIBTreeTest(BTreeTests, TestLongIntKeys, TestLongIntValues,
+ unittest.TestCase):
-class TestIIBTrees(unittest.TestCase):
+ def _makeOne(self):
+ from BTrees.IIBTree import IIBTreePy
+ return IIBTreePy()
- def _makeOne(self):
- from BTrees.IIBTree import IIBTree
- return IIBTree()
+ def getTwoValues(self):
+ return 1, 2
+
+class _TestIIBTreesBase(object):
+
def testNonIntegerKeyRaises(self):
self.assertRaises(TypeError, self._stringraiseskey)
self.assertRaises(TypeError, self._floatraiseskey)
@@ -143,6 +196,20 @@
self._makeOne()[1] = None
+class TestIIBTrees(_TestIIBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IIBTree
+ return IIBTree()
+
+
+class TestIIBTreesPy(_TestIIBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IIBTreePy
+ return IIBTreePy()
+
+
class TestIISets(I_SetsBase, unittest.TestCase):
def _makeOne(self):
@@ -150,6 +217,13 @@
return IISet()
+class TestIISetsPy(I_SetsBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IISetPy
+ return IISetPy()
+
+
class TestIITreeSets(I_SetsBase, unittest.TestCase):
def _makeOne(self):
@@ -157,16 +231,27 @@
return IITreeSet()
+class TestIITreeSetsPy(I_SetsBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IIBTree import IITreeSetPy
+ return IITreeSetPy()
+
+
class PureII(SetResult, unittest.TestCase):
+
def union(self, *args):
from BTrees.IIBTree import union
return union(*args)
+
def intersection(self, *args):
from BTrees.IIBTree import intersection
return intersection(*args)
+
def difference(self, *args):
from BTrees.IIBTree import difference
return difference(*args)
+
def builders(self):
from BTrees.IIBTree import IIBTree
from BTrees.IIBTree import IIBucket
@@ -175,42 +260,105 @@
return IISet, IITreeSet, makeBuilder(IIBTree), makeBuilder(IIBucket)
+class PureIIPy(SetResult, unittest.TestCase):
+
+ def union(self, *args):
+ from BTrees.IIBTree import unionPy
+ return unionPy(*args)
+
+ def intersection(self, *args):
+ from BTrees.IIBTree import intersectionPy
+ return intersectionPy(*args)
+
+ def difference(self, *args):
+ from BTrees.IIBTree import differencePy
+ return differencePy(*args)
+
+ def builders(self):
+ from BTrees.IIBTree import IIBTreePy
+ from BTrees.IIBTree import IIBucketPy
+ from BTrees.IIBTree import IITreeSetPy
+ from BTrees.IIBTree import IISetPy
+ return (IISetPy, IITreeSetPy,
+ makeBuilder(IIBTreePy), makeBuilder(IIBucketPy))
+
+
class TestIIMultiUnion(MultiUnion, unittest.TestCase):
+
def multiunion(self, *args):
from BTrees.IIBTree import multiunion
return multiunion(*args)
+
def union(self, *args):
from BTrees.IIBTree import union
return union(*args)
+
def mkset(self, *args):
from BTrees.IIBTree import IISet as mkset
return mkset(*args)
+
def mktreeset(self, *args):
from BTrees.IIBTree import IITreeSet as mktreeset
return mktreeset(*args)
+
def mkbucket(self, *args):
from BTrees.IIBTree import IIBucket as mkbucket
return mkbucket(*args)
+
def mkbtree(self, *args):
from BTrees.IIBTree import IIBTree as mkbtree
return mkbtree(*args)
+
+class TestIIMultiUnionPy(MultiUnion, unittest.TestCase):
+
+ def multiunion(self, *args):
+ from BTrees.IIBTree import multiunionPy
+ return multiunionPy(*args)
+
+ def union(self, *args):
+ from BTrees.IIBTree import unionPy
+ return unionPy(*args)
+
+ def mkset(self, *args):
+ from BTrees.IIBTree import IISetPy as mkset
+ return mkset(*args)
+
+ def mktreeset(self, *args):
+ from BTrees.IIBTree import IITreeSetPy as mktreeset
+ return mktreeset(*args)
+
+ def mkbucket(self, *args):
+ from BTrees.IIBTree import IIBucketPy as mkbucket
+ return mkbucket(*args)
+
+ def mkbtree(self, *args):
+ from BTrees.IIBTree import IIBTreePy as mkbtree
+ return mkbtree(*args)
+
+
class TestWeightedII(Weighted, unittest.TestCase):
+
def weightedUnion(self):
from BTrees.IIBTree import weightedUnion
return weightedUnion
+
def weightedIntersection(self):
from BTrees.IIBTree import weightedIntersection
return weightedIntersection
+
def union(self):
from BTrees.IIBTree import union
return union
+
def intersection(self):
from BTrees.IIBTree import intersection
return intersection
+
def mkbucket(self, *args):
from BTrees.IIBTree import IIBucket as mkbucket
return mkbucket(*args)
+
def builders(self):
from BTrees.IIBTree import IIBTree
from BTrees.IIBTree import IIBucket
@@ -219,6 +367,37 @@
return IIBucket, IIBTree, itemsToSet(IISet), itemsToSet(IITreeSet)
+class TestWeightedIIPy(Weighted, unittest.TestCase):
+
+ def weightedUnion(self):
+ from BTrees.IIBTree import weightedUnionPy
+ return weightedUnionPy
+
+ def weightedIntersection(self):
+ from BTrees.IIBTree import weightedIntersectionPy
+ return weightedIntersectionPy
+
+ def union(self):
+ from BTrees.IIBTree import unionPy
+ return unionPy
+
+ def intersection(self):
+ from BTrees.IIBTree import intersectionPy
+ return intersectionPy
+
+ def mkbucket(self, *args):
+ from BTrees.IIBTree import IIBucketPy as mkbucket
+ return mkbucket(*args)
+
+ def builders(self):
+ from BTrees.IIBTree import IIBTreePy
+ from BTrees.IIBTree import IIBucketPy
+ from BTrees.IIBTree import IITreeSetPy
+ from BTrees.IIBTree import IISetPy
+ return (IIBucketPy, IIBTreePy,
+ itemsToSet(IISetPy), itemsToSet(IITreeSetPy))
+
+
class IIBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -226,6 +405,13 @@
return IIBTree
+class IIBTreeConflictTestsPy(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IIBTreePy
+ return IIBTreePy
+
+
class IIBucketConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -233,6 +419,13 @@
return IIBucket
+class IIBucketConflictTestsPy(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IIBucketPy
+ return IIBucketPy
+
+
class IITreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -240,6 +433,13 @@
return IITreeSet
+class IITreeSetConflictTestsPy(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IITreeSetPy
+ return IITreeSetPy
+
+
class IISetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -247,6 +447,13 @@
return IISet
+class IISetConflictTestsPy(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IIBTree import IISetPy
+ return IISetPy
+
+
class IIModuleTest(ModuleTest, unittest.TestCase):
prefix = 'II'
@@ -263,20 +470,36 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(IIBTreeInternalKeyTest),
+ unittest.makeSuite(IIBTreePyInternalKeyTest),
unittest.makeSuite(IITreeSetInternalKeyTest),
+ unittest.makeSuite(IITreeSetPyInternalKeyTest),
unittest.makeSuite(IIBucketTest),
+ unittest.makeSuite(IIBucketPyTest),
unittest.makeSuite(IITreeSetTest),
+ unittest.makeSuite(IITreeSetPyTest),
unittest.makeSuite(IISetTest),
+ unittest.makeSuite(IISetPyTest),
unittest.makeSuite(IIBTreeTest),
+ unittest.makeSuite(IIBTreeTestPy),
unittest.makeSuite(TestIIBTrees),
+ unittest.makeSuite(TestIIBTreesPy),
unittest.makeSuite(TestIISets),
+ unittest.makeSuite(TestIISetsPy),
unittest.makeSuite(TestIITreeSets),
+ unittest.makeSuite(TestIITreeSetsPy),
unittest.makeSuite(TestIIMultiUnion),
+ unittest.makeSuite(TestIIMultiUnionPy),
unittest.makeSuite(PureII),
+ unittest.makeSuite(PureIIPy),
unittest.makeSuite(TestWeightedII),
+ unittest.makeSuite(TestWeightedIIPy),
unittest.makeSuite(IIBTreeConflictTests),
+ unittest.makeSuite(IIBTreeConflictTestsPy),
unittest.makeSuite(IIBucketConflictTests),
+ unittest.makeSuite(IIBucketConflictTestsPy),
unittest.makeSuite(IITreeSetConflictTests),
+ unittest.makeSuite(IITreeSetConflictTestsPy),
unittest.makeSuite(IISetConflictTests),
+ unittest.makeSuite(IISetConflictTestsPy),
unittest.makeSuite(IIModuleTest),
))
More information about the checkins
mailing list