[Checkins] SVN: grok/trunk/src/grok/tests/ Move two more tests related to JSON or XMLRPC to their respective directories.

[Philipp von Weitershausen]

Log message for revision 89313:
  Move two more tests related to JSON or XMLRPC to their respective directories.
  

Changed:
  A   grok/trunk/src/grok/tests/json/multiple_require.py
  D   grok/trunk/src/grok/tests/security/multiple_require_json.py
  D   grok/trunk/src/grok/tests/security/multiple_require_xmlrpc.py
  A   grok/trunk/src/grok/tests/xmlrpc/multiple_require.py

-=-
Copied: grok/trunk/src/grok/tests/json/multiple_require.py (from rev 89305, grok/trunk/src/grok/tests/security/multiple_require_json.py)
===================================================================
--- grok/trunk/src/grok/tests/json/multiple_require.py	                        (rev 0)
+++ grok/trunk/src/grok/tests/json/multiple_require.py	2008-08-03 19:31:05 UTC (rev 89313)
@@ -0,0 +1,25 @@
+"""
+Multiple calls of grok.require in one class are not allowed.
+
+  >>> grok.testing.grok(__name__)
+  Traceback (most recent call last):
+    ...
+  GrokError: grok.require was called multiple times in <class 'grok.tests.json.multiple_require.MultipleJSON'>. It may only be set once for a class.
+
+"""
+import grok
+import zope.interface
+
+class One(grok.Permission):
+    grok.name('permission.1')
+
+class Two(grok.Permission):
+    grok.name('permission.2')
+
+class MultipleJSON(grok.JSON):
+    grok.context(zope.interface.Interface)
+    grok.require(One)
+    grok.require(Two)
+
+    def render(self):
+        pass

Deleted: grok/trunk/src/grok/tests/security/multiple_require_json.py
===================================================================
--- grok/trunk/src/grok/tests/security/multiple_require_json.py	2008-08-03 19:27:36 UTC (rev 89312)
+++ grok/trunk/src/grok/tests/security/multiple_require_json.py	2008-08-03 19:31:05 UTC (rev 89313)
@@ -1,25 +0,0 @@
-"""
-Multiple calls of grok.require in one class are not allowed.
-
-  >>> grok.testing.grok(__name__)
-  Traceback (most recent call last):
-    ...
-  GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_json.MultipleJSON'>. It may only be set once for a class.
-
-"""
-import grok
-import zope.interface
-
-class One(grok.Permission):
-    grok.name('permission.1')
-
-class Two(grok.Permission):
-    grok.name('permission.2')
-
-class MultipleJSON(grok.JSON):
-    grok.context(zope.interface.Interface)
-    grok.require(One)
-    grok.require(Two)
-
-    def render(self):
-        pass

Deleted: grok/trunk/src/grok/tests/security/multiple_require_xmlrpc.py
===================================================================
--- grok/trunk/src/grok/tests/security/multiple_require_xmlrpc.py	2008-08-03 19:27:36 UTC (rev 89312)
+++ grok/trunk/src/grok/tests/security/multiple_require_xmlrpc.py	2008-08-03 19:31:05 UTC (rev 89313)
@@ -1,24 +0,0 @@
-"""
-Multiple calls of grok.require in one class are not allowed.
-
-  >>> grok.testing.grok(__name__)
-  Traceback (most recent call last):
-     ...
-  GrokError: grok.require was called multiple times in <class 'grok.tests.security.multiple_require_xmlrpc.MultipleXMLRPC'>. It may only be set once for a class.
-"""
-import grok
-import zope.interface
-
-class One(grok.Permission):
-    grok.name('permission.1')
-
-class Two(grok.Permission):
-    grok.name('permission.2')
-
-class MultipleXMLRPC(grok.XMLRPC):
-    grok.context(zope.interface.Interface)
-    grok.require(One)
-    grok.require(Two)
-
-    def render(self):
-        pass

Copied: grok/trunk/src/grok/tests/xmlrpc/multiple_require.py (from rev 89305, grok/trunk/src/grok/tests/security/multiple_require_xmlrpc.py)
===================================================================
--- grok/trunk/src/grok/tests/xmlrpc/multiple_require.py	                        (rev 0)
+++ grok/trunk/src/grok/tests/xmlrpc/multiple_require.py	2008-08-03 19:31:05 UTC (rev 89313)
@@ -0,0 +1,24 @@
+"""
+Multiple calls of grok.require in one class are not allowed.
+
+  >>> grok.testing.grok(__name__)
+  Traceback (most recent call last):
+     ...
+  GrokError: grok.require was called multiple times in <class 'grok.tests.xmlrpc.multiple_require.MultipleXMLRPC'>. It may only be set once for a class.
+"""
+import grok
+import zope.interface
+
+class One(grok.Permission):
+    grok.name('permission.1')
+
+class Two(grok.Permission):
+    grok.name('permission.2')
+
+class MultipleXMLRPC(grok.XMLRPC):
+    grok.context(zope.interface.Interface)
+    grok.require(One)
+    grok.require(Two)
+
+    def render(self):
+        pass