Remove FluentAssertions dependency

Directory.Packages.props

@@ -13,7 +13,7 @@
     <PackageVersion Include="Akka" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Persistence" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
-    <PackageVersion Include="Akka.Persistence.TestKit.Xunit2" Version="$(AkkaVersion)" />
+    <PackageVersion Include="Akka.TestKit.Xunit" Version="$(AkkaVersion)" />
   </ItemGroup>
   <!-- EventStore Package Versions -->
   <ItemGroup>
@@ -32,7 +32,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageVersion>
-    <PackageVersion Include="FluentAssertions" Version="5.10.3" />
     <PackageVersion Include="Docker.DotNet" Version="3.125.15" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
     <PackageVersion Include="JetBrains.dotMemoryUnit" Version="3.2.20220510" />

src/Akka.Persistence.EventStore.Benchmarks/Akka.Persistence.EventStore.Benchmarks.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -14,9 +14,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Akka.Persistence.TestKit.Xunit2" />
+      <PackageReference Include="Akka.TestKit.Xunit" />
       <PackageReference Include="BenchmarkDotNet" />
-      <PackageReference Include="FluentAssertions" />
         <PackageReference Include="JetBrains.Annotations">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

src/Akka.Persistence.EventStore.Benchmarks/BasePersistBenchmarks.cs

@@ -4,7 +4,7 @@
 using Akka.Persistence.EventStore.Benchmarks.Columns;
 using Akka.Routing;
 using Akka.TestKit;
-using Akka.TestKit.Xunit2;
+using Akka.TestKit.Xunit;
 using Akka.Util.Internal;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;

src/Akka.Persistence.EventStore.Benchmarks/EventStoreBenchmarkFixture.cs

@@ -2,7 +2,6 @@
 using Akka.Configuration;
 using Akka.Persistence.EventStore.Benchmarks.BenchmarkActors;
 using Akka.Persistence.EventStore.Tests;
-using FluentAssertions.Extensions;
 
 namespace Akka.Persistence.EventStore.Benchmarks;
 
@@ -95,7 +94,7 @@ await File.WriteAllTextAsync(
 
         await initializer.Ask<InitializeDbActor.Initialized>(
             InitializeDbActor.Initialize.Instance,
-            20.Minutes());
+            TimeSpan.FromMinutes(20));
     }
 
     public static async Task Cleanup()

src/Akka.Persistence.EventStore.Benchmarks/QueryByTagBenchmarks.cs

@@ -6,7 +6,7 @@
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 using BenchmarkDotNet.Loggers;
-using FluentAssertions;
+using Xunit;
 
 namespace Akka.Persistence.EventStore.Benchmarks;
 
@@ -50,7 +50,7 @@ public async Task QueryByTag10()
         await source.RunForeach(
             msg => { events.Add(msg); },
             _materializer);
-        events.Select(e => e.SequenceNr).Should().BeEquivalentTo(Enumerable.Range(2000001, 10));
+        Assert.Equal(Enumerable.Range(2000001, 10).Select(x => (long)x).OrderBy(x => x).ToList(), events.Select(e => e.SequenceNr).OrderBy(x => x).ToList());
     }
 
     [Benchmark]
@@ -61,7 +61,7 @@ public async Task QueryByTag100()
         await source.RunForeach(
             msg => { events.Add(msg); },
             _materializer);
-        events.Select(e => e.SequenceNr).Should().BeEquivalentTo(Enumerable.Range(2000001, 100));
+        Assert.Equal(Enumerable.Range(2000001, 100).Select(x => (long)x).OrderBy(x => x).ToList(), events.Select(e => e.SequenceNr).OrderBy(x => x).ToList());
     }
 
     [Benchmark]
@@ -72,7 +72,7 @@ public async Task QueryByTag1000()
         await source.RunForeach(
             msg => { events.Add(msg); },
             _materializer);
-        events.Select(e => e.SequenceNr).Should().BeEquivalentTo(Enumerable.Range(2000001, 1000));
+        Assert.Equal(Enumerable.Range(2000001, 1000).Select(x => (long)x).OrderBy(x => x).ToList(), events.Select(e => e.SequenceNr).OrderBy(x => x).ToList());
     }
 
     [Benchmark]
@@ -83,6 +83,6 @@ public async Task QueryByTag10000()
         await source.RunForeach(
             msg => { events.Add(msg); },
             _materializer);
-        events.Select(e => e.SequenceNr).Should().BeEquivalentTo(Enumerable.Range(2000001, 10000));
+        Assert.Equal(Enumerable.Range(2000001, 10000).Select(x => (long)x).OrderBy(x => x).ToList(), events.Select(e => e.SequenceNr).OrderBy(x => x).ToList());
     }
 }

src/Akka.Persistence.EventStore.Benchmarks/RecoverBenchmarks.cs

@@ -3,7 +3,7 @@
 using Akka.Persistence.EventStore.Benchmarks.BenchmarkActors;
 using Akka.Persistence.EventStore.Benchmarks.Columns;
 using Akka.TestKit;
-using Akka.TestKit.Xunit2;
+using Akka.TestKit.Xunit;
 using Akka.Util.Internal;
 using BenchmarkDotNet.Attributes;
 using BenchmarkDotNet.Configs;

src/Akka.Persistence.EventStore.Hosting.Tests/Akka.Persistence.EventStore.Hosting.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -13,7 +13,6 @@
 
     <ItemGroup>
         <PackageReference Include="Akka.Hosting.TestKit"/>
-        <PackageReference Include="FluentAssertions" />
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
 
         <PackageReference Include="JetBrains.Annotations">

src/Akka.Persistence.EventStore.Hosting.Tests/EventStoreEndToEndSpec.cs

@@ -5,8 +5,6 @@
 using Akka.Persistence.Query;
 using Akka.Streams;
 using Akka.Streams.TestKit;
-using FluentAssertions;
-using FluentAssertions.Extensions;
 using Xunit;
 
 namespace Akka.Persistence.EventStore.Hosting.Tests;
@@ -39,7 +37,7 @@ public async Task Should_Start_ActorSystem_wth_EventStore_Persistence()
     {
         var senderProbe = CreateTestProbe();
 
-        var timeout = 3.Seconds();
+        var timeout = TimeSpan.FromSeconds(3);
 
         // arrange
         var myPersistentActor = await ActorRegistry.GetAsync<MyPersistenceActor>();
@@ -53,19 +51,19 @@ public async Task Should_Start_ActorSystem_wth_EventStore_Persistence()
         var snapshot = await myPersistentActor.Ask<int[]>(GetAll, timeout);
 
         // assert
-        snapshot.Should().BeEquivalentTo(new[] { 1, 2 });
+        Assert.Equivalent(new[] { 1, 2 }, snapshot, strict: true);
 
         // kill + recreate actor with same PersistentId
         await myPersistentActor.GracefulStop(timeout);
         var myPersistentActor2 = Sys.ActorOf(Props.Create(() => new MyPersistenceActor(PId)));
 
         var snapshot2 = await myPersistentActor2.Ask<int[]>(GetAll, timeout);
-        snapshot2.Should().BeEquivalentTo(new[] { 1, 2 });
+        Assert.Equivalent(new[] { 1, 2 }, snapshot2, strict: true);
 
         // validate configs
         var config = Sys.Settings.Config;
-        config.GetString("akka.persistence.journal.plugin").Should().Be("akka.persistence.journal.eventstore");
-        config.GetString("akka.persistence.snapshot-store.plugin").Should().Be("akka.persistence.snapshot-store.eventstore");
+        Assert.Equal("akka.persistence.journal.eventstore", config.GetString("akka.persistence.journal.plugin"));
+        Assert.Equal("akka.persistence.snapshot-store.eventstore", config.GetString("akka.persistence.snapshot-store.plugin"));
 
         // validate that query is working
         var readJournal = Sys.ReadJournalFor<EventStoreReadJournal>("akka.persistence.query.journal.eventstore");

src/Akka.Persistence.EventStore.Hosting.Tests/EventStoreTenantOptionsSpec.cs

@@ -1,6 +1,5 @@
 using Akka.Configuration;
 using Akka.Persistence.EventStore.Configuration;
-using FluentAssertions;
 using Xunit;
 
 namespace Akka.Persistence.EventStore.Hosting.Tests;
@@ -24,7 +23,7 @@ public void DefaultOptionsTest()
 
         actualConfig = actualConfig.GetConfig(EventStorePersistence.TenantConfigPath);
 
-        actualConfig.GetString("tenant-stream-name-pattern").Should().Be(defaultConfig.GetString("tenant-stream-name-pattern"));
+        Assert.Equal(defaultConfig.GetString("tenant-stream-name-pattern"), actualConfig.GetString("tenant-stream-name-pattern"));
     }
 
     [Fact(DisplayName = "Custom Options should modify default config")]
