Housekeeping: Tests

AlexeyRaga · Jun 17, 2023 · 5f33634 · 5f33634
1 parent dd69952
commit 5f33634
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 79 deletions.
diff --git a/...gers.IntegrationTests/KafkaFlowFixture.cs → ...egrationTests/Fixture/KafkaFlowFixture.cs b/...gers.IntegrationTests/KafkaFlowFixture.cs → ...egrationTests/Fixture/KafkaFlowFixture.cs
@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Npgsql;
 
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
+namespace KafkaFlow.ProcessManagers.IntegrationTests.Fixture;
 
 public class KafkaFlowFixture : IDisposable, IAsyncDisposable
 {

diff --git a/...egrationTests/LoggingProcessStateStore.cs → ...Tests/Fixture/LoggingProcessStateStore.cs b/...egrationTests/LoggingProcessStateStore.cs → ...Tests/Fixture/LoggingProcessStateStore.cs
@@ -1,6 +1,4 @@
-using KafkaFlow.ProcessManagers.InMemory;
-
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
+namespace KafkaFlow.ProcessManagers.IntegrationTests.Fixture;
 
 public sealed class LoggingProcessStateStore : IProcessStateStore
 {
@@ -18,6 +16,8 @@ public LoggingProcessStateStore(IProcessStateStore innerStore)
 
     public IReadOnlyList<(ActionType, Type, Guid, VersionedState?)> Changes => _log.AsReadOnly();
 
+    public void ClearChanges() => _log.Clear();
+
     public ValueTask Persist(Type processType, Guid processId, VersionedState state)
     {
         _log.Add((ActionType.Persisted, processType, processId, state));

diff --git a/...ationTests/ServiceCollectionExtensions.cs → ...ts/Fixture/ServiceCollectionExtensions.cs b/...ationTests/ServiceCollectionExtensions.cs → ...ts/Fixture/ServiceCollectionExtensions.cs
@@ -1,7 +1,7 @@
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
-
 using Microsoft.Extensions.DependencyInjection;
 
+namespace KafkaFlow.ProcessManagers.IntegrationTests.Fixture;
+
 public static class ServiceCollectionExtensions
 {
     /// <summary>

diff --git a/...ProcessManagers.IntegrationTests/Types.cs → ....IntegrationTests/ITestMessageProducer.cs b/...ProcessManagers.IntegrationTests/Types.cs → ....IntegrationTests/ITestMessageProducer.cs
diff --git a/tests/KafkaFlow.ProcessManagers.IntegrationTests/Playground.cs b/tests/KafkaFlow.ProcessManagers.IntegrationTests/Playground.cs
diff --git a/tests/KafkaFlow.ProcessManagers.IntegrationTests/PostgresProcessManagerStoreTests.cs b/tests/KafkaFlow.ProcessManagers.IntegrationTests/PostgresProcessManagerStoreTests.cs
@@ -1,7 +1,6 @@
 using FluentAssertions;
 using KafkaFlow.Contrib.ProcessManagers.Postgres;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
 using Npgsql;
 
 namespace KafkaFlow.ProcessManagers.IntegrationTests;

diff --git a/tests/KafkaFlow.ProcessManagers.IntegrationTests/ProducerMarkers.cs b/tests/KafkaFlow.ProcessManagers.IntegrationTests/ProducerMarkers.cs
diff --git a/...rs.IntegrationTests/TestProcessManager.cs → ...sts/UserLifeCycle/UserLifeCycleProcess.cs b/...rs.IntegrationTests/TestProcessManager.cs → ...sts/UserLifeCycle/UserLifeCycleProcess.cs
@@ -1,41 +1,25 @@
 using System.Collections.Immutable;
 using Microsoft.Extensions.Logging;
 
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
+namespace KafkaFlow.ProcessManagers.IntegrationTests.UserLifeCycle;
 
 public sealed record TestState(DateTimeOffset StartedAt, ImmutableList<string> Log);
 
-public sealed class UserRegistered
-{
-    public UserRegistered(Guid UserId, string Email)
-    {
-        this.UserId = UserId;
-        this.Email = Email;
-    }
-
-    public Guid UserId { get; init; }
-    public string Email { get; init; }
-
-    public void Deconstruct(out Guid UserId, out string Email)
-    {
-        UserId = this.UserId;
-        Email = this.Email;
-    }
-}
+public sealed record UserRegistered(Guid UserId, string Email);
 
 public sealed record UserApproved(Guid UserId);
 
 public sealed record UserAccessGranted(Guid UserId);
 
-public class TestProcessManager : ProcessManager<TestState>,
+public class UserLifeCycleProcess : ProcessManager<TestState>,
     IProcessMessage<UserRegistered>,
     IProcessMessage<UserAccessGranted>,
     IProcessMessage<UserApproved>
 {
     private readonly ILogger _logger;
     private readonly IMessageProducer<ITestMessageProducer> _producer;
 
-    public TestProcessManager(ILogger<TestProcessManager> logger, IMessageProducer<ITestMessageProducer> producer)
+    public UserLifeCycleProcess(ILogger<UserLifeCycleProcess> logger, IMessageProducer<ITestMessageProducer> producer)
     {
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         _producer = producer ?? throw new ArgumentNullException(nameof(producer));

diff --git a/...s.IntegrationTests/ProcessManagerTests.cs → ...Cycle/UserLifecycleProcessManagerTests.cs b/...s.IntegrationTests/ProcessManagerTests.cs → ...Cycle/UserLifecycleProcessManagerTests.cs
@@ -1,14 +1,16 @@
 using FluentAssertions;
+using KafkaFlow.ProcessManagers.IntegrationTests.Fixture;
 
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
+namespace KafkaFlow.ProcessManagers.IntegrationTests.UserLifeCycle;
 
-public sealed class ProcessManagerTests : IAssemblyFixture<KafkaFlowFixture>
+public sealed class UserLifecycleProcessManagerTests : IAssemblyFixture<KafkaFlowFixture>
 {
     private readonly KafkaFlowFixture _fixture;
 
-    public ProcessManagerTests(KafkaFlowFixture fixture)
+    public UserLifecycleProcessManagerTests(KafkaFlowFixture fixture)
     {
         _fixture = fixture ?? throw new ArgumentNullException(nameof(fixture));
+        _fixture.ProcessStateStore.ClearChanges();
     }
 
     [Fact]
@@ -26,7 +28,7 @@ public async Task Should_start_fixture()
                 {
                     LoggingProcessStateStore.ActionType.Persisted,
                     LoggingProcessStateStore.ActionType.Persisted,
-                    LoggingProcessStateStore.ActionType.Deleted,
+                    LoggingProcessStateStore.ActionType.Deleted
                 }, x => x.WithStrictOrdering());
         });
     }

diff --git a/tests/KafkaFlow.ProcessManagers.IntegrationTests/Usings.cs b/tests/KafkaFlow.ProcessManagers.IntegrationTests/Usings.cs
@@ -1 +1,2 @@
-global using Xunit;
+global using Xunit;
+global using KafkaFlow.ProcessManagers.IntegrationTests.Utils;
diff --git a/...essManagers.IntegrationTests/TestUtils.cs → ...agers.IntegrationTests/Utils/TestUtils.cs b/...essManagers.IntegrationTests/TestUtils.cs → ...agers.IntegrationTests/Utils/TestUtils.cs
@@ -1,6 +1,6 @@
 using Xunit.Sdk;
 
-namespace KafkaFlow.ProcessManagers.IntegrationTests;
+namespace KafkaFlow.ProcessManagers.IntegrationTests.Utils;
 
 public static class TestUtils
 {