XUnit.v3 Upgrade

2026-01-04 09:33:40 +00:00 · 2025-11-18 16:12:52 -05:00
parent 2b926ef1c5
commit 76b463cc99
97 changed files with 379 additions and 449 deletions
--- a/test/Core.Test/AdminConsole/AutoFixture/CurrentContextOrganizationFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/CurrentContextOrganizationFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
--- a/test/Core.Test/AdminConsole/AutoFixture/OrganizationPolicyDetailsCustomization.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/OrganizationPolicyDetailsCustomization.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.Enums;
--- a/test/Core.Test/AdminConsole/AutoFixture/OrganizationUserFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/OrganizationUserFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Entities;
 using Bit.Core.Enums;

--- a/test/Core.Test/AdminConsole/AutoFixture/OrganizationUserPolicyDetailsFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/OrganizationUserPolicyDetailsFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;

--- a/test/Core.Test/AdminConsole/AutoFixture/PolicyDetailsFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/PolicyDetailsFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.Enums;
--- a/test/Core.Test/AdminConsole/AutoFixture/PolicyFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/PolicyFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.AdminConsole.Enums;

--- a/test/Core.Test/AdminConsole/AutoFixture/PolicyUpdateFixtures.cs
+++ b/test/Core.Test/AdminConsole/AutoFixture/PolicyUpdateFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.Data;
 using Bit.Core.AdminConsole.OrganizationFeatures.Policies.Models;
--- a/test/Core.Test/AdminConsole/OrganizationAuth/Models/BatchAuthRequestUpdateProcessorTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationAuth/Models/BatchAuthRequestUpdateProcessorTests.cs
@@ -53,7 +53,7 @@ public class BatchAuthRequestUpdateProcessorTests
        var sut = new BatchAuthRequestUpdateProcessor(authRequests, updates, configuration);
        Assert.NotEmpty(sut.Processors);
        sut.Process(errorHandler);
-        Assert.NotEmpty(sut.Processors.Where(p => p.ProcessedAuthRequest != null));
+        Assert.Contains(sut.Processors, p => p.ProcessedAuthRequest != null);
    }

    [Theory]
--- a/test/Core.Test/AdminConsole/OrganizationFeatures/Policies/PolicyRequirements/BasePolicyRequirementFactoryTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Policies/PolicyRequirements/BasePolicyRequirementFactoryTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
 using Bit.Core.AdminConsole.OrganizationFeatures.Policies.PolicyRequirements;
--- a/test/Core.Test/Auth/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs
+++ b/test/Core.Test/Auth/Models/Business/Tokenables/EmergencyAccessInviteTokenableTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Auth.Entities;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Tokens;
--- a/test/Core.Test/Auth/Models/Business/Tokenables/OrgUserInviteTokenableTests.cs
+++ b/test/Core.Test/Auth/Models/Business/Tokenables/OrgUserInviteTokenableTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Entities;
 using Bit.Core.Tokens;
--- a/test/Core.Test/Auth/Models/Business/Tokenables/RegistrationEmailVerificationTokenableTests.cs
+++ b/test/Core.Test/Auth/Models/Business/Tokenables/RegistrationEmailVerificationTokenableTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Tokens;

 namespace Bit.Core.Test.Auth.Models.Business.Tokenables;
--- a/test/Core.Test/Auth/Models/Business/Tokenables/SsoEmail2faSessionTokenableTests.cs
+++ b/test/Core.Test/Auth/Models/Business/Tokenables/SsoEmail2faSessionTokenableTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Entities;
 using Bit.Core.Tokens;
--- a/test/Core.Test/Auth/Models/Business/Tokenables/SsoTokenableTests.cs
+++ b/test/Core.Test/Auth/Models/Business/Tokenables/SsoTokenableTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.AdminConsole.Entities;
 using Bit.Core.Auth.Models.Business.Tokenables;
 using Bit.Core.Tokens;
--- a/test/Core.Test/Auth/Services/DuoUniversalTokenServiceTests.cs
+++ b/test/Core.Test/Auth/Services/DuoUniversalTokenServiceTests.cs
@@ -13,7 +13,7 @@ public class DuoUniversalTokenServiceTests
    [BitAutoData("", "ClientId", "ClientSecret")]
    [BitAutoData("api-valid.duosecurity.com", "", "ClientSecret")]
    [BitAutoData("api-valid.duosecurity.com", "ClientId", "")]
