Merge unit test change from 2.4 branch

lib/python/Products/PluginIndexes/tests/framework.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+
+######################################################################
+# Set up unit testing framework
+#
+# The following code should be at the top of every test module:
+#
+# import os, sys
+# execfile(os.path.join(sys.path[0], 'framework.py'))
+#
+# ...and the following at the bottom:
+#
+# framework()
+
+
+# Find the Testing package
+if not sys.modules.has_key('Testing'):
+    p0 = sys.path[0]
+    if p0 and __name__ == '__main__':
+        os.chdir(p0)
+        p0 = ''
+    p = d = os.path.abspath(os.curdir)
+    while d:
+        if os.path.isdir(os.path.join(p, 'Testing')):
+            sys.path[:1] = [p0, os.pardir, p]
+            break
+        p, d = os.path.split(p)
+    else:
+        print 'Unable to locate Testing package.'
+        sys.exit(1)
+
+import Testing, unittest
+execfile(os.path.join(os.path.split(Testing.__file__)[0], 'common.py'))
+
+

lib/python/Products/PluginIndexes/tests/testFieldIndex.py

@@ -83,17 +83,11 @@
 # 
 ##############################################################################
 
-import sys
-sys.path.insert(0, '.')
-try:
-    import Testing
-except ImportError:
-    sys.path[0] = '../../'
-    import Testing
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
 import ZODB
-import unittest
-from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex
+from FieldIndex.FieldIndex import FieldIndex
 
 class Dummy:
 
@@ -167,7 +161,7 @@ class TestCase( unittest.TestCase ):
         for k, v in expectedValues:
             assert k in result
     
-    def testEmpty( self ):
+    def checkEmpty( self ):
         "Test an empty FieldIndex."
 
         assert len( self._index ) == 0
@@ -188,7 +182,7 @@ class TestCase( unittest.TestCase ):
         self._checkApply( self._max_req, [] )
         self._checkApply( self._range_req, [] )
     
-    def testPopulated( self ):
+    def checkPopulated( self ):
         """ Test a populated FieldIndex """
         self._populateIndex()
         values = self._values
@@ -213,21 +207,21 @@ class TestCase( unittest.TestCase ):
         self._checkApply( self._max_req, values[ :3 ] + values[ -2: ] )
         self._checkApply( self._range_req, values[ 2:5 ] )
 
-    def testZero( self ):
+    def checkZero( self ):
         """ Make sure 0 gets indexed """
         self._populateIndex()
         values = self._values
         self._checkApply( self._zero_req, values[ -2:-1 ] )
         assert 0 in self._index.uniqueValues( 'foo' )
 
-    def testNone(self):
+    def checkNone(self):
         """ make sure None gets indexed """
         self._populateIndex()
         values = self._values
         self._checkApply(self._none_req, values[-1:])
         assert None in self._index.uniqueValues('foo')
 
-    def testRange(self):
+    def checkRange(self):
         """Test a range search"""
         index = FieldIndex( 'foo' )
         for i in range(100):
@@ -249,21 +243,4 @@ class TestCase( unittest.TestCase ):
         assert r==expect, r 
             
         
-def test_suite():
-    return unittest.makeSuite( TestCase )
-
-def debug():
-    return test_suite().debug()
-
-def pdebug():
-    import pdb
-    pdb.run('debug()')
-
-def main():
-    unittest.TextTestRunner().run( test_suite() )
-
-if __name__ == '__main__':
-   if len(sys.argv) > 1:
-      globals()[sys.argv[1]]()
-   else:
-      main()
+framework()

lib/python/Products/PluginIndexes/tests/testKeywordIndex.py

@@ -83,15 +83,9 @@
 # 
 ##############################################################################
 import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
-sys.path.insert(0, os.getcwd())
-try: import unittest
-except:
-    sys.path[0]=os.path.join(sys.path[0],'..','..')
-    import unittest
-
-import ZODB
-from Products.PluginIndexes.KeywordIndex.KeywordIndex  import KeywordIndex
+from KeywordIndex.KeywordIndex import KeywordIndex
 
 class Dummy:
 
