[Checkins] SVN: BTrees/branches/pure_python/ Move OI/OO-related set-op tests into OI/OO test modules.
Tres Seaver
cvs-admin at zope.org
Sun Nov 11 18:55:54 UTC 2012
Log message for revision 128227:
Move OI/OO-related set-op tests into OI/OO test modules.
Changed:
_U BTrees/branches/pure_python/
U BTrees/branches/pure_python/BTrees/tests/testSetOps.py
U BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py
U BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py
-=-
Modified: BTrees/branches/pure_python/BTrees/tests/testSetOps.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/testSetOps.py 2012-11-11 18:55:52 UTC (rev 128226)
+++ BTrees/branches/pure_python/BTrees/tests/testSetOps.py 2012-11-11 18:55:53 UTC (rev 128227)
@@ -19,40 +19,6 @@
from .common import itemsToSet
from .common import makeBuilder
-class PureOO(SetResult, unittest.TestCase):
- def union(self, *args):
- from BTrees.OOBTree import union
- return union(*args)
- def intersection(self, *args):
- from BTrees.OOBTree import intersection
- return intersection(*args)
- def difference(self, *args):
- from BTrees.OOBTree import difference
- return difference(*args)
- def builders(self):
- from BTrees.OOBTree import OOBTree
- from BTrees.OOBTree import OOBucket
- from BTrees.OOBTree import OOTreeSet
- from BTrees.OOBTree import OOSet
- return OOSet, OOTreeSet, makeBuilder(OOBTree), makeBuilder(OOBucket)
-
-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
- from BTrees.OIBTree import OITreeSet
- from BTrees.OIBTree import OISet
- return OISet, OITreeSet, makeBuilder(OIBTree), makeBuilder(OIBucket)
-
class PureOL(SetResult, unittest.TestCase):
def union(self, *args):
from BTrees.OLBTree import union
@@ -157,29 +123,6 @@
else:
self.fail("OOBTree shouldn't have multiunion")
-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
- from BTrees.OIBTree import OITreeSet
- from BTrees.OIBTree import OISet
- return OIBucket, OIBTree, itemsToSet(OISet), itemsToSet(OITreeSet)
-
class TestWeightedOL(Weighted, unittest.TestCase):
def weightedUnion(self):
from BTrees.OLBTree import weightedUnion
@@ -207,11 +150,6 @@
def test_suite():
return unittest.TestSuite((
- unittest.makeSuite(PureOO),
-
- unittest.makeSuite(PureOI),
- unittest.makeSuite(TestWeightedOI),
-
unittest.makeSuite(PureOL),
unittest.makeSuite(TestWeightedOL),
Modified: BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py 2012-11-11 18:55:52 UTC (rev 128226)
+++ BTrees/branches/pure_python/BTrees/tests/test_OIBTree.py 2012-11-11 18:55:53 UTC (rev 128227)
@@ -13,15 +13,19 @@
##############################################################################
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 TestLongIntValues
-from BTrees.tests.common import TypeTest
+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 NormalSetTests
+from .common import SetResult
+from .common import TestLongIntValues
+from .common import TypeTest
+from .common import Weighted
+from .common import itemsToSet
+from .common import makeBuilder
from BTrees.IIBTree import using64bits #XXX Ugly, but necessary
@@ -120,6 +124,48 @@
self.assertEqual(b.keys()[0], 30)
+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
+ from BTrees.OIBTree import OITreeSet
+ from BTrees.OIBTree import OISet
+ return OISet, OITreeSet, makeBuilder(OIBTree), makeBuilder(OIBucket)
+
+
+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
+ from BTrees.OIBTree import OITreeSet
+ from BTrees.OIBTree import OISet
+ return OIBucket, OIBTree, itemsToSet(OISet), itemsToSet(OITreeSet)
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(OIBTreeInternalKeyTest),
@@ -130,4 +176,7 @@
unittest.makeSuite(OIModuleTest),
unittest.makeSuite(OIBTreeTest),
unittest.makeSuite(TestOIBTrees),
+
+ unittest.makeSuite(PureOI),
+ unittest.makeSuite(TestWeightedOI),
))
Modified: BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py
===================================================================
--- BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py 2012-11-11 18:55:52 UTC (rev 128226)
+++ BTrees/branches/pure_python/BTrees/tests/test_OOBTree.py 2012-11-11 18:55:53 UTC (rev 128227)
@@ -13,13 +13,15 @@
##############################################################################
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 .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 NormalSetTests
+from .common import SetResult
+from .common import makeBuilder
class OOBTreeInternalKeyTest(InternalKeysMappingTest, unittest.TestCase):
@@ -157,6 +159,24 @@
return BTrees.Interfaces.IObjectObjectBTreeModule
+class PureOO(SetResult, unittest.TestCase):
+ def union(self, *args):
+ from BTrees.OOBTree import union
+ return union(*args)
+ def intersection(self, *args):
+ from BTrees.OOBTree import intersection
+ return intersection(*args)
+ def difference(self, *args):
+ from BTrees.OOBTree import difference
+ return difference(*args)
+ def builders(self):
+ from BTrees.OOBTree import OOBTree
+ from BTrees.OOBTree import OOBucket
+ from BTrees.OOBTree import OOTreeSet
+ from BTrees.OOBTree import OOSet
+ return OOSet, OOTreeSet, makeBuilder(OOBTree), makeBuilder(OOBucket)
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(OOBTreeInternalKeyTest),
@@ -173,4 +193,6 @@
unittest.makeSuite(OOBTreeTest),
unittest.makeSuite(OOBTreePyTest),
unittest.makeSuite(OOModuleTest),
+
+ unittest.makeSuite(PureOO),
))
More information about the checkins
mailing list