update xunit and fix compatibility issues in unit tests

microsoft · Jul 26, 2024 · 844b3fe · 844b3fe
1 parent 276bb33
commit 844b3fe
Show file tree

Hide file tree

Showing 102 changed files with 888 additions and 617 deletions.
diff --git a/libraries/Microsoft.Bot.Builder.Testing/Microsoft.Bot.Builder.Testing.csproj b/libraries/Microsoft.Bot.Builder.Testing/Microsoft.Bot.Builder.Testing.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Condition=" '$(ReleasePackageVersion)' == '' " Version="$(LocalPackageVersion)" />
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Condition=" '$(ReleasePackageVersion)' != '' " Version="$(ReleasePackageVersion)" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.9.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Bot.Builder.Dialogs\Microsoft.Bot.Builder.Dialogs.csproj" />

diff --git a/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj b/libraries/Microsoft.Bot.Streaming/Microsoft.Bot.Streaming.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
     <PackageId>Microsoft.Bot.Streaming</PackageId>
     <Description>Streaming library for the Bot Framework SDK</Description>
     <Summary>Streaming library for the Bot Framework SDK</Summary>
@@ -26,9 +26,20 @@
     <NoWarn>$(NoWarn);</NoWarn>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	  <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 </Project>
diff --git a/libraries/Microsoft.Bot.Streaming/Payloads/RequestManager.cs b/libraries/Microsoft.Bot.Streaming/Payloads/RequestManager.cs
@@ -56,7 +56,7 @@ public async Task<ReceiveResponse> GetResponseAsync(Guid requestId, Cancellation
                 return null;
             }
 
-            if (cancellationToken == null)
+            if (cancellationToken == default)
             {
                 cancellationToken = CancellationToken.None;
             }

diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/FacebookAdapterTests.cs b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/FacebookAdapterTests.cs
@@ -34,7 +34,7 @@ public void ConstructorShouldFailWithNullClient()
         }
 
         [Fact]
-        public async void ContinueConversationAsyncShouldSucceed()
+        public async Task ContinueConversationAsyncShouldSucceed()
         {
             var callbackInvoked = false;
             var facebookAdapter = new FacebookAdapter(new FacebookClientWrapper(_testOptions), _adapterOptions);
@@ -50,7 +50,7 @@ Task BotsLogic(ITurnContext turnContext, CancellationToken cancellationToken)
         }
 
         [Fact]
-        public async void ContinueConversationAsyncShouldFailWithNullConversationReference()
+        public async Task ContinueConversationAsyncShouldFailWithNullConversationReference()
         {
             var facebookAdapter = new FacebookAdapter(new FacebookClientWrapper(_testOptions), _adapterOptions);
             Task BotsLogic(ITurnContext turnContext, CancellationToken cancellationToken)
@@ -62,7 +62,7 @@ Task BotsLogic(ITurnContext turnContext, CancellationToken cancellationToken)
         }
 
         [Fact]
-        public async void ContinueConversationAsyncShouldFailWithNullLogic()
+        public async Task ContinueConversationAsyncShouldFailWithNullLogic()
         {
             var facebookAdapter = new FacebookAdapter(new FacebookClientWrapper(_testOptions), _adapterOptions);
             var conversationReference = new ConversationReference();
@@ -83,7 +83,7 @@ public async Task DeleteActivityAsyncShouldThrowNotImplementedException()
         }
 
         [Fact]
-        public async void ProcessAsyncShouldSucceedWithCorrectData()
+        public async Task ProcessAsyncShouldSucceedWithCorrectData()
         {
             var payload = File.ReadAllText(Directory.GetCurrentDirectory() + @"/Files/Payload.json");
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -102,7 +102,7 @@ public async void ProcessAsyncShouldSucceedWithCorrectData()
         }
 
         [Fact]
-        public async void ProcessAsyncShouldSucceedWithStandbyMessages()
+        public async Task ProcessAsyncShouldSucceedWithStandbyMessages()
         {
             var payload = File.ReadAllText(Directory.GetCurrentDirectory() + @"/Files/PayloadWithStandby.json");
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -120,7 +120,7 @@ public async void ProcessAsyncShouldSucceedWithStandbyMessages()
         }
 
         [Fact]
-        public async void ProcessAsyncShouldSucceedWithReferralMessages()
+        public async Task ProcessAsyncShouldSucceedWithReferralMessages()
         {
             var payload = File.ReadAllText(Directory.GetCurrentDirectory() + @"/Files/PayloadWithReferral.json");
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -138,7 +138,7 @@ public async void ProcessAsyncShouldSucceedWithReferralMessages()
         }
 
         [Fact]