@@ -153,21 +147,12 @@ class TestCase( unittest.TestCase ):
 
     def testAddObjectWOKeywords(self):
 
-
-        import zLOG
-
-        def log_write(subsystem, severity, summary, detail, error,
-                      PROBLEM=zLOG.PROBLEM):
-            if severity >= PROBLEM:
-                assert 0, "%s(%s): %s" % (subsystem, severity, summary)
-
-        old_log_write=zLOG.log_write
-        zLOG.log_write=log_write
+        catch_log_errors()
         try:
             self._populateIndex()
             self._index.index_object(999, None)
         finally:
-            zLOG.log_write=old_log_write
+            ignore_log_errors()
     
     def testEmpty( self ):
         assert len( self._index ) == 0
@@ -249,22 +234,4 @@ class TestCase( unittest.TestCase ):
         assert len(result) == 1
         assert result[0] == 8
 
-def test_suite():
-    return unittest.makeSuite( TestCase )
-
-def main():
-    unittest.TextTestRunner().run( test_suite() )
-
-def debug():
-    test_suite().debug()
-
-def pdebug():
-    import pdb
-    pdb.run('debug()')
-
-if __name__ == '__main__':
-    if len(sys.argv) > 1:
-        globals()[sys.argv[1]]()
-    else:
-        main()
-    
+framework()    

lib/python/Products/PluginIndexes/tests/testPathIndex.py

@@ -83,16 +83,10 @@
 # 
 ##############################################################################
 
-import sys
-sys.path.insert(0, '.')
-try:
-    import Testing
-except ImportError:
-    sys.path[0] = '../../'
-    import Testing
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
-import unittest
-from Products.PluginIndexes.PathIndex.PathIndex import PathIndex
+from PathIndex.PathIndex import PathIndex
 
 
 class Dummy:
@@ -194,22 +188,4 @@ class TestCase( unittest.TestCase ):
                 lst = list(res[0].keys())
                 assert lst==results,res
     
-        
-def test_suite():
-    return unittest.makeSuite( TestCase )
-
-def debug():
-    return test_suite().debug()
-
-def pdebug():
-    import pdb
-    pdb.run('debug()')
-
-def main():
-    unittest.TextTestRunner().run( test_suite() )
-
-if __name__ == '__main__':
-   if len(sys.argv) > 1:
-      globals()[sys.argv[1]]()
-   else:
-      main()
+framework()

lib/python/Products/PluginIndexes/tests/testSplitter.py

@@ -83,17 +83,10 @@
 # 
 ##############################################################################
 
-import sys
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
-try: import ZODB
-except:
-    import os
-    sys.path.insert(0, os.getcwd())
-    sys.path.insert(0, '../..')
-    import ZODB
-
-import unittest
-from Products.PluginIndexes.TextIndex import Splitter
+from TextIndex import Splitter
 
 Splitter = Splitter.getSplitter()
 
@@ -122,22 +115,4 @@ class TestSplitter(unittest.TestCase):
        r = map(None, a)
        assert r == ['without', 'you', 'nothing'], r
        
-def test_suite():
-   return unittest.makeSuite(TestSplitter, 'test')
-
-def main():
-   unittest.TextTestRunner().run(test_suite())
-
-def debug():
-   test_suite().debug()
-
-def pdebug():
-    import pdb
-    pdb.run('debug()')
-   
-if __name__=='__main__':
-   if len(sys.argv) > 1:
-      globals()[sys.argv[1]]()
-   else:
-      main()
-
+framework()

lib/python/Products/PluginIndexes/tests/testTextIndex.py

@@ -83,29 +83,12 @@
 # 
 ##############################################################################
 
-import sys, os
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
-sys.path.insert(0, os.getcwd())
-try: import unittest
-except:
-    sys.path[0]=os.path.join(sys.path[0],'..','..')
-    import unittest
+from Testing.ZODButil import makeDB, cleanDB
 
