test fixes

Author: bartekwasielak

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

@@ -71,7 +71,7 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
-                    if (ctx.EditedMessageEditOf1 == null)
+                    if (ctx.EditedMessageEditOf1 == null || !ctx.FirstEditHandled)
                     {
                         return false;
                     }
@@ -102,7 +102,7 @@ public async Task Should_publish_notification()
                         return false;
                     }
 
-                    if (!ctx.EditedMessageHandled || ctx.EditedMessageEditOf2 == null)
+                    if (!ctx.SecondEditHandled || ctx.EditedMessageEditOf2 == null)
                     {
                         return false;
                     }
@@ -128,10 +128,10 @@ public class EditMessageResolutionContext : ScenarioContext
         {
             public bool OriginalMessageHandled { get; set; }
             public string OriginalMessageFailureId { get; set; }
-            public bool EditedMessageHandled { get; set; }
+            public bool SecondEditHandled { get; set; }
             public string ResolvedMessageId { get; set; }
             public bool MessageResolved { get; set; }
-            public bool HasBeenEditedOnce { get; set; }
+            public bool FirstEditHandled { get; set; }
             public bool FirstEdit { get; set; }
             public bool SecondEdit { get; set; }
             public string SecondMessageFailureId { get; set; }
@@ -157,11 +157,11 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
                             throw new SimulatedException();
                         case 1:
                             testContext.EditedMessageEditOf1 = context.MessageHeaders["ServiceControl.EditOf"];
-                            testContext.HasBeenEditedOnce = true;
+                            testContext.FirstEditHandled = true;
                             throw new SimulatedException();
                         case 2:
                             testContext.EditedMessageEditOf2 = context.MessageHeaders["ServiceControl.EditOf"];
-                            testContext.EditedMessageHandled = true;
+                            testContext.SecondEditHandled = true;
                             return Task.CompletedTask;
                         default:
                             return Task.CompletedTask;