[Checkins] SVN: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/doctesting.py Remove ftest code.

[Uli Fouquet]

Log message for revision 87724:
  Remove ftest code.

Changed:
  U   z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/doctesting.py

-=-
Modified: z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/doctesting.py
===================================================================
--- z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/doctesting.py	2008-06-24 22:40:05 UTC (rev 87723)
+++ z3c.testsetup/branches/ulif-sepfunctesting/src/z3c/testsetup/doctesting.py	2008-06-24 22:40:29 UTC (rev 87724)
@@ -16,9 +16,6 @@
 import unittest
 import os.path
 from zope.testing import doctest, cleanup
-from zope.app.testing.functional import (
-    HTTPCaller, getRootFolder, sync, ZCMLLayer, FunctionalDocFileSuite,
-    FunctionalTestSetup)
 from z3c.testsetup.base import BasicTestSetup
 from z3c.testsetup.util import get_package
 
@@ -98,93 +95,3 @@
                 ))
         return suite
 
-
-class FunctionalDocTestSetup(DocTestSetup):
-    """A functional test setup for packages.
-
-    A collection of methods to search for appropriate doctest files in
-    a given package. ``FunctionalTestSetup`` is also able to
-    'register' the tests found and to deliver them as a ready-to-use
-    ``unittest.TestSuite`` instance.
-
-    While the functionality to search for testfiles is mostly
-    inherited from the base class, the focus here is to setup the
-    tests correctly.
-    """
-    ftesting_zcml = os.path.join(os.path.dirname(__file__),
-                                 'ftesting.zcml')
-    layer = ZCMLLayer(ftesting_zcml, __name__,
-                      'FunctionalLayer')
-
-    globs=dict(http=HTTPCaller(),
-               getRootFolder=getRootFolder,
-               sync=sync
-               )
-
-    optionflags = (doctest.ELLIPSIS+
-                   doctest.NORMALIZE_WHITESPACE+
-                   doctest.REPORT_NDIFF)
-
-    regexp_list = [
-        '^\s*:(T|t)est-(L|l)ayer:\s*(functional)\s*',
-        ]
-
-    checker = None
-
-    def __init__(self, package, checker=None, zcml_config = None,
-                 layer_name='FunctionalLayer', layer=None, **kw):
-        DocTestSetup.__init__(self, package, **kw)
-        self.checker = checker
-        # Setup a new layer if specified in params...
-        if zcml_config is not None and layer is None:
-            if not os.path.isfile(zcml_config):
-                zcml_config = os.path.join(
-                    os.path.dirname(self.package.__file__),
-                    zcml_config)
-            self.layer = ZCMLLayer(zcml_config, self.package.__name__,
-                                   layer_name)
-        elif layer is None:
-            # Look for ftesting.zcml in pkg-root...
-            pkg_ftesting_zcml = os.path.join(
-                os.path.dirname(self.package.__file__), 'ftesting.zcml')
-            if os.path.isfile(pkg_ftesting_zcml):
-                self.layer = ZCMLLayer(pkg_ftesting_zcml,
-                                       self.package.__name__, layer_name)
-        # Passing a ready-for-use layer overrides layer specified by
-        # zcml_config...
-        if layer is not None:
-            self.layer = layer
-        return
-        
-    def setUp(self, test):
-        FunctionalTestSetup().setUp()
-
-    def tearDown(self, test):
-        FunctionalTestSetup().tearDown()
-
-    def suiteFromFile(self, name):
-        suite = unittest.TestSuite()
-        if os.path.isabs(name):
-            # We get absolute pathnames, but we need relative ones...
-            common_prefix = os.path.commonprefix([self.package.__file__, name])
-            name = name[len(common_prefix):]
-        test = FunctionalDocFileSuite(
-            name, package=self.package,
-            setUp=self.setUp, tearDown=self.tearDown,
-            globs=self.globs,
-            optionflags=self.optionflags,
-            encoding=self.encoding,
-            checker=self.checker,
-            **self.additional_options
-            )
-        test.layer = self.layer
-        suite.addTest(test)
-        return suite
-
-    def getTestSuite(self):
-        docfiles = self.getDocTestFiles(package=self.package)
-        suite = unittest.TestSuite()
-        for name in docfiles:
-            suite.addTest(self.suiteFromFile(name))
-        return suite
-