-class Dummy:
-
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
-import zLOG
-
-def log_write(subsystem, severity, summary, detail, error):
-    if severity >= zLOG.PROBLEM:
-        assert 0, "%s(%s): %s" % (subsystem, severity, summary)
-
-zLOG.log_write=log_write
-
-import ZODB, ZODB.DemoStorage, ZODB.FileStorage
-from Products.PluginIndexes.TextIndex import TextIndex,GlobbingLexicon
+from TextIndex import TextIndex, GlobbingLexicon
 
 class Tests(unittest.TestCase):
 
@@ -114,14 +97,12 @@ class Tests(unittest.TestCase):
        self.doc=Dummy(text='this is the time, when all good zopes')
 
    def dbopen(self):
-       n = 'fs_tmp__%s' % os.getpid()
-       s = ZODB.FileStorage.FileStorage(n)
-       db=self.db=ZODB.DB(s)
-       self.jar=db.open()
-       if not self.jar.root().has_key('index'):
-           self.jar.root()['index']=TextIndex.TextIndex('text')
+       db = self.db = makeDB()
+       jar = self.jar = db.open()
+       if not jar.root().has_key('index'):
+           jar.root()['index'] = TextIndex.TextIndex('text')
            get_transaction().commit()
-       return self.jar.root()['index']
+       return jar.root()['index']
 
    def dbclose(self):
        self.jar.close()
@@ -133,18 +114,19 @@ class Tests(unittest.TestCase):
        get_transaction().abort()
        if hasattr(self, 'jar'):
            self.dbclose()
-           os.system('rm -f fs_tmp__*')
+           cleanDB()
+       self.__dict__.clear()
 
-   def checkSimpleAddDelete(self):
-       "Check that we can add and delete an object without error"
+   def testSimpleAddDelete(self):
+       "Test that we can add and delete an object without error"
        self.index.index_object(0, self.doc)
        self.index.index_object(1, self.doc)
        self.doc.text='spam is good, spam is fine, span span span'
        self.index.index_object(0, self.doc)
        self.index.unindex_object(0)
 
-   def checkPersistentUpdate1(self):
-       "Check simple persistent indexing"
+   def testPersistentUpdate1(self):
+       "Test simple persistent indexing"
        index=self.dbopen()
 
        self.doc.text='this is the time, when all good zopes'
@@ -169,8 +151,8 @@ class Tests(unittest.TestCase):
        r=list(r[0].keys())
        assert  r == [0,1], r
 
-   def checkPersistentUpdate2(self):
-       "Check less simple persistent indexing"
+   def testPersistentUpdate2(self):
+       "Test less simple persistent indexing"
        index=self.dbopen()
 
        self.doc.text='this is the time, when all good zopes'
@@ -217,63 +199,10 @@ class Tests(unittest.TestCase):
        """I hope I get to work on time""",
        ]
 
-   def checkGlobQuery(self):
-       "Check a glob query"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'m*n'})
-       r=list(r[0].keys())
-       assert  r == [0,2], r
-
-   def checkAndQuery(self):
-       "Check an AND query"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'time and country'})
-       r=list(r[0].keys())
-       assert  r == [0,], r
-
-   def checkOrQuery(self):
-       "Check an OR query"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'time or country'})
-       r=list(r[0].keys())
-       assert  r == [0,1,6], r
-
-   def checkNearQuery(self):
-       """Check a NEAR query.. (NOTE:ACTUALLY AN 'OR' TEST!!)"""
-       # NEAR never worked, so Zopes post-2.3.1b3 define near to mean OR
+   def globTest(self, qmap, rlist):
+       "Test a glob query"
+       index = getattr(self, '_v_index', None)
+       if index is None:
            index=self.dbopen()
            index._lexicon = GlobbingLexicon.GlobbingLexicon()
 
@@ -284,129 +213,64 @@ class Tests(unittest.TestCase):
 
            self.dbclose()
 
-       index=self.dbopen()
+           index = self._v_index = self.dbopen()
 
-       r = index._apply_index({'text':'time near country'})
-       r=list(r[0].keys())
-       assert  r == [0,1,6], r
+       r = list(index._apply_index(qmap)[0].keys())
+       assert  r == rlist, r
        
