Added assertions on EditOf

Author: bartekwasielak

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_edit_is_resolved_by_retry.cs

@@ -86,7 +86,11 @@ public async Task Should_publish_notification()
                     return true;
                 }).Run();
 
-            Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+            Assert.Multiple(() =>
+            {
+                Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.EditedMessageEditOf, Is.EqualTo(context.OriginalMessageFailureId));
+            });
         }
 
 
@@ -103,6 +107,7 @@ public class EditMessageResolutionContext : ScenarioContext
             public string EditedMessageFailureId { get; set; }
             public bool EditedAndRetriedMessage { get; set; }
             public bool RetriedMessage { get; set; }
+            public string EditedMessageEditOf { get; set; }
         }
 
         public class MessageReceiver : EndpointConfigurationBuilder
@@ -124,6 +129,7 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
                     if (!testContext.RetriedMessage)
                     {
                         testContext.EditedAndRetriedMessgaeHandled = true;
+                        testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
                         throw new SimulatedException();
                     }
 

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_msg_is_resolved_by_edit.cs

@@ -72,7 +72,11 @@ public async Task Should_publish_notification()
                     return true;
                 }).Run();
 
-            Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+            Assert.Multiple(() =>
+            {
+                Assert.That(context.ResolvedMessageId, Is.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.EditedMessageEditOf, Is.EqualTo(context.OriginalMessageFailureId));
+            });
         }
 
 
@@ -84,6 +88,7 @@ class EditMessageResolutionContext : ScenarioContext
             public bool EditedMessageHandled { get; set; }
             public string ResolvedMessageId { get; set; }
             public bool MessageResolved { get; set; }
+            public string EditedMessageEditOf { get; set; }
         }
 
         class MessageReceiver : EndpointConfigurationBuilder
@@ -98,6 +103,7 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
                     if (message.HasBeenEdited)
                     {
                         testContext.EditedMessageHandled = true;
+                        testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
                         return Task.CompletedTask;
                     }