adapt tests to backward incompatibile changes

src/ZPublisher/tests/testHTTPRequest.py

@@ -401,8 +401,8 @@ def test_processInputs_w_records_w_sequences(self):
         inputs = (
             ('onerec.name:record', 'foo'),
             ('onerec.tokens:tokens:record', 'one two'),
-            ('onerec.ints:int:record', '1'),
-            ('onerec.ints:int:record', '2'),
+            ('onerec.ints:int:list:record', '1'),
+            ('onerec.ints:int:list:record', '2'),
 
             ('setrec.name:records', 'first'),
             ('setrec.ilist:list:int:records', '1'),
@@ -422,8 +422,7 @@ def test_processInputs_w_records_w_sequences(self):
 
         self.assertEqual(req['onerec'].name, 'foo')
         self.assertEqual(req['onerec'].tokens, ['one', 'two'])
-        # Implicit sequences and records don't mix.
-        self.assertEqual(req['onerec'].ints, 2)
+        self.assertEqual(req['onerec'].ints, [1, 2])
 
         self.assertEqual(len(req['setrec']), 2)
         self.assertEqual(req['setrec'][0].name, 'first')
@@ -446,18 +445,18 @@ def test_processInputs_w_defaults(self):
             ('alist:int', '1'),
             ('alist:int', '2'),
 
-            ('explicitlist:int:list:default', '3'),
-            ('explicitlist:int:list:default', '4'),
-            ('explicitlist:int:list:default', '5'),
+            ('explicitlist:int:default:list', '3'),
+            ('explicitlist:int:default:list', '4'),
+            ('explicitlist:int:default:list', '5'),
             ('explicitlist:int:list', '1'),
             ('explicitlist:int:list', '2'),
 
-            ('bar.spam:record:default', 'eggs'),
-            ('bar.foo:record:default', 'foo'),
+            ('bar.spam:default:record', 'eggs'),
+            ('bar.foo:default:record', 'foo'),
             ('bar.foo:record', 'baz'),
 
-            ('setrec.spam:records:default', 'eggs'),
-            ('setrec.foo:records:default', 'foo'),
+            ('setrec.spam:default:records', 'eggs'),
+            ('setrec.foo:default:records', 'foo'),
             ('setrec.foo:records', 'baz'),
             ('setrec.foo:records', 'ham'),
         )
@@ -468,8 +467,8 @@ def test_processInputs_w_defaults(self):
         self.assertEqual(
             formkeys, ['alist', 'bar', 'explicitlist', 'foo', 'setrec'])
 
-        self.assertEqual(req['alist'], [1, 2, 3, 4, 5])
-        self.assertEqual(req['explicitlist'], [1, 2, 3, 4, 5])
+        self.assertEqual(req['alist'], [3, 4, 1, 2])
+        self.assertEqual(req['explicitlist'], [3, 4, 1, 2])
 
         self.assertEqual(req['foo'], 5)
         self.assertEqual(req['bar'].spam, 'eggs')
@@ -478,7 +477,6 @@ def test_processInputs_w_defaults(self):
         self.assertEqual(len(req['setrec']), 2)
         self.assertEqual(req['setrec'][0].spam, 'eggs')
         self.assertEqual(req['setrec'][0].foo, 'baz')
-        self.assertEqual(req['setrec'][1].spam, 'eggs')
         self.assertEqual(req['setrec'][1].foo, 'ham')
 
         self._noTaintedValues(req)
@@ -673,27 +671,27 @@ def test_processInputs_w_defaults_w_taints(self):
             ('tdeferlist', '1'),
             ('tdeferlist', '2'),
 
-            ('tinitbar.spam:record:default', 'eggs'),
-            ('tinitbar.foo:record:default', 'foo'),
+            ('tinitbar.spam:default:record', 'eggs'),
+            ('tinitbar.foo:default:record', 'foo'),
             ('tinitbar.foo:record', '<baz>'),
-            ('tdeferbar.spam:record:default', '<eggs>'),
-            ('tdeferbar.foo:record:default', 'foo'),
+            ('tdeferbar.spam:default:record', '<eggs>'),
+            ('tdeferbar.foo:default:record', 'foo'),
             ('tdeferbar.foo:record', 'baz'),
 
-            ('rdoesnotapply.spam:record:default', '<eggs>'),
+            ('rdoesnotapply.spam:default:record', '<eggs>'),
             ('rdoesnotapply.spam:record', 'eggs'),
 
-            ('tinitsetrec.spam:records:default', 'eggs'),
-            ('tinitsetrec.foo:records:default', 'foo'),
+            ('tinitsetrec.spam:default:records', 'eggs'),
+            ('tinitsetrec.foo:default:records', 'foo'),
             ('tinitsetrec.foo:records', '<baz>'),
             ('tinitsetrec.foo:records', 'ham'),
 
-            ('tdefersetrec.spam:records:default', '<eggs>'),
-            ('tdefersetrec.foo:records:default', 'foo'),
+            ('tdefersetrec.spam:default:records', '<eggs>'),
+            ('tdefersetrec.foo:default:records', 'foo'),
             ('tdefersetrec.foo:records', 'baz'),
             ('tdefersetrec.foo:records', 'ham'),
 
-            ('srdoesnotapply.foo:records:default', '<eggs>'),
+            ('srdoesnotapply.foo:default:records', '<eggs>'),
             ('srdoesnotapply.foo:records', 'baz'),
             ('srdoesnotapply.foo:records', 'ham'))
         req = self._processInputs(inputs)