Update functional tests to only use zope.app.appsetup instead of zope…

….app.testing

CHANGES.txt

@@ -4,8 +4,8 @@ Changes
 1.3 (unreleased)
 ----------------
 
-- Nothing changed yet.
-
+- Update functional tests to only use zope.app.appsetup instead
+  of zope.app.testing.
 
 1.2 (2009-12-20)
 ----------------

setup.py

@@ -11,7 +11,7 @@ def read(*rnames):
     )
 
 tests_require = [
-    'zope.app.testing',
+    'zope.app.appsetup',
     'zope.app.zcmlfiles',
     'zope.component',
     'zope.configuration',

src/grokcore/site/ftests/test_grok_functional.py

@@ -0,0 +1,40 @@
+import unittest
+import grokcore.site
+
+from pkg_resources import resource_listdir
+from zope.testing import doctest, renormalizing
+from zope.app.appsetup.testlayer import ZODBLayer
+
+FunctionalLayer = ZODBLayer(grokcore.site)
+
+
+def suiteFromPackage(name):
+    files = resource_listdir(__name__, name)
+    suite = unittest.TestSuite()
+    for filename in files:
+        if not filename.endswith('.py'):
+            continue
+        if filename == '__init__.py':
+            continue
+
+        dottedname = 'grokcore.site.ftests.%s.%s' % (name, filename[:-3])
+        test = doctest.DocTestSuite(
+            dottedname,
+            extraglobs=dict(getRootFolder=FunctionalLayer.getRootFolder),
+            optionflags=(doctest.ELLIPSIS+
+                         doctest.NORMALIZE_WHITESPACE+
+                         doctest.REPORT_NDIFF)
+            )
+        test.layer = FunctionalLayer
+
+        suite.addTest(test)
+    return suite
+
+def test_suite():
+    suite = unittest.TestSuite()
+    for name in ['utility', 'site']:
+        suite.addTest(suiteFromPackage(name))
+    return suite
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')