-        public async void ProcessAsyncShouldVerifyWebhookOnHubModeSubscribe()
+        public async Task ProcessAsyncShouldVerifyWebhookOnHubModeSubscribe()
         {
             var testOptionsVerifyEnabled = new FacebookAdapterOptions()
             {
@@ -190,7 +190,7 @@ public async Task ProcessAsyncShouldThrowExceptionWithUnverifiedSignature()
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldSucceedWithActivityTypeMessage()
+        public async Task SendActivitiesAsyncShouldSucceedWithActivityTypeMessage()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -219,7 +219,7 @@ public async void SendActivitiesAsyncShouldSucceedWithActivityTypeMessage()
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldSucceedWithActivityTypeMessageAndAttachments()
+        public async Task SendActivitiesAsyncShouldSucceedWithActivityTypeMessageAndAttachments()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -251,7 +251,7 @@ public async void SendActivitiesAsyncShouldSucceedWithActivityTypeMessageAndAtta
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldSucceedAndNoActivityReturnedWithActivityTypeNotMessage()
+        public async Task SendActivitiesAsyncShouldSucceedAndNoActivityReturnedWithActivityTypeNotMessage()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -283,7 +283,7 @@ public async void SendActivitiesAsyncShouldSucceedAndNoActivityReturnedWithActiv
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldPostToFacebookOnPassThreadControl()
+        public async Task SendActivitiesAsyncShouldPostToFacebookOnPassThreadControl()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -315,7 +315,7 @@ public async void SendActivitiesAsyncShouldPostToFacebookOnPassThreadControl()
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldPostToFacebookOnTakeThreadControl()
+        public async Task SendActivitiesAsyncShouldPostToFacebookOnTakeThreadControl()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);
@@ -347,7 +347,7 @@ public async void SendActivitiesAsyncShouldPostToFacebookOnTakeThreadControl()
         }
 
         [Fact]
-        public async void SendActivitiesAsyncShouldPostToFacebookOnRequestThreadControl()
+        public async Task SendActivitiesAsyncShouldPostToFacebookOnRequestThreadControl()
         {
             const string testResponse = "Test Response";
             var facebookClientWrapper = new Mock<FacebookClientWrapper>(_testOptions);

diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/FacebookWrapperTests.cs b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Facebook.Tests/FacebookWrapperTests.cs
@@ -8,6 +8,7 @@
 using System.Net.Http;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Moq;
 using Newtonsoft.Json;
@@ -64,7 +65,7 @@ public void VerifySignatureShouldReturnFalseWithInvalidRequestHash()
         }
 
         [Fact]
-        public async void SendMessageAsyncShouldThrowAnExceptionWithWrongPath()
+        public async Task SendMessageAsyncShouldThrowAnExceptionWithWrongPath()
         {
             var facebookMessageJson = File.ReadAllText(Directory.GetCurrentDirectory() + @"/Files/FacebookMessages.json");
             var facebookMessage = JsonConvert.DeserializeObject<List<FacebookMessage>>(facebookMessageJson)[5];
@@ -77,7 +78,7 @@ await Assert.ThrowsAsync<HttpRequestException>(async () =>
         }
 
         [Fact]
-        public async void SendMessageAsyncShouldThrowAnExceptionWithNullPath()
+        public async Task SendMessageAsyncShouldThrowAnExceptionWithNullPath()
         {
             var facebookMessageJson = File.ReadAllText(Directory.GetCurrentDirectory() + @"/Files/FacebookMessages.json");
             var facebookMessage = JsonConvert.DeserializeObject<List<FacebookMessage>>(facebookMessageJson)[5];
@@ -90,7 +91,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         }
 
         [Fact]
-        public async void SendMessageAsyncShouldThrowAnExceptionWithNullPayload()
+        public async Task SendMessageAsyncShouldThrowAnExceptionWithNullPayload()
         {
             var facebookWrapper = new FacebookClientWrapper(_testOptions);
 
@@ -101,7 +102,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         }
 
         [Fact]
-        public async void VerifyWebhookAsyncShouldSendOkWhenVerified()
+        public async Task VerifyWebhookAsyncShouldSendOkWhenVerified()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
             var httpRequest = new Mock<HttpRequest>();
@@ -124,7 +125,7 @@ public async void VerifyWebhookAsyncShouldSendOkWhenVerified()
         }
 
         [Fact]
-        public async void VerifyWebhookAsyncShouldSendUnauthorizedWhenNotVerified()
+        public async Task VerifyWebhookAsyncShouldSendUnauthorizedWhenNotVerified()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
             var httpRequest = new Mock<HttpRequest>();
@@ -147,7 +148,7 @@ public async void VerifyWebhookAsyncShouldSendUnauthorizedWhenNotVerified()
         }
 
         [Fact]
-        public async void VerifyWebhookAsyncShouldThrowExceptionWithNullRequest()
+        public async Task VerifyWebhookAsyncShouldThrowExceptionWithNullRequest()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
             var httpResponse = new Mock<HttpResponse>();
@@ -156,7 +157,7 @@ public async void VerifyWebhookAsyncShouldThrowExceptionWithNullRequest()
         }
 
         [Fact]
-        public async void VerifyWebhookAsyncShouldThrowExceptionWithNullResponse()
+        public async Task VerifyWebhookAsyncShouldThrowExceptionWithNullResponse()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
             var httpRequest = new Mock<HttpRequest>();
@@ -165,47 +166,47 @@ public async void VerifyWebhookAsyncShouldThrowExceptionWithNullResponse()
         }
 
         [Fact]
