Update test project

microsoftgraph · Jul 14, 2023 · b46704a · b46704a
1 parent 3a3ed21
commit b46704a
Show file tree

Hide file tree

Showing 36 changed files with 307 additions and 203 deletions.
diff --git a/test/BaseRequestBuilderExtensionTests.cs b/test/BaseRequestBuilderExtensionTests.cs
@@ -16,7 +16,7 @@ public void GetResourceSubscriptionPathReturnsCorrectPath()
       var expectedMeMessagesPath = "/me/messages";
 
       // ACT
-      using var gsc = GraphServiceTestClient.Create();
+      using var gsc = TestGraphServiceClient.Create();
       var channelResource = gsc.GraphServiceClient.Teams[teamId].Channels[channelId];
       var actualChannelPath = (channelResource as IBaseRequestBuilder).GetResourceSubscriptionPath();
 
@@ -36,7 +36,7 @@ public void WithODataCastUpdatesUrl()
       var expectedUrl = "/me/memberOf/microsoft.graph.directoryRole";
 
       // ACT
-      using var gsc = GraphServiceTestClient.Create();
+      using var gsc = TestGraphServiceClient.Create();
       var request = gsc.GraphServiceClient.Me.MemberOf.WithODataCast(oDataCast).Request();
       var actualUrl = request.RequestUrl;
 

diff --git a/test/BaseRequestExtensionTests.cs b/test/BaseRequestExtensionTests.cs
@@ -11,7 +11,7 @@ public void GraphRequestWithImmutableIdGeneratesCorrectRequestHeaders()
       // ARRANGE
 
       using var response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
       // ACT
       var request = gsc.GraphServiceClient
                           .Me
@@ -30,7 +30,7 @@ public void ExtensionRequestGeneratesCorrectRequestHeaders()
       // ARRANGE
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
       // ACT
       var request = gsc.GraphServiceClient
                           .SharePointAPI("https://mockSite.sharepoint.com")
@@ -50,7 +50,7 @@ public void GraphRequestWithEventualConsistencyGeneratesCorrectRequestHeader()
       // ARRANGE
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = gsc.GraphServiceClient

