move 'static' tests from grok to grokcore.view

zopefoundation · Jul 18, 2008 · d8debf0 · d8debf0
1 parent b828ff3
commit d8debf0
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 6 deletions.
diff --git a/src/grok/tests/static/__init__.py → ...rc/grokcore/view/tests/static/__init__.py b/src/grok/tests/static/__init__.py → ...rc/grokcore/view/tests/static/__init__.py
diff --git a/src/grok/tests/static/statichaspy.py → ...grokcore/view/tests/static/statichaspy.py b/src/grok/tests/static/statichaspy.py → ...grokcore/view/tests/static/statichaspy.py
@@ -2,8 +2,8 @@
 When a package contains a 'static' resource directory, it must not also contain
 a module called 'static.py':
 
-  >>> import grok
-  >>> grok.testing.grok('grok.tests.static.statichaspy_fixture')
+  >>> from grokcore.view.tests.test_all import grok
+  >>> grok('grokcore.view.tests.static.statichaspy_fixture')
   Traceback (most recent call last):
     ...
   GrokError: A package can not contain both a 'static' resource directory

diff --git a/...ts/static/statichaspy_fixture/__init__.py → ...ts/static/statichaspy_fixture/__init__.py b/...ts/static/statichaspy_fixture/__init__.py → ...ts/static/statichaspy_fixture/__init__.py
diff --git a/...ests/static/statichaspy_fixture/static.py → ...ests/static/statichaspy_fixture/static.py b/...ests/static/statichaspy_fixture/static.py → ...ests/static/statichaspy_fixture/static.py
diff --git a/...tatic/statichaspy_fixture/static/empty.pt → ...tatic/statichaspy_fixture/static/empty.pt b/...tatic/statichaspy_fixture/static/empty.pt → ...tatic/statichaspy_fixture/static/empty.pt
diff --git a/src/grok/tests/static/staticispackage.py → ...core/view/tests/static/staticispackage.py b/src/grok/tests/static/staticispackage.py → ...core/view/tests/static/staticispackage.py
@@ -1,8 +1,8 @@
 """
 It is an error for the 'static' directory to be a python package:
 
-  >>> import grok
-  >>> grok.testing.grok('grok.tests.static.staticispackage_fixture')
+  >>> from grokcore.view.tests.test_all import grok
+  >>> grok('grokcore.view.tests.static.staticispackage_fixture')
   Traceback (most recent call last):
     ...
   GrokError: The 'static' resource directory must not be a python package.

diff --git a/...tatic/staticispackage_fixture/__init__.py → ...tatic/staticispackage_fixture/__init__.py b/...tatic/staticispackage_fixture/__init__.py → ...tatic/staticispackage_fixture/__init__.py
diff --git a/...taticispackage_fixture/static/__init__.py → ...taticispackage_fixture/static/__init__.py b/...taticispackage_fixture/static/__init__.py → ...taticispackage_fixture/static/__init__.py
diff --git a/devel/grokcore.view/src/grokcore/view/tests/test_all.py b/devel/grokcore.view/src/grokcore/view/tests/test_all.py
@@ -64,7 +64,7 @@ def suiteFromPackage(name):
 
 def test_suite():
     suite = unittest.TestSuite()
-    for name in ['template']:
+    for name in ['template', 'static']:
         suite.addTest(suiteFromPackage(name))
     return suite
 

diff --git a/src/grok/tests/test_grok.py b/src/grok/tests/test_grok.py
@@ -43,7 +43,7 @@ def suiteFromPackage(name):
 def test_suite():
     suite = unittest.TestSuite()
     for name in ['adapter', 'error', 'view', 'event', 'security', 'catalog',
-                 'zcml', 'static', 'utility', 'xmlrpc', 'json', 'container',
+                 'zcml', 'utility', 'xmlrpc', 'json', 'container',
                  'traversal', 'form', 'grokker', 'directive',
                  'baseclass', 'annotation', 'application',
                  'viewlet', 'testsetup', 'conflict', 'order']: