[Zope-Checkins] CVS: Zope2 - testCatalog.py:1.1.2.21

Andreas Jung andreas@yetix.digicool.com
Thu, 8 Mar 2001 13:42:30 -0500


Update of /mnt/cvs-repository/Zope2/lib/python/Products/ZCatalog/tests
In directory yetix:/work/Zope2/CatalogUnit/lib/python/Products/ZCatalog/tests

Modified Files:
      Tag: Catalog-Unittest-Branch
	testCatalog.py 
Log Message:
fixed typo



--- Updated File testCatalog.py in package test --
--- testCatalog.py	2001/03/07 14:58:40	1.1.2.20
+++ testCatalog.py	2001/03/08 18:42:28	1.1.2.21
@@ -7,6 +7,12 @@
     Andreas Jung, andreas@digicool.com
     
     $Log$
+    Revision 1.1.2.21  2001/03/08 18:42:28  andreas
+    fixed typo
+
+    Revision 1.1.4.4  2001/03/08 12:14:27  andreas
+    minor changes
+
     Revision 1.1.2.20  2001/03/07 14:58:40  andreas
     *** empty log message ***
 
@@ -44,11 +50,12 @@
 from Products.ZCatalog import Catalog,Vocabulary
 import Persistence
 import ExtensionClass
-import dispatcher,keywords
+from Testing import dispatcher
+import keywords
 from zLOG import LOG
 
 import getopt,whrandom,thread,time,string,mailbox,rfc822
-from unittest import TestCase, TestSuite, TextTestRunner
+from Testing.unittest import TestCase, TestSuite, TextTestRunner
 
 
 # maximum number of files to read for the test suite
@@ -146,6 +153,7 @@
         
 
     def catMessage(self,m):
+        print m.dict["message-id"]
         self._catalog.catalogObject( testMessage(m) , m.dict["message-id"] )
         
     def uncatMessage(self,uid):
@@ -225,11 +233,10 @@
         
 class testSearches(dispatcher.Dispatcher,TestCase):
     """ test searches """
-
-    def __init__(self,func,args=(),kw={}):
 
+    def __init__(self,func,*args,**kw):
 
-        TestCase.__init__(self,func,args,kw)
+        TestCase.__init__(self,func,args,kw) 
         dispatcher.Dispatcher.__init__(self)
 
         self.init_phase = 0
@@ -559,16 +566,16 @@
     if '-b' in optsLst:
 
         basic_tests = [
-             testSearches("testFulltextIndex",(),{"numThreads": 1}),
-             testSearches("testFulltextIndex",(),{"numThreads": 4}),
-             testSearches("testFieldIndex",(),{"numThreads": 1}),
-             testSearches("testFieldIndex",(),{"numThreads": 4}),
-             testSearches("testFieldRangeIndex",(),{"numThreads": 1}),
-             testSearches("testFieldRangeIndex",(),{"numThreads": 4}),
-             testSearches("testKeywordIndex",(),{"numThreads": 1}),
-             testSearches("testKeywordIndex",(),{"numThreads": 4}),
-             testSearches("testKeywordRangeIndex",(),{"numThreads": 1}),
-             testSearches("testKeywordRangeIndex",(),{"numThreads": 4})
+             testSearches("testFulltextIndex",numThreads=1),
+             testSearches("testFulltextIndex",numThreads= 4),
+             testSearches("testFieldIndex",numThreads= 1),
+             testSearches("testFieldIndex",numThreads= 4),
+             testSearches("testFieldRangeIndex",numThreads=1),
+             testSearches("testFieldRangeIndex",numThreads= 4),
+             testSearches("testKeywordIndex",numThreads= 1),
+             testSearches("testKeywordIndex",numThreads= 4),
+             testSearches("testKeywordRangeIndex",numThreads= 1),
+             testSearches("testKeywordRangeIndex",numThreads=4)
         ]
 
         testsuite1 = TestSuite()



--- Updated File testCatalog.py in package Zope2 --
--- testCatalog.py	2001/03/07 14:58:40	1.1.2.20
+++ testCatalog.py	2001/03/08 18:42:28	1.1.2.21
@@ -7,6 +7,12 @@
     Andreas Jung, andreas@digicool.com
     
     $Log$
+    Revision 1.1.2.21  2001/03/08 18:42:28  andreas
+    fixed typo
+
+    Revision 1.1.4.4  2001/03/08 12:14:27  andreas
+    minor changes
+
     Revision 1.1.2.20  2001/03/07 14:58:40  andreas
     *** empty log message ***
 
@@ -44,11 +50,12 @@
 from Products.ZCatalog import Catalog,Vocabulary
 import Persistence
 import ExtensionClass
-import dispatcher,keywords
+from Testing import dispatcher
+import keywords
 from zLOG import LOG
 
 import getopt,whrandom,thread,time,string,mailbox,rfc822
-from unittest import TestCase, TestSuite, TextTestRunner
+from Testing.unittest import TestCase, TestSuite, TextTestRunner
 
 
 # maximum number of files to read for the test suite
@@ -146,6 +153,7 @@
         
 
     def catMessage(self,m):
+        print m.dict["message-id"]
         self._catalog.catalogObject( testMessage(m) , m.dict["message-id"] )
         
     def uncatMessage(self,uid):
@@ -225,11 +233,10 @@
         
 class testSearches(dispatcher.Dispatcher,TestCase):
     """ test searches """
-
-    def __init__(self,func,args=(),kw={}):
 
+    def __init__(self,func,*args,**kw):
 
-        TestCase.__init__(self,func,args,kw)
+        TestCase.__init__(self,func,args,kw) 
         dispatcher.Dispatcher.__init__(self)
 
         self.init_phase = 0
@@ -559,16 +566,16 @@
     if '-b' in optsLst:
 
         basic_tests = [
-             testSearches("testFulltextIndex",(),{"numThreads": 1}),
-             testSearches("testFulltextIndex",(),{"numThreads": 4}),
-             testSearches("testFieldIndex",(),{"numThreads": 1}),
-             testSearches("testFieldIndex",(),{"numThreads": 4}),
-             testSearches("testFieldRangeIndex",(),{"numThreads": 1}),
-             testSearches("testFieldRangeIndex",(),{"numThreads": 4}),
-             testSearches("testKeywordIndex",(),{"numThreads": 1}),
-             testSearches("testKeywordIndex",(),{"numThreads": 4}),
-             testSearches("testKeywordRangeIndex",(),{"numThreads": 1}),
-             testSearches("testKeywordRangeIndex",(),{"numThreads": 4})
+             testSearches("testFulltextIndex",numThreads=1),
+             testSearches("testFulltextIndex",numThreads= 4),
+             testSearches("testFieldIndex",numThreads= 1),
+             testSearches("testFieldIndex",numThreads= 4),
+             testSearches("testFieldRangeIndex",numThreads=1),
+             testSearches("testFieldRangeIndex",numThreads= 4),
+             testSearches("testKeywordIndex",numThreads= 1),
+             testSearches("testKeywordIndex",numThreads= 4),
+             testSearches("testKeywordRangeIndex",numThreads= 1),
+             testSearches("testKeywordRangeIndex",numThreads=4)
         ]
 
         testsuite1 = TestSuite()