[Zope-Checkins] CVS: Products/PluginIndexes/tests - framework.py:1.1.2.1 testFieldIndex.py:1.3.4.1 testKeywordIndex.py:1.2.4.1 testPathIndex.py:1.2.4.1 testSplitter.py:1.2.4.1 testTextIndex.py:1.2.4.1
Evan Simpson
evan@cvs.zope.org
Mon, 6 Aug 2001 13:16:42 -0400
Update of /cvs-repository/Products/PluginIndexes/tests
In directory cvs.zope.org:/tmp/cvs-serv1419/Products/PluginIndexes/tests
Modified Files:
Tag: Zope-2_4-branch
testFieldIndex.py testKeywordIndex.py testPathIndex.py
testSplitter.py testTextIndex.py
Added Files:
Tag: Zope-2_4-branch
framework.py
Log Message:
Added new unit test framework, changed several test suites to use it.
=== Added File Products/PluginIndexes/tests/framework.py ===
=== Products/PluginIndexes/tests/testFieldIndex.py 1.3 => 1.3.4.1 ===
##############################################################################
-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 @@
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 @@
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 @@
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 @@
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()
=== Products/PluginIndexes/tests/testKeywordIndex.py 1.2 => 1.2.4.1 ===
##############################################################################
import os, sys
-
-sys.path.insert(0, os.getcwd())
-try: import unittest
-except:
- sys.path[0]=os.path.join(sys.path[0],'..','..')
- import unittest
+execfile(os.path.join(sys.path[0], 'framework.py'))
-import ZODB
-from Products.PluginIndexes.KeywordIndex.KeywordIndex import KeywordIndex
+from KeywordIndex.KeywordIndex import KeywordIndex
class Dummy:
@@ -153,21 +147,12 @@
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 @@
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()
=== Products/PluginIndexes/tests/testPathIndex.py 1.2 => 1.2.4.1 ===
##############################################################################
-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:
@@ -193,23 +187,5 @@
res = self._index._apply_index({"path":{'query':path,"level":level}})
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()
=== Products/PluginIndexes/tests/testSplitter.py 1.2 => 1.2.4.1 ===
##############################################################################
-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 @@
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()
=== Products/PluginIndexes/tests/testTextIndex.py 1.2 => 1.2.4.1 ===
##############################################################################
-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 @@
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 @@
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 @@
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'
@@ -216,197 +198,79 @@
"""This license has been certified as Open Source(tm).""",
"""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
- 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 near country'})
- r=list(r[0].keys())
- assert r == [0,1,6], r
-
- def checkAndNotQuery(self):
- "Check an ANDNOT 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 not country'})
- r=list(r[0].keys())
- assert r == [6], r
-
- 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()
+ 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()
+
+ 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()
+ self.dbclose()
- index=self.dbopen()
+ index = self._v_index = self.dbopen()
- r = index._apply_index({'text':'zop'})
- r=list(r[0].keys())
- assert r == [], r
+ r = list(index._apply_index(qmap)[0].keys())
+ assert r == rlist, r
+ def testStarQuery(self):
+ "Test a star query"
+ self.globTest({'text':'m*n'}, [0,2])
+
+ def testAndQuery(self):
+ "Test an AND query"
+ self.globTest({'text':'time and country'}, [0,])
+
+ def testOrQuery(self):
+ "Test an OR query"
+ self.globTest({'text':'time or country'}, [0,1,6])
+
+ def testDefOrQuery(self):
+ "Test a default OR query"
+ self.globTest({'text':'time country'}, [0,1,6])
+
+ 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 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 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 testTextIndexOperatorQuery(self):
+ "Test a query with 'operator' in the request"
+ self.globTest({'text': {'query': 'time men', 'operator':'and'}}, [0,])
+
+ def testNonExistentWord(self):
+ """ Test for nonexistent word """
+ self.globTest({'text':'zop'}, [])
+
+ 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])
+
+ def testComplexQuery1(self):
+ """ Test complex query 1 """
+ self.globTest({'text':'((?ount* or get) and not wait) '
+ '"been *ert*"'}, [0, 1, 5, 6])
-def test_suite():
- return unittest.makeSuite(Tests, 'check')
-
-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()