[Plone-cvs] r28150 - in plone.contentrules/trunk: . docs plone/contentrules plone/contentrules/rule

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Wed Jul 22 23:34:01 2009
New Revision: 28150

Modified:
   plone.contentrules/trunk/docs/HISTORY.txt
   plone.contentrules/trunk/plone/contentrules/rule/eventvocab.py
   plone.contentrules/trunk/plone/contentrules/tests.py
   plone.contentrules/trunk/setup.py
Log:
Cleaned up tests to rely on a minimal amount of packages.


Modified: plone.contentrules/trunk/docs/HISTORY.txt
==============================================================================
--- plone.contentrules/trunk/docs/HISTORY.txt	(original)
+++ plone.contentrules/trunk/docs/HISTORY.txt	Wed Jul 22 23:34:01 2009
@@ -4,6 +4,9 @@
 
 plone.contentrules - 2.0 - unreleased
 
+    - Cleaned up tests to rely on a minimal amount of packages.
+      [hannosch]
+
     - Clarified license and copyright.
       [hannosch]
 

Modified: plone.contentrules/trunk/plone/contentrules/rule/eventvocab.py
==============================================================================
--- plone.contentrules/trunk/plone/contentrules/rule/eventvocab.py	(original)
+++ plone.contentrules/trunk/plone/contentrules/rule/eventvocab.py	Wed Jul 22 23:34:01 2009
@@ -1,7 +1,7 @@
 from zope.schema.interfaces import IVocabularyFactory
 from zope.interface import classProvides
 
-from zope.app.component.vocabulary import UtilityVocabulary
+from zope.componentvocabulary.vocabulary import UtilityVocabulary
 from plone.contentrules.rule.interfaces import IRuleEventType
 
 class EventTypesVocabulary(UtilityVocabulary):

Modified: plone.contentrules/trunk/plone/contentrules/tests.py
==============================================================================
--- plone.contentrules/trunk/plone/contentrules/tests.py	(original)
+++ plone.contentrules/trunk/plone/contentrules/tests.py	Wed Jul 22 23:34:01 2009
@@ -1,35 +1,31 @@
 import unittest
 
-import zope.annotation
-import zope.security
-import zope.app.security
-import zope.app.component
-import zope.app.container
-
-import plone.contentrules
-
-from zope.testing import doctest
-from zope.app.testing.placelesssetup import setUp, tearDown
+from zope.component.testing import PlacelessSetup as CAPlacelessSetup
 from zope.configuration.xmlconfig import XMLConfig
+from zope.container.testing import PlacelessSetup as ContainerPlacelessSetup
+from zope.testing import doctest
 
 optionflags = doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS
 
+class PlacelessSetup(CAPlacelessSetup, ContainerPlacelessSetup):
+
+    def setUp(self, doctesttest=None):
+        CAPlacelessSetup.setUp(self)
+        ContainerPlacelessSetup.setUp(self)
+
+ps = PlacelessSetup()
+
+
 def configurationSetUp(test):
-    setUp()
-    
-    XMLConfig('meta.zcml', zope.security)()
-    XMLConfig('meta.zcml', zope.app.security)()
-    XMLConfig('meta.zcml', zope.app.component)()
-    
-    XMLConfig('configure.zcml', zope.app.security)()
-    XMLConfig('configure.zcml', zope.app.container)()
-    XMLConfig('configure.zcml', zope.annotation)()
-    
+    ps.setUp()
+    import zope.component
+    XMLConfig('meta.zcml', zope.component)()
+
+    import plone.contentrules
     XMLConfig('configure.zcml', plone.contentrules)()
-    # XMLConfig('meta.zcml', plone.contentrules)()
 
 def configurationTearDown(test):
-    tearDown()
+    ps.tearDown()
 
 def test_suite():
     return unittest.TestSuite((
@@ -47,4 +43,4 @@
 
 
 if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
\ No newline at end of file
+    unittest.main(defaultTest='test_suite')

Modified: plone.contentrules/trunk/setup.py
==============================================================================
--- plone.contentrules/trunk/setup.py	(original)
+++ plone.contentrules/trunk/setup.py	Wed Jul 22 23:34:01 2009
@@ -1,5 +1,4 @@
 from setuptools import setup, find_packages
-import sys, os
 
 version = '2.0'
 
@@ -33,9 +32,7 @@
       extras_require=dict(
           test=[
             'zope.lifecycleevent',
-            'zope.security',
             'zope.testing',
-            'zope.app.testing',
           ]
       ),
       install_requires=[
@@ -43,12 +40,11 @@
         'ZODB3',
         'zope.annotation',
         'zope.component',
+        'zope.componentvocabulary',
         'zope.configuration',
         'zope.i18nmessageid',
         'zope.interface',
         'zope.schema',
-        'zope.app.component',
         'zope.app.container',
-        'zope.app.security',
       ],
       )