[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/plonetesting/test Rename testing helper module to fit the naming convention

[Wolfgang Schnerring]

Log message for revision 119173:
  Rename testing helper module to fit the naming convention
  

Changed:
  A   gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py
  D   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/isolation.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py

-=-
Copied: gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py (from rev 119171, gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/isolation.py)
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	                        (rev 0)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	2010-12-28 08:48:27 UTC (rev 119173)
@@ -0,0 +1,51 @@
+#############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+from zope.configuration import xmlconfig
+
+from plone.testing import Layer
+from plone.testing.z2 import STARTUP
+from plone.testing.z2 import FunctionalTesting
+
+from gocept.selenium import plonetesting
+import gocept.selenium.tests.isolation
+
+
+class Isolation(Layer):
+
+    defaultBases = (STARTUP, )
+
+    def setUp(self):
+        context = self['configurationContext']
+        xmlconfig.file('testing.zcml', package=plonetesting.tests,
+            context=context)
+
+ISOLATION = Isolation()
+
+FUNCTIONAL_ISOLATION = FunctionalTesting(bases=(ISOLATION,),
+    name="gocept.selenium:FunctionalIsolation")
+
+
+class IsolationTests(gocept.selenium.tests.isolation.IsolationTests):
+    """plone.testing implementation of methods needed by base class"""
+
+    @property
+    def selenium(self):
+        return self.layer['selenese']
+
+    def getDatabase(self):
+        return self.layer['zodbDB']
+
+    def getRootFolder(self):
+        return self.layer['app']

Deleted: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/isolation.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/isolation.py	2010-12-28 08:39:15 UTC (rev 119172)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/isolation.py	2010-12-28 08:48:27 UTC (rev 119173)
@@ -1,51 +0,0 @@
-#############################################################################
-#
-# Copyright (c) 2010 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-
-from zope.configuration import xmlconfig
-
-from plone.testing import Layer
-from plone.testing.z2 import STARTUP
-from plone.testing.z2 import FunctionalTesting
-
-from gocept.selenium import plonetesting
-import gocept.selenium.tests.isolation
-
-
-class Isolation(Layer):
-
-    defaultBases = (STARTUP, )
-
-    def setUp(self):
-        context = self['configurationContext']
-        xmlconfig.file('testing.zcml', package=plonetesting.tests,
-            context=context)
-
-ISOLATION = Isolation()
-
-FUNCTIONAL_ISOLATION = FunctionalTesting(bases=(ISOLATION,),
-    name="gocept.selenium:FunctionalIsolation")
-
-
-class IsolationTests(gocept.selenium.tests.isolation.IsolationTests):
-    """plone.testing implementation of methods needed by base class"""
-
-    @property
-    def selenium(self):
-        return self.layer['selenese']
-
-    def getDatabase(self):
-        return self.layer['zodbDB']
-
-    def getRootFolder(self):
-        return self.layer['app']

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py	2010-12-28 08:39:15 UTC (rev 119172)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py	2010-12-28 08:48:27 UTC (rev 119173)
@@ -22,10 +22,10 @@
 from plone.app.testing.layers import SITE_OWNER_PASSWORD
 
 from gocept.selenium import plonetesting
-from gocept.selenium.plonetesting.tests import isolation
+from gocept.selenium.plonetesting import testing
 
 PLONE_ISOLATION = FunctionalTesting(
-    bases=(isolation.ISOLATION, PLONE_FIXTURE),
+    bases=(testing.ISOLATION, PLONE_FIXTURE),
     name="gocept.selenium:PloneIsolation")
 
 PLONE_SELENIUM = plone.testing.Layer(
@@ -34,7 +34,7 @@
 
 
 class Plone3Tests(unittest.TestCase,
-    isolation.IsolationTests):
+    testing.IsolationTests):
 
     layer = PLONE_SELENIUM
 

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py	2010-12-28 08:39:15 UTC (rev 119172)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py	2010-12-28 08:48:27 UTC (rev 119173)
@@ -22,10 +22,10 @@
 from plone.app.testing.layers import SITE_OWNER_PASSWORD
 
 from gocept.selenium import plonetesting
-from gocept.selenium.plonetesting.tests import isolation
+from gocept.selenium.plonetesting import testing
 
 PLONE_ISOLATION = FunctionalTesting(
-    bases=(isolation.ISOLATION, PLONE_FIXTURE),
+    bases=(testing.ISOLATION, PLONE_FIXTURE),
     name="gocept.selenium:PloneIsolation")
 
 PLONE_SELENIUM = plone.testing.Layer(
@@ -34,7 +34,7 @@
 
 
 class Plone4Tests(unittest.TestCase,
-    isolation.IsolationTests):
+    testing.IsolationTests):
 
     layer = PLONE_SELENIUM
 

Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py	2010-12-28 08:39:15 UTC (rev 119172)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/zope2/test_zope2.py	2010-12-28 08:48:27 UTC (rev 119173)
@@ -11,20 +11,21 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import unittest
 
+import gocept.selenium.plonetesting
+import gocept.selenium.plonetesting.testing
 import plone.testing
-from gocept.selenium import plonetesting
-from gocept.selenium.plonetesting.tests import isolation
+import unittest
 
 
 ZOPE2_ISOLATION = plone.testing.Layer(
-    bases=(plonetesting.SELENIUM, isolation.FUNCTIONAL_ISOLATION,),
+    bases=(gocept.selenium.plonetesting.SELENIUM,
+           gocept.selenium.plonetesting.testing.FUNCTIONAL_ISOLATION,),
     name="gocept.selenium:Zope2")
 
 
 class Zope2Tests(unittest.TestCase,
-    isolation.IsolationTests):
+    gocept.selenium.plonetesting.testing.IsolationTests):
 
     layer = ZOPE2_ISOLATION