EditOf assets - next attempt

Author: bartekwasielak

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

@@ -1,6 +1,5 @@
 namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
 {
-    using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting;
@@ -16,7 +15,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     class When_a_failed_edit_is_resolved_by_retry : ExternalIntegrationAcceptanceTest
     {
         [Test]
-        [Ignore("resolving tests individually")]
         public async Task Should_publish_notification()
         {
             var context = await Define<EditMessageResolutionContext>()
@@ -74,7 +72,7 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
-                    if (!ctx.RetriedMessageHandled)
+                    if (!ctx.RetriedMessageHandled || ctx.EditedMessageEditOf == null)
                     {
                         return false;
                     }
@@ -122,7 +120,6 @@ public class EditMessageResolutionHandler(EditMessageResolutionContext testConte
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
                 {
-                    var editOf = context.MessageHeaders["ServiceControl.EditOf"];
                     if (!message.HasBeenEdited)
                     {
                         testContext.OriginalMessageHandled = true;
@@ -131,7 +128,8 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
 
                     if (!testContext.RetriedMessage)
                     {
-                        testContext.EditedMessageEditOf = editOf;
+                        testContext.EditedMessageEditOf = context.MessageHeaders["ServiceControl.EditOf"];
+                        ;
                         testContext.EditedAndRetriedMessgaeHandled = true;
                         throw new SimulatedException();
                     }