Update tests

Author: samwelkanda

tests/conftest.py

@@ -1,44 +1,42 @@
 import httpx
 import pytest
-from azure.identity.aio import DefaultAzureCredential
-from kiota_abstractions.authentication import AccessTokenProvider
+from kiota_abstractions.authentication import AnonymousAuthenticationProvider
 from kiota_authentication_azure.azure_identity_access_token_provider import (
     AzureIdentityAccessTokenProvider,
 )
 
 from msgraph.core import APIVersion, NationalClouds
-from msgraph.core.middleware import GraphRequest, GraphRequestContext
+from msgraph.core.graph_client_factory import GraphClientFactory
+from msgraph.core.middleware import GraphRequestContext
 
 BASE_URL = NationalClouds.Global + '/' + APIVersion.v1
 
 
-class MockAccessTokenProvider(AccessTokenProvider):
+class MockAuthenticationProvider(AnonymousAuthenticationProvider):
 
-    async def get_authorization_token(self, request: GraphRequest) -> str:
+    async def get_authorization_token(self, request: httpx.Request) -> str:
         """Returns a string representing a dummy token
         Args:
             request (GraphRequest): Graph request object
         """
-        return "Sample token"
-
-    def get_allowed_hosts_validator(self) -> None:
-        pass
+        request.headers['Authorization'] = 'Sample token'
+        return
 
 
 @pytest.fixture
-def mock_token_provider():
-    return MockAccessTokenProvider()
+def mock_auth_provider():
+    return MockAuthenticationProvider()
 
 
 @pytest.fixture
 def mock_transport():
-    return httpx.AsyncClient()._transport
+    client = GraphClientFactory.create_with_default_middleware()
+    return client._transport
 
 
 @pytest.fixture
 def mock_request():
     req = httpx.Request('GET', "https://example.org")
-    req.context = GraphRequestContext({}, req.headers)
     return req
 
 

tests/unit/test_graph_client_factory.py

@@ -4,62 +4,59 @@
 # ------------------------------------
 import httpx
 import pytest
-from kiota_http.middleware import AsyncKiotaTransport
+from kiota_http.middleware import (
+    AsyncKiotaTransport,
+    MiddlewarePipeline,
+    ParametersNameDecodingHandler,
+)
 
 from msgraph.core import APIVersion, GraphClientFactory, NationalClouds
-from msgraph.core._constants import DEFAULT_CONNECTION_TIMEOUT, DEFAULT_REQUEST_TIMEOUT
-from msgraph.core.middleware import GraphAuthorizationHandler
-from msgraph.core.middleware.middleware import GraphMiddlewarePipeline
-from msgraph.core.middleware.redirect import GraphRedirectHandler
-from msgraph.core.middleware.retry import GraphRetryHandler
 from msgraph.core.middleware.telemetry import GraphTelemetryHandler
 
 
-def test_create_with_default_middleware_no_auth_provider():
-    """Test creation of GraphClient without a token provider does not
-    add the Authorization middleware"""
-    client = GraphClientFactory.create_with_default_middleware(client=httpx.AsyncClient())
+def test_create_with_default_middleware():
+    """Test creation of GraphClient using default middleware"""
+    client = GraphClientFactory.create_with_default_middleware()
 
     assert isinstance(client, httpx.AsyncClient)
     assert isinstance(client._transport, AsyncKiotaTransport)
-    pipeline = client._transport.middleware
-    assert isinstance(pipeline, GraphMiddlewarePipeline)
-    assert not isinstance(pipeline._first_middleware, GraphAuthorizationHandler)
+    pipeline = client._transport.pipeline
+    assert isinstance(pipeline, MiddlewarePipeline)
+    assert isinstance(pipeline._first_middleware, ParametersNameDecodingHandler)
+    assert isinstance(pipeline._current_middleware, GraphTelemetryHandler)
 
 
-def test_create_with_default_middleware(mock_token_provider):
-    """Test creation of GraphClient using default middleware and passing a token
-    provider adds Authorization middleware"""
-    client = GraphClientFactory.create_with_default_middleware(
-        client=httpx.AsyncClient(), token_provider=mock_token_provider
-    )
-
-    assert isinstance(client, httpx.AsyncClient)
-    assert isinstance(client._transport, AsyncKiotaTransport)
-    pipeline = client._transport.middleware
-    assert isinstance(pipeline, GraphMiddlewarePipeline)
-    assert isinstance(pipeline._first_middleware, GraphAuthorizationHandler)
-
-
-def test_create_with_custom_middleware(mock_token_provider):
+def test_create_with_custom_middleware():
     """Test creation of HTTP Clients with custom middleware"""
     middleware = [
         GraphTelemetryHandler(),
     ]