-    public async void ValidateDuoConfiguration_InvalidConfig_ReturnsFalse(
+    public async Task ValidateDuoConfiguration_InvalidConfig_ReturnsFalse(
        string host, string clientId, string clientSecret, SutProvider<DuoUniversalTokenService> sutProvider)
    {
        // Arrange
--- a/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs
+++ b/test/Core.Test/AutoFixture/Attributes/CiSkippedTheory.cs
@@ -1,9 +1,12 @@
-namespace Bit.Core.Test.AutoFixture.Attributes;
+using System.Runtime.CompilerServices;
+
+namespace Bit.Core.Test.AutoFixture.Attributes;

 public sealed class CiSkippedTheory : Xunit.TheoryAttribute
 {
    private static bool IsGithubActions() => Environment.GetEnvironmentVariable("CI") != null;
-    public CiSkippedTheory()
+
+    public CiSkippedTheory([CallerFilePath] string? sourceFilePath = null, [CallerLineNumber] int sourceLineNumber = -1) : base(sourceFilePath, sourceLineNumber)
    {
        if (IsGithubActions())
        {
--- a/test/Core.Test/AutoFixture/CollectionAccessSelectionFixtures.cs
+++ b/test/Core.Test/AutoFixture/CollectionAccessSelectionFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Models.Data;

 namespace Bit.Core.Test.AutoFixture;
--- a/test/Core.Test/AutoFixture/GlobalSettingsFixtures.cs
+++ b/test/Core.Test/AutoFixture/GlobalSettingsFixtures.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using AutoFixture;
 using AutoFixture.Kernel;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core;
 using Bit.Core.Test.Helpers.Factories;
 using Microsoft.AspNetCore.DataProtection;
--- a/test/Core.Test/Core.Test.csproj
+++ b/test/Core.Test/Core.Test.csproj
@@ -8,15 +8,9 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
      <PrivateAssets>all</PrivateAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Diagnostics.Testing" Version="9.3.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
    <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="AutoFixture.Xunit2" Version="$(AutoFixtureXUnit2Version)" />
+    <PackageReference Include="xunit.v3" Version="$(XUnitv3Version)" />
+    <PackageReference Include="AutoFixture.Xunit3" Version="$(AutoFixtureXUnit3Version)" />
    <PackageReference Include="AutoFixture.AutoNSubstitute" Version="$(AutoFixtureAutoNSubstituteVersion)" />
    <PackageReference Include="Kralizek.AutoFixture.Extensions.MockHttp" Version="2.1.0" />
  </ItemGroup>
--- a/test/Core.Test/Platform/Push/NotificationHub/NotificationHubProxyTests.cs
+++ b/test/Core.Test/Platform/Push/NotificationHub/NotificationHubProxyTests.cs
@@ -25,7 +25,7 @@ public class NotificationHubProxyTests

    [Theory]
    [MemberData(nameof(ClientMethods))]
-    public async void CallsAllClients(Func<NotificationHubClientProxy, Task> proxyMethod, Func<INotificationHubClient, Task> clientMethod)
+    public async Task CallsAllClients(Func<NotificationHubClientProxy, Task> proxyMethod, Func<INotificationHubClient, Task> clientMethod)
    {
        var clients = _clients.ToArray();
        var proxy = new NotificationHubClientProxy(clients);
--- a/test/Core.Test/Tokens/ExpiringTokenTests.cs
+++ b/test/Core.Test/Tokens/ExpiringTokenTests.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Utilities;
 using Xunit;

--- a/test/Core.Test/Tokens/TokenTests.cs
+++ b/test/Core.Test/Tokens/TokenTests.cs
@@ -1,4 +1,4 @@
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Tokens;
 using Xunit;

--- a/test/Core.Test/Tools/AutoFixture/SendFixtures.cs
+++ b/test/Core.Test/Tools/AutoFixture/SendFixtures.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using AutoFixture;
-using AutoFixture.Xunit2;
+using AutoFixture.Xunit3;
 using Bit.Core.Tools.Entities;
 using Bit.Test.Common.AutoFixture.Attributes;

@@ -37,4 +37,3 @@ internal class NewUserSendCustomizeAttribute : CustomizeAttribute
    public override ICustomization GetCustomization(ParameterInfo parameterInfo)
        => new NewUserSend();
 }
-