erp5_api_style: update tests for new API

bt5/erp5_api_style/DocumentTemplateItem/portal_components/document.erp5.jIOWebSection.py

@@ -122,8 +122,6 @@ class jIOWebSection(WebSection):
       __bobo_traverse__ from DocumentExtensibleTraversableMixin is not called
     """
     # Register current web site physical path for later URL generation
-    if not self.REQUEST.get("live_test", False) and self.REQUEST.REQUEST_METHOD == "GET":
-      return self._asjIOStyle(mode="get", text_content=self.REQUEST.form.keys()[0])
     return self._asjIOStyle(mode="get", text_content=self.REQUEST.get('BODY'))
 
   security.declareProtected(Permissions.View, 'post')
@@ -151,6 +149,4 @@ class jIOWebSection(WebSection):
       __bobo_traverse__ from DocumentExtensibleTraversableMixin is not called
     """
     # Register current web site physical path for later URL generation
-    if not self.REQUEST.get("live_test", False) and self.REQUEST.REQUEST_METHOD == "GET":
-      return self._asjIOStyle(mode="allDocs", text_content=self.REQUEST.form.keys()[0])
     return self._asjIOStyle(mode="allDocs", text_content=self.REQUEST.get('BODY'))

bt5/erp5_api_style/TestTemplateItem/portal_components/test.erp5.testJioApiStyle.py

@@ -764,11 +764,11 @@ result_list = context.getPortalObject().portal_catalog(
   select_list=("relative_url", "portal_type", "title"),
   **search_kw
 )
-return [{
+return json.dumps([{
   "id": x.relative_url,
   "portal_type": x.portal_type,
   "title": x.title,
-} for x in result_list]
+} for x in result_list])
 """ % (self.id_template))
 
   def test_action_all_docs_success_one_action_one_result(self):
@@ -792,16 +792,12 @@ return [{
         "title": "%s"
       }""" % self.id_template
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(
-      response["result_list"],
-      [{
-        "id": person.getRelativeUrl(),
-        "portal_type": person.getPortalType(),
-        "title": person.getTitle(),
-      }],
-    )
+    self.assertEqual(1, len(response))
+    self.assertEqual({
+      u"id": person.getRelativeUrl().decode(),
+      u"portal_type": person.getPortalType().decode(),
+      u"title": person.getTitle().decode(),
+    }, response[0])
 
   def test_action_all_docs_success_one_action_no_result(self):
     """
@@ -824,9 +820,7 @@ return [{
         "title": "BAR"
       }"""
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(0, len(response["result_list"]))
+    self.assertEqual(0, len(response))
 
   def createUpdateScriptjIOWebSectionSearchOrganisationFromJSON(self):
     createZODBPythonScript(
@@ -848,11 +842,11 @@ result_list = context.getPortalObject().portal_catalog(
   select_list=("relative_url", "portal_type", "title"),
   **search_kw
 )
-return [{
+return json.dumps([{
   "id": x.relative_url,
   "portal_type": x.portal_type,
   "title": x.title,
-} for x in result_list]
+} for x in result_list])
 """)
 
   def test_action_all_docs_success_two_actions_with_result(self):
@@ -888,16 +882,12 @@ return [{
         "title": "%s"
       }""" % self.id_template
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(
-      response["result_list"],
-      [{
-        "id": organisation.getRelativeUrl(),
-        "portal_type": organisation.getPortalType(),
-        "title": organisation.getTitle(),
-      }],
-    )
+    self.assertEqual(1, len(response))
+    self.assertEqual({
+      u"id": organisation.getRelativeUrl().decode(),
+      u"portal_type": organisation.getPortalType().decode(),
+      u"title": organisation.getTitle().decode(),
+    }, response[0])
     # Check Second action
     response = json.loads(self.allDocsToApi(
       """{
@@ -905,16 +895,12 @@ return [{
         "title": "%s"
       }""" % self.id_template
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(
-      response["result_list"],
-      [{
-        "id": person.getRelativeUrl(),
-        "portal_type": person.getPortalType(),
-        "title": person.getTitle(),
-      }],
-    )
+    self.assertEqual(1, len(response))
+    self.assertEqual({
+      u"id": person.getRelativeUrl().decode(),
+      u"portal_type": person.getPortalType().decode(),
+      u"title": person.getTitle().decode(),
+    }, response[0])
 
   def test_action_all_docs_success_two_actions_with_no_result(self):
     """
@@ -949,9 +935,7 @@ return [{
         "title": "BAR"
       }"""
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(0, len(response["result_list"]))
+    self.assertEqual(0, len(response))
     # Check Second action
     response = json.loads(self.allDocsToApi(
       """{
@@ -959,9 +943,7 @@ return [{
         "title": "BAR"
       }"""
     ))
-    if not "result_list" in response:
-      raise ValueError("Unexcpected Answer %s" % response)
-    self.assertEqual(0, len(response["result_list"]))
+    self.assertEqual(0, len(response))
 
   def test_action_all_docs_no_action_matches(self):
     """