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

[Martijn Pieters]

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

Modified Files:
      Tag: Zope-2_5-branch
	testHTTPRequest.py 
Log Message:
Simplify tests by moving 'not in req.other' test up to _processInputs.

=== Zope/lib/python/ZPublisher/tests/testHTTPRequest.py 1.1.2.5 => 1.1.2.6 ===
         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()
@@ -165,7 +164,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()
@@ -195,7 +193,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()
@@ -226,7 +223,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()
@@ -274,7 +270,6 @@
             ('setrec.foo:records', 'ham'),
             )
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()
@@ -306,7 +301,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()
@@ -323,7 +317,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()
@@ -371,7 +364,6 @@
             ('tdeferdefersetrec.foo:records', 'spam'),
             ('tdeferdefersetrec.bar:records', '<eggs>'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -422,7 +414,6 @@
             ('tdefersecondsetrec.ituple:tuple:int:records', '2'),
             )
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -475,7 +466,6 @@
             ('srdoesnotapply.foo:records', 'baz'),
             ('srdoesnotapply.foo:records', 'ham'))
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         taintedformkeys = list(req.taintedform.keys())
         taintedformkeys.sort()
@@ -510,7 +500,6 @@
         inputs = (
             ('name.:tuple', 'name with dot as tuple'),)
         req = self._processInputs(inputs)
-        self._noFormValuesInOther(req)
 
         formkeys = list(req.form.keys())
         formkeys.sort()