The ZCatalog tests now work without importing the Zope package. Yehaw!

lib/python/Products/ZCatalog/tests/testCatalog.py

@@ -4,7 +4,9 @@
 
 import os,sys, unittest
 
-import Zope
+import ZODB, OFS.Application
+from ZODB.DemoStorage import DemoStorage
+from ZODB.DB import DB
 from Products.ZCatalog import ZCatalog,Vocabulary
 from Products.ZCatalog.Catalog import Catalog,CatalogError
 import ExtensionClass
@@ -18,6 +20,27 @@ from Products.PluginIndexes.KeywordIndex.KeywordIndex import KeywordIndex
 import whrandom,string, unittest
 
 
+def createDatabase():
+    # XXX We have to import and init products in order for PluginIndexes to
+    # be registered.
+    OFS.Application.import_products()
+
+    # Create a DemoStorage and put an Application in it
+    db = DB(DemoStorage())
+    conn = db.open()
+    root = conn.root()
+    app = OFS.Application.Application()
+    root['Application'] = app
+    get_transaction().commit()
+
+    # Init products
+    OFS.Application.initialize(app)
+
+    return app
+
+app = createDatabase()
+
+
 ################################################################################
 # Stuff of Chris
 ################################################################################