[Checkins] SVN: zope.component/tseaver-test_cleanup/ Remove imports at test module scope.
Tres Seaver
cvs-admin at zope.org
Tue Jun 26 00:26:56 UTC 2012
Log message for revision 127084:
Remove imports at test module scope.
Changed:
_U zope.component/tseaver-test_cleanup/
U zope.component/tseaver-test_cleanup/src/zope/component/tests/test_security.py
-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test_security.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test_security.py 2012-06-26 00:26:48 UTC (rev 127083)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test_security.py 2012-06-26 00:26:53 UTC (rev 127084)
@@ -17,21 +17,7 @@
from zope.component.testing import PlacelessSetup
-from zope.component.testfiles.views import IV
-from zope.component.testfiles.views import V1
-from zope.component.testfiles.views import R1
-from zope.component.testfiles.views import IR
-from zope.component.tests.examples import Ob3 #XXX
-
-
-_ZCML_TEMPLATE = """<configure
- xmlns='http://namespaces.zope.org/zope'
- i18n_domain='zope'>
- %s
- </configure>"""
-
-
class ResourceViewTests(PlacelessSetup, unittest.TestCase):
def setUp(self):
@@ -49,7 +35,10 @@
def testView(self):
from zope.component import queryMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import V1
ob = Ob3()
request = Request(IV)
self.assertEqual(queryMultiAdapter((ob, request), name=u'test'), None)
@@ -67,9 +56,11 @@
def testMultiView(self):
from zope.component import queryMultiAdapter
+ from zope.component.tests.examples import Ob3
from zope.component.testfiles.adapter import A1
from zope.component.testfiles.adapter import A2
from zope.component.testfiles.adapter import A3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
self._config(
'''
@@ -107,10 +98,13 @@
def testView_w_multiple_factories(self):
from zope.component import queryMultiAdapter
+ from zope.component.tests.examples import Ob3
from zope.component.testfiles.adapter import A1
from zope.component.testfiles.adapter import A2
from zope.component.testfiles.adapter import A3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import V1
self._config(
'''
<view name="test"
@@ -150,7 +144,11 @@
def testViewThatProvidesAnInterface(self):
from zope.component import queryMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IR
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import V1
ob = Ob3()
self.assertEqual(queryMultiAdapter((ob, Request(IR)), IV, u'test'),
None)
@@ -183,7 +181,11 @@
def testUnnamedViewThatProvidesAnInterface(self):
from zope.component import queryMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IR
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import V1
ob = Ob3()
self.assertEqual(queryMultiAdapter((ob, Request(IR)), IV), None)
@@ -217,6 +219,7 @@
from zope.component.testfiles.adapter import A1
from zope.component.testfiles.components import Content
from zope.component.testfiles.components import IContent
+ from zope.component.testfiles.views import IR
from zope.component.testfiles.views import Request
self._config(
'''
@@ -239,9 +242,11 @@
getMultiAdapter, (MyContent(), Request(IR)))
def testInterfaceProtectedView(self):
+ from zope.security.checker import ProxyFactory
from zope.component import getMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
- from zope.security.checker import ProxyFactory
self._config(
'''
<view name="test"
@@ -259,6 +264,8 @@
def testAttributeProtectedView(self):
from zope.component import getMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
from zope.security.checker import ProxyFactory
self._config(
@@ -278,6 +285,8 @@
def testInterfaceAndAttributeProtectedView(self):
from zope.component import getMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
self._config(
'''
@@ -297,6 +306,8 @@
def testDuplicatedInterfaceAndAttributeProtectedView(self):
from zope.component import getMultiAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
self._config(
'''
@@ -346,7 +357,10 @@
def testResource(self):
from zope.component import queryAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import R1
ob = Ob3()
self.assertEqual(
queryAdapter(Request(IV), name=u'test'), None)
@@ -363,7 +377,11 @@
def testResourceThatProvidesAnInterface(self):
from zope.component import queryAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IR
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import R1
ob = Ob3()
self.assertEqual(queryAdapter(Request(IR), IV, u'test'),
None)
@@ -395,7 +413,11 @@
def testUnnamedResourceThatProvidesAnInterface(self):
from zope.component import queryAdapter
+ from zope.component.tests.examples import Ob3
+ from zope.component.testfiles.views import IR
+ from zope.component.testfiles.views import IV
from zope.component.testfiles.views import Request
+ from zope.component.testfiles.views import R1
ob = Ob3()
self.assertEqual(queryAdapter(Request(IR), IV), None)
@@ -433,6 +455,14 @@
''',
testing=1)
+
+_ZCML_TEMPLATE = """<configure
+ xmlns='http://namespaces.zope.org/zope'
+ i18n_domain='zope'>
+ %s
+ </configure>"""
+
+
def test_suite():
return unittest.TestSuite((
unittest.makeSuite(ResourceViewTests),
More information about the checkins
mailing list