Test pure-Python IF entities everywhere.

BTrees/check.py

@@ -33,6 +33,7 @@ that doesn't exist in the actual BTree).
 """
 
 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

BTrees/tests/test_IFBTree.py

@@ -36,6 +36,13 @@ class IFBTreeInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
         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 @@ class IFTreeSetInternalKeyTest(InternalKeysSetTest, unittest.TestCase):
         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 @@ class IFBucketTest(MappingBase, unittest.TestCase):
         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,27 +92,48 @@ class IFSetTest(ExtendedSetTests, unittest.TestCase):
         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 TestIFBTrees(unittest.TestCase):
+    class IFBTreePyTest(BTreeTests, TestLongIntKeys, unittest.TestCase):
 
         def _makeOne(self):
-        from BTrees.IFBTree import IFBTree
-        return IFBTree()
+            from BTrees.IFBTree import IFBTreePy
+            return IFBTreePy()
+
+        def getTwoValues(self):
+            return 0.5, 1.5
+
+
+class _TestIFBTreesBase(unittest.TestCase):
 
     def testNonIntegerKeyRaises(self):
         self.assertRaises(TypeError, self._stringraiseskey)
@@ -114,36 +164,89 @@ class TestIFBTrees(unittest.TestCase):
     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 @@ class PureIF(SetResult, unittest.TestCase):
         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 @@ class IFBTreeConflictTests(MappingConflictTestBase, unittest.TestCase):
         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 @@ class IFBucketConflictTests(MappingConflictTestBase, unittest.TestCase):
         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 @@ class IFTreeSetConflictTests(SetConflictTestBase, unittest.TestCase):
         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 @@ class IFSetConflictTests(SetConflictTestBase, unittest.TestCase):
         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 @@ class IFModuleTest(ModuleTest, unittest.TestCase):
 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),
     ))