[Plone-cvs] r27910 - in ResourceRegistries/trunk/Products/ResourceRegistries: skins tests tests/skins tests/test_profile

[David G. <svn...@pl...>]

Author: davisagli
Date: Thu Jul  9 07:00:58 2009
New Revision: 27910

Added:
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/skins/
      - copied from r27909, ResourceRegistries/trunk/Products/ResourceRegistries/skins/
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/test_profile/skins.xml   (contents, props changed)
Removed:
   ResourceRegistries/trunk/Products/ResourceRegistries/skins/
Modified:
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/RegistryTestCase.py
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/test.zcml
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/testCSSRegistry.py
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/testExportImport.py
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/testJSRegistry.py
   ResourceRegistries/trunk/Products/ResourceRegistries/tests/testKSSRegistry.py
Log:
load the test skin layer in the test setup, so we don't have to install it in real Plone sites

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/RegistryTestCase.py
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/RegistryTestCase.py	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/RegistryTestCase.py	Thu Jul  9 07:00:58 2009
@@ -1,7 +1,23 @@
+import transaction
+from Testing import ZopeTestCase
 from Products.PloneTestCase import PloneTestCase
+from Products.PloneTestCase.layer import onsetup
+from Products.Five.zcml import load_config
 
 PloneTestCase.setupPloneSite()
 
+@onsetup
+def load_zcml():
+    import Products.ResourceRegistries.tests
+    load_config('test.zcml', Products.ResourceRegistries.tests)
+    
+    site = ZopeTestCase.app().plone
+    tool = site.portal_setup
+    profile_id = 'profile-Products.ResourceRegistries.tests:test'
+    result = tool.runImportStepFromProfile(profile_id, 'skins')
+    transaction.commit()
+load_zcml()
+
 class RegistryTestCase(PloneTestCase.PloneTestCase):
     pass
 

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/test.zcml
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/test.zcml	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/test.zcml	Thu Jul  9 07:00:58 2009
@@ -1,8 +1,13 @@
 <configure xmlns="http://namespaces.zope.org/zope"
        xmlns:browser="http://namespaces.zope.org/browser"
        xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+       xmlns:cmf="http://namespaces.zope.org/cmf"
        i18n_domain="ResourceRegistries.tests">
 
+  <cmf:registerDirectory
+      name="ResourceRegistries"
+      />
+
   <browser:resource
       name="test_rr_1.css"
       file="test_rr_1.css"

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/testCSSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/testCSSRegistry.py	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/testCSSRegistry.py	Thu Jul  9 07:00:58 2009
@@ -1,7 +1,7 @@
 #
 # CSSRegistry Tests
 #
-from zope.component import getUtility, getMultiAdapter
+from zope.component import getMultiAdapter
 from zope.contentprovider.interfaces import IContentProvider
 
 from App.Common import rfc1123_date
@@ -12,7 +12,7 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.utils import getToolByName
 
-from Products.PloneTestCase.PloneTestCase import PLONE21, portal_owner, default_password
+from Products.PloneTestCase.PloneTestCase import portal_owner, default_password
 
 from Products.ResourceRegistries.config import CSSTOOLNAME
 from Products.ResourceRegistries.interfaces import ICSSRegistry
@@ -807,10 +807,6 @@
     'Publishing with Five'
 
     def afterSetUp(self):
-        # Define some resource
-        from Products.Five.zcml import load_config
-        import Products.ResourceRegistries.tests
-        load_config('test.zcml', Products.ResourceRegistries.tests)
         self.tool = getattr(self.portal, CSSTOOLNAME)
         self.tool.clearResources()
         self.tool.registerStylesheet('++resource++test_rr_1.css')

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/testExportImport.py
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/testExportImport.py	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/testExportImport.py	Thu Jul  9 07:00:58 2009
@@ -6,9 +6,6 @@
     def test_removing(self):
         # Test that you can tell the resource registries to remove a
         # resource (a javascript here) using xml.
