Reorganize tests to make functional discoverable

zopefoundation · Jan 12, 2018 · ff2b889 · ff2b889
1 parent 51dea47
commit ff2b889
Show file tree

Hide file tree

Showing 24 changed files with 45 additions and 10 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -25,4 +25,4 @@ recipe = zc.recipe.testrunner
 eggs =
   grokcore.security
   grokcore.security[test]
-defaults = ['--tests-pattern', '^f?tests$', '-v']
+defaults = ['-vc']
diff --git a/src/grokcore/security/ftesting.zcml b/src/grokcore/security/ftesting.zcml
@@ -9,6 +9,6 @@
   <include package="grokcore.security" file="meta.zcml" />
   <include package="grokcore.view" file="publication_security.zcml" />
 
-  <grok:grok package=".ftests" />
+  <grok:grok package=".tests.functional" />
 
 </configure>
diff --git a/src/grokcore/security/tests/__init__.py b/src/grokcore/security/tests/__init__.py
@@ -1 +1,31 @@
-# make this directory a package
+##############################################################################
+#
+# Copyright (c) 2006-2007 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Grok
+"""
+from grokcore.component import *
+
+from grokcore.security.components import Permission
+from grokcore.security.components import Public
+from grokcore.security.directive import require, permissions
+
+# Import this module so that it's available as soon as you import the
+# 'grokcore.security' package.  Useful for tests and interpreter examples.
+import grokcore.security.testing
+
+# Only export public API
+from grokcore.security.interfaces import IGrokcoreSecurityAPI, HAVE_ROLE
+if HAVE_ROLE:
+    from grokcore.security.components import Role
+
+__all__ = list(IGrokcoreSecurityAPI)
diff --git a/...kcore/security/tests/security/__init__.py → src/grokcore/security/tests/base/__init__.py b/...kcore/security/tests/security/__init__.py → src/grokcore/security/tests/base/__init__.py
diff --git a/src/grokcore/security/ftests/__init__.py → ...curity/tests/base/permissions/__init__.py b/src/grokcore/security/ftests/__init__.py → ...curity/tests/base/permissions/__init__.py
diff --git a/...e/security/tests/permissions/directive.py → ...urity/tests/base/permissions/directive.py b/...e/security/tests/permissions/directive.py → ...urity/tests/base/permissions/directive.py
@@ -4,7 +4,7 @@
   >>> import grokcore.security.testing
   >>>
   >>> grokcore.security.testing.grok(
-  ...     'grokcore.security.tests.permissions.directive_fixture')
+  ...     'grokcore.security.tests.base.permissions.directive_fixture')
   Traceback (most recent call last):
   ...
   martian.error.GrokImportError: You can only pass unicode values, ASCII \

diff --git a/...ty/tests/permissions/directive_fixture.py → ...sts/base/permissions/directive_fixture.py b/...ty/tests/permissions/directive_fixture.py → ...sts/base/permissions/directive_fixture.py
diff --git a/...grokcore/security/ftests/role/__init__.py → ...core/security/tests/base/role/__init__.py b/...grokcore/security/ftests/role/__init__.py → ...core/security/tests/base/role/__init__.py
diff --git a/.../security/tests/role/missing_role_name.py → ...rity/tests/base/role/missing_role_name.py b/.../security/tests/role/missing_role_name.py → ...rity/tests/base/role/missing_role_name.py
diff --git a/...okcore/security/tests/role/permissions.py → ...e/security/tests/base/role/permissions.py b/...okcore/security/tests/role/permissions.py → ...e/security/tests/base/role/permissions.py
diff --git a/...grokcore/security/tests/role/role_i18n.py → ...ore/security/tests/base/role/role_i18n.py b/...grokcore/security/tests/role/role_i18n.py → ...ore/security/tests/base/role/role_i18n.py
diff --git a/src/grokcore/security/tests/base/security/__init__.py b/src/grokcore/security/tests/base/security/__init__.py
@@ -0,0 +1 @@
+# make this directory a package
diff --git a/...kcore/security/tests/security/fallback.py → .../security/tests/base/security/fallback.py b/...kcore/security/tests/security/fallback.py → .../security/tests/base/security/fallback.py
diff --git a/...rity/tests/security/missing_permission.py → ...tests/base/security/missing_permission.py b/...rity/tests/security/missing_permission.py → ...tests/base/security/missing_permission.py
@@ -7,7 +7,7 @@
   ...
   zope.configuration.config.ConfigurationExecutionError: \
   martian.error.GrokError: Undefined permission 'doesnt.exist' in <class \
-  'grokcore.security.tests.security.missing_permission.MissingPermission'>. \
+  'grokcore.security.tests.base.security.missing_permission.MissingPermission'>. \
   Use grok.Permission first...
 """
 import grokcore.security as grok

