[Checkins] SVN: gocept.selenium/trunk/src/gocept/selenium/plonetesting/test coding style

Wolfgang Schnerring wosc at wosc.de
Tue Dec 28 04:43:53 EST 2010


Log message for revision 119183:
  coding style
  

Changed:
  U   gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.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

-=-
Modified: gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py
===================================================================
--- gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	2010-12-28 09:35:00 UTC (rev 119182)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/testing.py	2010-12-28 09:43:53 UTC (rev 119183)
@@ -12,28 +12,26 @@
 #
 ##############################################################################
 
-from zope.configuration import xmlconfig
+import gocept.selenium.plonetesting.tests
+import plone.testing
+import plone.testing.z2
+import zope.configuration.xmlconfig
 
-from plone.testing import Layer
-from plone.testing.z2 import STARTUP
-from plone.testing.z2 import FunctionalTesting
 
-from gocept.selenium import plonetesting
+class Isolation(plone.testing.Layer):
 
+    defaultBases = (plone.testing.z2.STARTUP,)
 
-class Isolation(Layer):
-
-    defaultBases = (STARTUP, )
-
     def setUp(self):
-        context = self['configurationContext']
-        xmlconfig.file('testing.zcml', package=plonetesting.tests,
-            context=context)
+        zope.configuration.xmlconfig.file(
+            'testing.zcml', package=gocept.selenium.plonetesting.tests,
+            context=self['configurationContext'])
 
 ISOLATION = Isolation()
 
-FUNCTIONAL_ISOLATION = FunctionalTesting(bases=(ISOLATION,),
-    name="gocept.selenium:FunctionalIsolation")
+FUNCTIONAL_ISOLATION = plone.testing.z2.FunctionalTesting(
+    bases=(ISOLATION,),
+    name='FunctionalIsolation')
 
 
 class IsolationTestHelper(object):

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 09:35:00 UTC (rev 119182)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone3/test_plone3.py	2010-12-28 09:43:53 UTC (rev 119183)
@@ -12,32 +12,30 @@
 #
 ##############################################################################
 
-import unittest
-
-import plone.testing
-from plone.testing.z2 import FunctionalTesting
-
-from plone.app.testing.layers import PLONE_FIXTURE
 from plone.app.testing.layers import SITE_OWNER_NAME
 from plone.app.testing.layers import SITE_OWNER_PASSWORD
-
-from gocept.selenium import plonetesting
-from gocept.selenium.plonetesting import testing
+import gocept.selenium.plonetesting
+import gocept.selenium.plonetesting.testing
 import gocept.selenium.tests.isolation
+import plone.app.testing.layers
+import plone.testing
+import plone.testing.z2
+import unittest
 
 
-PLONE_ISOLATION = FunctionalTesting(
-    bases=(testing.ISOLATION, PLONE_FIXTURE),
+PLONE_ISOLATION = plone.testing.z2.FunctionalTesting(
+    bases=(gocept.selenium.plonetesting.testing.ISOLATION,
+           plone.app.testing.layers.PLONE_FIXTURE),
     name="gocept.selenium:PloneIsolation")
 
 PLONE_SELENIUM = plone.testing.Layer(
-    bases=(plonetesting.SELENIUM, PLONE_ISOLATION,),
+    bases=(gocept.selenium.plonetesting.SELENIUM, PLONE_ISOLATION,),
     name="gocept.selenium:Plone3")
 
 
 class Plone3Tests(gocept.selenium.tests.isolation.IsolationTests,
-                  testing.IsolationTestHelper,
-                  plonetesting.TestCase):
+                  gocept.selenium.plonetesting.testing.IsolationTestHelper,
+                  gocept.selenium.plonetesting.TestCase):
 
     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 09:35:00 UTC (rev 119182)
+++ gocept.selenium/trunk/src/gocept/selenium/plonetesting/tests/plone4/test_plone4.py	2010-12-28 09:43:53 UTC (rev 119183)
@@ -12,32 +12,30 @@
 #
 ##############################################################################
 
-import unittest
-
-import plone.testing
-from plone.testing.z2 import FunctionalTesting
-
-from plone.app.testing.layers import PLONE_FIXTURE
 from plone.app.testing.layers import SITE_OWNER_NAME
 from plone.app.testing.layers import SITE_OWNER_PASSWORD
-
-from gocept.selenium import plonetesting
-from gocept.selenium.plonetesting import testing
+import gocept.selenium.plonetesting
+import gocept.selenium.plonetesting.testing
 import gocept.selenium.tests.isolation
+import plone.app.testing.layers
+import plone.testing
+import plone.testing.z2
+import unittest
 
 
-PLONE_ISOLATION = FunctionalTesting(
-    bases=(testing.ISOLATION, PLONE_FIXTURE),
+PLONE_ISOLATION = plone.testing.z2.FunctionalTesting(
+    bases=(gocept.selenium.plonetesting.testing.ISOLATION,
+           plone.app.testing.layers.PLONE_FIXTURE),
     name="gocept.selenium:PloneIsolation")
 
 PLONE_SELENIUM = plone.testing.Layer(
-    bases=(plonetesting.SELENIUM, PLONE_ISOLATION,),
+    bases=(gocept.selenium.plonetesting.SELENIUM, PLONE_ISOLATION,),
     name="gocept.selenium:Plone4")
 
 
 class Plone4Tests(gocept.selenium.tests.isolation.IsolationTests,
-                  testing.IsolationTestHelper,
-                  plonetesting.TestCase):
+                  gocept.selenium.plonetesting.testing.IsolationTestHelper,
+                  gocept.selenium.plonetesting.TestCase):
 
     layer = PLONE_SELENIUM
 



More information about the checkins mailing list