@@ -40,6 +39,6 @@ public void ModifiedOptionsTest()
 
         var config = new EventStoreTenantSettings(tenantConfig);
 
-        config.TenantStreamNamePattern.Should().Be("custom-tenant-stream-[[TENANT_NAME]]");
+        Assert.Equal("custom-tenant-stream-[[TENANT_NAME]]", config.TenantStreamNamePattern);
     }
 }

src/Akka.Persistence.EventStore.Hosting.Tests/JournalSettingsSpec.cs

@@ -1,6 +1,5 @@
 using Akka.Configuration;
 using Akka.Persistence.EventStore.Configuration;
-using FluentAssertions;
 using Xunit;
 
 namespace Akka.Persistence.EventStore.Hosting.Tests;
@@ -28,20 +27,18 @@ public void DefaultOptionsTest()
 
         var actualPluginConfig = actualConfig.GetConfig(EventStorePersistence.JournalConfigPath);
 
-        actualPluginConfig.GetString("connection-string").Should().Be(defaultConfig.GetString("connection-string"));
-        actualPluginConfig.GetString("adapter").Should().Be(defaultConfig.GetString("adapter"));
-        actualPluginConfig.GetString("prefix").Should().Be(defaultConfig.GetString("prefix"));
-        actualPluginConfig.GetString("tagged-stream-name-pattern").Should().Be(defaultConfig.GetString("tagged-stream-name-pattern"));
-        actualPluginConfig.GetString("persistence-ids-stream-name").Should().Be(defaultConfig.GetString("persistence-ids-stream-name"));
-        actualPluginConfig.GetString("persisted-events-stream-name").Should().Be(defaultConfig.GetString("persisted-events-stream-name"));
-        actualPluginConfig.GetString("tenant").Should().Be(defaultConfig.GetString("tenant"));
-        actualPluginConfig.GetString("parallelism").Should().Be(defaultConfig.GetString("parallelism"));
-        actualPluginConfig.GetString("buffer-size").Should().Be(defaultConfig.GetString("buffer-size"));
-        actualPluginConfig.GetString("materializer-dispatcher").Should()
-            .Be(defaultConfig.GetString("materializer-dispatcher"));
-        actualPluginConfig.GetBoolean("disable-revision-check").Should()
-            .Be(defaultConfig.GetBoolean("disable-revision-check"));
-        actualConfig.GetString("akka.persistence.query.plugin").Should().Be(EventStorePersistence.QueryConfigPath);
+        Assert.Equal(defaultConfig.GetString("connection-string"), actualPluginConfig.GetString("connection-string"));
+        Assert.Equal(defaultConfig.GetString("adapter"), actualPluginConfig.GetString("adapter"));
+        Assert.Equal(defaultConfig.GetString("prefix"), actualPluginConfig.GetString("prefix"));
+        Assert.Equal(defaultConfig.GetString("tagged-stream-name-pattern"), actualPluginConfig.GetString("tagged-stream-name-pattern"));
+        Assert.Equal(defaultConfig.GetString("persistence-ids-stream-name"), actualPluginConfig.GetString("persistence-ids-stream-name"));
+        Assert.Equal(defaultConfig.GetString("persisted-events-stream-name"), actualPluginConfig.GetString("persisted-events-stream-name"));
+        Assert.Equal(defaultConfig.GetString("tenant"), actualPluginConfig.GetString("tenant"));
+        Assert.Equal(defaultConfig.GetString("parallelism"), actualPluginConfig.GetString("parallelism"));
+        Assert.Equal(defaultConfig.GetString("buffer-size"), actualPluginConfig.GetString("buffer-size"));
+        Assert.Equal(defaultConfig.GetString("materializer-dispatcher"), actualPluginConfig.GetString("materializer-dispatcher"));
+        Assert.Equal(defaultConfig.GetBoolean("disable-revision-check"), actualPluginConfig.GetBoolean("disable-revision-check"));
+        Assert.Equal(EventStorePersistence.QueryConfigPath, actualConfig.GetString("akka.persistence.query.plugin"));
     }
 
     [Fact(DisplayName = "Custom Options should modify default config")]
@@ -71,16 +68,16 @@ public void ModifiedOptionsTest()
 
         var config = new EventStoreJournalSettings(journalConfig);
 
