[Checkins] SVN: Sandbox/nadako/zope.browserresource/s Get rid of zope.app.testing test dependency.
Dan Korostelev
nadako at gmail.com
Sat Aug 22 08:14:23 EDT 2009
Log message for revision 103080:
Get rid of zope.app.testing test dependency.
Changed:
U Sandbox/nadako/zope.browserresource/setup.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directoryresource.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_fileresource.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_icondirective.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_pagetemplateresource.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resource.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py
U Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/testi18nfileresource.py
-=-
Modified: Sandbox/nadako/zope.browserresource/setup.py
===================================================================
--- Sandbox/nadako/zope.browserresource/setup.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/setup.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -56,7 +56,7 @@
'zope.browser',
],
extras_require={
- 'test': ['zope.testing', 'zope.app.testing'],
+ 'test': ['zope.testing'],
},
zip_safe = False,
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directives.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -45,7 +45,7 @@
from zope.component.testfiles.views import IC, V1, VZMI, R1, IV
from zope.browserresource.fileresource import FileResource
from zope.browserresource.i18nfileresource import I18nFileResource
-from zope.app.testing import placelesssetup
+from zope.testing import cleanup
tests_path = os.path.join(
os.path.dirname(zope.browserresource.__file__),
@@ -112,7 +112,7 @@
self.request = request
-class Test(placelesssetup.PlacelessSetup, unittest.TestCase):
+class Test(cleanup.CleanUp, unittest.TestCase):
def setUp(self):
super(Test, self).setUp()
@@ -267,8 +267,8 @@
return unittest.TestSuite((
unittest.makeSuite(Test),
DocTestSuite('zope.browserresource.metaconfigure',
- setUp=placelesssetup.setUp,
- tearDown=placelesssetup.tearDown)
+ setUp=cleanup.setUp,
+ tearDown=cleanup.tearDown)
))
if __name__=='__main__':
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directoryresource.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directoryresource.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_directoryresource.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -25,8 +25,12 @@
from zope.security.checker import NamesChecker, ProxyFactory
from zope.interface import implements
from zope.location.interfaces import IContained
+from zope.traversing.browser.absoluteurl import AbsoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
+from zope.component import provideAdapter
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing import cleanup
+
from zope.browserresource.directoryresource import \
DirectoryResourceFactory, DirectoryResource
from zope.browserresource.fileresource import FileResource
@@ -47,8 +51,12 @@
ob = Ob()
-class Test(support.SiteHandler, PlacelessSetup, TestCase):
+class Test(support.SiteHandler, cleanup.CleanUp, TestCase):
+ def setUp(self):
+ super(Test, self).setUp()
+ provideAdapter(AbsoluteURL, (None, None), IAbsoluteURL)
+
def testNotFound(self):
path = os.path.join(test_directory, 'testfiles')
request = TestRequest()
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_fileresource.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_fileresource.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_fileresource.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -23,7 +23,7 @@
from zope.security.proxy import removeSecurityProxy
from zope.security.checker import NamesChecker
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing import cleanup
from zope.component import provideAdapter
from zope.publisher.http import IHTTPRequest
@@ -40,7 +40,7 @@
test_directory = os.path.dirname(p.__file__)
-class Test(PlacelessSetup, TestCase):
+class Test(cleanup.CleanUp, TestCase):
def setUp(self):
super(Test, self).setUp()
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_icondirective.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_icondirective.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_icondirective.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -28,12 +28,14 @@
from zope.security.interfaces import Forbidden
from zope.security.proxy import removeSecurityProxy
from zope.traversing.interfaces import IContainmentRoot
+from zope.traversing.browser.absoluteurl import AbsoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
import zope.location.interfaces
import zope.browserresource
from zope.component.testfiles.views import IC
from zope.browserresource.tests import support
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing import cleanup
template = """<configure
@@ -60,12 +62,13 @@
protectName(FileResource, '__call__', 'zope.Public')
-class Test(support.SiteHandler, PlacelessSetup, TestCase):
+class Test(support.SiteHandler, cleanup.CleanUp, TestCase):
def setUp(self):
super(Test, self).setUp()
XMLConfig('meta.zcml', zope.browserresource)()
defineCheckers()
+ component.provideAdapter(AbsoluteURL, (None, None), IAbsoluteURL)
def test(self):
self.assertEqual(
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_pagetemplateresource.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_pagetemplateresource.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_pagetemplateresource.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -24,8 +24,8 @@
from zope.publisher.browser import TestRequest
from zope.traversing.interfaces import ITraversable
from zope.traversing.adapters import DefaultTraversable
+from zope.testing import cleanup
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.browserresource.pagetemplateresource import \
PageTemplateResourceFactory
import zope.browserresource.tests as p
@@ -39,7 +39,7 @@
)
-class Test(PlacelessSetup, TestCase):
+class Test(cleanup.CleanUp, TestCase):
def setUp(self):
super(Test, self).setUp()
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resource.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resource.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resource.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -24,12 +24,17 @@
import zope.location.interfaces
from zope.browserresource.resource import Resource
from zope.browserresource.tests import support
-from zope.app.testing.placelesssetup import PlacelessSetup
from zope.traversing.browser.interfaces import IAbsoluteURL
+from zope.traversing.browser.absoluteurl import AbsoluteURL
+from zope.testing import cleanup
-class TestResource(support.SiteHandler, PlacelessSetup, unittest.TestCase):
+class TestResource(support.SiteHandler, cleanup.CleanUp, unittest.TestCase):
+ def setUp(self):
+ super(TestResource, self).setUp()
+ component.provideAdapter(AbsoluteURL, (None, None), IAbsoluteURL)
+
def testGlobal(self):
req = TestRequest()
r = Resource(req)
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/test_resources.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -25,9 +25,9 @@
from zope.component import provideAdapter
from zope.interface import Interface
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing.cleanup import CleanUp
-class Test(PlacelessSetup, TestCase):
+class Test(CleanUp, TestCase):
def setUp(self):
super(Test, self).setUp()
Modified: Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/testi18nfileresource.py
===================================================================
--- Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/testi18nfileresource.py 2009-08-22 12:01:18 UTC (rev 103079)
+++ Sandbox/nadako/zope.browserresource/src/zope/browserresource/tests/testi18nfileresource.py 2009-08-22 12:14:23 UTC (rev 103080)
@@ -21,7 +21,7 @@
from zope.publisher.interfaces import NotFound
from zope.component import provideAdapter, provideUtility
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.testing import cleanup
from zope.i18n.interfaces import IUserPreferredCharsets, IUserPreferredLanguages
@@ -41,7 +41,7 @@
test_directory = os.path.dirname(p.__file__)
-class Test(PlacelessSetup, TestII18nAware):
+class Test(cleanup.CleanUp, TestII18nAware):
def setUp(self):
super(Test, self).setUp()
More information about the Checkins
mailing list