[Zope-Checkins] SVN: Zope/trunk/src/Products/ZCatalog/tests/test Whitespace and remove some code fossils
Hanno Schlichting
hannosch at hannosch.eu
Sat Jul 31 14:44:28 EDT 2010
Log message for revision 115275:
Whitespace and remove some code fossils
Changed:
U Zope/trunk/src/Products/ZCatalog/tests/testBrains.py
U Zope/trunk/src/Products/ZCatalog/tests/testCatalog.py
U Zope/trunk/src/Products/ZCatalog/tests/testLazySequences.py
-=-
Modified: Zope/trunk/src/Products/ZCatalog/tests/testBrains.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/tests/testBrains.py 2010-07-31 18:43:15 UTC (rev 115274)
+++ Zope/trunk/src/Products/ZCatalog/tests/testBrains.py 2010-07-31 18:44:28 UTC (rev 115275)
@@ -11,9 +11,8 @@
#
##############################################################################
"""Unittests for Catalog brains
+"""
-$Id$"""
-
import unittest
import Acquisition
from zExceptions import Unauthorized
@@ -35,20 +34,20 @@
"""Object that raises ConflictError when accessed"""
def check(self):
raise ConflictError
-
+
class DummyRequest(Acquisition.Implicit):
-
+
def physicalPathToURL(self, path, relative=False):
if not relative:
path = 'http://superbad.com' + path
return path
_marker = object()
-
+
class DummyCatalog(Acquisition.Implicit):
-
- _objs = {'/happy':Happy('happy'),
- '/secret':Secret('secret'),
+
+ _objs = {'/happy':Happy('happy'),
+ '/secret':Secret('secret'),
'/conflicter':Conflicter('conflicter')}
_paths = _objs.keys() + ['/zonked']
_paths.sort()
@@ -71,26 +70,26 @@
if default is not _marker:
return default
raise
-
+
def getpath(self, rid):
return self._paths[rid]
-
+
def getobject(self, rid):
return self.restrictedTraverse(self._paths[rid])
def resolve_url(self, path, REQUEST):
path = path[path.find('/', path.find('//')+1):] # strip server part
return self.restrictedTraverse(path)
-
+
class ConflictingCatalog(DummyCatalog):
-
+
def getpath(self, rid):
raise ConflictError
class BrainsTestBase:
_old_flag = None
-
+
def setUp(self):
self.cat = DummyCatalog()
self.cat.REQUEST = DummyRequest()
@@ -108,7 +107,7 @@
def _restore_getOb_flag(self):
from Products.ZCatalog import CatalogBrains
CatalogBrains.GETOBJECT_RAISES = self._old_flag
-
+
def _makeBrain(self, rid):
from Products.ZCatalog.CatalogBrains import AbstractCatalogBrain
class Brain(AbstractCatalogBrain):
@@ -120,38 +119,38 @@
self.failUnless(b.has_key('test_field'))
self.failUnless(b.has_key('data_record_id_'))
self.failIf(b.has_key('godel'))
-
+
def testGetPath(self):
b = [self._makeBrain(rid) for rid in range(3)]
self.assertEqual(b[0].getPath(), '/conflicter')
self.assertEqual(b[1].getPath(), '/happy')
self.assertEqual(b[2].getPath(), '/secret')
-
+
def testGetPathPropagatesConflictErrors(self):
self.cat = ConflictingCatalog()
b = self._makeBrain(0)
self.assertRaises(ConflictError, b.getPath)
-
+
def testGetURL(self):
b = self._makeBrain(0)
self.assertEqual(b.getURL(), 'http://superbad.com/conflicter')
-
+
def testGetRID(self):
b = self._makeBrain(42)
self.assertEqual(b.getRID(), 42)
-
+
def testGetObjectHappy(self):
b = self._makeBrain(1)
self.assertEqual(b.getPath(), '/happy')
self.failUnless(b.getObject().aq_base is self.cat.getobject(1).aq_base)
-
+
def testGetObjectPropagatesConflictErrors(self):
b = self._makeBrain(0)
self.assertEqual(b.getPath(), '/conflicter')
self.assertRaises(ConflictError, b.getObject)
class TestBrains(BrainsTestBase, unittest.TestCase):
-
+
def _flag_value(self):
return True
@@ -160,16 +159,16 @@
b = self._makeBrain(2)
self.assertEqual(b.getPath(), '/secret')
self.assertRaises(Unauthorized, b.getObject)
-
+
def testGetObjectRaisesNotFoundForMissing(self):
from zExceptions import NotFound
b = self._makeBrain(3)
self.assertEqual(b.getPath(), '/zonked')
self.assertRaises(KeyError, self.cat.getobject, 3)
self.assertRaises((NotFound, AttributeError, KeyError), b.getObject)
-
+
class TestBrainsOldBehavior(BrainsTestBase, unittest.TestCase):
-
+
def _flag_value(self):
return False
@@ -177,18 +176,15 @@
b = self._makeBrain(2)
self.assertEqual(b.getPath(), '/secret')
self.assertEqual(b.getObject(), None)
-
+
def testGetObjectReturnsNoneForMissing(self):
b = self._makeBrain(3)
self.assertEqual(b.getPath(), '/zonked')
self.assertRaises(KeyError, self.cat.getobject, 3)
- self.assertEqual(b.getObject(), None)
+ self.assertEqual(b.getObject(), None)
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestBrains))
suite.addTest(unittest.makeSuite(TestBrainsOldBehavior))
return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: Zope/trunk/src/Products/ZCatalog/tests/testCatalog.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/tests/testCatalog.py 2010-07-31 18:43:15 UTC (rev 115274)
+++ Zope/trunk/src/Products/ZCatalog/tests/testCatalog.py 2010-07-31 18:44:28 UTC (rev 115275)
@@ -259,7 +259,7 @@
self._catalog.reindexIndex('title', {})
data = self._catalog.getMetadataForUID('0')
self.assertEqual(data['title'], '0')
-
+
def testReindexIndexesFalse(self):
# setup
false_id = self.upper + 1
@@ -873,6 +873,3 @@
suite.addTest( unittest.makeSuite( TestMerge ) )
suite.addTest( unittest.makeSuite( TestZCatalogGetObject ) )
return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: Zope/trunk/src/Products/ZCatalog/tests/testLazySequences.py
===================================================================
--- Zope/trunk/src/Products/ZCatalog/tests/testLazySequences.py 2010-07-31 18:43:15 UTC (rev 115274)
+++ Zope/trunk/src/Products/ZCatalog/tests/testLazySequences.py 2010-07-31 18:44:28 UTC (rev 115275)
@@ -11,9 +11,8 @@
#
##############################################################################
"""Unittests for Lazy sequence classes
+"""
-$Id$"""
-
import unittest
class BaseSequenceTest(unittest.TestCase):
@@ -60,7 +59,7 @@
seq3 = list(letters)
lcat = apply(self._createLSeq,
[self._createLSeq(seq) for seq in (seq1, seq2, seq3)])
- self._compare(lcat[5:-5], seq1[5:] + seq2 + seq3[:-5])
+ self._compare(lcat[5:-5], seq1[5:] + seq2 + seq3[:-5])
def testConsistentLength(self):
# Unaccessed length
@@ -102,7 +101,7 @@
class TestLazyFilter(TestLazyCat):
def _createLSeq(self, *seq):
return self._createLFilter(lambda x: True, *seq)
-
+
def _createLFilter(self, filter, *seq):
from Products.ZCatalog.Lazy import LazyFilter
totalseq = []
@@ -162,7 +161,7 @@
def testConsistentLengthWithMop(self):
from string import letters
-
+
seq = range(10) + list(letters)
def filter(x):
if isinstance(x, int):
@@ -214,6 +213,3 @@
suite.addTest(unittest.makeSuite(TestLazyMop))
suite.addTest(unittest.makeSuite(TestLazyValues))
return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
More information about the Zope-Checkins
mailing list