EditOf assertions

Author: bartekwasielak

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

@@ -1,6 +1,5 @@
 namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
 {
-    using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting;
@@ -13,7 +12,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     using ServiceControl.MessageFailures.Api;
     using JsonSerializer = System.Text.Json.JsonSerializer;
 
-    [Ignore("resolving tests individually")]
     class When_a_reedit_solves_a_failed_msg : AcceptanceTest
     {
         [Test]
@@ -58,6 +56,11 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
+                    if (ctx.EditedMessageEditOf1 == null)
+                    {
+                        return false;
+                    }
+
                     if (!ctx.SecondEdit)
                     {
                         var failedMessagedId = await this.GetOnlyFailedUnresolvedMessageId();
@@ -84,7 +87,7 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
-                    if (!ctx.EditedMessageHandled)
+                    if (!ctx.EditedMessageHandled || ctx.EditedMessageEditOf2 == null)
                     {
                         return false;
                     }
@@ -132,18 +135,17 @@ 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 = editOf;
+                            testContext.EditedMessageEditOf1 = context.MessageHeaders["ServiceControl.EditOf"];
                             testContext.HasBeenEditedOnce = true;
                             throw new SimulatedException();
                         case 2:
-                            testContext.EditedMessageEditOf2 = editOf;
+                            testContext.EditedMessageEditOf2 = context.MessageHeaders["ServiceControl.EditOf"];
                             testContext.EditedMessageHandled = true;
                             return Task.CompletedTask;
                         default: