fix: PR review

Signed-off-by: SebastienDegodez <sebastien.degodez@gmail.com>

Author: SebastienDegodez

README.md

@@ -16,7 +16,7 @@ You will work with a ASP.NET Core application and explore:
 - [Step 5: Write Tests for Async](step5-write-async-tests.md)
 
 Complementary Resources:
-- [Integration Testing Patterns](step-integration-testing-patterns.md)
+- [Integration Testing Patterns](explain-integration-testing-patterns.md)
 
 ## License Summary
 

explain-integration-testing-patterns.md

@@ -7,7 +7,7 @@ This guide explains two different approaches for setting up integration tests wi
 When writing integration tests that use Microcks and Kafka containers, you have two main architectural choices:
 
 1. **IClassFixture Pattern**: Multiple container instances, isolated per test class
-2. **ICollectionFixture Pattern**: Single shared container instance, optimized for performance
+2. **ICollectionFixture Pattern**: A set of shared container instances (e.g., one Microcks container and one Kafka container) used by all test classes for optimal performance and resource efficiency
 
 ## Pattern 1: IClassFixture - Isolated Test Classes
 
@@ -19,7 +19,7 @@ When writing integration tests that use Microcks and Kafka containers, you have
 
 ### Architecture
 ```csharp
-public class MyTestClass : IClassFixture<MicrocksWebApplicationFactory<Program>>
+public class MyTestClass : IClassFixture<OrderServiceWebApplicationFactory<Program>>
 {
     // Each test class gets its own factory instance
     // Each factory starts its own containers
@@ -34,8 +34,15 @@ public class MyTestClass : IClassFixture<MicrocksWebApplicationFactory<Program>>
 ### Implementation Example
 
 #### Step 1: WebApplicationFactory with Dynamic Ports
+
+> **Note:**
+> The implementation of `OrderServiceWebApplicationFactory` (or `MicrocksWebApplicationFactory`) must be adapted depending on the fixture pattern:
+>
+> - With **IClassFixture**, each test class gets its own factory and containers. You must allocate **dynamic ports** for Kestrel, Kafka, and all services, because static port mapping (like `kafka:9092:9092`) is not possible—otherwise, you will have port conflicts if tests run in parallel. All port assignments must be programmatic and injected into your test server and mocks.
+>
+> - With **ICollectionFixture** (shared collection), a single factory and set of containers are shared for all tests. You allocate ports only once, which simplifies configuration and avoids conflicts. This is why the shared collection pattern is recommended for most test suites.
 ```csharp
