Skip to content

Commit 2a814c6

Browse files
committed
Update tests
1 parent e17b22e commit 2a814c6

File tree

3 files changed

+22
-15
lines changed

3 files changed

+22
-15
lines changed
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import pytest
2+
from kiota_http.kiota_client_factory import KiotaClientFactory
3+
4+
from msgraph_core._enums import FeatureUsageFlag
5+
from msgraph_core.middleware import AsyncGraphTransport, GraphRequestContext
6+
7+
8+
def test_set_request_context_and_feature_usage(mock_request, mock_transport):
9+
middleware = KiotaClientFactory.get_default_middleware()
10+
pipeline = KiotaClientFactory.create_middleware_pipeline(middleware, mock_transport)
11+
transport = AsyncGraphTransport(mock_transport, pipeline)
12+
transport.set_request_context_and_feature_usage(mock_request)
13+
14+
assert hasattr(mock_request, 'context')
15+
assert isinstance(mock_request.context, GraphRequestContext)
16+
assert mock_request.context.feature_usage == hex(
17+
FeatureUsageFlag.RETRY_HANDLER_ENABLED | FeatureUsageFlag.REDIRECT_HANDLER_ENABLED
18+
)

tests/unit/test_graph_client_factory.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
# ------------------------------------
55
import httpx
66
import pytest
7-
from kiota_http.middleware import AsyncKiotaTransport, MiddlewarePipeline, RedirectHandler
7+
from kiota_http.middleware import MiddlewarePipeline, RedirectHandler
88

99
from msgraph_core import APIVersion, GraphClientFactory, NationalClouds
10-
from msgraph_core.middleware.telemetry import GraphTelemetryHandler
10+
from msgraph_core.middleware import AsyncGraphTransport, GraphTelemetryHandler
1111

1212

1313
def test_create_with_default_middleware():
1414
"""Test creation of GraphClient using default middleware"""
1515
client = GraphClientFactory.create_with_default_middleware()
1616

1717
assert isinstance(client, httpx.AsyncClient)
18-
assert isinstance(client._transport, AsyncKiotaTransport)
18+
assert isinstance(client._transport, AsyncGraphTransport)
1919
pipeline = client._transport.pipeline
2020
assert isinstance(pipeline, MiddlewarePipeline)
2121
assert isinstance(pipeline._first_middleware, RedirectHandler)
@@ -30,7 +30,7 @@ def test_create_with_custom_middleware():
3030
client = GraphClientFactory.create_with_custom_middleware(middleware=middleware)
3131

3232
assert isinstance(client, httpx.AsyncClient)
33-
assert isinstance(client._transport, AsyncKiotaTransport)
33+
assert isinstance(client._transport, AsyncGraphTransport)
3434
pipeline = client._transport.pipeline
3535
assert isinstance(pipeline._first_middleware, GraphTelemetryHandler)
3636

tests/unit/test_graph_telemetry_handler.py

-11
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,11 @@
1010
import pytest
1111

1212
from msgraph_core import SDK_VERSION, APIVersion, NationalClouds
13-
from msgraph_core._enums import FeatureUsageFlag
1413
from msgraph_core.middleware import GraphRequestContext, GraphTelemetryHandler
1514

1615
BASE_URL = NationalClouds.Global + '/' + APIVersion.v1
1716

1817

19-
def test_set_request_context_and_feature_usage(mock_request, mock_transport):
20-
telemetry_handler = GraphTelemetryHandler()
21-
telemetry_handler.set_request_context_and_feature_usage(mock_request, mock_transport)
22-
23-
assert hasattr(mock_request, 'context')
24-
assert mock_request.context.feature_usage == hex(
25-
FeatureUsageFlag.RETRY_HANDLER_ENABLED | FeatureUsageFlag.REDIRECT_HANDLER_ENABLED
26-
)
27-
28-
2918
def test_is_graph_url(mock_graph_request):
3019
"""
3120
Test method that checks whether a request url is a graph endpoint

0 commit comments

Comments
 (0)