-        from Products.Five.zcml import load_config
-        import Products.ResourceRegistries.tests
-        load_config('test.zcml', Products.ResourceRegistries.tests)
         tool = self.portal.portal_setup
         profile_id = 'profile-Products.ResourceRegistries.tests:test'
         # The next line used to throw an UnboundLocalError:

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/testJSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/testJSRegistry.py	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/testJSRegistry.py	Thu Jul  9 07:00:58 2009
@@ -1,7 +1,7 @@
 #
 # JSRegistry Tests
 #
-from zope.component import getUtility, getMultiAdapter
+from zope.component import getMultiAdapter
 from zope.contentprovider.interfaces import IContentProvider
 
 from App.Common import rfc1123_date
@@ -12,13 +12,12 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.utils import getToolByName
 
-from Products.PloneTestCase.PloneTestCase import PLONE21, portal_owner, default_password
+from Products.PloneTestCase.PloneTestCase import portal_owner, default_password
 
 from Products.ResourceRegistries.config import JSTOOLNAME
 from Products.ResourceRegistries.interfaces import IJSRegistry
 from Products.ResourceRegistries.tests.RegistryTestCase import RegistryTestCase
 from Products.ResourceRegistries.tests.RegistryTestCase import FunctionalRegistryTestCase
-from Products.ResourceRegistries.tools.packer import test_suite as packer_tests
 
 class TestJSImplementation(RegistryTestCase):
 
@@ -505,9 +504,6 @@
 
     def afterSetUp(self):
         # Define some resource
-        from Products.Five.zcml import load_config
-        import Products.ResourceRegistries.tests
-        load_config('test.zcml', Products.ResourceRegistries.tests)
         self.tool = getattr(self.portal, JSTOOLNAME)
         self.tool.clearResources()
         self.tool.registerScript('++resource++test_rr_1.js')
@@ -877,9 +873,6 @@
 class TestUnicodeAwareness(RegistryTestCase):
 
     def afterSetUp(self):
-        from Products.Five.zcml import load_config
-        import Products.ResourceRegistries.tests
-        load_config('test.zcml', Products.ResourceRegistries.tests)
         self.tool = getattr(self.portal, JSTOOLNAME)
         self.tool.clearResources()
         body = "/* add a comment with unicode\n   \xc3\x9bercool! */\nwindow.alert('running')\n"

Modified: ResourceRegistries/trunk/Products/ResourceRegistries/tests/testKSSRegistry.py
==============================================================================
--- ResourceRegistries/trunk/Products/ResourceRegistries/tests/testKSSRegistry.py	(original)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/testKSSRegistry.py	Thu Jul  9 07:00:58 2009
@@ -12,7 +12,7 @@
 from Products.CMFCore.Expression import Expression
 from Products.CMFCore.utils import getToolByName
 
-from Products.PloneTestCase.PloneTestCase import PLONE21, portal_owner, default_password
+from Products.PloneTestCase.PloneTestCase import portal_owner, default_password
 
 from Products.ResourceRegistries.config import KSSTOOLNAME
 from Products.ResourceRegistries.interfaces import IKSSRegistry
@@ -657,9 +657,6 @@
 
     def afterSetUp(self):
         # Define some resource
-        from Products.Five.zcml import load_config
-        import Products.ResourceRegistries.tests
-        load_config('test.zcml', Products.ResourceRegistries.tests)
         self.tool = getattr(self.portal, KSSTOOLNAME)
         self.tool.clearResources()
         self.tool.registerKineticStylesheet('++resource++test_rr_1.kss')

Added: ResourceRegistries/trunk/Products/ResourceRegistries/tests/test_profile/skins.xml
==============================================================================
--- (empty file)
+++ ResourceRegistries/trunk/Products/ResourceRegistries/tests/test_profile/skins.xml	Thu Jul  9 07:00:58 2009
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<object name="portal_skins">
+ <object name="ResourceRegistries" meta_type="Filesystem Directory View"
+    directory="Products.ResourceRegistries.tests:skins/ResourceRegistries"/>
+ <skin-path name="Plone Default">
+  <layer name="ResourceRegistries" insert-after="custom"/>
+ </skin-path>
+</object>