-   def checkAndNotQuery(self):
-       "Check an ANDNOT query"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
+   def testStarQuery(self):
+       "Test a star query"
+       self.globTest({'text':'m*n'}, [0,2])
 
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
+   def testAndQuery(self):
+       "Test an AND query"
+       self.globTest({'text':'time and country'}, [0,])
 
-       self.dbclose()
+   def testOrQuery(self):
+       "Test an OR query"
+       self.globTest({'text':'time or country'}, [0,1,6])
 
-       index=self.dbopen()
+   def testDefOrQuery(self):
+       "Test a default OR query"
+       self.globTest({'text':'time country'}, [0,1,6])
 
-       r = index._apply_index({'text':'time and not country'})
-       r=list(r[0].keys())
-       assert  r == [6], r
+   def testNearQuery(self):
+       """Test a NEAR query.. (NOTE:ACTUALLY AN 'AND' TEST!!)"""
+       # NEAR never worked, so Zopes post-2.3.1b3 define near to mean AND
+       self.globTest({'text':'time ... country'}, [0,])
 
-   def checkParenMatchingQuery(self):
-       "Check a query with parens"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'(time and country) men'})
-       r=list(r[0].keys())
-       assert  r == [0], r
-
-       r = index._apply_index({'text':'(time and not country) or men'})
-       r=list(r[0].keys())
-       assert  r == [0, 6], r
-
-   def checkQuoteMatchingQuery(self):
-       "Check a query with quotes.. this is known to fail under 2.3.1b3-"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-
-
-       r = index._apply_index({'text':'"now is the time"'})
-       r=list(r[0].keys())
-       assert  r == [], r
-
-       r = index._apply_index({'text':'"This is the time"'})
-       r=list(r[0].keys())
-       assert  r == [0], r
-
-   def checkTextIndexOperatorQuery(self):
-       "Check a query with 'textindex_operator' in the request"
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'time men','textindex_operator':'and'})
-       r=list(r[0].keys())
-       assert  r == [0], r
-
-   def checkNonExistentWord(self):
-       """ Check for nonexistent word """
-       index=self.dbopen()
-       index._lexicon = GlobbingLexicon.GlobbingLexicon()
-
-       for i in range(len(self.sample_texts)):
-           self.doc.text=self.sample_texts[i]
-           index.index_object(i, self.doc)
-           get_transaction().commit()
-
-       self.dbclose()
-
-       index=self.dbopen()
-
-       r = index._apply_index({'text':'zop'})
-       r=list(r[0].keys())
-       assert  r == [], r
+   def testQuotesQuery(self):
+       """Test a quoted query"""
+       self.globTest({'text':'"This is the time"'}, [0,])
+       self.globTest({'text':'"now is the time"'}, [])
 
+   def testAndNotQuery(self):
+       "Test an ANDNOT query"
+       self.globTest({'text':'time and not country'}, [6,])
 
-def test_suite():
-   return unittest.makeSuite(Tests, 'check')
+   def testParenMatchingQuery(self):
+       "Test a query with parens"
+       self.globTest({'text':'(time and country) men'}, [0,])
+       self.globTest({'text':'(time and not country) or men'}, [0, 6])
 
-def main():
-   unittest.TextTestRunner().run(test_suite())
+   def testTextIndexOperatorQuery(self):
+       "Test a query with 'operator' in the request"
+       self.globTest({'text': {'query': 'time men', 'operator':'and'}}, [0,])
 
-def debug():
-   test_suite().debug()
+   def testNonExistentWord(self):
+       """ Test for nonexistent word """
+       self.globTest({'text':'zop'}, [])
        
-def pdebug():
-    import pdb
-    pdb.run('debug()')
+   def testShortWord(self):
+       """ Test for short word """
+       self.globTest({'text':'to'}, [0, 2, 6])
+       self.globTest({'text':'*to'}, [0, 2, 6])
+       self.globTest({'text':'to*'}, [0, 2, 6])
+       self.globTest({'text':'*to*'}, [0, 2, 6])
        
