MassTransit 9.2.0

readme.md

@@ -276,11 +276,20 @@ Will result in the following snapshot file.
         },
         ElementId: Guid_3
       }
+    ],
+    Created: [
+      {
+        Saga: {
+          CorrelationId: Guid_3,
+          StartMessageReceived: true
+        },
+        ElementId: Guid_3
+      }
     ]
   }
 }
 ```
-<sup><a href='/src/Tests/SagaTests.Run.verified.txt#L1-L46' title='Snippet source file'>snippet source</a> | <a href='#snippet-SagaTests.Run.verified.txt' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/SagaTests.Run.verified.txt#L1-L55' title='Snippet source file'>snippet source</a> | <a href='#snippet-SagaTests.Run.verified.txt' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

src/Directory.Build.props

@@ -1,7 +1,7 @@
 
 <Project>
   <PropertyGroup>
-    <Version>2.2.0</Version>
+    <Version>2.3.0</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <LangVersion>preview</LangVersion>
     <PackageTags>MassTransit, Verify</PackageTags>
@@ -13,4 +13,4 @@
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
-</Project>
+</Project>

src/Tests/ConsumerTests.cs

@@ -89,4 +89,4 @@ public Task Consume(ConsumeContext<SubmitOrder> context) =>
                     OrderId = context.Message.OrderId
                 });
     }
-}
+}

src/Tests/EmptySagaStateMachineTests.EmptyEventsAndStateChangesAreOmitted.verified.txt

@@ -0,0 +1,5 @@
+{
+  Consumed: [],
+  Sagas: [],
+  Created: []
+}

src/Tests/EmptySagaStateMachineTests.cs

@@ -0,0 +1,20 @@
+namespace Tests;
+
+public class EmptySagaStateMachineTests
+{
+    [Fact]
+    public async Task EmptyEventsAndStateChangesAreOmitted()
+    {
+        await using var provider = new ServiceCollection()
+            .AddMassTransitTestHarness(_ =>
+                _.AddSagaStateMachine<SagaStateMachineTests.ConsumerStateMachine, SagaStateMachineTests.ConsumerSaga>())
+            .BuildServiceProvider(true);
+        var harness = provider.GetRequiredService<ITestHarness>();
+        var sagaHarness = harness.GetSagaStateMachineHarness<SagaStateMachineTests.ConsumerStateMachine, SagaStateMachineTests.ConsumerSaga>();
+
+        await harness.Start();
+
+        await Verify(sagaHarness)
+            .IgnoreMember("StateMachine");
+    }
+}

src/Tests/SagaStateMachineTests.Run.verified.txt

@@ -53,6 +53,29 @@
         ElementId: Guid_3
       }
     ],
+    Events: [
+      {
+        Event: StartEvent,
+        CorrelationId: Guid_3,
+        MessageType: SagaStateMachineTests.Start,
+        Message: {
+          CorrelationId: Guid_3
+        }
+      }
+    ],
+    StateChanges: [
+      {
+        Event: StartEvent,
+        CorrelationId: Guid_3,
+        CurrentState: Initial
+      },
+      {
+        Event: StartEvent,
+        CorrelationId: Guid_3,
+        PreviousState: Initial,
+        CurrentState: Final
+      }
+    ],
     StateMachine: {
       StartEvent: {
         Name: StartEvent

src/Tests/SagaTests.Run.verified.txt

@@ -41,6 +41,15 @@
         },
         ElementId: Guid_3
       }
+    ],
+    Created: [
+      {
+        Saga: {
+          CorrelationId: Guid_3,
+          StartMessageReceived: true
+        },
+        ElementId: Guid_3
+      }
     ]
   }
 }

src/Tests/SagaTests.cs

@@ -45,4 +45,4 @@ public class Start : CorrelatedBy<Guid>
         public Guid CorrelationId { get; init; }
     }
     #endregion
-}
+}

src/Verify.MassTransit/ContextConverters/MessageContextConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit;
-
-class MessageContextConverter :
+class MessageContextConverter :
     WriteOnlyJsonConverter<MessageContext>
 {
     public override void Write(VerifyJsonWriter writer, MessageContext context)

src/Verify.MassTransit/ContextConverters/ReceiveContextConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit;
-
-class ReceiveContextConverter :
+class ReceiveContextConverter :
     WriteOnlyJsonConverter<ReceiveContext>
 {
     public override void Write(VerifyJsonWriter writer, ReceiveContext context)

src/Verify.MassTransit/ContextConverters/SendContextConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit;
-
-class SendContextConverter :
+class SendContextConverter :
     WriteOnlyJsonConverter<SendContext>
 {
     public override void Write(VerifyJsonWriter writer, SendContext context)

src/Verify.MassTransit/ConverterHelpers.cs

@@ -1,6 +1,4 @@
-using MassTransit;
-
-static class ConverterHelpers
+static class ConverterHelpers
 {
     public static void WriteHeaders(this VerifyJsonWriter writer, object context, Headers headers)
     {
@@ -22,4 +20,4 @@ public static void WriteHeaders(this VerifyJsonWriter writer, object context, He
         path = path.TrimStart('/');
         return path;
     }
-}
+}

src/Verify.MassTransit/GlobalUsings.cs

@@ -0,0 +1,2 @@
+global using MassTransit;
+global using MassTransit.Testing;

src/Verify.MassTransit/MessageConverters/PublishedMessageConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class PublishedMessageConverter :
+class PublishedMessageConverter :
     WriteOnlyJsonConverter<IPublishedMessage>
 {
     public override void Write(VerifyJsonWriter writer, IPublishedMessage message)

src/Verify.MassTransit/MessageConverters/PublishedMessageListConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class PublishedMessageListConverter :
+class PublishedMessageListConverter :
     WriteOnlyJsonConverter<IPublishedMessageList>
 {
     public override void Write(VerifyJsonWriter writer, IPublishedMessageList messages)

src/Verify.MassTransit/MessageConverters/ReceivedMessageConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class ReceivedMessageConverter :
+class ReceivedMessageConverter :
     WriteOnlyJsonConverter<IReceivedMessage>
 {
     public override void Write(VerifyJsonWriter writer, IReceivedMessage message)

src/Verify.MassTransit/MessageConverters/ReceivedMessageListConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class ReceivedMessageListConverter :
+class ReceivedMessageListConverter :
     WriteOnlyJsonConverter<IReceivedMessageList>
 {
     public override void Write(VerifyJsonWriter writer, IReceivedMessageList messages)

src/Verify.MassTransit/MessageConverters/SentMessageConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class SentMessageConverter :
+class SentMessageConverter :
     WriteOnlyJsonConverter<ISentMessage>
 {
     public override void Write(VerifyJsonWriter writer, ISentMessage message)

src/Verify.MassTransit/MessageConverters/SentMessageListConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class SentMessageListConverter :
+class SentMessageListConverter :
     WriteOnlyJsonConverter<ISentMessageList>
 {
     public override void Write(VerifyJsonWriter writer, ISentMessageList messages)

src/Verify.MassTransit/SagaConverters/ReceivedEventConverter.cs

@@ -0,0 +1,13 @@
+class ReceivedEventConverter :
+    WriteOnlyJsonConverter<IReceivedEvent>
+{
+    public override void Write(VerifyJsonWriter writer, IReceivedEvent received)
+    {
+        writer.WriteStartObject();
+        writer.WriteMember(received, received.Event.Name, "Event");
+        writer.WriteMember(received, received.CorrelationId, "CorrelationId");
+        writer.WriteMember(received, received.MessageType, "MessageType");
+        writer.WriteMember(received, received.MessageObject, "Message");
+        writer.WriteEndObject();
+    }
+}

src/Verify.MassTransit/SagaConverters/ReceivedEventListConverter.cs

@@ -0,0 +1,14 @@
+class ReceivedEventListConverter :
+    WriteOnlyJsonConverter<IReceivedEventList>
+{
+    public override void Write(VerifyJsonWriter writer, IReceivedEventList events)
+    {
+        writer.WriteStartArray();
+        foreach (var received in events.Select(_ => true))
+        {
+            writer.Serialize(received);
+        }
+
+        writer.WriteEndArray();
+    }
+}

src/Verify.MassTransit/SagaConverters/SagaListConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit;
-using MassTransit.Testing;
-using MassTransit.Testing.Implementations;
+using MassTransit.Testing.Implementations;
 
 class SagaListConverter :
     WriteOnlyJsonConverter

src/Verify.MassTransit/SagaConverters/SagaStateMachineTestHarnessConverter.cs

@@ -0,0 +1,38 @@
+class SagaStateMachineTestHarnessConverter :
+    WriteOnlyJsonConverter
+{
+    public override void Write(VerifyJsonWriter writer, object harness)
+    {
+        var type = harness.GetType();
+        writer.WriteStartObject();
+        WriteMember(writer, harness, type, "Consumed");
+        WriteMember(writer, harness, type, "Sagas");
+        WriteMember(writer, harness, type, "Created");
+
+        var events = (IReceivedEventList) Value(harness, type, "Events")!;
+        if (events.Select(_ => true).Any())
+        {
+            writer.WriteMember(harness, events, "Events");
+        }
+
+        var stateChanges = (IStateChangeList) Value(harness, type, "StateChanges")!;
+        if (stateChanges.Select(_ => true).Any())
+        {
+            writer.WriteMember(harness, stateChanges, "StateChanges");
+        }
+
+        WriteMember(writer, harness, type, "StateMachine");
+        writer.WriteEndObject();
+    }
+
+    static void WriteMember(VerifyJsonWriter writer, object harness, Type type, string name) =>
+        writer.WriteMember(harness, Value(harness, type, name), name);
+
+    static object? Value(object harness, Type type, string name) =>
+        type.GetProperty(name)!.GetValue(harness);
+
+    public override bool CanConvert(Type type) =>
+        type.GetInterfaces()
+            .Any(_ => _.IsGenericType &&
+                      _.GetGenericTypeDefinition() == typeof(ISagaStateMachineTestHarness<,>));
+}

src/Verify.MassTransit/SagaConverters/SagaTestHarnessConverter.cs

@@ -1,7 +1,4 @@
-using MassTransit;
-using MassTransit.Testing;
-
-class SagaTestHarnessConverter :
+class SagaTestHarnessConverter :
     WriteOnlyJsonConverter
 {
     static MethodInfo innerWriteDef;
@@ -24,6 +21,7 @@ static void InnerWrite<T>(VerifyJsonWriter writer, SagaTestHarness<T> harness)
     {
         writer.WriteMember(harness, harness.Consumed, "Consumed");
         writer.WriteMember(harness, harness.Sagas, "Sagas");
+        writer.WriteMember(harness, harness.Created, "Created");
     }
 
     public override bool CanConvert(Type type) =>

src/Verify.MassTransit/SagaConverters/StateChangeConverter.cs

@@ -0,0 +1,13 @@
+class StateChangeConverter :
+    WriteOnlyJsonConverter<IStateChange>
+{
+    public override void Write(VerifyJsonWriter writer, IStateChange change)
+    {
+        writer.WriteStartObject();
+        writer.WriteMember(change, change.Event?.Name, "Event");
+        writer.WriteMember(change, change.CorrelationId, "CorrelationId");
+        writer.WriteMember(change, change.PreviousState?.Name, "PreviousState");
+        writer.WriteMember(change, change.CurrentState?.Name, "CurrentState");
+        writer.WriteEndObject();
+    }
+}

src/Verify.MassTransit/SagaConverters/StateChangeListConverter.cs

@@ -0,0 +1,14 @@
+class StateChangeListConverter :
+    WriteOnlyJsonConverter<IStateChangeList>
+{
+    public override void Write(VerifyJsonWriter writer, IStateChangeList changes)
+    {
+        writer.WriteStartArray();
+        foreach (var change in changes.Select(_ => true))
+        {
+            writer.Serialize(change);
+        }
+
+        writer.WriteEndArray();
+    }
+}

src/Verify.MassTransit/TestHarnessConverters/ConsumerTestHarnessConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class ConsumerTestHarnessConverter :
+class ConsumerTestHarnessConverter :
     WriteOnlyJsonConverter
 {
     public override void Write(VerifyJsonWriter writer, object harness)
@@ -13,4 +11,4 @@ public override void Write(VerifyJsonWriter writer, object harness)
 
     public override bool CanConvert(Type type) =>
         type.CanConvertToGeneric(typeof(ConsumerTestHarness<>));
-}
+}

src/Verify.MassTransit/TestHarnessConverters/TestHarnessConverter.cs

@@ -1,6 +1,4 @@
-using MassTransit.Testing;
-
-class TestHarnessConverter :
+class TestHarnessConverter :
     WriteOnlyJsonConverter<IBaseTestHarness>
 {
     public override void Write(VerifyJsonWriter writer, IBaseTestHarness harness)

src/Verify.MassTransit/VerifyMassTransit.cs

@@ -25,8 +25,13 @@ public static void Initialize()
             converters.Add(new SentMessageListConverter());
             converters.Add(new PublishedMessageConverter());
             converters.Add(new PublishedMessageListConverter());
+            converters.Add(new SagaStateMachineTestHarnessConverter());
             converters.Add(new SagaTestHarnessConverter());
             converters.Add(new SagaListConverter());
+            converters.Add(new ReceivedEventConverter());
+            converters.Add(new ReceivedEventListConverter());
+            converters.Add(new StateChangeConverter());
+            converters.Add(new StateChangeListConverter());
             converters.Add(new MessageContextConverter());
             converters.Add(new SendContextConverter());
             converters.Add(new ReceiveContextConverter());