diff --git a/...tests/security/missing_permission_name.py → .../base/security/missing_permission_name.py b/...tests/security/missing_permission_name.py → .../base/security/missing_permission_name.py
diff --git a/...curity/tests/security/multiple_require.py → ...y/tests/base/security/multiple_require.py b/...curity/tests/security/multiple_require.py → ...y/tests/base/security/multiple_require.py
@@ -5,7 +5,7 @@
   Traceback (most recent call last):
     ...
   martian.error.GrokError: grok.require was called multiple times in \
-  <class 'grokcore.security.tests.security.multiple_require.MultipleView'>. \
+  <class 'grokcore.security.tests.base.security.multiple_require.MultipleView'>. \
   It may only be set once for a class.
 
 """

diff --git a/...y/tests/security/not_a_permissionclass.py → ...ts/base/security/not_a_permissionclass.py b/...y/tests/security/not_a_permissionclass.py → ...ts/base/security/not_a_permissionclass.py
diff --git a/...ore/security/tests/security/permission.py → ...ecurity/tests/base/security/permission.py b/...ore/security/tests/security/permission.py → ...ecurity/tests/base/security/permission.py
diff --git a/...ecurity/tests/security/protect_getattr.py → ...ty/tests/base/security/protect_getattr.py b/...ecurity/tests/security/protect_getattr.py → ...ty/tests/base/security/protect_getattr.py
diff --git a/...re/security/tests/permissions/__init__.py → ...ore/security/tests/functional/__init__.py b/...re/security/tests/permissions/__init__.py → ...ore/security/tests/functional/__init__.py
diff --git a/src/grokcore/security/tests/role/__init__.py → ...ecurity/tests/functional/role/__init__.py b/src/grokcore/security/tests/role/__init__.py → ...ecurity/tests/functional/role/__init__.py
diff --git a/src/grokcore/security/ftests/role/roles.py → ...e/security/tests/functional/role/roles.py b/src/grokcore/security/ftests/role/roles.py → ...e/security/tests/functional/role/roles.py
diff --git a/src/grokcore/security/tests/test_all.py → src/grokcore/security/tests/test_base.py b/src/grokcore/security/tests/test_all.py → src/grokcore/security/tests/test_base.py
@@ -20,7 +20,8 @@ def cleanUpZope(test):
 
 
 def suiteFromPackage(name):
-    files = resource_listdir(__name__, name)
+    layer_dir = 'base'
+    files = resource_listdir(__name__, '{}/{}'.format(layer_dir, name))
     suite = unittest.TestSuite()
     for filename in files:
         if not filename.endswith('.py'):
@@ -29,7 +30,8 @@ def suiteFromPackage(name):
             continue
         if filename == '__init__.py':
             continue
-        dottedname = 'grokcore.security.tests.%s.%s' % (name, filename[:-3])
+        dottedname = 'grokcore.security.tests.%s.%s.%s' % (
+            layer_dir, name, filename[:-3])
         test = doctest.DocTestSuite(
             dottedname,
             tearDown=cleanUpZope,

diff --git a/src/grokcore/security/ftests/test_all.py → ...rokcore/security/tests/test_functional.py b/src/grokcore/security/ftests/test_all.py → ...rokcore/security/tests/test_functional.py
@@ -26,14 +26,16 @@ class Layer(
 
 
 def suiteFromPackage(name):
-    files = resource_listdir(__name__, name)
+    layer_dir = 'functional'
+    files = resource_listdir(__name__, '{}/{}'.format(layer_dir, name))
     suite = unittest.TestSuite()
     for filename in files:
         if not filename.endswith('.py'):
             continue
         if filename == '__init__.py':
             continue
-        dottedname = 'grokcore.security.ftests.%s.%s' % (name, filename[:-3])
+        dottedname = 'grokcore.security.tests.%s.%s.%s' % (
+            layer_dir, name, filename[:-3])
         test = doctest.DocTestSuite(
             dottedname,
             checker=checker,