[Checkins] SVN: BTrees/branches/pure_python/ Test pure-Python IF entities everywhere.
Tres Seaver
cvs-admin at zope.org
Mon Nov 12 22:48:44 UTC 2012
Log message for revision 128268:
Test pure-Python IF entities everywhere.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/check.py
U BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/check.py
===================================================================
--- BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:43 UTC (rev 128267)
+++ BTrees/branches/pure_python/BTrees/check.py 2012-11-12 22:48:44 UTC (rev 128268)
@@ -33,6 +33,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.IOBTree import IOBTree, IOBucket, IOSet, IOTreeSet
from BTrees.LFBTree import LFBTree, LFBucket, LFSet, LFTreeSet
Modified: BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py 2012-11-12 22:48:43 UTC (rev 128267)
+++ BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py 2012-11-12 22:48:44 UTC (rev 128268)
@@ -36,6 +36,13 @@
return IFBTree
+class IFBTreePyInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFBTreePy
+ return IFBTreePy
+
+
class IFTreeSetInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
def _getTargetClass(self):
@@ -43,6 +50,13 @@
return IFTreeSet
+class IFTreeSetPyInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFTreeSetPy
+ return IFTreeSetPy
+
+
class IFBucketTest(MappingBase, unittest.TestCase):
def _getTargetClass(self):
@@ -50,12 +64,27 @@
return IFBucket
+class IFBucketPyTest(MappingBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFBucketPy
+ return IFBucketPy
+
+
class IFTreeSetTest(NormalSetTests, unittest.TestCase):
def _getTargetClass(self):
from BTrees.IFBTree import IFTreeSet
return IFTreeSet
+
+class IFTreeSetPyTest(NormalSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFTreeSetPy
+ return IFTreeSetPy
+
+
class IFSetTest(ExtendedSetTests, unittest.TestCase):
def _getTargetClass(self):
@@ -63,28 +92,49 @@
return IFSet
+class IFSetPyTest(ExtendedSetTests, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFSetPy
+ return IFSetPy
+
+
class IFBTreeTest(BTreeTests, unittest.TestCase):
def _makeOne(self):
from BTrees.IFBTree import IFBTree
return IFBTree()
+
+class IFBTreePyTest(BTreeTests, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IFBTree import IFBTreePy
+ return IFBTreePy()
+
if using64bits:
class IFBTreeTest(BTreeTests, TestLongIntKeys, unittest.TestCase):
+
def _makeOne(self):
from BTrees.IFBTree import IFBTree
return IFBTree()
+
def getTwoValues(self):
return 0.5, 1.5
+ class IFBTreePyTest(BTreeTests, TestLongIntKeys, unittest.TestCase):
-class TestIFBTrees(unittest.TestCase):
+ def _makeOne(self):
+ from BTrees.IFBTree import IFBTreePy
+ return IFBTreePy()
- def _makeOne(self):
- from BTrees.IFBTree import IFBTree
- return IFBTree()
+ def getTwoValues(self):
+ return 0.5, 1.5
+
+class _TestIFBTreesBase(unittest.TestCase):
+
def testNonIntegerKeyRaises(self):
self.assertRaises(TypeError, self._stringraiseskey)
self.assertRaises(TypeError, self._floatraiseskey)
@@ -114,36 +164,89 @@
def _noneraisesvalue(self):
self._makeOne()[1] = None
+
+class TestIFBTrees(_TestIFBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IFBTree import IFBTree
+ return IFBTree()
+
+
+class TestIFBTreesPy(_TestIFBTreesBase, unittest.TestCase):
+
+ def _makeOne(self):
+ from BTrees.IFBTree import IFBTreePy
+ return IFBTreePy()
+
+
class TestIFMultiUnion(MultiUnion, unittest.TestCase):
+
def multiunion(self, *args):
from BTrees.IFBTree import multiunion
return multiunion(*args)
+
def union(self, *args):
from BTrees.IFBTree import union
return union(*args)
+
def mkset(self, *args):
from BTrees.IFBTree import IFSet as mkset
return mkset(*args)
+
def mktreeset(self, *args):
from BTrees.IFBTree import IFTreeSet as mktreeset
return mktreeset(*args)
+
def mkbucket(self, *args):
from BTrees.IFBTree import IFBucket as mkbucket
return mkbucket(*args)
+
def mkbtree(self, *args):
from BTrees.IFBTree import IFBTree as mkbtree
return mkbtree(*args)
+
+class TestIFMultiUnionPy(MultiUnion, unittest.TestCase):
+
+ def multiunion(self, *args):
+ from BTrees.IFBTree import multiunionPy
+ return multiunionPy(*args)
+
+ def union(self, *args):
+ from BTrees.IFBTree import unionPy
+ return unionPy(*args)
+
+ def mkset(self, *args):
+ from BTrees.IFBTree import IFSetPy as mkset
+ return mkset(*args)
+
+ def mktreeset(self, *args):
+ from BTrees.IFBTree import IFTreeSetPy as mktreeset
+ return mktreeset(*args)
+
+ def mkbucket(self, *args):
+ from BTrees.IFBTree import IFBucketPy as mkbucket
+ return mkbucket(*args)
+
+ def mkbtree(self, *args):
+ from BTrees.IFBTree import IFBTreePy as mkbtree
+ return mkbtree(*args)
+
+
class PureIF(SetResult, unittest.TestCase):
+
def union(self, *args):
from BTrees.IFBTree import union
return union(*args)
+
def intersection(self, *args):
from BTrees.IFBTree import intersection
return intersection(*args)
+
def difference(self, *args):
from BTrees.IFBTree import difference
return difference(*args)
+
def builders(self):
from BTrees.IFBTree import IFBTree
from BTrees.IFBTree import IFBucket
@@ -152,6 +255,29 @@
return IFSet, IFTreeSet, makeBuilder(IFBTree), makeBuilder(IFBucket)
+class PureIFPy(SetResult, unittest.TestCase):
+
+ def union(self, *args):
+ from BTrees.IFBTree import unionPy
+ return unionPy(*args)
+
+ def intersection(self, *args):
+ from BTrees.IFBTree import intersectionPy
+ return intersectionPy(*args)
+
+ def difference(self, *args):
+ from BTrees.IFBTree import differencePy
+ return differencePy(*args)
+
+ def builders(self):
+ from BTrees.IFBTree import IFBTreePy
+ from BTrees.IFBTree import IFBucketPy
+ from BTrees.IFBTree import IFTreeSetPy
+ from BTrees.IFBTree import IFSetPy
+ return (IFSetPy, IFTreeSetPy,
+ makeBuilder(IFBTreePy), makeBuilder(IFBucketPy))
+
+
class IFBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -159,6 +285,13 @@
return IFBTree
+class IFBTreePyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFBTreePy
+ return IFBTreePy
+
+
class IFBucketConflictTests(MappingConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -166,6 +299,13 @@
return IFBucket
+class IFBucketPyConflictTests(MappingConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFBucketPy
+ return IFBucketPy
+
+
class IFTreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -173,6 +313,13 @@
return IFTreeSet
+class IFTreeSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFTreeSetPy
+ return IFTreeSetPy
+
+
class IFSetConflictTests(SetConflictTestBase, unittest.TestCase):
def _getTargetClass(self):
@@ -180,6 +327,13 @@
return IFSet
+class IFSetPyConflictTests(SetConflictTestBase, unittest.TestCase):
+
+ def _getTargetClass(self):
+ from BTrees.IFBTree import IFSetPy
+ return IFSetPy
+
+
class IFModuleTest(ModuleTest, unittest.TestCase):
prefix = 'IF'
@@ -195,17 +349,30 @@
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(IFBTreeInternalKeyTest),
+ unittest.makeSuite(IFBTreePyInternalKeyTest),
unittest.makeSuite(IFTreeSetInternalKeyTest),
+ unittest.makeSuite(IFTreeSetPyInternalKeyTest),
unittest.makeSuite(IFBucketTest),
+ unittest.makeSuite(IFBucketPyTest),
unittest.makeSuite(IFTreeSetTest),
+ unittest.makeSuite(IFTreeSetPyTest),
unittest.makeSuite(IFSetTest),
- unittest.makeSuite(IFModuleTest),
+ unittest.makeSuite(IFSetPyTest),
unittest.makeSuite(IFBTreeTest),
+ unittest.makeSuite(IFBTreePyTest),
unittest.makeSuite(TestIFBTrees),
+ unittest.makeSuite(TestIFBTreesPy),
unittest.makeSuite(TestIFMultiUnion),
+ unittest.makeSuite(TestIFMultiUnionPy),
unittest.makeSuite(PureIF),
+ unittest.makeSuite(PureIFPy),
unittest.makeSuite(IFBTreeConflictTests),
+ unittest.makeSuite(IFBTreePyConflictTests),
unittest.makeSuite(IFBucketConflictTests),
+ unittest.makeSuite(IFBucketPyConflictTests),
unittest.makeSuite(IFTreeSetConflictTests),
+ unittest.makeSuite(IFTreeSetPyConflictTests),
unittest.makeSuite(IFSetConflictTests),
+ unittest.makeSuite(IFSetPyConflictTests),
+ unittest.makeSuite(IFModuleTest),
))
More information about the checkins
mailing list