test fixes and checking of indexer overwrites (xapian currently fails)

Author: Richard Jones

test/db_test_base.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: db_test_base.py,v 1.64 2006-01-30 00:36:26 richard Exp $
+# $Id: db_test_base.py,v 1.65 2006-02-07 04:14:32 richard Exp $
 
 import unittest, os, shutil, errno, imp, sys, time, pprint, sets
 
@@ -26,7 +26,7 @@
 from mocknull import MockNull
 
 config = configuration.CoreConfig()
-config.DATABASE = "_test_dir"
+config.DATABASE = "db"
 config.RDBMS_NAME = "rounduptest"
 config.RDBMS_HOST = "localhost"
 config.RDBMS_USER = "rounduptest"
@@ -1108,7 +1108,7 @@ def testImportExport(self):
                 for itemprops in items[1:]:
                     id = int(klass.import_list(names, itemprops))
                     if hasattr(klass, 'import_files'):
-                        klass.import_files('_test_export', id)
+                        klass.import_files('_test_export', str(id))
                     maxid = max(maxid, id)
                 self.db.setid(cn, str(maxid+1))
                 klass.import_journals(journals[cn])

test/test_indexer.py

@@ -18,13 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# $Id: test_indexer.py,v 1.8 2005-04-28 09:06:09 richard Exp $
+# $Id: test_indexer.py,v 1.9 2006-02-07 04:14:32 richard Exp $
 
 import os, unittest, shutil
 
 class db:
-    class config:
+    class config(dict):
         DATABASE = 'test-index'
+    config = config()
+    config[('main', 'indexer_stopwords')] = []
 
 class IndexerTest(unittest.TestCase):
     def setUp(self):
@@ -44,6 +46,10 @@ def test_basics(self):
         self.assertEqual(self.dex.find(['blah']), [('test', '2', 'foo')])
         self.assertEqual(self.dex.find(['blah', 'hello']), [])
 
+        # change
+        self.dex.add_text(('test', '1', 'foo'), 'a the hello')
+        self.assertEqual(self.dex.find(['world']), [('test', '2', 'foo')])
+
     def tearDown(self):
         shutil.rmtree('test-index')