-    client = GraphClientFactory.create_with_custom_middleware(
-        client=httpx.AsyncClient(), middleware=middleware
-    )
+    client = GraphClientFactory.create_with_custom_middleware(middleware=middleware)
 
     assert isinstance(client, httpx.AsyncClient)
     assert isinstance(client._transport, AsyncKiotaTransport)
-    pipeline = client._transport.middleware
+    pipeline = client._transport.pipeline
     assert isinstance(pipeline._first_middleware, GraphTelemetryHandler)
 
 
-def test_get_common_middleware():
-    middleware = GraphClientFactory._get_common_middleware()
-
-    assert len(middleware) == 3
-    assert isinstance(middleware[0], GraphRedirectHandler)
-    assert isinstance(middleware[1], GraphRetryHandler)
-    assert isinstance(middleware[2], GraphTelemetryHandler)
+def test_graph_client_factory_with_custom_configuration():
+    """
+    Test creating a graph client with custom url overrides the default
+    """
+    graph_client = GraphClientFactory.create_with_default_middleware(
+        api_version=APIVersion.beta, host=NationalClouds.China
+    )
+    assert isinstance(graph_client, httpx.AsyncClient)
+    assert str(graph_client.base_url) == f'{NationalClouds.China}/{APIVersion.beta}/'
+
+
+def test_get_base_url():
+    """
+    Test base url is formed by combining the national cloud endpoint with
+    Api version
+    """
+    url = GraphClientFactory._get_base_url(
+        host=NationalClouds.Germany,
+        api_version=APIVersion.beta,
+    )
+    assert url == f'{NationalClouds.Germany}/{APIVersion.beta}'

tests/unit/test_graph_request_adapter.py

@@ -7,12 +7,11 @@
 )
 
 from msgraph.core.graph_request_adapter import GraphRequestAdapter
-from tests.conftest import mock_token_provider
 
 
-def test_create_graph_request_adapter(mock_token_provider):
-    request_adapter = GraphRequestAdapter(mock_token_provider)
-    assert request_adapter._authentication_provider is mock_token_provider
+def test_create_graph_request_adapter(mock_auth_provider):
+    request_adapter = GraphRequestAdapter(mock_auth_provider)
+    assert request_adapter._authentication_provider is mock_auth_provider
     assert isinstance(request_adapter._parse_node_factory, ParseNodeFactoryRegistry)
     assert isinstance(
         request_adapter._serialization_writer_factory, SerializationWriterFactoryRegistry

tests/unit/test_graph_telemetry_handler.py

@@ -9,12 +9,23 @@
 import httpx
 import pytest
 
-from msgraph.core import SDK_VERSION, APIVersion, GraphClient, NationalClouds
+from msgraph.core import SDK_VERSION, APIVersion, NationalClouds
+from msgraph.core._enums import FeatureUsageFlag
 from msgraph.core.middleware import GraphRequestContext, GraphTelemetryHandler
 
 BASE_URL = NationalClouds.Global + '/' + APIVersion.v1
 
 
+def test_set_request_context_and_feature_usage(mock_request, mock_transport):
+    telemetry_handler = GraphTelemetryHandler()
+    telemetry_handler.set_request_context_and_feature_usage(mock_request, mock_transport)
+
+    assert hasattr(mock_request, 'context')
+    assert mock_request.context.feature_usage == hex(
+        FeatureUsageFlag.RETRY_HANDLER_ENABLED | FeatureUsageFlag.REDIRECT_HANDLER_ENABLED
+    )
+
+
 def test_is_graph_url(mock_graph_request):
     """
     Test method that checks whether a request url is a graph endpoint