[Checkins] SVN: zope.app.i18n/trunk/src/zope/app/i18n/ Reduce the use of zope.app.testing

[Marius Gedminas]

Log message for revision 128565:
  Reduce the use of zope.app.testing
  

Changed:
  U   zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py
  U   zope.app.i18n/trunk/src/zope/app/i18n/tests/test_filters.py
  U   zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py

-=-
Modified: zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py	2012-12-10 21:05:14 UTC (rev 128564)
+++ zope.app.i18n/trunk/src/zope/app/i18n/browser/tests/test_translate.py	2012-12-10 21:53:48 UTC (rev 128565)
@@ -18,10 +18,10 @@
 import unittest
 from StringIO import StringIO
 
-from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.testing import ztapi
+from zope.component.testing import PlacelessSetup
 from zope.component.interfaces import IFactory
 from zope.component.factory import Factory
+from zope.component import provideAdapter, provideUtility
 
 from zope.app.i18n.browser.translate import Translate
 from zope.app.i18n.translationdomain import TranslationDomain
@@ -46,11 +46,10 @@
         super(TranslateTest, self).setUp()
 
         # Setup the registries
-        ztapi.provideAdapter(IHTTPRequest, IUserPreferredCharsets,
-                             HTTPCharsets)
+        provideAdapter(HTTPCharsets, (IHTTPRequest,), IUserPreferredCharsets)
 
-        ztapi.provideUtility(IFactory, Factory(MessageCatalog),
-                             'zope.app.MessageCatalog')
+        provideUtility(Factory(MessageCatalog), IFactory,
+                       'zope.app.MessageCatalog')
 
         domain = TranslationDomain()
         domain.domain = 'default'

Modified: zope.app.i18n/trunk/src/zope/app/i18n/tests/test_filters.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/tests/test_filters.py	2012-12-10 21:05:14 UTC (rev 128564)
+++ zope.app.i18n/trunk/src/zope/app/i18n/tests/test_filters.py	2012-12-10 21:53:48 UTC (rev 128565)
@@ -21,10 +21,10 @@
 from cStringIO import StringIO
 from zope.interface import implements
 
-from zope.app.testing import ztapi
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.component.testing import PlacelessSetup
 from zope.component.interfaces import IFactory
 from zope.component.factory import Factory
+from zope.component import provideUtility
 
 from zope.app.i18n.messagecatalog import MessageCatalog
 from zope.i18n.negotiator import negotiator
@@ -69,12 +69,12 @@
         super(TestGettextExportImport, self).setUp()
 
         # Setup the negotiator utility
-        ztapi.provideUtility(INegotiator, negotiator)
+        provideUtility(negotiator, INegotiator)
 
         self._domain = TranslationDomain()
         self._domain.domain = 'default'
-        ztapi.provideUtility(IFactory, Factory(MessageCatalog),
-                             'zope.app.MessageCatalog')
+        provideUtility(Factory(MessageCatalog), IFactory,
+                       'zope.app.MessageCatalog')
 
     def testImportExport(self):
         imp = GettextImportFilter(self._domain)

Modified: zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py	2012-12-10 21:05:14 UTC (rev 128564)
+++ zope.app.i18n/trunk/src/zope/app/i18n/tests/test_translationdomain.py	2012-12-10 21:53:48 UTC (rev 128565)
@@ -19,6 +19,7 @@
 import doctest
 
 from zope.component import getGlobalSiteManager
+from zope.component import provideUtility
 from zope.component.interfaces import IFactory
 from zope.component.factory import Factory
 from zope.i18n.interfaces import ITranslationDomain
@@ -33,7 +34,7 @@
 from zope.app.i18n import interfaces
 from zope.app.i18n.messagecatalog import MessageCatalog
 from zope.app.i18n.translationdomain import TranslationDomain
-from zope.app.testing import setup, ztapi
+from zope.app.testing import setup
 
 
 class Environment(object):
@@ -194,10 +195,9 @@
         self.sm = setup.createSiteManager(self.rootFolder, setsite=True)
         setup.addUtility(self.sm, 'default', ITranslationDomain, self._domain)
 
-        ztapi.provideUtility(IFactory, Factory(MessageCatalog),
-                             'zope.app.MessageCatalog')
+        provideUtility(Factory(MessageCatalog), IFactory,
+                       'zope.app.MessageCatalog')
 
-
     def _getTranslationDomain(self):
         domain = TranslationDomain()
         domain.domain = 'default'