assert editOf - another trial

Author: bartekwasielak

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

@@ -121,6 +121,7 @@ public class EditMessageResolutionHandler(EditMessageResolutionContext testConte
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
                 {
+                    var editOf = context.MessageHeaders["ServiceControl.EditOf"];
                     if (!message.HasBeenEdited)
                     {
                         testContext.OriginalMessageHandled = true;
@@ -129,7 +130,7 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
 
                     if (!testContext.RetriedMessage)
                     {
-                        testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
+                        testContext.EditedMessageEditOf = editOf;
                         testContext.EditedAndRetriedMessgaeHandled = true;
                         throw new SimulatedException();
                     }

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

@@ -100,9 +100,10 @@ class EditMessageResolutionHandler(EditMessageResolutionContext testContext)
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
                 {
+                    var editOf = context.MessageHeaders["ServiceControl.EditOf"];
                     if (message.HasBeenEdited)
                     {
-                        testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
+                        testContext.EditedMessageEditOf = editOf;
                         testContext.EditedMessageHandled = true;
                         return Task.CompletedTask;
                     }

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

@@ -131,17 +131,18 @@ public class EditMessageResolutionHandler(EditMessageResolutionContext testConte
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
                 {
+                    var editOf = context.MessageHeaders["ServiceControl.EditOf"];
                     switch (message.MessageAttempt)
                     {
                         case 0:
                             testContext.OriginalMessageHandled = true;
                             throw new SimulatedException();
                         case 1:
-                            testContext.EditedMessageEditOf1 = context.MessageHeaders["ServiceControl.EditOf"];
+                            testContext.EditedMessageEditOf1 = editOf;
                             testContext.HasBeenEditedOnce = true;
                             throw new SimulatedException();
                         case 2:
-                            testContext.EditedMessageEditOf2 = context.MessageHeaders["ServiceControl.EditOf"];
+                            testContext.EditedMessageEditOf2 = editOf;
                             testContext.EditedMessageHandled = true;
                             return Task.CompletedTask;
                         default: