[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/exportimport/tests/test_content.py Backport ztapi removal to 2.2 branch

[Hano Schlichting]

Log message for revision 126490:
  Backport ztapi removal to 2.2 branch
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/exportimport/tests/test_content.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/exportimport/tests/test_content.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/exportimport/tests/test_content.py	2012-05-24 16:47:26 UTC (rev 126489)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/exportimport/tests/test_content.py	2012-05-24 17:50:22 UTC (rev 126490)
@@ -40,8 +40,7 @@
         return SetupTool('portal_setup')
 
     def _setUpAdapters(self):
-        from zope.app.testing import ztapi
-        #from OFS.Image import File
+        from zope.component import provideAdapter
 
         from Products.GenericSetup.interfaces import IFilesystemExporter
         from Products.GenericSetup.interfaces import IFilesystemImporter
@@ -56,39 +55,30 @@
         from Products.GenericSetup.content import \
              INIAwareFileAdapter
 
-        #from Products.CMFCore.exportimport.content import \
-        #        OFSFileAdapter
+        provideAdapter(StructureFolderWalkingAdapter,
+                       (IFolderish,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(IFolderish,
-                             IFilesystemExporter,
-                             StructureFolderWalkingAdapter,
-                            )
+        provideAdapter(StructureFolderWalkingAdapter,
+                       (IFolderish,),
+                       IFilesystemImporter)
 
-        ztapi.provideAdapter(IFolderish,
-                             IFilesystemImporter,
-                             StructureFolderWalkingAdapter,
-                            )
+        provideAdapter(CSVAwareFileAdapter,
+                       (ICSVAware,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(ICSVAware,
-                             IFilesystemExporter,
-                             CSVAwareFileAdapter,
-                            )
+        provideAdapter(CSVAwareFileAdapter,
+                       (ICSVAware,),
+                       IFilesystemImporter)
 
-        ztapi.provideAdapter(ICSVAware,
-                             IFilesystemImporter,
-                             CSVAwareFileAdapter,
-                            )
+        provideAdapter(INIAwareFileAdapter,
+                       (IINIAware,),
+                       IFilesystemExporter)
 
-        ztapi.provideAdapter(IINIAware,
-                             IFilesystemExporter,
-                             INIAwareFileAdapter,
-                            )
+        provideAdapter(INIAwareFileAdapter,
+                       (IINIAware,),
+                       IFilesystemImporter)
 
-        ztapi.provideAdapter(IINIAware,
-                             IFilesystemImporter,
-                             INIAwareFileAdapter,
-                            )
-
     def tearDown(self):
         cleanUp()