modernized tests and upgraded to Akka.NET v1.5.0-beta3 (#287)

akkadotnet · Feb 27, 2023 · 884a270 · 884a270
1 parent 402d33e
commit 884a270
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 145 deletions.
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerAllEventsSpec : AllEventsSpec, IDisposable
+    public class BatchingSqlServerAllEventsSpec : AllEventsSpec
     {
         public BatchingSqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -42,15 +43,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec, IDisposable
+    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec
     {
         public BatchingSqlServerCurrentAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -42,15 +43,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/...Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs b/...Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec, IDisposable
+    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec
     {
         public BatchingSqlServerCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByPersistenceIdSpec), output)
@@ -44,15 +45,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec, IDisposable
+    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec
     {
         public BatchingSqlServerCurrentEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByTagSpec), output)
@@ -50,15 +51,11 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec, IDisposable
+    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec
     {
         public BatchingSqlServerCurrentPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentPersistenceIdsSpec), output)
@@ -44,15 +45,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec, IDisposable
+    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec
     {
         public BatchingSqlServerEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByPersistenceIdSpec), output)
@@ -44,15 +45,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec, IDisposable
+    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec
     {
         public BatchingSqlServerEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByTagSpec), output)
@@ -50,15 +51,11 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.TestKit.Performance;
 using Xunit;
@@ -13,7 +14,7 @@
 namespace Akka.Persistence.SqlServer.Tests
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec, IDisposable
+    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec
     {
         public BatchingSqlServerJournalPerfSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), "BatchingSqlServerJournalPerfSpec", output)
@@ -47,15 +48,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return ConfigurationFactory.ParseString(specString);
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec, IDisposable
+    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec
     {
         public BatchingSqlServerPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerPersistenceIdsSpec), output)
@@ -44,15 +45,11 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System;
+using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -15,7 +16,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerAllEventsSpec : AllEventsSpec, IDisposable
+    public class SqlServerAllEventsSpec : AllEventsSpec
     {
         public SqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(InitConfig(fixture),
             nameof(SqlServerAllEventsSpec), output)
@@ -48,15 +49,11 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        protected void Dispose(bool disposing)
-        {
-            DbUtils.Clean();
-        }
-
-        public void Dispose()
+        public override Task DisposeAsync()
         {
             GC.SuppressFinalize(this);
-            Dispose(true);
+            DbUtils.Clean();
+            return base.DisposeAsync();
         }
     }
 }