Update tests

Author: samwelkanda

tests/unit/test_graph_client.py

@@ -45,15 +45,6 @@ def test_initialize_graph_client_both_token_provider_and_custom_middleware(mock_
         graph_client = GraphClient(token_provider=mock_token_provider, middleware=middleware)
 
 
-def test_initialize_graph_client_without_token_provider_or_custom_middleware():
-    """
-    Test creating a graph client with default middleware works as expected
-    """
-
-    with pytest.raises(Exception):
-        graph_client = GraphClient()
-
-
 def test_graph_client_with_custom_configuration(mock_token_provider):
     """
     Test creating a graph client with custom middleware works as expected
@@ -75,3 +66,15 @@ def test_graph_client_uses_same_session(mock_token_provider):
 
     graph_client2 = GraphClient(token_provider=mock_token_provider)
     assert graph_client1 is graph_client2
+
+
+def test_get_base_url():
+    """
+    Test base url is formed by combining the national cloud endpoint with
+    Api version
+    """
+    url = GraphClient()._get_base_url(
+        base_url=NationalClouds.Germany,
+        api_version=APIVersion.beta,
+    )
+    assert url == f'{NationalClouds.Germany}/{APIVersion.beta}'

tests/unit/test_graph_client_factory.py

@@ -10,84 +10,56 @@
 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_initialize_with_custom_config():
-    """Test creation of HTTP Client will use custom configuration if they are passed"""
-    client = GraphClientFactory(
-        api_version=APIVersion.beta, base_url=NationalClouds.Global, timeout=(5, 5), client=None
-    )
+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())
 
-    assert client.api_version == APIVersion.beta
-    assert client.base_url == NationalClouds.Global
-    assert client.timeout == (5, 5)
-    assert not isinstance(client.client, httpx.AsyncClient)
+    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)
 
 
 def test_create_with_default_middleware(mock_token_provider):
-    """Test creation of GraphClient using default middleware"""
-    client = GraphClientFactory(
-        api_version=APIVersion.beta,
-        timeout=httpx.Timeout(
-            5,
-            connect=5,
-        ),
-        base_url=NationalClouds.Global,
-        client=None
-    ).create_with_default_middleware(token_provider=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)
-    assert str(client.base_url) == f'{NationalClouds.Global}/{APIVersion.beta}/'
+    pipeline = client._transport.middleware
+    assert isinstance(pipeline, GraphMiddlewarePipeline)
+    assert isinstance(pipeline._first_middleware, GraphAuthorizationHandler)
 
 
 def test_create_with_custom_middleware(mock_token_provider):
     """Test creation of HTTP Clients with custom middleware"""
     middleware = [
-        GraphAuthorizationHandler(mock_token_provider),
+        GraphTelemetryHandler(),
     ]
-    client = GraphClientFactory(
-        api_version=APIVersion.v1,
-        timeout=httpx.Timeout(
-            5,
-            connect=5,
-        ),
-        base_url=NationalClouds.Global,
-        client=None
-    ).create_with_custom_middleware(middleware=middleware)
+    client = GraphClientFactory.create_with_custom_middleware(
+        client=httpx.AsyncClient(), middleware=middleware
+    )
 
     assert isinstance(client, httpx.AsyncClient)
     assert isinstance(client._transport, AsyncKiotaTransport)
-    assert str(client.base_url) == f'{NationalClouds.Global}/{APIVersion.v1}/'
+    pipeline = client._transport.middleware
+    assert isinstance(pipeline._first_middleware, GraphTelemetryHandler)
 
 
-def test_get_base_url():
-    """
-    Test base url is formed by combining the national cloud endpoint with
-    Api version
-    """
-    client = GraphClientFactory(
-        api_version=APIVersion.beta,
-        base_url=NationalClouds.Germany,
-        timeout=httpx.Timeout(
-            5,
-            connect=5,
-        ),
-        client=None
-    )
-    assert client._get_base_url() == f'{NationalClouds.Germany}/{APIVersion.beta}'
-
-
-def test_get_default_middleware(mock_token_provider):
-    client = GraphClientFactory(
-        api_version=APIVersion.beta,
-        base_url=NationalClouds.Germany,
-        timeout=httpx.Timeout(
-            5,
-            connect=5,
-        ),
-        client=None
-    )
-    middleware = client._get_default_middleware(mock_token_provider, httpx.AsyncClient()._transport)
+def test_get_common_middleware():
+    middleware = GraphClientFactory._get_common_middleware()
 
-    assert isinstance(middleware, GraphMiddlewarePipeline)
+    assert len(middleware) == 3
+    assert isinstance(middleware[0], GraphRedirectHandler)
+    assert isinstance(middleware[1], GraphRetryHandler)
+    assert isinstance(middleware[2], GraphTelemetryHandler)

tests/unit/test_graph_request_adapter.py

@@ -0,0 +1,26 @@
+import httpx
+import pytest
+from asyncmock import AsyncMock
+from kiota_abstractions.serialization import (
+    ParseNodeFactoryRegistry,
+    SerializationWriterFactoryRegistry,
+)
+
+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
+    assert isinstance(request_adapter._parse_node_factory, ParseNodeFactoryRegistry)
+    assert isinstance(
+        request_adapter._serialization_writer_factory, SerializationWriterFactoryRegistry
+    )
+    assert isinstance(request_adapter._http_client, httpx.AsyncClient)
+    assert request_adapter.base_url == ''
+
+
+def test_create_request_adapter_no_auth_provider():
+    with pytest.raises(TypeError):
+        GraphRequestAdapter(None)