[WIP] Replace deprecated factory

src/otest/aus/request.py

@@ -86,11 +86,10 @@ def map_profile(self, profile_map):
 
 
 class SyncRequest(Request):
-    request_cls = None
+    endpoint = None
     method = ""
     module = ""
     content_type = URL_ENCODED
-    response_cls = None
     response_where = "url"
     response_type = "urlencoded"
     accept = None
@@ -106,12 +105,12 @@ def __init__(self, conv, inut, sh, **kwargs):
 
         self.conv.req = self
         self.tests = copy.deepcopy(self._tests)
-        if self.request_cls:
-            self.request = self.conv.msg_factory(self.request_cls)
+        if self.endpoint:
+            self.request = self.conv.msg_factory.get_request_type(self.endpoint)
         else:
             self.request = Message
-        if self.response_cls:
-            self.response = self.conv.msg_factory(self.response_cls)
+        if self.endpoint:
+            self.response = self.conv.msg_factory.get_response_type(self.endpoint)
         else:
             self.response = Message
 
@@ -236,11 +235,10 @@ def run(self):
 
 
 class AsyncRequest(Request):
-    request_cls = None
+    endpoint = None
     method = ""
     module = ""
     content_type = URL_ENCODED
-    response_cls = ""
     response_where = "url"  # if code otherwise 'body'
     response_type = "urlencoded"
     accept = None
@@ -255,8 +253,8 @@ def __init__(self, conv, inut, sh, **kwargs):
         self.conv.req = self
         self.tests = copy.deepcopy(self._tests)
         self.csi = None
-        self.request = self.conv.msg_factory(self.request_cls)
-        self.response = self.conv.msg_factory(self.response_cls)
+        self.request = self.conv.msg_factory.get_request_type(self.endpoint)
+        self.response = self.conv.msg_factory.get_response_type(self.endpoint)
 
     def run(self):
         _client = self.conv.entity
@@ -287,7 +285,7 @@ def parse_response(self, path, inut, message_factory, response=None):
         except KeyError:
             response_mode = None
 
-        if self.request_cls == "AuthorizationRequest":
+        if self.endpoint == "authorization_endpoint":
             try:
                 _rt = self.csi["response_type"]
             except KeyError:
@@ -322,7 +320,7 @@ def parse_response(self, path, inut, message_factory, response=None):
         ev_index = _conv.events.store(EV_RESPONSE, info,
                                       sender=self.__class__.__name__)
 
-        resp_cls = message_factory(self.response_cls)
+        resp_cls = message_factory.get_response_type(self.endpoint)
         #  algs = _conv.entity.sign_enc_algs("id_token")
         try:
             response = _conv.entity.parse_response(

src/otest/test_setup.py

@@ -10,7 +10,7 @@
 from otest.flow import FlowState
 from otest.prof_util import ProfileHandler
 
-from oic.oic.message import factory
+from oic.oic.message import OIDCMessageFactory
 from oic.oic.message import ProviderConfigurationResponse
 from oic.utils.authn.client import CLIENT_AUTHN_METHOD
 
@@ -39,7 +39,7 @@ def setup_conv():
 
     info = WebIh(session=session_handler, profile_handler=ProfileHandler)
 
-    conv = Conversation([], entity, factory, callback_uris=[])
+    conv = Conversation([], entity, OIDCMessageFactory, callback_uris=[])
     conv.events = Events()
     conv.tool_config = {}
     return {'conv': conv, 'io': info}