[Checkins] SVN: BTrees/branches/pure_python/ Move IF-related set-op tests into IF test module.

[Tres Seaver]

Log message for revision 128223:
  Move IF-related set-op tests into IF test module.

Changed:
  _U  BTrees/branches/pure_python/
  U   BTrees/branches/pure_python/BTrees/tests/testSetOps.py
  U   BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py

-=-
Modified: BTrees/branches/pure_python/BTrees/tests/testSetOps.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/testSetOps.py	2012-11-11 18:55:48 UTC (rev 128222)
+++ BTrees/branches/pure_python/BTrees/tests/testSetOps.py	2012-11-11 18:55:49 UTC (rev 128223)
@@ -36,23 +36,6 @@
         from BTrees.OOBTree import OOSet
         return OOSet, OOTreeSet, makeBuilder(OOBTree), makeBuilder(OOBucket)
 
-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
-        from BTrees.IFBTree import IFTreeSet
-        from BTrees.IFBTree import IFSet
-        return IFSet, IFTreeSet, makeBuilder(IFBTree), makeBuilder(IFBucket)
-
 class PureOI(SetResult, unittest.TestCase):
     def union(self, *args):
         from BTrees.OIBTree import union
@@ -138,26 +121,6 @@
         from BTrees.OLBTree import OLSet
         return OLSet, OLTreeSet, makeBuilder(OLBTree), makeBuilder(OLBucket)
 
-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 TestLLMultiUnion(MultiUnion, unittest.TestCase):
     def multiunion(self, *args):
         from BTrees.LLBTree import multiunion
@@ -378,9 +341,6 @@
 def test_suite():
     return unittest.TestSuite((
 
-        unittest.makeSuite(TestIFMultiUnion),
-        unittest.makeSuite(PureIF),
-
         unittest.makeSuite(TestLLMultiUnion),
         unittest.makeSuite(PureLL),
         unittest.makeSuite(TestWeightedLL),

Modified: BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py	2012-11-11 18:55:48 UTC (rev 128222)
+++ BTrees/branches/pure_python/BTrees/tests/test_IFBTree.py	2012-11-11 18:55:49 UTC (rev 128223)
@@ -13,14 +13,17 @@
 ##############################################################################
 import unittest
 
-from BTrees.tests.common import BTreeTests
-from BTrees.tests.common import ExtendedSetTests
-from BTrees.tests.common import InternalKeysMappingTest
-from BTrees.tests.common import InternalKeysSetTest
-from BTrees.tests.common import MappingBase
-from BTrees.tests.common import ModuleTest
-from BTrees.tests.common import NormalSetTests
-from BTrees.tests.common import TestLongIntKeys
+from .common import BTreeTests
+from .common import ExtendedSetTests
+from .common import InternalKeysMappingTest
+from .common import InternalKeysSetTest
+from .common import MappingBase
+from .common import ModuleTest
+from .common import MultiUnion
+from .common import NormalSetTests
+from .common import SetResult
+from .common import TestLongIntKeys
+from .common import makeBuilder
 from BTrees.IIBTree import using64bits #XXX Ugly, but unavoidable
 
 
@@ -121,6 +124,43 @@
     def _noneraisesvalue(self):
         self._makeOne()[1] = None
 
+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 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
+        from BTrees.IFBTree import IFTreeSet
+        from BTrees.IFBTree import IFSet
+        return IFSet, IFTreeSet, makeBuilder(IFBTree), makeBuilder(IFBucket)
+
 def test_suite():
     return unittest.TestSuite((
         unittest.makeSuite(IFBTreeInternalKeyTest),
@@ -131,4 +171,7 @@
         unittest.makeSuite(IFModuleTest),
         unittest.makeSuite(IFBTreeTest),
         unittest.makeSuite(TestIFBTrees),
+
+        unittest.makeSuite(TestIFMultiUnion),
+        unittest.makeSuite(PureIF),
     ))