diff --git a/test/BaseSharePointAPIRequestTests.cs b/test/BaseSharePointAPIRequestTests.cs
@@ -20,7 +20,7 @@ public async Task SetsDefaultHandlerOption()
     {
       // ARRANGE
       var handler = new MockSharePointServiceHandler();
-      var client = GraphServiceTestClient.Create(handler);
+      var client = TestGraphServiceClient.Create(handler);
       var req = new BaseSharePointAPIRequest("TEST", "http://localhost", client.GraphServiceClient, null);
 
       // ACT
@@ -35,7 +35,7 @@ public async Task SetsHandlerOption()
     {
       // ARRANGE
       var handler = new MockSharePointServiceHandler();
-      var client = GraphServiceTestClient.Create(handler);
+      var client = TestGraphServiceClient.Create(handler);
       var expected = true;
       var req = new BaseSharePointAPIRequest("TEST", "http://localhost", client.GraphServiceClient, null);
 
@@ -52,7 +52,7 @@ public async Task SetsHandlerOptionToClientSetting()
     {
       // ARRANGE
       var handler = new MockSharePointServiceHandler();
-      var client = GraphServiceTestClient.Create(handler);
+      var client = TestGraphServiceClient.Create(handler);
       var expected = true;
       CommunityGraphClientFactory.TelemetryDisabled = expected;
       var req = new BaseSharePointAPIRequest("TEST", "http://localhost", client.GraphServiceClient, null);

diff --git a/test/ChangeLogRequestTests.cs b/test/ChangeLogRequestTests.cs
@@ -35,7 +35,7 @@ public async Task GetChanges_ReturnsCorrectDerivedClasses()
       };
 
       var mockAuthProvider = new MockAuthenticationProvider();
-      var mockHttpProvider = new MockHttpProvider(responseMessage, new Serializer());
+      var mockHttpProvider = new MockHttpProvider(responseMessage, new Graph.Community.Test.TestSerializer());
       var graphServiceClient = new GraphServiceClient(mockAuthProvider.Object, mockHttpProvider.Object);
 
       // ACT

diff --git a/test/Graph.Community.Test.csproj b/test/Graph.Community.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/test/GraphGroupExtensionsTests.cs b/test/GraphGroupExtensionsTests.cs
@@ -19,8 +19,7 @@ public async Task AddMember_GeneratesCorrectRequest()
       var expectedUri = new Uri($"https://graph.microsoft.com/v1.0/groups/{groupId}/members/$ref");
       var expectedContent = $"{{\"@odata.id\":\"https://graph.microsoft.com/v1.0/directoryObjects/{userId}\"}}";
 
-      using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create();
 
       // ACT
       await gsc.GraphServiceClient
@@ -57,8 +56,7 @@ public async Task RemoveMember_GeneratesCorrectRequest()
 
       var expectedUri = new Uri($"https://graph.microsoft.com/v1.0/groups/{groupId}/members/{userId}/$ref");
 
-      using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create();
 
       // ACT
       await gsc.GraphServiceClient
@@ -93,8 +91,7 @@ public async Task AddOwner_GeneratesCorrectRequest()
       var expectedUri = new Uri($"https://graph.microsoft.com/v1.0/groups/{groupId}/owners/$ref");
       var expectedContent = $"{{\"@odata.id\":\"https://graph.microsoft.com/v1.0/directoryObjects/{userId}\"}}";
 
-      using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create();
 
       // ACT
       await gsc.GraphServiceClient
@@ -131,8 +128,7 @@ public async Task RemoveOwner_GeneratesCorrectRequest()
 
       var expectedUri = new Uri($"https://graph.microsoft.com/v1.0/groups/{groupId}/owners/{userId}/$ref");
 
-      using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create();
 
       // ACT
       await gsc.GraphServiceClient

diff --git a/test/ListCollectionRequestTests.cs b/test/ListCollectionRequestTests.cs
@@ -26,7 +26,7 @@ public void GeneratesCorrectRequestHeaders()
       // ARRANGE
 
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT
         var request = gsc.GraphServiceClient
@@ -50,7 +50,7 @@ public async Task Get_GeneratesCorrectRequest()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists");
 
       using var response = new HttpResponseMessage();
-      using var gsc = GraphServiceTestClient.Create(response);
+      using var gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       await gsc.GraphServiceClient
@@ -90,7 +90,7 @@ public async Task Get_ReturnsCorrectResponse()
       ChangeToken expectedChangeToken = new ChangeToken() { StringValue = "1;3;f12b876b-54d7-44e4-9dad-122bedd899a6;637891749137700000;350718294" };
 
       using (responseMessage)
-      using (var gsc = GraphServiceTestClient.Create(responseMessage))
+      using (var gsc = TestGraphServiceClient.Create(responseMessage))
       {
         // ACT
         var response = await gsc.GraphServiceClient

diff --git a/test/ListFieldCollectionRequestTests.cs b/test/ListFieldCollectionRequestTests.cs
@@ -30,7 +30,7 @@ public void GeneratesCorrectRequestHeaders()
       // ARRANGE
       var mockListId = Guid.NewGuid();
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT
         var request = gsc.GraphServiceClient
@@ -57,7 +57,7 @@ public void GetFields_GeneratesCorrectRequest()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')/fields");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = gsc.GraphServiceClient
@@ -96,7 +96,7 @@ public async Task GetFields_ReturnsCorrectDerivedClasses()
       };
 
       var mockAuthProvider = new MockAuthenticationProvider();
-      var mockHttpProvider = new MockHttpProvider(responseMessage, new Serializer());
+      var mockHttpProvider = new MockHttpProvider(responseMessage, new Graph.Community.Test.TestSerializer());
       var graphServiceClient = new GraphServiceClient(mockAuthProvider.Object, mockHttpProvider.Object);
 
       // ACT

diff --git a/test/ListItemCollectionRequestTests.cs b/test/ListItemCollectionRequestTests.cs
@@ -26,7 +26,7 @@ public void GeneratesCorrectRequestHeaders()
       // ARRANGE
 
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT
         var request = gsc.GraphServiceClient
@@ -52,7 +52,7 @@ public async Task Get_GeneratesCorrectRequest()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')/items");
 
       using var response = new HttpResponseMessage();
-      using var gsc = GraphServiceTestClient.Create(response);
+      using var gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       await gsc.GraphServiceClient
@@ -95,7 +95,7 @@ public async Task Get_ReturnsCorrectResponse()
       ChangeToken expectedChangeToken = new ChangeToken() { StringValue = "1;3;f12b876b-54d7-44e4-9dad-122bedd899a6;637891749137700000;350718294" };
 
       using (responseMessage)
-      using (var gsc = GraphServiceTestClient.Create(responseMessage))
+      using (var gsc = TestGraphServiceClient.Create(responseMessage))
       {
         // ACT
         var response = await gsc.GraphServiceClient

diff --git a/test/ListItemRequestTests.cs b/test/ListItemRequestTests.cs
@@ -29,7 +29,7 @@ public void GetById_GeneratesCorrectRequestUriAndHeaders()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')/items({mockListItemId})");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient testClient = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient testClient = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = testClient.GraphServiceClient
@@ -55,7 +55,7 @@ public async Task GetById_MissingId_Throws()
       var mockListItemId = 0;
 
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT & ASSERT
         await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
@@ -85,7 +85,7 @@ public async Task GetById_ReturnsCorrectResponse()
       };
 
       using (responseMessage)
-      using (GraphServiceTestClient gsc = GraphServiceTestClient.Create(responseMessage))
+      using (TestGraphServiceClient gsc = TestGraphServiceClient.Create(responseMessage))
       {
         // ACT
         var actual = await gsc.GraphServiceClient

diff --git a/test/ListRequestTests.cs b/test/ListRequestTests.cs
@@ -29,7 +29,7 @@ public void GetById_GeneratesCorrectRequestUriAndHeaders()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient testClient = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient testClient = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = testClient.GraphServiceClient
@@ -54,7 +54,7 @@ public void GetById_GeneratesCorrectRequestUriAndHeaders_WithExpand()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')?$expand=Forms");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient testClient = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient testClient = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = testClient.GraphServiceClient
@@ -78,7 +78,7 @@ public void GetById_GeneratesCorrectRequestUriAndHeaders_WithExpand()
     public async Task GetById_MissingId_Throws()
     {
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT & ASSERT
         await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
@@ -100,7 +100,7 @@ public void GetByTitle_GeneratesCorrectRequestUriAndHeaders()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists/getByTitle('{mockListTitle}')");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = gsc.GraphServiceClient
@@ -125,7 +125,7 @@ public void GetByTitle_GeneratesCorrectRequestUriAndHeaders_WithExpand()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists/getByTitle('{mockListTitle}')?$expand=Forms");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = gsc.GraphServiceClient
@@ -149,7 +149,7 @@ public void GetByTitle_GeneratesCorrectRequestUriAndHeaders_WithExpand()
     public async Task GetByTitle_MissingTitle_Throws(string title)
     {
       using (var response = new HttpResponseMessage())
-      using (var gsc = GraphServiceTestClient.Create(response))
+      using (var gsc = TestGraphServiceClient.Create(response))
       {
         // ACT & ASSERT
         await Assert.ThrowsAsync<ArgumentNullException>(
@@ -177,7 +177,7 @@ public async Task Get_ReturnsCorrectResponse()
       };
 
       using (responseMessage)
-      using (GraphServiceTestClient gsc = GraphServiceTestClient.Create(responseMessage))
+      using (TestGraphServiceClient gsc = TestGraphServiceClient.Create(responseMessage))
       {
         // ACT
         var actual = await gsc.GraphServiceClient
@@ -207,7 +207,7 @@ public void GetItems_GeneratesCorrectRequestUriAndHeaders()
       var expectedUri = new Uri($"{mockWebUrl}/_api/web/lists('{mockListId}')/items");
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient testClient = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient testClient = TestGraphServiceClient.Create(response);
 
       // ACT
       var request = testClient.GraphServiceClient
@@ -238,7 +238,7 @@ public async Task GetChanges_GeneratesCorrectRequest()
       var expectedContent = "{\"query\":{\"Add\":true}}";
 
       using HttpResponseMessage response = new HttpResponseMessage();
-      using GraphServiceTestClient gsc = GraphServiceTestClient.Create(response);
+      using TestGraphServiceClient gsc = TestGraphServiceClient.Create(response);
 
       // ACT
       await gsc.GraphServiceClient

diff --git a/test/Mocks/MockHttpProvider.cs b/test/Mocks/MockHttpProvider.cs
@@ -15,15 +15,21 @@ public class MockHttpProvider : Mock<IHttpProvider>
     public string ContentAsString { get; private set; }
     public HttpContentHeaders ContentHeaders { get; private set; }
 
-    public MockHttpProvider(HttpResponseMessage httpResponseMessage, ISerializer serializer = null)
-        : base(MockBehavior.Loose)
+    public MockHttpProvider(HttpResponseMessage httpResponseMessage, ISerializer serializer)
+        : base(MockBehavior.Strict)
     {
+      var paul = "Debug";
+
       this.Setup(provider => provider.SendAsync(It.IsAny<HttpRequestMessage>(), It.IsAny<HttpCompletionOption>(), It.IsAny<CancellationToken>()))
         .Callback<HttpRequestMessage, HttpCompletionOption, CancellationToken>(async (req, opt, tok) => await this.ReadRequestContent(req))
         .ReturnsAsync(httpResponseMessage);
 
 
-      this.SetupGet(provider => provider.Serializer).Returns(serializer);
+      ISerializer s() {
+        var paul = "debug";
+        return serializer;
+      }
+      this.SetupGet(provider => provider.Serializer).Returns(s());
     }
 
     private async Task ReadRequestContent(HttpRequestMessage req)

diff --git a/test/Mocks/MockSerializer.cs b/test/Mocks/MockSerializer.cs