refactor

Author: YunchuWang

azure/functions/decorators/function_app.py

@@ -1694,26 +1694,27 @@ def __init__(self, app,
         """Constructor of :class:`AsgiFunctionApp` object.
 
         :param app: asgi app object.
+        :param http_auth_level: Determines what keys, if any, need to be
+        present
+        on the request in order to invoke the function.
         """
         super().__init__(auth_level=http_auth_level)
-        self._add_http_app(AsgiMiddleware(app), 'asgi')
+        self._add_http_app(AsgiMiddleware(app))
 
-    def _add_http_app(self,
-                      http_middleware: AsgiMiddleware,
-                      http_type: str) -> None:
+    def _add_http_app(self, asgi_middleware: AsgiMiddleware) -> None:
         """Add an Asgi app integrated http function.
 
-        :param http_middleware: :class:`AsgiMiddleware` instance.
+        :param asgi_middleware: :class:`AsgiMiddleware` instance.
 
         :return: None
         """
 
-        @self.http_type(http_type=http_type)
+        @self.http_type(http_type='asgi')
         @self.route(methods=(method for method in HttpMethod),
                     auth_level=self.auth_level,
                     route="/{*route}")
         async def http_app_func(req: HttpRequest, context: Context):
-            return await http_middleware.handle_async(req, context)
+            return await asgi_middleware.handle_async(req, context)
 
 
 class WsgiFunctionApp(ExternalHttpFunctionApp):
@@ -1724,21 +1725,20 @@ def __init__(self, app,
         :param app: wsgi app object.
         """
         super().__init__(auth_level=http_auth_level)
-        self._add_http_app(WsgiMiddleware(app), 'wsgi')
+        self._add_http_app(WsgiMiddleware(app))
 
     def _add_http_app(self,
-                      http_middleware: WsgiMiddleware,
-                      http_type: str) -> None:
+                      wsgi_middleware: WsgiMiddleware) -> None:
         """Add a Wsgi app integrated http function.
 
-        :param http_middleware: :class:`WsgiMiddleware` instance.
+        :param wsgi_middleware: :class:`WsgiMiddleware` instance.
 
         :return: None
         """
 
-        @self.http_type(http_type=http_type)
+        @self.http_type(http_type='wsgi')
         @self.route(methods=(method for method in HttpMethod),
                     auth_level=self.auth_level,
                     route="/{*route}")
         def http_app_func(req: HttpRequest, context: Context):
-            return http_middleware.handle(req, context)
+            return wsgi_middleware.handle(req, context)

tests/decorators/test_function_app.py

@@ -303,8 +303,6 @@ def test_add_asgi(self, add_http_app_mock):
         self.assertIsInstance(add_http_app_mock.call_args[0][0],
                               AsgiMiddleware)
 
-        self.assertEqual(add_http_app_mock.call_args[0][1], 'asgi')
-
     @mock.patch('azure.functions.decorators.function_app.WsgiFunctionApp'
                 '._add_http_app')
     def test_add_wsgi(self, add_http_app_mock):
@@ -314,7 +312,6 @@ def test_add_wsgi(self, add_http_app_mock):
         add_http_app_mock.assert_called_once()
         self.assertIsInstance(add_http_app_mock.call_args[0][0],
                               WsgiMiddleware)
-        self.assertEqual(add_http_app_mock.call_args[0][1], 'wsgi')
 
     def test_add_asgi_app(self):
         self._test_http_external_app(AsgiFunctionApp(app=object()), True)