-if __name__=='__main__':
-   if len(sys.argv) > 1:
-      globals()[sys.argv[1]]()
-   else:
-      main()
+   def testComplexQuery1(self):
+       """ Test complex query 1 """
+       self.globTest({'text':'((?ount* or get) and not wait) '
+                      '"been *ert*"'}, [0, 1, 5, 6])
 
+framework()

lib/python/Products/PythonScripts/tests/framework.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+
+######################################################################
+# Set up unit testing framework
+#
+# The following code should be at the top of every test module:
+#
+# import os, sys
+# execfile(os.path.join(sys.path[0], 'framework.py'))
+#
+# ...and the following at the bottom:
+#
+# framework()
+
+
+# Find the Testing package
+if not sys.modules.has_key('Testing'):
+    p0 = sys.path[0]
+    if p0 and __name__ == '__main__':
+        os.chdir(p0)
+        p0 = ''
+    p = d = os.path.abspath(os.curdir)
+    while d:
+        if os.path.isdir(os.path.join(p, 'Testing')):
+            sys.path[:1] = [p0, os.pardir, p]
+            break
+        p, d = os.path.split(p)
+    else:
+        print 'Unable to locate Testing package.'
+        sys.exit(1)
+
+import Testing, unittest
+execfile(os.path.join(os.path.split(Testing.__file__)[0], 'common.py'))
+
+

lib/python/Products/PythonScripts/tests/testPythonScript.py

@@ -82,30 +82,21 @@
 # attributions are listed in the accompanying credits file.
 # 
 ##############################################################################
-import sys
-
-try:
-    sys.path.insert(0, '.')
-    import ZODB
-except:
-    sys.path.insert(0, '../../..')
-    import ZODB
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
 
+import ZODB
 from Products.PythonScripts.PythonScript import PythonScript
 from AccessControl.SecurityManagement import newSecurityManager
 
 newSecurityManager(None, None)
 
-from unittest import TestCase, TestSuite, VerboseTextTestRunner, makeSuite
-
-TextTestRunner = VerboseTextTestRunner
-
 # Test Classes
 
 def readf(name):
     return open('tscripts/%s%s' % (name, '.ps'), 'r').read()
 
-class TestPythonScriptNoAq(TestCase):
+class TestPythonScriptNoAq(unittest.TestCase):
     def _newPS(self, txt, bind=None):
         ps = PythonScript('ps')
         ps.ZBindings_edit(bind or {})
@@ -217,29 +208,5 @@ class TestPythonScriptNoAq(TestCase):
         true = self._newPS(readf('boolean_map'))()
         assert true
 
-
-test_classes = (TestPythonScriptNoAq,)
-
-# unit test machinery
-
-def test_suite():
-    ts = []
-    for tclass in test_classes:
-        ts.append(makeSuite(tclass, 'test'))
-    
-    return TestSuite(tuple(ts))
-
-def main():
-    alltests=test_suite()
-    runner = TextTestRunner()
-    runner.run(alltests)
-
-def debug():
-   test_suite().debug()
-    
-if __name__=='__main__':
-   if len(sys.argv) > 1:
-      globals()[sys.argv[1]]()
-   else:
-      main()
+framework()
 

lib/python/Testing/ZODButil.py

+import os
+from glob import glob
+import ZODB
+from ZODB.FileStorage import FileStorage
+
+def makeDB():
+    s = FileStorage('fs_tmp__%s' % os.getpid())
+    return ZODB.DB(s)
+
+def cleanDB():
+    for fn in glob('fs_tmp__*'):
+        os.remove(fn)
+    

lib/python/Testing/__init__.py

@@ -85,29 +85,20 @@
 """
 Set up testing environment
 
-$Id: __init__.py,v 1.2 2001/03/15 13:16:25 jim Exp $
+$Id: __init__.py,v 1.3 2001/08/06 17:20:30 evan Exp $
 """
-import os, sys
-startfrom = head = os.getcwd()
+import os
 
-while 1:
-    sys.path[0]=startfrom
-    try:
-        import ZODB
-    except ImportError:
-        head = os.path.split(startfrom)[0]
-        if head == '':
-            raise "Couldn't import ZODB"
-        startfrom = head
-        continue
-    else:
-        break
+def pdir(path):
+    return os.path.split(path)[0]
 
