Refactored testoutput helper usage

oskardudycz · Sep 3, 2024 · 7dc4043 · 7dc4043
1 parent 94b9fca
commit 7dc4043
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 172 deletions.
diff --git a/Workshops/EventDrivenArchitecture/02-EntitiesDefinition/EntityDefinitionTests.cs b/Workshops/EventDrivenArchitecture/02-EntitiesDefinition/EntityDefinitionTests.cs
@@ -12,8 +12,6 @@ namespace EntitiesDefinition;
 
 public class EntityDefinitionTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     [Trait("Category", "SkipCI")]
     public async Task CheckingInGuest_Succeeds()
@@ -168,6 +166,7 @@ public async Task GroupCheckoutForMultipleGuestStay_ShouldBeInitiated()
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public EntityDefinitionTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/...EventDrivenArchitecture/03-BusinessProcesses/Version1-Aggregates/EntityDefinitionTests.cs b/...EventDrivenArchitecture/03-BusinessProcesses/Version1-Aggregates/EntityDefinitionTests.cs
@@ -14,8 +14,6 @@ namespace BusinessProcesses.Version1_Aggregates;
 
 public class EntityDefinitionTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     public async Task CheckingInGuest_Succeeds()
     {
@@ -163,6 +161,7 @@ public async Task GroupCheckoutForMultipleGuestStay_ShouldBeInitiated()
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public EntityDefinitionTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/...ggregates/GroupCheckouts/GroupCheckout.cs → ...ates/GroupCheckouts/GroupCheckoutEvent.cs b/...ggregates/GroupCheckouts/GroupCheckout.cs → ...ates/GroupCheckouts/GroupCheckoutEvent.cs
diff --git a/...rivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/BusinessProcessTests.cs b/...rivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/BusinessProcessTests.cs
@@ -14,8 +14,6 @@ namespace BusinessProcesses.Version2_ImmutableEntities;
 
 public class BusinessProcessTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     public async Task GroupCheckoutForMultipleGuestStayWithoutPaymentsAndCharges_ShouldComplete()
     {
@@ -52,7 +50,6 @@ public async Task GroupCheckoutForMultipleGuestStayWithoutPaymentsAndCharges_Sho
         );
     }
 
-
     [Fact]
     public async Task GroupCheckoutForMultipleGuestStayWithAllStaysSettled_ShouldComplete()
     {
@@ -99,7 +96,6 @@ public async Task GroupCheckoutForMultipleGuestStayWithAllStaysSettled_ShouldCom
         );
     }
 
