[Zope-Checkins] CVS: Zope/lib/python/ZPublisher/tests - testHTTPRequest.py:1.7

[Martijn Pieters]

Update of /cvs-repository/Zope/lib/python/ZPublisher/tests
In directory cvs.zope.org:/tmp/cvs-serv9285

Modified Files:
	testHTTPRequest.py 
Log Message:
Simplify tests by moving 'not in req.other' test up to _processInputs.

=== Zope/lib/python/ZPublisher/tests/testHTTPRequest.py 1.6 => 1.7 ===
         env['QUERY_STRING'] = query_string
         req = self._getHTTPRequest(env)
         req.processInputs()
+        self._noFormValuesInOther(req)
         return req
 
     def _noTaintedValues(self, req):
@@ -110,7 +111,6 @@
             ('spacey key', 'val'), ('key', 'spacey val'),
             ('multi', '1'), ('multi', '2'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -135,7 +135,6 @@
             ('multiline:lines', 'one\ntwo'),
             ('morewords:text', 'one\ntwo\n'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -163,7 +162,6 @@
                   
                   ('nouconverter:string:utf8', 'test\xc2\xae'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -191,7 +189,6 @@
             ('setrec.foo:records', 'foo'), ('setrec.bar:records', 'bar'),
             ('setrec.foo:records', 'spam'), ('setrec.bar:records', 'eggs'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -221,7 +218,6 @@
             ('ftuple:tuple:float', '1.2'),
             ('tlist:tokens:list', 'one two'), ('tlist:list:tokens', '3 4'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -252,7 +248,6 @@
             ('setrec.ituple:tuple:int:records', '1'),
             ('setrec.ituple:tuple:int:records', '2'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -300,7 +295,6 @@
             ('setrec.foo:records', 'ham'),
             )
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -332,7 +326,6 @@
             ('spacey key', 'val'), ('key', 'spacey val'),
             ('multi', '1'), ('multi', '2'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -349,7 +342,6 @@
             ('spacey key', 'val'), ('key', 'spacey val'),
             ('multi', '1'), ('multi', '2'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -370,7 +362,6 @@
                   
                   ('tnouconverter:string:utf8', '<test\xc2\xae>'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -420,7 +411,6 @@
             ('tdeferdefersetrec.foo:records', 'spam'),
             ('tdeferdefersetrec.bar:records', '<eggs>'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -471,7 +461,6 @@
             ('tdefersecondsetrec.ituple:tuple:int:records', '2'),
             )
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -524,7 +513,6 @@
             ('srdoesnotapply.foo:records', 'baz'),
             ('srdoesnotapply.foo:records', 'ham'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -559,7 +547,6 @@
         inputs = (
             ('name.:tuple', 'name with dot as tuple'),)
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()