[Zope-Checkins] CVS: Zope/lib/python/SearchIndex/tests - framework.py:1.2.2.1 testSplitter.py:1.2.40.1 testUnKeywordIndex.py:1.5.36.1 testUnTextIndex.py:1.5.36.1 test_UnIndex.py:1.4.40.1
Shane Hathaway
shane@digicool.com
Thu, 9 Aug 2001 13:34:13 -0400
Update of /cvs-repository/Zope/lib/python/SearchIndex/tests
In directory cvs.zope.org:/tmp/cvs-serv29115/lib/python/SearchIndex/tests
Modified Files:
Tag: NR-branch
testSplitter.py testUnKeywordIndex.py testUnTextIndex.py
test_UnIndex.py
Added Files:
Tag: NR-branch
framework.py
Log Message:
Sync NR-branch with trunk. Sorry about so many checkin messages...
=== Added File Zope/lib/python/SearchIndex/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'))
=== Zope/lib/python/SearchIndex/tests/testSplitter.py 1.2 => 1.2.40.1 ===
#
##############################################################################
+import os, sys
+execfile(os.path.join(sys.path[0], 'framework.py'))
-import sys
-
-try: import ZODB
-except:
- import os
- sys.path.insert(0, os.getcwd())
- sys.path.insert(0, '../..')
- import ZODB
-
-import unittest
from SearchIndex.Splitter import Splitter
class TestSplitter(unittest.TestCase):
@@ -120,22 +112,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()
=== Zope/lib/python/SearchIndex/tests/testUnKeywordIndex.py 1.5 => 1.5.36.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 SearchIndex.UnKeywordIndex import UnKeywordIndex
@@ -249,22 +244,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()
=== Zope/lib/python/SearchIndex/tests/testUnTextIndex.py 1.5 => 1.5.36.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
+catch_log_errors()
+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
import SearchIndex.UnTextIndex
import SearchIndex.GlobbingLexicon
@@ -115,9 +99,7 @@
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)
+ db = self.db = makeDB()
self.jar=db.open()
if not self.jar.root().has_key('index'):
self.jar.root()['index']=SearchIndex.UnTextIndex.UnTextIndex('text')
@@ -134,18 +116,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'
@@ -170,8 +153,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'
@@ -217,195 +200,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 = SearchIndex.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 = SearchIndex.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 = SearchIndex.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 = SearchIndex.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 = SearchIndex.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 = SearchIndex.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 = SearchIndex.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':'"This is the time"'})
- r=list(r[0].keys())
- assert r == [0], r
-
- r = index._apply_index({'text':'"now is the time"'})
- r=list(r[0].keys())
- assert r == [], r
-
- def checkTextIndexOperatorQuery(self):
- "Check a query with 'textindex_operator' in the request"
- index=self.dbopen()
- index._lexicon = SearchIndex.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 = SearchIndex.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 = SearchIndex.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 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()
-
+ 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 'textindex_operator' in the request"
+ self.globTest({'text':'time men', 'textindex_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])
+
+framework()
=== Zope/lib/python/SearchIndex/tests/test_UnIndex.py 1.4 => 1.4.40.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 SearchIndex.UnIndex import UnIndex
class Dummy:
@@ -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()