-        config.ConnectionString.Should().Be("a");
-        config.Adapter.Should().Be("custom");
-        config.StreamPrefix.Should().Be("prefix");
-        config.TaggedStreamNamePattern.Should().Be("custom-tagged-[[TAG]]");
-        config.PersistedEventsStreamName.Should().Be("persisted-events-custom");
-        config.PersistenceIdsStreamName.Should().Be("persistence-ids-custom");
-        config.Tenant.Should().Be("tenant");
-        config.Parallelism.Should().Be(10);
-        config.BufferSize.Should().Be(1000);
-        config.MaterializerDispatcher.Should().Be("custom-dispatcher");
-        config.DisableRevisionCheck.Should().Be(true);
+        Assert.Equal("a", config.ConnectionString);
+        Assert.Equal("custom", config.Adapter);
+        Assert.Equal("prefix", config.StreamPrefix);
+        Assert.Equal("custom-tagged-[[TAG]]", config.TaggedStreamNamePattern);
+        Assert.Equal("persisted-events-custom", config.PersistedEventsStreamName);
+        Assert.Equal("persistence-ids-custom", config.PersistenceIdsStreamName);
+        Assert.Equal("tenant", config.Tenant);
+        Assert.Equal(10, config.Parallelism);
+        Assert.Equal(1000, config.BufferSize);
+        Assert.Equal("custom-dispatcher", config.MaterializerDispatcher);
+        Assert.True(config.DisableRevisionCheck);
     }
 }

src/Akka.Persistence.EventStore.Hosting.Tests/SnapshotSettingsSpec.cs

@@ -1,6 +1,5 @@
 using Akka.Configuration;
 using Akka.Persistence.EventStore.Configuration;
-using FluentAssertions;
 using Xunit;
 
 namespace Akka.Persistence.EventStore.Hosting.Tests;
@@ -28,12 +27,11 @@ public void DefaultOptionsTest()
 
         actualConfig = actualConfig.GetConfig(EventStorePersistence.SnapshotStoreConfigPath);
 
-        actualConfig.GetString("connection-string").Should().Be("a");
-        actualConfig.GetString("adapter").Should().Be(defaultConfig.GetString("adapter"));
-        actualConfig.GetString("prefix").Should().Be(defaultConfig.GetString("prefix"));
-        actualConfig.GetString("tenant").Should().Be(defaultConfig.GetString("tenant"));
-        actualConfig.GetString("materializer-dispatcher").Should()
-            .Be(defaultConfig.GetString("materializer-dispatcher"));
+        Assert.Equal("a", actualConfig.GetString("connection-string"));
+        Assert.Equal(defaultConfig.GetString("adapter"), actualConfig.GetString("adapter"));
+        Assert.Equal(defaultConfig.GetString("prefix"), actualConfig.GetString("prefix"));
+        Assert.Equal(defaultConfig.GetString("tenant"), actualConfig.GetString("tenant"));
+        Assert.Equal(defaultConfig.GetString("materializer-dispatcher"), actualConfig.GetString("materializer-dispatcher"));
     }
 
     [Fact(DisplayName = "Custom Options should modify default config")]
@@ -56,10 +54,10 @@ public void ModifiedOptionsTest()
 
         var config = new EventStoreSnapshotSettings(snapshotConfig);
 
-        config.ConnectionString.Should().Be("a");
-        config.Adapter.Should().Be("custom");
-        config.StreamPrefix.Should().Be("custom@");
-        config.Tenant.Should().Be("tenant");
-        config.MaterializerDispatcher.Should().Be("custom-dispatcher");
+        Assert.Equal("a", config.ConnectionString);
+        Assert.Equal("custom", config.Adapter);
+        Assert.Equal("custom@", config.StreamPrefix);
+        Assert.Equal("tenant", config.Tenant);
+        Assert.Equal("custom-dispatcher", config.MaterializerDispatcher);
     }
 }

src/Akka.Persistence.EventStore.Tests/Akka.Persistence.EventStore.Tests.csproj

@@ -15,7 +15,6 @@
         <PackageReference Include="xunit.runner.visualstudio"/>
         <PackageReference Include="Akka.Persistence.TCK"/>
         <PackageReference Include="Docker.DotNet"/>
-        <PackageReference Include="FluentAssertions" />
         <PackageReference Include="JetBrains.Annotations">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>