-os.environ['SOFTWARE_HOME']=os.environ.get('SOFTWARE_HOME', startfrom)
+# Set the INSTANCE_HOME to the Testing package directory
+os.environ['INSTANCE_HOME'] = INSTANCE_HOME = pdir(__file__)
 
-os.environ['INSTANCE_HOME']=os.environ.get(
-    'INSTANCE_HOME',
-    os.path.join(os.environ['SOFTWARE_HOME'],'..','..')
-    )
+# Set the SOFTWARE_HOME to the directory containing the Testing package
+os.environ['SOFTWARE_HOME'] = SOFTWARE_HOME = pdir(INSTANCE_HOME)
+
+# Prevent useless initialization by pretending to be a ZEO client
+os.environ['ZEO_CLIENT'] = '1'
 
 

lib/python/Testing/common.py

+# Default test runner
+TestRunner = unittest.TextTestRunner
+
+def framework():
+    if __name__ != '__main__':
+        return
+    if len(sys.argv) > 1:
+        errs = globals()[sys.argv[1]]()
+    else:
+        errs = TestRunner().run(test_suite())
+    sys.exit(errs and 1 or 0)
+
+def debug():
+    test_suite().debug()
+
+def pdebug():
+    import pdb
+    pdb.run('debug()')
+
+def test_suite():
+    # The default test suite includes every subclass of TestCase in
+    # the module, with 'test' as the test method prefix.
+    ClassType = type(unittest.TestCase)
+    tests = []
+    for v in globals().values():
+        if isinstance(v, ClassType) and issubclass(v, unittest.TestCase):
+            tests.append(unittest.makeSuite(v))
+    if len(tests) > 1:
+        return unittest.TestSuite(tests)
+    if len(tests) == 1:
+        return tests[0]
+    return
+
+class Dummy:
+    '''Utility class for quick & dirty instances'''
+    def __init__(self, **kw):
+        self.__dict__.update(kw)
+
+    def __str__( self ):
+        return 'Dummy(%s)' % `self.__dict__`
+    
+    __repr__ = __str__
+
+def catch_log_errors():
+    import zLOG
+
+    if hasattr(zLOG, 'old_log_write'):
+        return
+
+    def log_write(subsystem, severity, summary, detail, error,
+                  PROBLEM=zLOG.PROBLEM):
+        if severity >= PROBLEM:
+            assert 0, "%s(%s): %s" % (subsystem, severity, summary)
+
+    zLOG.old_log_write = zLOG.log_write
+    zLOG.log_write = log_write
+
+def ignore_log_errors():
+    import zLOG
+
+    if hasattr(zLOG, 'old_log_write'):
+        zLOG.log_write = zLOG.old_log_write
+        del zLOG.old_log_write
+
+def Testing_file(*args):
+    dir = os.path.split(Testing.__file__)[0]
+    return apply(os.path.join, (dir,) + args)

lib/python/Testing/custom_zodb.py

+import ZODB, os
+from ZODB.FileStorage import FileStorage
+from ZODB.DemoStorage import DemoStorage
+
+dfi = os.path.join(SOFTWARE_HOME, '..', '..', 'var', 'Data.fs.in')
+dfi = os.path.abspath(dfi)
+Storage = DemoStorage(base=FileStorage(dfi, read_only=1), quota=(1<<20))

utilities/testrunner.py

@@ -65,13 +65,11 @@ class TestRunner:
         return function()
 
     def smellsLikeATest(self, filepath, find=string.find):
-        file=open(filepath, 'r')
-        lines=file.readlines()
+        file = open(filepath, 'r')
+        text = file.read()
         file.close()
-        for line in lines:
-            if find(line, 'def test_suite(') > -1:
-                return 1
-        return 0
+        return ((find(text, 'unittest') > -1) or
+                (find(text, 'framework.py') > -1))
 
     def runSuite(self, suite):
         runner=pyunit.TextTestRunner()