Adding more conditions to the test

Author: bartekwasielak

src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs

@@ -1,13 +1,13 @@
 namespace ServiceControl.AcceptanceTests.Recoverability
 {
     using System;
+    using System.Collections.Generic;
     using System.Linq;
     using System.Text.Json;
     using System.Threading.Tasks;
     using AcceptanceTesting;
     using AcceptanceTesting.EndpointTemplates;
     using AcceptanceTests;
-    using Contracts.MessageFailures;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
     using NUnit.Framework;
@@ -37,6 +37,11 @@ public async Task A_new_message_failure_is_created()
                     .DoNotFailOnErrorMessages())
                 .Done(async ctx =>
                 {
+                    if (!ctx.ExternalProcessorSubscribed)
+                    {
+                        return false;
+                    }
+
                     if (!ctx.OriginalMessageHandled)
                     {
                         return false;
@@ -109,6 +114,10 @@ public async Task A_new_message_failure_is_created()
                     "FailedMessages/" + context.EditedMessageFailure.ProcessingAttempts.Last().Headers["ServiceControl.EditOf"],
                     Is.EqualTo(context.OriginalMessageFailure.Id));
                 Assert.That(editedMessageBody.MessageInternalId, Is.EqualTo(context.EditedMessageInternalId));
+                Assert.That(context.MessageFailedIds, Has.Count.EqualTo(2));
+                Assert.That(context.MessageFailedIds, Is.Unique);
+                Assert.That(context.MessageFailedIds, Has.Some.EqualTo(context.OriginalMessageFailureId));
+                Assert.That(context.MessageFailedIds, Has.Some.EqualTo(context.EditedMessageFailureId));
             });
         }
 
@@ -119,14 +128,12 @@ class EditMessageFailureContext : ScenarioContext
             public bool EditedMessageHandled { get; set; }
             public FailedMessage OriginalMessageFailure { get; set; }
             public FailedMessage EditedMessageFailure { get; set; }
-
             public string OriginalMessageFailureId { get; set; }
             public string EditedMessageFailureId { get; set; }
             public string EditedMessageInternalId { get; set; }
             public bool ExternalProcessorSubscribed { get; set; }
-            public string FirstMessageFailedId { get; set; }
-            public string SecondMessageFailedId { get; set; }
             public bool MessageFailedHandled { get; set; }
+            public List<string> MessageFailedIds { get; } = [];
         }
 
         class FailingEditedMessageReceiver : EndpointConfigurationBuilder
@@ -152,13 +159,9 @@ public Task Handle(FailingMessage message, IMessageHandlerContext context)
 
                 public Task Handle(ServiceControl.Contracts.MessageFailed message, IMessageHandlerContext context)
                 {
-                    if (testContext.FirstMessageFailedId == null)
-                    {
-                        testContext.FirstMessageFailedId = message.FailedMessageId;
-                    }
-                    else
+                    testContext.MessageFailedIds.Add(message.FailedMessageId);
+                    if (testContext.MessageFailedIds.Count == 2)
                     {
-                        testContext.SecondMessageFailedId = message.FailedMessageId;
                         testContext.MessageFailedHandled = true;
                     }
                     return Task.CompletedTask;