-        public async void PassThreadControlAsyncShouldThrowExceptionWithNullTargetAppId()
+        public async Task PassThreadControlAsyncShouldThrowExceptionWithNullTargetAppId()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 
             await Assert.ThrowsAsync<ArgumentNullException>(async () => { await facebookClientWrapper.PassThreadControlAsync(null, "fakeUserId", "Test Pass Thread Control", default); });
         }
 
         [Fact]
-        public async void PassThreadControlAsyncShouldThrowExceptionWithNullUserId()
+        public async Task PassThreadControlAsyncShouldThrowExceptionWithNullUserId()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 
             await Assert.ThrowsAsync<ArgumentNullException>(async () => { await facebookClientWrapper.PassThreadControlAsync("fakeAppId", null, "Test Pass Thread Control", default); });
         }
 
         [Fact]
-        public async void RequestThreadControlAsyncShouldThrowExceptionWithNullUserId()
+        public async Task RequestThreadControlAsyncShouldThrowExceptionWithNullUserId()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 
             await Assert.ThrowsAsync<ArgumentNullException>(async () => { await facebookClientWrapper.RequestThreadControlAsync(null, "Test Pass Thread Control", default); });
         }
 
         [Fact]
-        public async void TakeThreadControlAsyncShouldThrowExceptionWithNullUserId()
+        public async Task TakeThreadControlAsyncShouldThrowExceptionWithNullUserId()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 
             await Assert.ThrowsAsync<ArgumentNullException>(async () => { await facebookClientWrapper.TakeThreadControlAsync(null, "Test Pass Thread Control", default); });
         }
 
         [Fact]
-        public async void PostToFacebookApiAsyncShouldThrowExceptionWithNullPostType()
+        public async Task PostToFacebookApiAsyncShouldThrowExceptionWithNullPostType()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 
             await Assert.ThrowsAsync<ArgumentNullException>(async () => { await facebookClientWrapper.PostToFacebookApiAsync(null, "fakeContent", default); });
         }
 
         [Fact]
-        public async void PostToFacebookApiAsyncShouldThrowExceptionWithNullContent()
+        public async Task PostToFacebookApiAsyncShouldThrowExceptionWithNullContent()
         {
             var facebookClientWrapper = new FacebookClientWrapper(_testOptions);
 

diff --git a/....Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj b/....Bot.Builder.Adapters.Facebook.Tests/Microsoft.Bot.Builder.Adapters.Facebook.Tests.csproj
@@ -18,7 +18,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...rosoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj b/...rosoft.Bot.Builder.Adapters.Slack.Tests/Microsoft.Bot.Builder.Adapters.Slack.Tests.csproj
@@ -20,7 +20,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/SlackAdapterTests.cs b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Slack.Tests/SlackAdapterTests.cs
@@ -405,7 +405,7 @@ Task BotsLogic(ITurnContext turnContext, CancellationToken cancellationToken)
         }
 
         [Fact]
-        public async void ProcessAsyncShouldFailWithNullHttpRequest()
+        public async Task ProcessAsyncShouldFailWithNullHttpRequest()
         {
             var slackApi = new Mock<SlackClientWrapper>(_testOptions);
             slackApi.Setup(x => x.TestAuthAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("mockedUserId"));
@@ -421,7 +421,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         }
 
         [Fact]
-        public async void ProcessAsyncShouldFailWithNullHttpResponse()
+        public async Task ProcessAsyncShouldFailWithNullHttpResponse()
         {
             var slackApi = new Mock<SlackClientWrapper>(_testOptions);
             slackApi.Setup(x => x.TestAuthAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("mockedUserId"));
@@ -437,7 +437,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(async () =>
         }
 
         [Fact]
-        public async void ProcessAsyncShouldFailWithNullBot()
+        public async Task ProcessAsyncShouldFailWithNullBot()
         {
             var slackApi = new Mock<SlackClientWrapper>(_testOptions);
             slackApi.Setup(x => x.TestAuthAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult("mockedUserId"));
@@ -543,7 +543,7 @@ public async Task ProcessAsyncShouldSucceedWithUnknownEventType()
 
             await slackAdapter.ProcessAsync(httpRequest.Object, httpResponse.Object, new Mock<IBot>().Object, default);
 
-            Assert.Equal(httpResponse.Object.StatusCode, (int)HttpStatusCode.OK);
+            Assert.Equal((int)HttpStatusCode.OK, httpResponse.Object.StatusCode);
         }
 
         [Fact]
@@ -559,7 +559,7 @@ public async Task ProcessAsyncShouldSucceedWithReactionAddedEventType()
 
             await slackAdapter.ProcessAsync(httpRequest.Object, httpResponse.Object, new Mock<IBot>().Object, default);
 
-            Assert.Equal(httpResponse.Object.StatusCode, (int)HttpStatusCode.OK);
+            Assert.Equal((int)HttpStatusCode.OK, httpResponse.Object.StatusCode);
         }
 
         [Fact]

diff --git a/...soft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj b/...soft.Bot.Builder.Adapters.Twilio.Tests/Microsoft.Bot.Builder.Adapters.Twilio.Tests.csproj
@@ -16,7 +16,7 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit" Version="2.9.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>