-
     [Fact]
     public async Task GroupCheckoutForMultipleGuestStayWithOneSettledAndRestUnsettled_ShouldFail()
     {
@@ -215,6 +211,7 @@ public async Task GroupCheckoutForMultipleGuestStayWithAllUnsettled_ShouldFail()
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public BusinessProcessTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/...ivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/EntityDefinitionTests.cs b/...ivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/EntityDefinitionTests.cs
@@ -14,8 +14,6 @@ namespace BusinessProcesses.Version2_ImmutableEntities;
 
 public class EntityDefinitionTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     public async Task CheckingInGuest_Succeeds()
     {
@@ -141,6 +139,7 @@ public async Task CheckingOutGuestWithSettledBalance_FailsWithGuestCheckoutFaile
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public EntityDefinitionTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/...hitecture/03-BusinessProcesses/Version2-ImmutableEntities/GroupCheckouts/GroupCheckout.cs b/...hitecture/03-BusinessProcesses/Version2-ImmutableEntities/GroupCheckouts/GroupCheckout.cs
diff --git a/...ure/03-BusinessProcesses/Version2-ImmutableEntities/GroupCheckouts/GroupCheckoutEvents.cs b/...ure/03-BusinessProcesses/Version2-ImmutableEntities/GroupCheckouts/GroupCheckoutEvents.cs
@@ -0,0 +1,42 @@
+using BusinessProcesses.Version2_ImmutableEntities.Core;
+
+namespace BusinessProcesses.Version2_ImmutableEntities.GroupCheckouts;
+
+using static GroupCheckoutEvent;
+
+public abstract record GroupCheckoutEvent
+{
+    public record GroupCheckoutInitiated(
+        Guid GroupCheckoutId,
+        Guid ClerkId,
+        Guid[] GuestStayIds,
+        DateTimeOffset InitiatedAt
+    ): GroupCheckoutEvent;
+
+    public record GuestCheckoutCompleted(
+        Guid GroupCheckoutId,
+        Guid GuestStayId,
+        DateTimeOffset CompletedAt
+    ): GroupCheckoutEvent;
+
+    public record GuestCheckoutFailed(
+        Guid GroupCheckoutId,
+        Guid GuestStayId,
+        DateTimeOffset FailedAt
+    ): GroupCheckoutEvent;
+
+    public record GroupCheckoutCompleted(
+        Guid GroupCheckoutId,
+        Guid[] CompletedCheckouts,
+        DateTimeOffset CompletedAt
+    ): GroupCheckoutEvent;
+
+    public record GroupCheckoutFailed(
+        Guid GroupCheckoutId,
+        Guid[] CompletedCheckouts,
+        Guid[] FailedCheckouts,
+        DateTimeOffset FailedAt
+    ): GroupCheckoutEvent;
+
+    private GroupCheckoutEvent() { }
+}
diff --git a/...ventDrivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/GuestStayFacade.cs b/...ventDrivenArchitecture/03-BusinessProcesses/Version2-ImmutableEntities/GuestStayFacade.cs
@@ -1,6 +1,7 @@
 using BusinessProcesses.Core;
 using BusinessProcesses.Version2_ImmutableEntities.GroupCheckouts;
 using BusinessProcesses.Version2_ImmutableEntities.GuestStayAccounts;
+using GroupCheckoutEvent = BusinessProcesses.Version1_Aggregates.GroupCheckouts.GroupCheckoutEvent;
 
 namespace BusinessProcesses.Version2_ImmutableEntities;
 
@@ -63,9 +64,8 @@ public async ValueTask CheckOutGuest(CheckOutGuest command, CancellationToken ct
     public async ValueTask InitiateGroupCheckout(InitiateGroupCheckout command, CancellationToken ct = default)
     {
         var @event =
-            GroupCheckout.Initiate(command.GroupCheckoutId, command.ClerkId, command.GuestStayIds, command.Now);
+            new GroupCheckoutEvent.GroupCheckoutInitiated(command.GroupCheckoutId, command.ClerkId, command.GuestStayIds, command.Now);
 
-        await database.Store(command.GroupCheckoutId, GroupCheckout.Initial.Evolve(@event), ct);
         await eventBus.Publish([@event], ct);
     }
 }

diff --git a/Workshops/EventDrivenArchitecture/EventDrivenArchitecture.sln b/Workshops/EventDrivenArchitecture/EventDrivenArchitecture.sln
@@ -20,6 +20,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "01-EventsDefinition", "Solu
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "02-EntitiesDefinition", "Solutions\02-EntitiesDefinition\02-EntitiesDefinition.csproj", "{4901FBDE-1248-402F-89F2-8027655B703D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "03-BusinessProcesses", "Solutions\03-BusinessProcesses\03-BusinessProcesses.csproj", "{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,9 +64,14 @@ Global
 		{4901FBDE-1248-402F-89F2-8027655B703D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4901FBDE-1248-402F-89F2-8027655B703D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4901FBDE-1248-402F-89F2-8027655B703D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7312A099-6FAD-462A-8D94-FB817B531A27} = {96700308-E324-4D7A-854D-9ED17ECEE9B7}
 		{4901FBDE-1248-402F-89F2-8027655B703D} = {96700308-E324-4D7A-854D-9ED17ECEE9B7}
+		{0C7E9C5A-090E-4D48-A2CC-D60AF87591AA} = {96700308-E324-4D7A-854D-9ED17ECEE9B7}
 	EndGlobalSection
 EndGlobal
diff --git a/...rchitecture/Solutions/02-EntitiesDefinition/Solution1-Aggregates/EntityDefinitionTests.cs b/...rchitecture/Solutions/02-EntitiesDefinition/Solution1-Aggregates/EntityDefinitionTests.cs
@@ -14,8 +14,6 @@ namespace EntitiesDefinition.Solution1_Aggregates;
 
 public class EntityDefinitionTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     public async Task CheckingInGuest_Succeeds()
     {
@@ -163,6 +161,7 @@ public async Task GroupCheckoutForMultipleGuestStay_ShouldBeInitiated()
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public EntityDefinitionTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/...ture/Solutions/02-EntitiesDefinition/Solution2-ImmutableEntities/EntityDefinitionTests.cs b/...ture/Solutions/02-EntitiesDefinition/Solution2-ImmutableEntities/EntityDefinitionTests.cs
@@ -14,8 +14,6 @@ namespace EntitiesDefinition.Solution2_ImmutableEntities;
 
 public class EntityDefinitionTests
 {
-    private readonly ITestOutputHelper testOutputHelper;
-
     [Fact]
     public async Task CheckingInGuest_Succeeds()
     {
@@ -163,6 +161,7 @@ public async Task GroupCheckoutForMultipleGuestStay_ShouldBeInitiated()
     private readonly GuestStayFacade guestStayFacade;
     private readonly Faker generate = new();
     private readonly DateTimeOffset now = DateTimeOffset.Now;
+    private readonly ITestOutputHelper testOutputHelper;
 
     public EntityDefinitionTests(ITestOutputHelper testOutputHelper)
     {

diff --git a/Workshops/EventDrivenArchitecture/Solutions/03-BusinessProcesses/03-BusinessProcesses.csproj b/Workshops/EventDrivenArchitecture/Solutions/03-BusinessProcesses/03-BusinessProcesses.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <RootNamespace>BusinessProcesses</RootNamespace>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Bogus" Version="35.6.1"/>
+        <PackageReference Include="FluentAssertions" Version="6.12.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
+        <PackageReference Include="Ogooreck" Version="0.8.2"/>
+        <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="xunit" Version="2.9.0"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.8"/>
+    </ItemGroup>
+</Project>
diff --git a/Workshops/EventDrivenArchitecture/Solutions/03-BusinessProcesses/UnitTest1.cs b/Workshops/EventDrivenArchitecture/Solutions/03-BusinessProcesses/UnitTest1.cs
@@ -0,0 +1,11 @@
+using Xunit;
+
+namespace BusinessProcesses;
+
+public class UnitTest1
+{
+    [Fact]
+    public void Test1()
+    {
+    }
+}