debug attempt

amend

amend

another attempt

Author: bartekwasielak

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

@@ -12,6 +12,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     using ServiceControl.MessageFailures;
     using ServiceControl.MessageFailures.Api;
     using JsonSerializer = System.Text.Json.JsonSerializer;
+    using ServiceBus.Management.Infrastructure.Settings;
 
     class When_a_failed_edit_is_resolved_by_retry : ExternalIntegrationAcceptanceTest
     {
@@ -102,7 +103,7 @@ public async Task Should_publish_notification()
         }
 
 
-        class EditMessageResolutionContext : ScenarioContext
+        public class EditMessageResolutionContext : ScenarioContext
         {
             public bool OriginalMessageHandled { get; set; }
             public bool EditedMessage { get; set; }
@@ -117,15 +118,22 @@ class EditMessageResolutionContext : ScenarioContext
             public bool RetriedMessage { get; set; }
         }
 
-        class MessageReceiver : EndpointConfigurationBuilder
+        public class MessageReceiver : EndpointConfigurationBuilder
         {
-            public MessageReceiver()
-            {
-                CustomEndpointName("simpleendpoint1");
-                EndpointSetup<DefaultServerWithoutAudit>(c => c.NoRetries());
-            }
+            public MessageReceiver() =>
+                EndpointSetup<DefaultServerWithoutAudit>(c =>
+                    {
+                        var routing = c.ConfigureRouting();
+                        routing.RouteToEndpoint(typeof(FailedMessagesArchived).Assembly,
+                            Settings.DEFAULT_INSTANCE_NAME);
+                    },
+                    publisherMetadata =>
+                    {
+                        publisherMetadata.RegisterPublisherFor<FailedMessagesArchived>(Settings.DEFAULT_INSTANCE_NAME);
+                    });
+
 
-            class EditMessageResolutionHandler(EditMessageResolutionContext testContext)
+            public class EditMessageResolutionHandler(EditMessageResolutionContext testContext)
                 : IHandleMessages<EditResolutionMessage>, IHandleMessages<MessageFailureResolvedByRetry>
             {
                 public Task Handle(EditResolutionMessage message, IMessageHandlerContext context)
@@ -156,10 +164,9 @@ public Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext
             }
         }
 
-        class EditResolutionMessage : IMessage
+        public class EditResolutionMessage : IMessage
         {
             public bool HasBeenEdited { get; init; }
-            public bool HasBeenRetried { get; init; }
         }
     }
 }

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

@@ -1,6 +1,7 @@
 namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
 {
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting;
@@ -11,6 +12,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     using NUnit.Framework;
     using ServiceControl.MessageFailures;
     using ServiceControl.MessageFailures.Api;
+    using TestSupport;
     using JsonSerializer = System.Text.Json.JsonSerializer;
 
     class When_a_failed_msg_is_resolved_by_edit : ExternalIntegrationAcceptanceTest
@@ -114,6 +116,7 @@ public Task Handle(EditResolutionMessage message, IMessageHandlerContext context
 
                 public Task Handle(MessageFailureResolvedByRetry message, IMessageHandlerContext context)
                 {
+                    Debug.WriteLine($"HHHHHH - handling message {message.FailedMessageId}");
                     testContext.ResolvedMessageId.Add(message.FailedMessageId);
                     testContext.MessageResolved = true;
                     return Task.CompletedTask;