Merge pull request #909 from microsoftgraph/andrueastman/cleanup

chore: cleanup usage of obsolete members and async suffixes in test project
microsoftgraph · Sep 4, 2024 · 958a753 · 958a753
2 parents 6f090ad + b8f4209
commit 958a753
Show file tree

Hide file tree

Showing 14 changed files with 101 additions and 141 deletions.
diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Extensions/IDecryptableContentExtensionsTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Extensions/IDecryptableContentExtensionsTests.cs
@@ -64,7 +64,7 @@ public IDecryptableContentExtensionsTests()
         }
 
         [Fact]
-        public async Task DecryptableContentCanBeDecryptedWithCertificate()
+        public async Task DecryptableContentCanBeDecryptedWithCertificateAsync()
         {
             // Arrange
             var testChangeNotificationEncryptedContent = new TestChangeNotificationEncryptedContent

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj b/tests/Microsoft.Graph.DotnetCore.Core.Test/Microsoft.Graph.DotnetCore.Core.Test.csproj
@@ -5,7 +5,6 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <LangVersion>latest</LangVersion>
-    <NoWarn>CS0618</NoWarn>
   </PropertyGroup>
     <ItemGroup>
       <None Update="xunit.runner.json">
@@ -35,6 +34,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <ProjectReference Include="..\..\src\Microsoft.Graph.Core\Microsoft.Graph.Core.csproj" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
    <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockCompressedContent.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Mocks/MockCompressedContent.cs
diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/AsyncMonitorTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/AsyncMonitorTests.cs
@@ -50,14 +50,14 @@ public void Dispose()
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_IsCancelled()
+        public async Task PollForOperationCompletionAsync_IsCancelledAsync()
         {
             var item = await this.asyncMonitor.PollForOperationCompletionAsync(this.progress.Object, new CancellationToken(true));
             Assert.Null(item);
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_OperationCompleted()
+        public async Task PollForOperationCompletionAsync_OperationCompletedAsync()
         {
             bool called = false;
             this.progress.Setup(
@@ -96,7 +96,7 @@ public async Task PollForOperationCompletionAsync_OperationCompleted()
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_OperationCancelled()
+        public async Task PollForOperationCompletionAsync_OperationCancelledAsync()
         {
             this.requestAdapter
                 .Setup(requestAdapter => requestAdapter.SendNoContentAsync(It.IsAny<RequestInformation>(), It.IsAny<Dictionary<string, ParsableFactory<IParsable>>>(), It.IsAny<CancellationToken>()))
@@ -112,7 +112,7 @@ public async Task PollForOperationCompletionAsync_OperationCancelled()
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_OperationDeleteFailed()
+        public async Task PollForOperationCompletionAsync_OperationDeleteFailedAsync()
         {
             this.requestAdapter
                 .Setup(requestAdapter => requestAdapter.SendNoContentAsync(It.IsAny<RequestInformation>(), It.IsAny<Dictionary<string, ParsableFactory<IParsable>>>(), It.IsAny<CancellationToken>()))
@@ -128,7 +128,7 @@ public async Task PollForOperationCompletionAsync_OperationDeleteFailed()
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_OperationFailed()
+        public async Task PollForOperationCompletionAsync_OperationFailedAsync()
         {
             this.requestAdapter
                 .Setup(requestAdapter => requestAdapter.SendNoContentAsync(It.IsAny<RequestInformation>(), It.IsAny<Dictionary<string, ParsableFactory<IParsable>>>(), It.IsAny<CancellationToken>()))
@@ -144,7 +144,7 @@ public async Task PollForOperationCompletionAsync_OperationFailed()
         }
 
         [Fact]
-        public async Task PollForOperationCompletionAsync_OperationNull()
+        public async Task PollForOperationCompletionAsync_OperationNullAsync()
         {
             this.requestAdapter
                 .Setup(requestAdapter => requestAdapter.SendNoContentAsync(It.IsAny<RequestInformation>(), It.IsAny<Dictionary<string, ParsableFactory<IParsable>>>(), It.IsAny<CancellationToken>()))

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/BatchRequestBuilderTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/BatchRequestBuilderTests.cs
@@ -33,7 +33,9 @@ public async Task BatchRequestBuilderAsync()
             BatchRequestStep requestStep2 = new BatchRequestStep("2", httpRequestMessage2, new List<string> { "1" });
 
             // 4.3 Add batch request steps to BatchRequestContent.
+#pragma warning disable CS0618 // Type or member is obsolete use the BatchRequestContentCollection for making batch requests
             BatchRequestContent batchRequestContent = new BatchRequestContent(baseClient, requestStep1, requestStep2);
+#pragma warning restore CS0618 // Type or member is obsolete use the BatchRequestContentCollection for making batch requests
             var requestInformation = await batchRequestBuilder.ToPostRequestInformationAsync(batchRequestContent);
 
             // Assert

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Content/BatchRequestContentTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Content/BatchRequestContentTests.cs
@@ -2,6 +2,7 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
+#pragma warning disable CS0618 // Type or member is obsolete Guidance is to use the BatchRequestContentCollection for making batch requests
 namespace Microsoft.Graph.DotnetCore.Core.Test.Requests.Content
 {
     using System;
@@ -184,7 +185,7 @@ public void BatchRequestContent_RemoveBatchRequestStepWithIdForNonExistingId()
         }
 
         [Fact]
-        public async Task BatchRequestContent_NewBatchWithFailedRequests()
+        public async Task BatchRequestContent_NewBatchWithFailedRequestsAsync()
         {
             BatchRequestContentCollection batchRequestContent = new BatchRequestContentCollection(client);
             var requestIds = new List<string>();
@@ -208,7 +209,7 @@ public async Task BatchRequestContent_NewBatchWithFailedRequests()
         }
 
         [Fact]
-        public async Task BatchRequestContent_NewBatchWithFailedRequests2()
+        public async Task BatchRequestContent_NewBatchWithFailedRequests2Async()
         {
             BatchRequestContentCollection batchRequestContent = new BatchRequestContentCollection(client);
             var requestIds = new List<string>();
@@ -230,7 +231,7 @@ public async Task BatchRequestContent_NewBatchWithFailedRequests2()
         }
 
         [Fact]
-        public async Task BatchRequestContent_NewBatchWithFailedRequestsWithBody()
+        public async Task BatchRequestContent_NewBatchWithFailedRequestsWithBodyAsync()
         {
             BatchRequestContentCollection batchRequestContent = new BatchRequestContentCollection(client);
             var requestIds = new List<string>();
@@ -311,7 +312,7 @@ public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestCont
         }
 
         [Fact]
-        public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestContentSupportsNonJsonPayload()
+        public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestContentSupportsNonJsonPayloadAsync()
         {
             using var fileStream = File.Open("ms-logo.png", FileMode.Open);
             BatchRequestStep batchRequestStep1 = new BatchRequestStep("1", new HttpRequestMessage(HttpMethod.Get, REQUEST_URL));
@@ -364,7 +365,7 @@ public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestCont
         }
 
         [Fact]
-        public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestContentFromStepAsyncDoesNotModifyDateTimes()
+        public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestContentFromStepAsyncDoesNotModifyDateTimesAsync()
         {
             // System.Text.Json is strict on json content by default. So make sure that there are no
             // trailing comma's and special characters
@@ -468,7 +469,7 @@ public async System.Threading.Tasks.Task BatchRequestContent_GetBatchRequestCont
         }
 
         [Fact]
-        public async Task BatchRequest_GetBathRequestContentAsyncRetainsInsertionOrder()
+        public async Task BatchRequest_GetBathRequestContentAsyncRetainsInsertionOrderAsync()
         {
             BatchRequestStep batchRequestStep1 = new BatchRequestStep("1", new HttpRequestMessage(HttpMethod.Get, REQUEST_URL));
             BatchRequestStep batchRequestStep2 = new BatchRequestStep(Guid.NewGuid().ToString(), new HttpRequestMessage(HttpMethod.Get, REQUEST_URL), new List<string> { "1" });
@@ -537,7 +538,7 @@ public void BatchRequestContent_AddBatchRequestStepWithHttpRequestMessageToBatch
         }
 
         [Fact]
-        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequest()
+        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestAsync()
         {
             // Arrange
             RequestInformation requestInformation = new RequestInformation() { HttpMethod = Method.GET, UrlTemplate = REQUEST_URL };
@@ -556,7 +557,7 @@ public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequest()
         }
 
         [Fact]
-        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHeaderOptions()
+        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHeaderOptionsAsync()
         {
             // Create a BatchRequestContent from a BaseRequest object
             BatchRequestContent batchRequestContent = new BatchRequestContent(client);
@@ -593,7 +594,7 @@ public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestWithHead
         }
 
         [Fact]
-        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestToBatchRequestContentWithMaxSteps()
+        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestToBatchRequestContentWithMaxStepsAsync()
         {
             // Arrange
             BatchRequestContent batchRequestContent = new BatchRequestContent(client);
@@ -623,7 +624,7 @@ public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestToBatchR
         [InlineData("https://graph.microsoft.com/beta/users/[email protected]/events", "/users/[email protected]/events")]
         [InlineData("https://graph.microsoft.com/v1.0/users?$filter=identities/any(id:id/issuer%20eq%20'$74707853-18b3-411f-ad57-2ef65f6fdeb0'%20and%20id/issuerAssignedId%20eq%20'**[email protected]**')", "/users?$filter=identities/any(id:id/issuer eq '$74707853-18b3-411f-ad57-2ef65f6fdeb0' and id/issuerAssignedId eq '**[email protected]**')")]
         [InlineData("https://graph.microsoft.com/beta/users?$filter=identities/any(id:id/issuer%20eq%20'$74707853-18b3-411f-ad57-2ef65f6fdeb0'%20and%20id/issuerAssignedId%20eq%20'**[email protected]**')&$top=1", "/users?$filter=identities/any(id:id/issuer eq '$74707853-18b3-411f-ad57-2ef65f6fdeb0' and id/issuerAssignedId eq '**[email protected]**')&$top=1")]
-        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestProperlySetsVersion(string requestUrl, string expectedUrl)
+        public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestProperlySetsVersionAsync(string requestUrl, string expectedUrl)
         {
             // Arrange
             BatchRequestStep batchRequestStep = new BatchRequestStep("1", new HttpRequestMessage(HttpMethod.Get, requestUrl));
@@ -647,7 +648,7 @@ public async Task BatchRequestContent_AddBatchRequestStepWithBaseRequestProperly
 
         [Theory]
         [InlineData("https://graph.microsoft.com/v1.0/drives/b%21ynG/items/74707853-18b3-411f-ad57-2ef65f6fdeb0:/test.txt:/textfilecontentbytes", "/drives/b!ynG/items/74707853-18b3-411f-ad57-2ef65f6fdeb0:/test.txt:/textfilecontentbytes")]
-        public async Task BatchRequestContent_AddBatchRequestPutStepWithBaseRequestProperlyEncodedURI(string requestUrl, string expectedUrl)
+        public async Task BatchRequestContent_AddBatchRequestPutStepWithBaseRequestProperlyEncodedURIAsync(string requestUrl, string expectedUrl)
         {
             // Arrange
             BatchRequestStep batchRequestStep = new BatchRequestStep("1", new HttpRequestMessage(HttpMethod.Put, requestUrl));

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Content/BatchResponseContentTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Content/BatchResponseContentTests.cs
@@ -229,7 +229,7 @@ public async Task BatchResponseContent_GetResponseStreamByIdAsync()
 
 
         [Fact]
-        public async Task BatchResponseContent_GetResponseByIdAsyncWithDeseirializer()
+        public async Task BatchResponseContent_GetResponseByIdAsyncWithDeseirializerAsync()
         {
             // Arrange
             string responseJSON = "{\"responses\":"
@@ -295,7 +295,7 @@ public async Task BatchResponseContent_GetResponseByIdAsyncWithDeseirializer()
         }
 
         [Fact]
-        public async Task BatchResponseContent_GetResponseByIdAsyncWithDeserializerWorksWithDateTimeOffsets()
+        public async Task BatchResponseContent_GetResponseByIdAsyncWithDeserializerWorksWithDateTimeOffsetsAsync()
         {
             // Arrange an example Event object with a few properties
             string responseJSON = "\n{\n" +

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/GraphClientFactoryTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/GraphClientFactoryTests.cs
@@ -198,7 +198,7 @@ public void CreateClient_WithHandlers()
         }
 
         [Fact]
-        public async Task SendRequest_Redirect()
+        public async Task SendRequest_RedirectAsync()
         {
             var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "http://example.org/foo");
             var redirectResponse = new HttpResponseMessage(HttpStatusCode.MovedPermanently);
@@ -218,7 +218,7 @@ public async Task SendRequest_Redirect()
         }
 
         [Fact]
-        public async Task SendRequest_Retry()
+        public async Task SendRequest_RetryAsync()
         {
             var httpRequestMessage = new HttpRequestMessage(HttpMethod.Post, "http://example.org/foo");
             httpRequestMessage.Content = new StringContent("Hello World");

diff --git a/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Middleware/TelemetryHandlerTests.cs b/tests/Microsoft.Graph.DotnetCore.Core.Test/Requests/Middleware/TelemetryHandlerTests.cs
@@ -24,7 +24,7 @@ public TelemetryHandlerTests()
         }
 
         [Fact]
-        public async Task TelemetryHandlerShouldSetTelemetryHeaderWithDefaults()
+        public async Task TelemetryHandlerShouldSetTelemetryHeaderWithDefaultsAsync()
         {
             var configuredTelemetryHandler = new GraphTelemetryHandler();
             configuredTelemetryHandler.InnerHandler = new FakeSuccessHandler();
@@ -56,7 +56,7 @@ public async Task TelemetryHandlerShouldSetTelemetryHeaderWithDefaults()
         }
 
         [Fact]
-        public async Task TelemetryHandlerShouldSetTelemetryHeaderWithCustomConfiguration()
+        public async Task TelemetryHandlerShouldSetTelemetryHeaderWithCustomConfigurationAsync()
         {
             var clientOptions = new GraphClientOptions
             {