Update package versions and modernize unit tests (#268)

petabridge · Feb 22, 2024 · fffaa11 · fffaa11
1 parent fba99c3
commit fffaa11
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 35 deletions.
diff --git a/src/Akka.HealthCheck.Cluster.Tests/Akka.HealthCheck.Cluster.Tests.csproj b/src/Akka.HealthCheck.Cluster.Tests/Akka.HealthCheck.Cluster.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit.Xunit" />
+    <PackageReference Include="Akka.TestKit.Xunit2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="FluentAssertions"/>
     <PackageReference Include="xunit" />

diff --git a/src/Akka.HealthCheck.Cluster.Tests/ReadinessStatusClusterUpSpecs.cs b/src/Akka.HealthCheck.Cluster.Tests/ReadinessStatusClusterUpSpecs.cs
@@ -5,7 +5,7 @@
 
 namespace Akka.HealthCheck.Cluster.Tests
 {
-    public class ReadinessStatusClusterUpSpecs : TestKit.Xunit.TestKit
+    public class ReadinessStatusClusterUpSpecs : TestKit.Xunit2.TestKit
     {
         public ReadinessStatusClusterUpSpecs(ITestOutputHelper helper)
                     : base(Config, "ClusterServer", output: helper)

diff --git a/src/Akka.HealthCheck.Persistence.Tests/Akka.HealthCheck.Persistence.Tests.csproj b/src/Akka.HealthCheck.Persistence.Tests/Akka.HealthCheck.Persistence.Tests.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="akka.persistence.sqlite" />
     <PackageReference Include="Akka.Persistence.TestKit.Xunit2" />
-    <PackageReference Include="Akka.TestKit.Xunit" />
+    <PackageReference Include="Akka.TestKit.Xunit2" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />

diff --git a/...heck.Persistence.Tests/AkkaPersistenceLivenessProbeNotAvailableDueToSnapshotStoreSpecs.cs b/...heck.Persistence.Tests/AkkaPersistenceLivenessProbeNotAvailableDueToSnapshotStoreSpecs.cs
@@ -16,7 +16,7 @@
 
 namespace Akka.HealthCheck.Persistence.Tests
 {
-    public class AkkaPersistenceLivenessProbeNotAvailableDueToSnapshotStoreSpecs : TestKit.Xunit.TestKit
+    public class AkkaPersistenceLivenessProbeNotAvailableDueToSnapshotStoreSpecs : TestKit.Xunit2.TestKit
     {
         public AkkaPersistenceLivenessProbeNotAvailableDueToSnapshotStoreSpecs(ITestOutputHelper helper)
                     : base(TestConfig.BadSnapshotConfig, output: helper)

diff --git a/...ealthCheck.Persistence.Tests/AkkaPersistenceLivenessProbeNotAvailableduetoJournalSpecs.cs b/...ealthCheck.Persistence.Tests/AkkaPersistenceLivenessProbeNotAvailableduetoJournalSpecs.cs
@@ -14,7 +14,7 @@
 
 namespace Akka.HealthCheck.Persistence.Tests
 {
-    public class AkkaPersistenceLivenessProbeNotAvailableDueToJournalSpecs : TestKit.Xunit.TestKit
+    public class AkkaPersistenceLivenessProbeNotAvailableDueToJournalSpecs : TestKit.Xunit2.TestKit
     {
         public AkkaPersistenceLivenessProbeNotAvailableDueToJournalSpecs(ITestOutputHelper helper)
                     : base(TestConfig.BadJournalConfig, output: helper)

diff --git a/src/Akka.HealthCheck.Persistence.Tests/AkkaPersistenceLivenessProbeSubscriptionTest.cs b/src/Akka.HealthCheck.Persistence.Tests/AkkaPersistenceLivenessProbeSubscriptionTest.cs
@@ -14,7 +14,7 @@
 
 namespace Akka.HealthCheck.Persistence.Tests
 {
-    public class AkkaPersistenceLivenessProbeSubscriptionTest : TestKit.Xunit.TestKit
+    public class AkkaPersistenceLivenessProbeSubscriptionTest : TestKit.Xunit2.TestKit
     {
 
         public AkkaPersistenceLivenessProbeSubscriptionTest(ITestOutputHelper helper)

diff --git a/src/Akka.HealthCheck.Tests/Akka.HealthCheck.Tests.csproj b/src/Akka.HealthCheck.Tests/Akka.HealthCheck.Tests.csproj
@@ -5,15 +5,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.TestKit.Xunit" />
+    <PackageReference Include="Akka.TestKit.Xunit2" />
     <PackageReference Include="FluentAssertions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Akka.HealthCheck\Akka.HealthCheck.csproj" />
+  <ItemGroup>
+    <ProjectReference Include="..\Akka.HealthCheck\Akka.HealthCheck.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Akka.HealthCheck.Tests/AkkaHealthCheckIntegrationSpec.cs b/src/Akka.HealthCheck.Tests/AkkaHealthCheckIntegrationSpec.cs
@@ -22,7 +22,7 @@
 
 namespace Akka.HealthCheck.Tests
 {
-    public class AkkaHealthCheckIntegrationSpec : TestKit.Xunit.TestKit
+    public class AkkaHealthCheckIntegrationSpec : TestKit.Xunit2.TestKit
     {
         public AkkaHealthCheckIntegrationSpec(ITestOutputHelper helper)
             : base(GetConfig(), output: helper)

diff --git a/src/Akka.HealthCheck.Tests/Configuration/HealthCheckSettingsSpecs.cs b/src/Akka.HealthCheck.Tests/Configuration/HealthCheckSettingsSpecs.cs
@@ -16,7 +16,7 @@
 
 namespace Akka.HealthCheck.Tests.Configuration
 {
-    public class HealthCheckSettingsSpecs : TestKit.Xunit.TestKit
+    public class HealthCheckSettingsSpecs : TestKit.Xunit2.TestKit
     {
         [Fact(DisplayName = "Should be able to load default Akka.HealthCheck HOCON")]
         public void Should_load_default_HealthCheck_HOCON()

diff --git a/src/Akka.HealthCheck.Tests/LiveNessProbeSpecBase.cs b/src/Akka.HealthCheck.Tests/LiveNessProbeSpecBase.cs
@@ -17,7 +17,7 @@ namespace Akka.HealthCheck.Tests
     /// <summary>
     ///     Base class for testing the ability for various probe implementations
     /// </summary>
-    public abstract class LivenessProbeSpecBase : TestKit.Xunit.TestKit
+    public abstract class LivenessProbeSpecBase : TestKit.Xunit2.TestKit
     {
         protected LivenessProbeSpecBase(ITestOutputHelper helper) : this(helper, Config.Empty)
         {

diff --git a/src/Akka.HealthCheck.Tests/Liveness/LivenessTransportActorSpecs.cs b/src/Akka.HealthCheck.Tests/Liveness/LivenessTransportActorSpecs.cs
@@ -19,7 +19,7 @@
 
 namespace Akka.HealthCheck.Tests.Liveness
 {
-    public class LivenessTransportActorSpecs : TestKit.Xunit.TestKit
+    public class LivenessTransportActorSpecs : TestKit.Xunit2.TestKit
     {
         public LivenessTransportActorSpecs(ITestOutputHelper helper)
             : base(output: helper)

diff --git a/src/Akka.HealthCheck.Tests/Readiness/ReadinessTransportActorSpecs.cs b/src/Akka.HealthCheck.Tests/Readiness/ReadinessTransportActorSpecs.cs
@@ -19,7 +19,7 @@
 
 namespace Akka.HealthCheck.Tests.Readiness
 {
-    public class ReadinessTransportActorSpecs : TestKit.Xunit.TestKit
+    public class ReadinessTransportActorSpecs : TestKit.Xunit2.TestKit
     {
         public ReadinessTransportActorSpecs(ITestOutputHelper helper)
             : base(output: helper)

diff --git a/src/Akka.HealthCheck.Tests/ReadinessProbeSpecBase.cs b/src/Akka.HealthCheck.Tests/ReadinessProbeSpecBase.cs
@@ -17,7 +17,7 @@ namespace Akka.HealthCheck.Tests
     /// <summary>
     ///     Base class for testing the ability for various probe implementations
     /// </summary>
-    public abstract class ReadinessProbeSpecBase : TestKit.Xunit.TestKit
+    public abstract class ReadinessProbeSpecBase : TestKit.Xunit2.TestKit
     {
         protected ReadinessProbeSpecBase(ITestOutputHelper helper) : this(helper, Config.Empty)
         {

diff --git a/src/Akka.HealthCheck.Tests/Transports/SocketStatusTransportSpecs.cs b/src/Akka.HealthCheck.Tests/Transports/SocketStatusTransportSpecs.cs
@@ -19,7 +19,7 @@
 
 namespace Akka.HealthCheck.Tests.Transports
 {
-    public class SocketStatusTransportSpecs : TestKit.Xunit.TestKit
+    public class SocketStatusTransportSpecs : TestKit.Xunit2.TestKit
     {
         public SocketStatusTransportSpecs()
         {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,24 +19,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <AkkaPackageTags>akka;actors;actor model;Akka;concurrency;health check;</AkkaPackageTags>
-    <NBenchVersion>1.2.2</NBenchVersion>
-    <XunitVersion>2.5.1</XunitVersion>
-    <XUnitRunnerVersion>2.5.1</XUnitRunnerVersion>
-    <TestSdkVersion>17.7.2</TestSdkVersion>
-    <CoverletVersion>3.2.0</CoverletVersion>
-    <FluentAssertionVersion>6.12.0</FluentAssertionVersion>
-    <AkkaVersion>1.5.13</AkkaVersion>
-    <AkkaHostingVersion>1.5.13</AkkaHostingVersion>
-    <FluentAssertionVersion>6.10.0</FluentAssertionVersion>
     <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
     <NetTestVersion>net6.0</NetTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
     <NetLibVersion>net6.0</NetLibVersion>
     <NetCoreLibVersion>netcoreapp3.1</NetCoreLibVersion>
-    <PbmVersion>1.2.1</PbmVersion>
-    <BootstrapDockerVersion>0.5.3</BootstrapDockerVersion>
-    <KubernetesClientVersion>4.0.26</KubernetesClientVersion>
-    <MicrosoftExtensionsVersion>[3.0.0,)</MicrosoftExtensionsVersion>
   </PropertyGroup>
   <!-- SourceLink support for all Akka.NET projects -->
   <ItemGroup>

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <AkkaVersion>1.5.15</AkkaVersion>
+    <AkkaHostingVersion>1.5.15</AkkaHostingVersion>
   </PropertyGroup>
   <!-- App dependencies -->
   <ItemGroup>
@@ -11,16 +13,16 @@
     <PackageVersion Include="Akka.Persistence" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Persistence.Hosting" Version="$(AkkaHostingVersion)" />
     <PackageVersion Include="akka.persistence.sqlite" Version="$(AkkaVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="[3.0.0,)" />
   </ItemGroup>
   <!-- Test dependencies -->
   <ItemGroup>
     <PackageVersion Include="Akka.Persistence.TestKit.Xunit2" Version="$(AkkaVersion)" />
-    <PackageVersion Include="Akka.TestKit.Xunit" Version="$(AkkaVersion)" />
-    <PackageVersion Include="FluentAssertions" Version="$(FluentAssertionVersion)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageVersion Include="xunit" Version="$(XunitVersion)" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />
+    <PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="xunit" Version="2.7.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
   </ItemGroup>
   <!-- SourceLink support for all Akka.NET projects -->
   <ItemGroup>