-public class MicrocksWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
+public class OrderServiceWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
     where TProgram : class
 {
     public ushort ActualPort { get; private set; }
@@ -102,13 +109,13 @@ public class MicrocksWebApplicationFactory<TProgram> : KestrelWebApplicationFact
 
 #### Step 2: Test Class Implementation
 ```csharp
-public class OrderControllerTests : IClassFixture<MicrocksWebApplicationFactory<Program>>
+public class OrderControllerTests : IClassFixture<OrderServiceWebApplicationFactory<Program>>
 {
-    private readonly MicrocksWebApplicationFactory<Program> _factory;
+    private readonly OrderServiceWebApplicationFactory<Program> _factory;
     private readonly ITestOutputHelper _testOutput;
 
     public OrderControllerTests(
-        MicrocksWebApplicationFactory<Program> factory,
+        OrderServiceWebApplicationFactory<Program> factory,
         ITestOutputHelper testOutput)
     {
         _factory = factory;
@@ -153,15 +160,15 @@ public class OrderControllerTests : IClassFixture<MicrocksWebApplicationFactory<
 ### Architecture
 ```csharp
 [Collection(SharedTestCollection.Name)]
-public class MyTestClass : BaseIntegrationTest
+public class MyTestClass
 {
     // All test classes share the same factory instance
     // Single set of containers for all tests
 }
 ```
 
 ### Key Benefits
-- **Single Container Instance**: One Microcks + one Kafka container for all tests
+- **Single set of containers Instances**: One Microcks + one Kafka container for all tests
 - **Performance Optimized**: ~70% faster test execution
 - **Resource Efficient**: Lower memory and CPU usage
 - **Single Port Allocation**: One Kestrel port for the entire test suite
@@ -171,15 +178,15 @@ public class MyTestClass : BaseIntegrationTest
 #### Step 1: Shared Collection Definition
 ```csharp
 [CollectionDefinition(Name)]
-public class SharedTestCollection : ICollectionFixture<MicrocksWebApplicationFactory<Program>>
+public class SharedTestCollection : ICollectionFixture<OrderServiceWebApplicationFactory<Program>>
 {
     public const string Name = "SharedTestCollection";
 }
 ```
 
 #### Step 2: Enhanced WebApplicationFactory
 ```csharp
-public class MicrocksWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
+public class OrderServiceWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
     where TProgram : class
 {
     private static readonly SemaphoreSlim InitializationSemaphore = new(1, 1);
@@ -250,7 +257,7 @@ public abstract class BaseIntegrationTest
     public KafkaContainer KafkaContainer { get; }
     public HttpClient HttpClient { get; private set; }
 
-    protected BaseIntegrationTest(MicrocksWebApplicationFactory<Program> factory)
+    protected BaseIntegrationTest(OrderServiceWebApplicationFactory<Program> factory)
     {
         Factory = factory;
         HttpClient = factory.CreateClient();
@@ -274,7 +281,7 @@ public class OrderControllerTests : BaseIntegrationTest
 
     public OrderControllerTests(
         ITestOutputHelper testOutput,
-        MicrocksWebApplicationFactory<Program> factory)
+        OrderServiceWebApplicationFactory<Program> factory)
         : base(factory)
     {
         _testOutput = testOutput;

tests/Order.Service.Tests/Api/OrderControllerContractTests.cs

@@ -34,7 +34,7 @@ public class OrderControllerContractTests : BaseIntegrationTest
 
     public OrderControllerContractTests(
         ITestOutputHelper testOutputHelper,
-        MicrocksWebApplicationFactory<Program> factory)
+        OrderServiceWebApplicationFactory<Program> factory)
         : base(factory)
     {
         TestOutputHelper = testOutputHelper;

tests/Order.Service.Tests/Api/OrderControllerPostmanContractTests.cs

@@ -30,7 +30,7 @@ public class OrderControllerPostmanContractTests : BaseIntegrationTest
 
     public OrderControllerPostmanContractTests(
         ITestOutputHelper testOutputHelper,
-        MicrocksWebApplicationFactory<Program> factory)
+        OrderServiceWebApplicationFactory<Program> factory)
         : base(factory)
     {
         TestOutputHelper = testOutputHelper;

tests/Order.Service.Tests/BaseIntegrationTest.cs

@@ -41,7 +41,7 @@ public abstract class BaseIntegrationTest
     public KafkaContainer KafkaContainer { get; }
     public HttpClient? HttpClient { get; private set; }
 
-    protected BaseIntegrationTest(MicrocksWebApplicationFactory<Program> factory)
+    protected BaseIntegrationTest(OrderServiceWebApplicationFactory<Program> factory)
     {
         Factory = factory;
 

tests/Order.Service.Tests/Client/PastryAPIClientTests.cs

@@ -36,7 +36,7 @@ public class PastryAPIClientTests : BaseIntegrationTest
 
     public PastryAPIClientTests(
         ITestOutputHelper testOutputHelper,
-        MicrocksWebApplicationFactory<Program> factory)
+        OrderServiceWebApplicationFactory<Program> factory)
         : base(factory)
     {
         TestOutputHelper = testOutputHelper;

tests/Order.Service.Tests/Order.Service.Tests.csproj

@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Awaitility.NET" Version="1.0.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

…e.Tests/MicrocksWebApplicationFactory.cs …sts/OrderServiceWebApplicationFactory.cstests/Order.Service.Tests/MicrocksWebApplicationFactory.cs renamed to tests/Order.Service.Tests/OrderServiceWebApplicationFactory.cs tests/Order.Service.Tests/MicrocksWebApplicationFactory.cs renamed to tests/Order.Service.Tests/OrderServiceWebApplicationFactory.cs

@@ -42,10 +42,10 @@ namespace Order.Service.Tests;
 /// This factory is designed to be used as a singleton across all test classes to optimize container startup time.
 /// Containers are started once and reused by all tests in the test assembly.
 /// </summary>
-public class MicrocksWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
+public class OrderServiceWebApplicationFactory<TProgram> : KestrelWebApplicationFactory<TProgram>, IAsyncLifetime
     where TProgram : class
 {
-    private const string MicrocksImage = "quay.io/microcks/microcks-uber:1.13.0";
+    private const string MicrocksImage = "quay.io/microcks/microcks-uber:1.13.0-native";
 
     private static readonly SemaphoreSlim InitializationSemaphore = new(1, 1);
     private static bool _isInitialized;

tests/Order.Service.Tests/SharedTestCollection.cs

@@ -24,7 +24,7 @@ namespace Order.Service.Tests;
 /// This guarantees that containers are started only once across all test classes.
 /// </summary>
 [CollectionDefinition(Name)]
-public class SharedTestCollection : ICollectionFixture<MicrocksWebApplicationFactory<Program>>
+public class SharedTestCollection : ICollectionFixture<OrderServiceWebApplicationFactory<Program>>
 {
     public const string Name = "SharedTestCollection";
 }

tests/Order.Service.Tests/UseCases/OrderEventListenerTests.cs

@@ -23,7 +23,7 @@
 using Order.Service.UseCases;
 using Order.Service.UseCases.Model;
 using OrderModel = Order.Service.UseCases.Model.Order;
-
+using static Awaitility.Awaitility;
 using Xunit;
 
 namespace Order.Service.Tests.UseCases;
@@ -34,7 +34,7 @@ public class OrderEventListenerTests : BaseIntegrationTest
 
     public OrderEventListenerTests(
         ITestOutputHelper testOutputHelper,
-        MicrocksWebApplicationFactory<Program> factory)
+        OrderServiceWebApplicationFactory<Program> factory)
         : base(factory)
     {
         TestOutputHelper = testOutputHelper;
@@ -52,11 +52,41 @@ public async Task TestEventIsConsumedAndProcessedByService()
         using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
         var consumerTask = StartOrderEventConsumerAsync(cts.Token);
 
+        var orderUseCase = Factory.Services.GetRequiredService<OrderUseCase>();
         OrderModel? order = null;
-        // Act & Assert - Polling pattern similar to the Java example
+
+        // Act & Assert
         try
         {
-            order = await PollForOrderProcessingAsync(expectedOrderId, cts);
+            Await().
+                AtMost(TimeSpan.FromSeconds(4))
+                .PollDelay(TimeSpan.FromMilliseconds(400))
+                .PollInterval(TimeSpan.FromMilliseconds(400))
+                .Until(() =>
+                {
+                    try
+                    {
+                        var retrievedOrder = orderUseCase.GetOrderAsync(expectedOrderId, TestContext.Current.CancellationToken).Result;
+                        if (retrievedOrder != null)
+                        {
+                            TestOutputHelper.WriteLine($"Order {retrievedOrder.Id} successfully processed!");
+                            order = retrievedOrder;
+                            cts.Cancel(); // Cancel the consumer after successful processing
+                            return true;
+                        }
+                        return false;
+                    }
+                    catch (OrderNotFoundException)
+                    {
+                        TestOutputHelper.WriteLine($"Order {expectedOrderId} not found yet, continuing to poll...");
+                        return false;
+                    }
+                    catch (AggregateException ex) when (ex.InnerException is OrderNotFoundException)
+                    {
+                        TestOutputHelper.WriteLine($"Order {expectedOrderId} not found yet, continuing to poll...");
+                        return false;
+                    }
+                });
 
             Assert.NotNull(order);
             // Verify the order properties match expected values
@@ -84,43 +114,7 @@ public async Task TestEventIsConsumedAndProcessedByService()
         }
     }
 
-    private async Task<OrderModel> PollForOrderProcessingAsync(
-        string expectedOrderId,
-        CancellationTokenSource cts)
-    {
-        var pollDelay = TimeSpan.FromMilliseconds(400);
-        var pollInterval = TimeSpan.FromMilliseconds(400);
-        var startTime = DateTime.UtcNow;
-
-        var orderUseCase = Factory.Services.GetRequiredService<OrderUseCase>();
-        // Initial delay
-        await Task.Delay(pollDelay, TestContext.Current.CancellationToken);
 
-        while (DateTime.UtcNow - startTime < TimeSpan.FromSeconds(4))
-        {
-            try
-            {
-                // Simulate getting order by ID (this would normally call a GET endpoint)
-                var order = await orderUseCase.GetOrderAsync(expectedOrderId, TestContext.Current.CancellationToken);
-
-                if (order is not null)
-                {
-                    TestOutputHelper.WriteLine($"Order {order.Id} successfully processed!");
-                    cts.Cancel(); // Cancel the consumer after successful processing
-                    return order;
-                }
-            }
-            catch (OrderNotFoundException)
-            {
-                // Continue polling until timeout
-                TestOutputHelper.WriteLine($"Order {expectedOrderId} not found yet, continuing to poll...");
-            }
-
-            await Task.Delay(pollInterval, TestContext.Current.CancellationToken);
-        }
-
-        throw new TimeoutException($"Order {expectedOrderId} was not processed within the expected timeout.");
-    }
 
     private async Task StartOrderEventConsumerAsync(CancellationToken cancellationToken)
     {