[CMF-checkins] CVS: CMF/CMFCore/tests - test_CatalogTool.py:1.4

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFCore/tests
In directory cvs.zope.org:/tmp/cvs-serv25567/CMFCore/tests

Modified Files:
	test_CatalogTool.py 
Log Message:
- updated CatalogTool interface (Collector #206)
- reindexObjectSecurity() now uses update_metadata=0


=== CMF/CMFCore/tests/test_CatalogTool.py 1.3 => 1.4 ===
--- CMF/CMFCore/tests/test_CatalogTool.py:1.3	Mon Jan  6 15:40:46 2003
+++ CMF/CMFCore/tests/test_CatalogTool.py	Sun Dec  7 12:31:22 2003
@@ -1,7 +1,13 @@
 from unittest import TestCase, TestSuite, makeSuite, main
 
+import Testing
 import Zope
 try:
+    Zope.startup()
+except AttributeError:
+    # for Zope versions before 2.6.1
+    pass
+try:
     from Interface.Verify import verifyClass
 except ImportError:
     # for Zope versions before 2.6.0
@@ -39,10 +45,12 @@
     def test_interface(self):
         from Products.CMFCore.interfaces.portal_catalog \
                 import portal_catalog as ICatalogTool
+        from Products.ZCatalog.IZCatalog import IZCatalog
         from Products.CMFCore.interfaces.portal_actions \
                 import ActionProvider as IActionProvider
 
         verifyClass(ICatalogTool, CatalogTool)
+        verifyClass(IZCatalog, CatalogTool)
         verifyClass(IActionProvider, CatalogTool)