[Plone-cvs] r11821 - ResourceRegistries/branches/1.3/tests

[fschulze <svn...@pl...>]

Author: fschulze
Date: Sat Dec 30 21:05:30 2006
New Revision: 11821

Removed:
   ResourceRegistries/branches/1.3/tests/five_tests_base.py
   ResourceRegistries/branches/1.3/tests/framework.py
   ResourceRegistries/branches/1.3/tests/interfaces.py
   ResourceRegistries/branches/1.3/tests/runalltests.py
   ResourceRegistries/branches/1.3/tests/testSkeleton.py
Modified:
   ResourceRegistries/branches/1.3/tests/RegistryTestCase.py
   ResourceRegistries/branches/1.3/tests/testCSSRegistry.py
   ResourceRegistries/branches/1.3/tests/testJSRegistry.py
Log:
Cleaned up test framework. We now get two errors, but all other tests run with Zope 2.9 now.

Modified: ResourceRegistries/branches/1.3/tests/RegistryTestCase.py
==============================================================================
--- ResourceRegistries/branches/1.3/tests/RegistryTestCase.py	(original)
+++ ResourceRegistries/branches/1.3/tests/RegistryTestCase.py	Sat Dec 30 21:05:30 2006
@@ -1,11 +1,10 @@
-from Products.PloneTestCase.ptc import PloneTestCase, Functional, setupPloneSite
+from Products.PloneTestCase import PloneTestCase
 
-PRODUCTS = ['ResourceRegistries']
+PloneTestCase.setupPloneSite()
 
-setupPloneSite(products=PRODUCTS)
-
-class RegistryTestCase(PloneTestCase):
+class RegistryTestCase(PloneTestCase.PloneTestCase):
     pass
 
-class FunctionalRegistryTestCase(Functional, PloneTestCase):
+class FunctionalRegistryTestCase(PloneTestCase.FunctionalTestCase,
+                                 PloneTestCase.PloneTestCase):
     pass

Modified: ResourceRegistries/branches/1.3/tests/testCSSRegistry.py
==============================================================================
--- ResourceRegistries/branches/1.3/tests/testCSSRegistry.py	(original)
+++ ResourceRegistries/branches/1.3/tests/testCSSRegistry.py	Sat Dec 30 21:05:30 2006
@@ -21,7 +21,6 @@
 from Products.ResourceRegistries.interfaces.ResourceRegistries import ICSSRegistry as z2ICSSRegistry
 from Products.ResourceRegistries.tests.RegistryTestCase import RegistryTestCase
 from Products.ResourceRegistries.tests.RegistryTestCase import FunctionalRegistryTestCase
-from Products.ResourceRegistries.tests.five_tests_base import FiveTestsBase
 
 
 class TestImplementation(RegistryTestCase):
@@ -739,11 +738,10 @@
         self.assertEqual(response.getStatus(), 200)
 
 
-class TestFivePublishing(FunctionalRegistryTestCase, FiveTestsBase):
+class TestFivePublishing(FunctionalRegistryTestCase):
     'Publishing with Five'
 
     def afterSetUp(self):
-        FiveTestsBase.afterSetUp(self)
         # Define some resource
         from Products.Five.zcml import load_string, load_config
         load_string(dedent('''\

Modified: ResourceRegistries/branches/1.3/tests/testJSRegistry.py
==============================================================================
--- ResourceRegistries/branches/1.3/tests/testJSRegistry.py	(original)
+++ ResourceRegistries/branches/1.3/tests/testJSRegistry.py	Sat Dec 30 21:05:30 2006
@@ -21,7 +21,6 @@
 from Products.ResourceRegistries.interfaces import IJSRegistry
 from Products.ResourceRegistries.tests.RegistryTestCase import RegistryTestCase
 from Products.ResourceRegistries.tests.RegistryTestCase import FunctionalRegistryTestCase
-from Products.ResourceRegistries.tests.five_tests_base import FiveTestsBase
 
 
 class TestJSImplementation(RegistryTestCase):
@@ -468,11 +467,10 @@
                          'text/html;charset=utf-8')
         self.assertEqual(response.getStatus(), 200)
 
-class TestFivePublishing(FunctionalRegistryTestCase, FiveTestsBase):
+class TestFivePublishing(FunctionalRegistryTestCase):
     'Publishing with Five'
 
     def afterSetUp(self):
-        FiveTestsBase.afterSetUp(self)
         # Define some resource
         from Products.Five.zcml import load_string, load_config
         load_string(dedent('''\