From 5afc545cddc40f24a6e35df92879d49c744ae332 Mon Sep 17 00:00:00 2001 From: Daniel Marbach Date: Tue, 12 Mar 2024 09:31:57 +0000 Subject: [PATCH] Acceptance test todos (#3994) * Remove the setting of the scenario context since that is done by the endpoint runner already * Adjust scanning to cores approach and unify templates * Make base a real base again * NoRetries --- .../EndpointConfigurationExtensions.cs | 81 ++++++++++++++++--- .../EndpointTemplates/ConfigureExtensions.cs | 31 ------- .../EndpointTemplates/DefaultServerBase.cs | 30 ++----- .../DefaultServerWithAudit.cs | 18 +++++ .../DefaultServerWithoutAudit.cs | 19 +++++ ...intCustomizationConfigurationExtensions.cs | 51 ------------ .../When_a_failed_message_is_retried.cs | 68 ++++------------ .../When_a_message_fails_to_import.cs | 12 ++- .../CustomChecks/When_a_custom_check_fails.cs | 15 +--- .../When_a_periodic_custom_check_fails.cs | 12 ++- ...When_critical_storage_threshold_reached.cs | 8 +- .../When_custom_check_events_are_triggered.cs | 15 +--- .../When_email_notifications_are_enabled.cs | 4 +- ...hen_reporting_custom_check_with_signalr.cs | 17 ++-- .../When_a_custom_check_fails.cs | 10 +-- .../When_a_custom_check_succeeds.cs | 10 +-- .../When_heartbeat_is_restored.cs | 10 +-- .../When_heartbeat_loss_is_detected.cs | 10 +-- ...e_from_unmonitored_endpoint_is_imported.cs | 20 ++--- .../Monitoring/When_an_endpoint_is_removed.cs | 8 +- .../Monitoring/When_an_endpoint_starts_up.cs | 4 +- ...ndpoint_with_heartbeat_plugin_starts_up.cs | 9 +-- ...nitored_endpoint_is_marked_as_monitored.cs | 8 +- ...red_endpoint_starts_to_sends_heartbeats.cs | 10 +-- .../ExternalIntegrationAcceptanceTest.cs | 6 +- .../When_a_failed_message_is_archived.cs | 4 +- ...n_a_failed_message_is_resolved_by_retry.cs | 4 +- ...n_a_failed_message_is_resolved_manually.cs | 4 +- .../When_a_failed_message_is_unarchived.cs | 4 +- .../When_a_group_is_archived.cs | 4 +- .../When_a_message_has_failed_detected.cs | 7 +- .../When_encountered_an_error.cs | 16 +--- .../Groups/When_a_group_is_archived.cs | 20 ++--- .../Groups/When_a_group_is_retried.cs | 16 +--- ...e_fails_twice_with_different_exceptions.cs | 20 ++--- ...age_groups_are_sorted_by_a_web_api_call.cs | 8 +- .../Groups/When_messages_have_failed.cs | 12 +-- .../When_two_similar_messages_have_failed.cs | 16 +--- .../ErrorImportPerformanceTests.cs | 20 ++--- .../Is_System_Message_Tests.cs | 4 +- .../When_a_SagaComplete_message_fails.cs | 4 +- .../When_a_failed_message_is_pending_retry.cs | 20 ++--- .../When_a_invalid_id_is_sent_to_retry.cs | 20 ++--- .../When_a_message_has_failed.cs | 14 ++-- ...sage_has_failed_from_send_only_endpoint.cs | 8 +- .../When_a_messages_fails_multiple_times.cs | 8 +- ...etry_is_resolved_by_queue_and_timeframe.cs | 25 ++---- ..._pending_retry_is_resolved_by_selection.cs | 25 ++---- .../When_a_pending_retry_is_retried_again.cs | 25 ++---- ...retry_is_retried_by_queue_and_timeframe.cs | 25 ++---- .../When_a_retry_fails_to_be_sent.cs | 20 ++--- ..._for_a_empty_body_message_is_successful.cs | 10 +-- ...When_a_retry_for_a_failed_message_fails.cs | 20 ++--- ...etry_for_a_failed_message_is_successful.cs | 25 ++---- .../When_all_messages_are_retried.cs | 16 +--- ...n_event_with_multiple_subscribers_fails.cs | 8 +- ..._errors_with_same_uniqueid_are_imported.cs | 12 +-- .../When_failed_message_is_imported.cs | 7 +- ...failed_message_searched_by_body_content.cs | 17 +--- ...ng_message_with_missing_metadata_failed.cs | 4 +- ...a_message_fails_a_retry_with_a_redirect.cs | 33 +++----- .../When_a_message_is_retried.cs | 33 +++----- .../When_a_message_is_retried.cs | 4 +- ...ge_is_retried_and_succeeds_with_a_reply.cs | 30 ++----- ...essage_is_retried_with_a_replyTo_header.cs | 4 +- ...thout_a_correlationid_header_is_retried.cs | 16 +--- ...a_native_integration_message_is_retried.cs | 10 +-- .../When_edited_message_fails_to_process.cs | 16 +--- .../When_editing_message_body.cs | 16 +--- .../When_editing_message_headers.cs | 8 +- .../Recoverability/When_retry_is_confirmed.cs | 15 +--- .../When_single_message_fails_in_batch.cs | 9 +-- .../EndpointTemplates/DefaultServer.cs | 23 ------ ...When_critical_storage_threshold_reached.cs | 11 +-- .../When_a_message_fails_to_import.cs | 6 +- ...en_a_message_sent_with_missing_metadata.cs | 2 +- ...ge_processed_successfully_from_sendonly.cs | 2 +- ..._messages_are_marked_as_system_messages.cs | 12 +-- ...n_messages_with_big_bodies_are_ingested.cs | 8 +- .../When_processed_message_is_imported.cs | 13 +-- ...cessed_message_searched_by_body_content.cs | 2 +- ...processed_message_searched_by_messageid.cs | 18 +---- ..._message_searched_by_msgid_for_endpoint.cs | 18 +---- .../When_single_message_fails_in_batch.cs | 7 +- .../When_a_new_endpoint_is_detected.cs | 6 +- ...ssful_retry_at_old_endpoint_is_detected.cs | 12 +-- ...uccessful_retry_from_old_SC_is_detected.cs | 6 +- ...importing_a_message_resolved_by_a_retry.cs | 6 +- ..._a_message_emitted_by_a_saga_is_audited.cs | 23 ++---- ...hen_a_message_hitting_a_saga_is_audited.cs | 8 +- ...ssage_hitting_multiple_sagas_is_audited.cs | 16 ++-- ...hen_a_message_that_is_handled_by_a_saga.cs | 18 ++--- .../DefaultServerWithAudit.cs | 21 ----- .../DefaultServerWithoutAudit.cs | 20 ----- .../EndpointTemplates/DefaultServer.cs | 23 ------ .../When_querying_disconnected_count.cs | 11 +-- .../When_querying_queue_length_data.cs | 12 +-- .../When_querying_retries_data.cs | 18 ++--- .../When_querying_timings_data.cs | 18 ++--- .../When_sending_legacy_metric_report.cs | 9 +-- .../When_endpoint_known_to_audit_instance.cs | 2 +- ...n_event_processed_by_multiple_endpoints.cs | 2 +- ...When_message_searched_by_conversationId.cs | 2 +- ...essage_searched_by_endpoint_by_messages.cs | 2 +- ...age_searched_by_endpoint_by_messagetype.cs | 2 +- .../When_message_searched_by_messageid.cs | 2 +- .../When_message_searched_by_messages.cs | 2 +- .../When_message_searched_by_messagetype.cs | 2 +- .../When_requesting_a_message_body.cs | 2 +- .../Connection/PlatformConnectionTests.cs | 2 +- .../When_remote_instance_is_not_reachable.cs | 2 +- .../When_a_message_is_imported_twice.cs | 2 +- .../When_endpoint_detected_via_audits.cs | 2 +- ...t_from_old_sc_is_sent_to_audit_instance.cs | 2 +- ...e_retry_audit_is_sent_to_audit_instance.cs | 2 +- ...issuing_retry_by_specifying_instance_id.cs | 2 +- ...en_sending_saga_audit_to_audit_instance.cs | 2 +- ...hen_sending_saga_audit_to_main_instance.cs | 2 +- .../DefaultServerWithAudit.cs | 20 ----- .../DefaultServerWithoutAudit.cs | 18 ----- 120 files changed, 487 insertions(+), 1088 deletions(-) delete mode 100644 src/ServiceControl.AcceptanceTesting/EndpointTemplates/ConfigureExtensions.cs create mode 100644 src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithAudit.cs create mode 100644 src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithoutAudit.cs delete mode 100644 src/ServiceControl.AcceptanceTesting/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs delete mode 100644 src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs delete mode 100644 src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs delete mode 100644 src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs delete mode 100644 src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs delete mode 100644 src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs delete mode 100644 src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs diff --git a/src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs b/src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs index 067859554a..1ee7563f17 100644 --- a/src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs +++ b/src/ServiceControl.AcceptanceTesting/EndpointConfigurationExtensions.cs @@ -1,33 +1,96 @@ namespace ServiceControl.AcceptanceTesting { + using System; + using System.Collections.Generic; + using System.Linq; + using System.Reflection; + using System.Threading.Tasks; + using InfrastructureConfig; + using Microsoft.Extensions.DependencyInjection; using NServiceBus; + using NServiceBus.AcceptanceTesting.Customization; + using NServiceBus.AcceptanceTesting.Support; using NServiceBus.Configuration.AdvancedExtensibility; using NServiceBus.Features; + using NServiceBus.Hosting.Helpers; public static class EndpointConfigurationExtensions { - public static void NoImmediateRetries(this EndpointConfiguration configuration) + // This logic has been adapted from Cores ScanTypesForTest to specialize it to the needs of ServiceControl + public static void ScanTypesForTest(this EndpointConfiguration config, + EndpointCustomizationConfiguration customizationConfiguration) { - configuration.Recoverability().Immediate(x => x.NumberOfRetries(0)); + // disable file system scanning for better performance + // note that this might cause issues when required assemblies are only being loaded at endpoint startup time + var assemblyScanner = new AssemblyScanner { ScanFileSystemAssemblies = false }; + + config.TypesToIncludeInScan( + assemblyScanner.GetScannableAssemblies().Assemblies + .Where(a => !a.FullName!.StartsWith("ServiceControl")) // this prevents handlers, custom checks etc from ServiceControl to be scanned + .Where(a => a != customizationConfiguration.BuilderType.Assembly) // exclude all types from test assembly by default + .SelectMany(a => a.GetTypes()) + .Union(GetNestedTypeRecursive(customizationConfiguration.BuilderType.DeclaringType, customizationConfiguration.BuilderType)) + .Union(customizationConfiguration.TypesToInclude) + .Except(customizationConfiguration.TypesToExclude) + .ToList()); + return; + + IEnumerable GetNestedTypeRecursive(Type rootType, Type builderType) + { + if (rootType == null) + { + throw new InvalidOperationException("Make sure you nest the endpoint infrastructure inside the TestFixture as nested classes"); + } + + yield return rootType; + + if (typeof(IEndpointConfigurationFactory).IsAssignableFrom(rootType) && rootType != builderType) + { + yield break; + } + + foreach (var nestedType in rootType.GetNestedTypes(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).SelectMany(t => GetNestedTypeRecursive(t, builderType))) + { + yield return nestedType; + } + } } - public static void NoDelayedRetries(this EndpointConfiguration configuration) + public static async Task DefinePersistence(this EndpointConfiguration config, RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomizationConfiguration) { - configuration.Recoverability().Delayed(x => x.NumberOfRetries(0)); + var persistenceConfiguration = new ConfigureEndpointInMemoryPersistence(); + await persistenceConfiguration.Configure(endpointCustomizationConfiguration.EndpointName, config, runDescriptor.Settings, endpointCustomizationConfiguration.PublisherMetadata); + runDescriptor.OnTestCompleted(_ => persistenceConfiguration.Cleanup()); } + public static void RegisterComponentsAndInheritanceHierarchy(this EndpointConfiguration builder, RunDescriptor runDescriptor) => builder.RegisterComponents(services => { RegisterInheritanceHierarchyOfContextOnContainer(runDescriptor, services); }); + + static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDescriptor, + IServiceCollection services) + { + var type = runDescriptor.ScenarioContext.GetType(); + while (type != typeof(object)) + { + services.AddSingleton(type, runDescriptor.ScenarioContext); + type = type.BaseType; + } + } + + public static void NoImmediateRetries(this EndpointConfiguration configuration) + => configuration.Recoverability().Immediate(x => x.NumberOfRetries(0)); + + public static void NoDelayedRetries(this EndpointConfiguration configuration) + => configuration.Recoverability().Delayed(x => x.NumberOfRetries(0)); + public static void NoRetries(this EndpointConfiguration configuration) { configuration.NoDelayedRetries(); configuration.NoImmediateRetries(); } - public static void NoOutbox(this EndpointConfiguration configuration) - { - configuration.DisableFeature(); - } + public static void NoOutbox(this EndpointConfiguration configuration) => configuration.DisableFeature(); public static RoutingSettings ConfigureRouting(this EndpointConfiguration configuration) => - new RoutingSettings(configuration.GetSettings()); + new(configuration.GetSettings()); } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/ConfigureExtensions.cs b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/ConfigureExtensions.cs deleted file mode 100644 index 114a705c0b..0000000000 --- a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/ConfigureExtensions.cs +++ /dev/null @@ -1,31 +0,0 @@ -namespace ServiceControl.AcceptanceTesting.EndpointTemplates -{ - using System.Threading.Tasks; - using InfrastructureConfig; - using Microsoft.Extensions.DependencyInjection; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - - public static class ConfigureExtensions - { - public static async Task DefinePersistence(this EndpointConfiguration config, RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomizationConfiguration) - { - var persistenceConfiguration = new ConfigureEndpointInMemoryPersistence(); - await persistenceConfiguration.Configure(endpointCustomizationConfiguration.EndpointName, config, runDescriptor.Settings, endpointCustomizationConfiguration.PublisherMetadata); - runDescriptor.OnTestCompleted(_ => persistenceConfiguration.Cleanup()); - } - - public static void RegisterComponentsAndInheritanceHierarchy(this EndpointConfiguration builder, RunDescriptor runDescriptor) => builder.RegisterComponents(services => { RegisterInheritanceHierarchyOfContextOnContainer(runDescriptor, services); }); - - static void RegisterInheritanceHierarchyOfContextOnContainer(RunDescriptor runDescriptor, - IServiceCollection services) - { - var type = runDescriptor.ScenarioContext.GetType(); - while (type != typeof(object)) - { - services.AddSingleton(type, runDescriptor.ScenarioContext); - type = type.BaseType; - } - } - } -} \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerBase.cs b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerBase.cs index af81d3e51f..fed815ee6e 100644 --- a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerBase.cs +++ b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerBase.cs @@ -1,28 +1,23 @@ namespace ServiceControl.AcceptanceTesting.EndpointTemplates { using System; - using System.Linq; using System.Net; - using System.Reflection; using System.Threading.Tasks; using AcceptanceTesting; using NServiceBus; - using NServiceBus.AcceptanceTesting; - using NServiceBus.AcceptanceTesting.Customization; using NServiceBus.AcceptanceTesting.Support; using NServiceBus.Configuration.AdvancedExtensibility; using NServiceBus.Features; using ServiceControl.AcceptanceTesting.InfrastructureConfig; - public class DefaultServerBase : IEndpointSetupTemplate + public abstract class DefaultServerBase(IConfigureEndpointTestExecution endpointTestExecutionConfiguration) + : IEndpointSetupTemplate { - public DefaultServerBase() : this(new ConfigureEndpointLearningTransport()) + protected DefaultServerBase() : this(new ConfigureEndpointLearningTransport()) { } - public DefaultServerBase(IConfigureEndpointTestExecution endpointTestExecutionConfiguration) => this.endpointTestExecutionConfiguration = endpointTestExecutionConfiguration; - - public async Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomizations, Func configurationBuilderCustomization) + public virtual async Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointCustomizations, Func configurationBuilderCustomization) { ServicePointManager.DefaultConnectionLimit = 100; @@ -41,8 +36,6 @@ public async Task GetConfiguration(RunDescriptor runDescr endpointConfiguration.RegisterComponentsAndInheritanceHierarchy(runDescriptor); await endpointConfiguration.DefinePersistence(runDescriptor, endpointCustomizations); - typeof(ScenarioContext).GetProperty("CurrentEndpoint", BindingFlags.Static | BindingFlags.NonPublic).SetValue(runDescriptor.ScenarioContext, endpointCustomizations.EndpointName); - endpointConfiguration.UseSerialization(); endpointConfiguration.Pipeline.Register(); @@ -57,20 +50,13 @@ public async Task GetConfiguration(RunDescriptor runDescr await configurationBuilderCustomization(endpointConfiguration); // scan types at the end so that all types used by the configuration have been loaded into the AppDomain - endpointConfiguration.TypesToIncludeInScan(endpointCustomizations.GetTypesScopedByTestClass().Concat(new[] - { - typeof(TraceIncomingBehavior), typeof(TraceOutgoingBehavior) - }).ToList()); + endpointConfiguration.ScanTypesForTest(endpointCustomizations); return endpointConfiguration; } - static bool IsExternalContract(Type t) - { - return t.Namespace != null && t.Namespace.StartsWith("ServiceControl.Contracts") - && t.Assembly.GetName().Name == "ServiceControl.Contracts"; - } - - IConfigureEndpointTestExecution endpointTestExecutionConfiguration; + static bool IsExternalContract(Type t) => + t.Namespace != null && t.Namespace.StartsWith("ServiceControl.Contracts") + && t.Assembly.GetName().Name == "ServiceControl.Contracts"; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithAudit.cs b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithAudit.cs new file mode 100644 index 0000000000..e37dee4c12 --- /dev/null +++ b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithAudit.cs @@ -0,0 +1,18 @@ +namespace ServiceControl.AcceptanceTesting.EndpointTemplates +{ + using System; + using System.Threading.Tasks; + using NServiceBus; + using NServiceBus.AcceptanceTesting.Support; + + public class DefaultServerWithAudit : DefaultServerBase + { + public override Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => + base.GetConfiguration(runDescriptor, endpointConfiguration, async builder => + { + builder.AuditProcessedMessagesTo("audit"); + + await configurationBuilderCustomization(builder); + }); + } +} \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithoutAudit.cs b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithoutAudit.cs new file mode 100644 index 0000000000..397cea4c49 --- /dev/null +++ b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/DefaultServerWithoutAudit.cs @@ -0,0 +1,19 @@ +namespace ServiceControl.AcceptanceTesting.EndpointTemplates +{ + using System; + using System.Threading.Tasks; + using NServiceBus; + using NServiceBus.AcceptanceTesting.Support; + using NServiceBus.Features; + + public class DefaultServerWithoutAudit : DefaultServerBase + { + public override Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => + base.GetConfiguration(runDescriptor, endpointConfiguration, async b => + { + b.DisableFeature(); + + await configurationBuilderCustomization(b); + }); + } +} \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs b/src/ServiceControl.AcceptanceTesting/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs deleted file mode 100644 index a96f4383c0..0000000000 --- a/src/ServiceControl.AcceptanceTesting/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs +++ /dev/null @@ -1,51 +0,0 @@ -namespace ServiceControl.AcceptanceTesting.EndpointTemplates -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Reflection; - using NServiceBus.AcceptanceTesting.Support; - using NServiceBus.Hosting.Helpers; - - public static class EndpointCustomizationConfigurationExtensions - { - public static IEnumerable GetTypesScopedByTestClass(this EndpointCustomizationConfiguration endpointConfiguration) - { - var assemblies = new AssemblyScanner().GetScannableAssemblies(); - - var assembliesToScan = assemblies.Assemblies - //exclude acceptance tests by default - .Where(a => a != Assembly.GetExecutingAssembly() && a != typeof(TBootstrapper).Assembly) - .Where(a => a.FullName.StartsWith("ServiceControl") == false) - .ToList(); - var types = assembliesToScan - .SelectMany(a => a.GetTypes()); - - types = types.Union(GetNestedTypeRecursive(endpointConfiguration.BuilderType.DeclaringType, endpointConfiguration.BuilderType)); - - types = types.Union(endpointConfiguration.TypesToInclude); - - return types.Where(t => !endpointConfiguration.TypesToExclude.Contains(t)).ToList(); - } - - static IEnumerable GetNestedTypeRecursive(Type rootType, Type builderType) - { - if (rootType == null) - { - throw new InvalidOperationException("Make sure you nest the endpoint infrastructure inside the TestFixture as nested classes"); - } - - yield return rootType; - - if (typeof(IEndpointConfigurationFactory).IsAssignableFrom(rootType) && rootType != builderType) - { - yield break; - } - - foreach (var nestedType in rootType.GetNestedTypes(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).SelectMany(t => GetNestedTypeRecursive(t, builderType))) - { - yield return nestedType; - } - } - } -} \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_failed_message_is_retried.cs b/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_failed_message_is_retried.cs index 19956cc11c..96d8b33543 100644 --- a/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_failed_message_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_failed_message_is_retried.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -17,7 +18,6 @@ using ServiceControl.MessageFailures; using ServiceControl.Recoverability; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_failed_message_is_retried : AcceptanceTest { @@ -194,27 +194,20 @@ await Define() public class FailingEndpoint : EndpointConfigurationBuilder { - public FailingEndpoint() - { - EndpointSetup(c => + public FailingEndpoint() => + EndpointSetup(c => { c.GetSettings().Get().TransportTransactionMode = TransportTransactionMode.ReceiveOnly; c.EnableFeature(); c.ReportSuccessfulRetriesToServiceControl(); - var recoverability = c.Recoverability(); - recoverability.Immediate(s => s.NumberOfRetries(0)); - recoverability.Delayed(s => s.NumberOfRetries(0)); + c.NoRetries(); }); - } class StartFeature : Feature { - public StartFeature() - { - EnableByDefault(); - } + public StartFeature() => EnableByDefault(); protected override void Setup(FeatureConfigurationContext context) { @@ -224,28 +217,16 @@ protected override void Setup(FeatureConfigurationContext context) class SendMessageAtStart : FeatureStartupTask { protected override Task OnStart(IMessageSession session, CancellationToken cancellationToken = default) - { - return session.SendLocal(new MyMessage(), cancellationToken); - } + => session.SendLocal(new MyMessage(), cancellationToken); protected override Task OnStop(IMessageSession session, CancellationToken cancellationToken = default) - { - return Task.CompletedTask; - } + => Task.CompletedTask; } } - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -266,26 +247,19 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) public class FailingEndpointWithoutAudit : EndpointConfigurationBuilder { - public FailingEndpointWithoutAudit() - { - EndpointSetup(c => + public FailingEndpointWithoutAudit() => + EndpointSetup(c => { c.GetSettings().Get().TransportTransactionMode = TransportTransactionMode.ReceiveOnly; c.EnableFeature(); - var recoverability = c.Recoverability(); - recoverability.Immediate(s => s.NumberOfRetries(0)); - recoverability.Delayed(s => s.NumberOfRetries(0)); + c.NoRetries(); }); - } class StartFeature : Feature { - public StartFeature() - { - EnableByDefault(); - } + public StartFeature() => EnableByDefault(); protected override void Setup(FeatureConfigurationContext context) { @@ -306,17 +280,9 @@ protected override Task OnStop(IMessageSession session, CancellationToken cancel } } - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -343,8 +309,6 @@ public class Context : ScenarioContext public bool AboutToSendRetry { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_message_fails_to_import.cs b/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_message_fails_to_import.cs index 756d7089a6..e63b9efc3a 100644 --- a/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_message_fails_to_import.cs +++ b/src/ServiceControl.AcceptanceTests.RavenDB/Recoverability/MessageFailures/When_a_message_fails_to_import.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts.MessageFailures; using Infrastructure; using Infrastructure.DomainEvents; @@ -14,7 +15,6 @@ using NUnit.Framework; using Operations; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_fails_to_import : AcceptanceTest @@ -95,7 +95,7 @@ public void Enrich(ErrorEnricherContext context) public class ErrorLogSpy : EndpointConfigurationBuilder { - public ErrorLogSpy() => EndpointSetup(); + public ErrorLogSpy() => EndpointSetup(); public class MyMessageHandler(MyContext scenarioContext) : IHandleMessages { @@ -110,7 +110,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) public class Sender : EndpointConfigurationBuilder { public Sender() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MyMessage), typeof(Receiver)); @@ -120,7 +120,7 @@ public class Sender : EndpointConfigurationBuilder public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { var recoverability = c.Recoverability(); recoverability.Immediate(x => x.NumberOfRetries(0)); @@ -138,9 +138,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_custom_check_fails.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_custom_check_fails.cs index e13e7adb18..23b5594798 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_custom_check_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_custom_check_fails.cs @@ -5,13 +5,13 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using EventLog; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.CustomChecks; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -37,21 +37,14 @@ await Define() Assert.IsTrue(entry.RelatedTo.Any(item => item.StartsWith($"/endpoint/{Conventions.EndpointNamingConvention(typeof(EndpointWithFailingCustomCheck))}"))); } - public class MyContext : ScenarioContext - { - } + public class MyContext : ScenarioContext; public class EndpointWithFailingCustomCheck : EndpointConfigurationBuilder { - public EndpointWithFailingCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); + public EndpointWithFailingCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); - class FailingCustomCheck : CustomCheck + class FailingCustomCheck() : CustomCheck("MyCustomCheckId", "MyCategory") { - public FailingCustomCheck() - : base("MyCustomCheckId", "MyCategory") - { - } - public override Task PerformCheck(CancellationToken cancellationToken = default) => Task.FromResult(CheckResult.Failed("Some reason")); } } diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs index e7546bd383..cd6ae00151 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_a_periodic_custom_check_fails.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts.CustomChecks; using EventLog; using Microsoft.AspNetCore.SignalR.Client; @@ -17,7 +18,6 @@ using NServiceBus.Features; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -69,7 +69,7 @@ public class MyContext : ScenarioContext public class EndpointThatUsesSignalR : EndpointConfigurationBuilder { - public EndpointThatUsesSignalR() => EndpointSetup(c => c.EnableFeature()); + public EndpointThatUsesSignalR() => EndpointSetup(c => c.EnableFeature()); class EnableSignalR : Feature { @@ -121,12 +121,11 @@ protected override async Task OnStart(IMessageSession session, CancellationToken public class WithCustomCheck : EndpointConfigurationBuilder { - public WithCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); + public WithCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); - class FailingCustomCheck : NServiceBus.CustomChecks.CustomCheck + class FailingCustomCheck(MyContext context) + : NServiceBus.CustomChecks.CustomCheck("MyCustomCheckId", "MyCategory", TimeSpan.FromSeconds(5)) { - public FailingCustomCheck(MyContext context) : base("MyCustomCheckId", "MyCategory", TimeSpan.FromSeconds(5)) => this.context = context; - public override Task PerformCheck(CancellationToken cancellationToken = default) { if (executed && context.SignalrStarted) @@ -139,7 +138,6 @@ public override Task PerformCheck(CancellationToken cancellationTok return Task.FromResult(CheckResult.Pass); } - readonly MyContext context; bool executed; } } diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs index f7c3971b44..9d37113020 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_critical_storage_threshold_reached.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using MessageFailures.Api; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; [TestFixture] class When_critical_storage_threshold_reached : AcceptanceTest @@ -94,14 +94,12 @@ await Define() public class Sender : EndpointConfigurationBuilder { - public Sender() - { - EndpointSetup(c => + public Sender() => + EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); c.NoRetries(); }); - } public class MyMessageHandler : IHandleMessages { diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_custom_check_events_are_triggered.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_custom_check_events_are_triggered.cs index e91a7c80c6..ded109fe19 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_custom_check_events_are_triggered.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_custom_check_events_are_triggered.cs @@ -5,13 +5,13 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using EventLog; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.CustomChecks; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; [TestFixture] class When_custom_check_events_are_triggered : AcceptanceTest @@ -41,18 +41,11 @@ public class MyContext : ScenarioContext public class EndpointWithCustomCheck : EndpointConfigurationBuilder { - public EndpointWithCustomCheck() - { - EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); - } + public EndpointWithCustomCheck() => EndpointSetup(c => c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1))); - public class EventuallyFailingCustomCheck : CustomCheck + public class EventuallyFailingCustomCheck() + : CustomCheck("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1)) { - public EventuallyFailingCustomCheck() - : base("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1)) - { - } - public override Task PerformCheck(CancellationToken cancellationToken = default) { #pragma warning disable IDE0047 // Remove unnecessary parentheses diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_email_notifications_are_enabled.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_email_notifications_are_enabled.cs index 539e19c5bd..6bfa757a9d 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_email_notifications_are_enabled.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_email_notifications_are_enabled.cs @@ -14,7 +14,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; - using TestSupport.EndpointTemplates; + using AcceptanceTesting.EndpointTemplates; [TestFixture] class When_email_notifications_are_enabled : AcceptanceTest @@ -84,7 +84,7 @@ public class MyContext : ScenarioContext public class EndpointWithFailingCustomCheck : EndpointConfigurationBuilder { - public EndpointWithFailingCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); + public EndpointWithFailingCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); class FailingCustomCheck() : CustomCheck("MyCustomCheckId", "MyCategory") { diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_reporting_custom_check_with_signalr.cs b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_reporting_custom_check_with_signalr.cs index dc9a8dbad8..63498ff12f 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_reporting_custom_check_with_signalr.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/CustomChecks/When_reporting_custom_check_with_signalr.cs @@ -5,6 +5,7 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using Microsoft.AspNetCore.SignalR.Client; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -13,7 +14,6 @@ using NServiceBus.Features; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; [TestFixture] class When_reporting_custom_check_with_signalr : AcceptanceTest @@ -42,7 +42,7 @@ public class MyContext : ScenarioContext public class EndpointThatUsesSignalR : EndpointConfigurationBuilder { - public EndpointThatUsesSignalR() => EndpointSetup(c => c.EnableFeature()); + public EndpointThatUsesSignalR() => EndpointSetup(c => c.EnableFeature()); class EnableSignalR : Feature { @@ -93,18 +93,11 @@ protected override Task OnStart(IMessageSession session, CancellationToken cance class EndpointWithCustomCheck : EndpointConfigurationBuilder { - public EndpointWithCustomCheck() - { - EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); - } + public EndpointWithCustomCheck() => EndpointSetup(c => { c.ReportCustomChecksTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromSeconds(1)); }); - public class EventuallyFailingCustomCheck : CustomCheck + public class EventuallyFailingCustomCheck() + : CustomCheck("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1)) { - public EventuallyFailingCustomCheck() - : base("EventuallyFailingCustomCheck", "Testing", TimeSpan.FromSeconds(1)) - { - } - public override Task PerformCheck(CancellationToken cancellationToken = default) { #pragma warning disable IDE0047 // Remove unnecessary parentheses diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_fails.cs b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_fails.cs index ef8f3ca7d7..58aba1d122 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_fails.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; - using TestSupport.EndpointTemplates; [TestFixture] class When_a_custom_check_fails : AcceptanceTest @@ -66,7 +66,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); @@ -75,12 +75,8 @@ public class ExternalProcessor : EndpointConfigurationBuilder publisherMetadata.RegisterPublisherFor(Settings.DEFAULT_SERVICE_NAME); }); - public class CustomCheckFailedHandler : IHandleMessages + public class CustomCheckFailedHandler(MyContext testContext) : IHandleMessages { - readonly MyContext testContext; - - public CustomCheckFailedHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(CustomCheckFailed message, IMessageHandlerContext context) { testContext.CustomCheckFailedReceived = true; diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_succeeds.cs b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_succeeds.cs index 6163290293..1914962cc7 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_succeeds.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_a_custom_check_succeeds.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; - using TestSupport.EndpointTemplates; [TestFixture] class When_a_custom_check_succeeds : AcceptanceTest @@ -61,7 +61,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); @@ -70,12 +70,8 @@ public class ExternalProcessor : EndpointConfigurationBuilder publisherMetadata.RegisterPublisherFor(Settings.DEFAULT_SERVICE_NAME); }); - public class CustomCheckSucceededHandler : IHandleMessages + public class CustomCheckSucceededHandler(MyContext testContext) : IHandleMessages { - readonly MyContext testContext; - - public CustomCheckSucceededHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(CustomCheckSucceeded message, IMessageHandlerContext context) { testContext.CustomCheckSucceededReceived = true; diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_is_restored.cs b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_is_restored.cs index f7261392ee..15e5eb96ed 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_is_restored.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_is_restored.cs @@ -3,6 +3,7 @@ namespace ServiceControl.AcceptanceTests.Monitoring.ExternalIntegration using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using Contracts.HeartbeatMonitoring; using NServiceBus; @@ -10,7 +11,6 @@ namespace ServiceControl.AcceptanceTests.Monitoring.ExternalIntegration using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; - using TestSupport.EndpointTemplates; /// /// The test simulates the heartbeat subsystem by publishing EndpointHeartbeatRestored event. @@ -61,18 +61,14 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); }, publisherMetadata => { publisherMetadata.RegisterPublisherFor(Settings.DEFAULT_SERVICE_NAME); }); - public class FailureHandler : IHandleMessages + public class FailureHandler(MyContext testContext) : IHandleMessages { - readonly MyContext testContext; - - public FailureHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(HeartbeatRestored message, IMessageHandlerContext context) { testContext.NotificationDelivered = true; diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_loss_is_detected.cs b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_loss_is_detected.cs index c5acb32c6a..d694eb10e4 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_loss_is_detected.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/ExternalIntegration/When_heartbeat_loss_is_detected.cs @@ -3,6 +3,7 @@ namespace ServiceControl.AcceptanceTests.Monitoring.ExternalIntegration using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using Contracts.HeartbeatMonitoring; using NServiceBus; @@ -10,7 +11,6 @@ namespace ServiceControl.AcceptanceTests.Monitoring.ExternalIntegration using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; - using TestSupport.EndpointTemplates; /// /// The test simulates the heartbeat subsystem by publishing EndpointFailedToHeartbeat event. @@ -63,18 +63,14 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); }, publisherMetadata => { publisherMetadata.RegisterPublisherFor(Settings.DEFAULT_SERVICE_NAME); }); - public class FailureHandler : IHandleMessages + public class FailureHandler(MyContext testContext) : IHandleMessages { - readonly MyContext testContext; - - public FailureHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(HeartbeatStopped message, IMessageHandlerContext context) { testContext.NotificationDelivered = true; diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_a_failed_message_from_unmonitored_endpoint_is_imported.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_a_failed_message_from_unmonitored_endpoint_is_imported.cs index d81844355a..fc016c77e2 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_a_failed_message_from_unmonitored_endpoint_is_imported.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_a_failed_message_from_unmonitored_endpoint_is_imported.cs @@ -4,13 +4,13 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.Persistence; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -59,23 +59,15 @@ public async Task It_is_persisted() public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext testContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(MyContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { testContext.EndpointNameOfReceivingEndpoint = settings.EndpointName(); @@ -84,9 +76,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_is_removed.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_is_removed.cs index 2af46ba24b..d9bca770f4 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_is_removed.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_is_removed.cs @@ -5,12 +5,12 @@ namespace ServiceControl.AcceptanceTests.Monitoring using System.Net.Http; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Persistence; - using TestSupport.EndpointTemplates; [TestFixture] class When_an_endpoint_is_removed : AcceptanceTest @@ -57,13 +57,11 @@ await Define() Assert.AreEqual(0, endpointsAfterDelete.Count); } - class Context : ScenarioContext - { - } + class Context : ScenarioContext; public class StartingEndpoint : EndpointConfigurationBuilder { - public StartingEndpoint() => EndpointSetup(c => c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromHours(1))); + public StartingEndpoint() => EndpointSetup(c => c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME, TimeSpan.FromHours(1))); } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_starts_up.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_starts_up.cs index f83c41f93c..a400e2b47f 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_starts_up.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_starts_up.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts.EndpointControl; using EventLog; using NServiceBus; @@ -11,7 +12,6 @@ using NServiceBus.Configuration.AdvancedExtensibility; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; [TestFixture] class When_an_endpoint_starts_up : AcceptanceTest @@ -40,7 +40,7 @@ await Define() public class StartingEndpoint : EndpointConfigurationBuilder { public StartingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_with_heartbeat_plugin_starts_up.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_with_heartbeat_plugin_starts_up.cs index a5dae413ea..74b4343416 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_with_heartbeat_plugin_starts_up.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_endpoint_with_heartbeat_plugin_starts_up.cs @@ -2,13 +2,12 @@ { using System.Threading.Tasks; using AcceptanceTesting; - using Microsoft.Extensions.DependencyInjection; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Persistence; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -55,13 +54,11 @@ await Define() Assert.True(endpoint.Monitored, "An endpoint discovered from heartbeats should be monitored"); } - public class MyContext : ScenarioContext - { - } + public class MyContext : ScenarioContext; public class StartingEndpoint : EndpointConfigurationBuilder { - public StartingEndpoint() => EndpointSetup(c => c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME)); + public StartingEndpoint() => EndpointSetup(c => c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME)); } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_unmonitored_endpoint_is_marked_as_monitored.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_unmonitored_endpoint_is_marked_as_monitored.cs index 6cfb98c084..ace5490f88 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_an_unmonitored_endpoint_is_marked_as_monitored.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_an_unmonitored_endpoint_is_marked_as_monitored.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts.EndpointControl; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -13,7 +14,6 @@ using ServiceControl.Monitoring; using ServiceControl.Operations; using ServiceControl.Persistence; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -85,13 +85,11 @@ enum State WaitingForHeartbeatFailure } - public class MyContext : ScenarioContext - { - } + public class MyContext : ScenarioContext; public class MyEndpoint : EndpointConfigurationBuilder { - public MyEndpoint() => EndpointSetup(); + public MyEndpoint() => EndpointSetup(); } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Monitoring/When_unmonitored_endpoint_starts_to_sends_heartbeats.cs b/src/ServiceControl.AcceptanceTests/Monitoring/When_unmonitored_endpoint_starts_to_sends_heartbeats.cs index 2555ebf991..708c059931 100644 --- a/src/ServiceControl.AcceptanceTests/Monitoring/When_unmonitored_endpoint_starts_to_sends_heartbeats.cs +++ b/src/ServiceControl.AcceptanceTests/Monitoring/When_unmonitored_endpoint_starts_to_sends_heartbeats.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts.EndpointControl; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; using ServiceControl.Persistence; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -72,18 +72,16 @@ await Define() Assert.IsTrue(endpoint.IsSendingHeartbeats, "Should be emitting heartbeats"); } - public class MyContext : ScenarioContext - { - } + public class MyContext : ScenarioContext; public class WithoutHeartbeat : EndpointConfigurationBuilder { - public WithoutHeartbeat() => EndpointSetup(); + public WithoutHeartbeat() => EndpointSetup(); } public class WithHeartbeat : EndpointConfigurationBuilder { - public WithHeartbeat() => EndpointSetup(c => { c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME); }).CustomEndpointName(EndpointName); + public WithHeartbeat() => EndpointSetup(c => { c.SendHeartbeatTo(Settings.DEFAULT_SERVICE_NAME); }).CustomEndpointName(EndpointName); } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs index e035127c0d..bec6039d65 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/ExternalIntegrationAcceptanceTest.cs @@ -4,12 +4,12 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; abstract class ExternalIntegrationAcceptanceTest : AcceptanceTest @@ -17,7 +17,7 @@ abstract class ExternalIntegrationAcceptanceTest : AcceptanceTest public class ErrorSender : EndpointConfigurationBuilder { public ErrorSender() => - EndpointSetup(c => + EndpointSetup(c => { c.NoDelayedRetries(); c.ReportSuccessfulRetriesToServiceControl(); @@ -60,7 +60,7 @@ OutgoingMessage CreateTransportMessage(string messageId) } } - public class AMessage : ICommand { } + public class AMessage : ICommand; public class Context : ScenarioContext, ISequenceContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_archived.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_archived.cs index ef474edf16..01f9e3d078 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_archived.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_archived.cs @@ -3,13 +3,13 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_failed_message_is_archived : ExternalIntegrationAcceptanceTest { @@ -57,7 +57,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(FailedMessagesArchived).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_by_retry.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_by_retry.cs index 954b46d42c..35dfdedccd 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_by_retry.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_by_retry.cs @@ -2,13 +2,13 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; using JsonSerializer = System.Text.Json.JsonSerializer; class When_a_failed_message_is_resolved_by_retry : ExternalIntegrationAcceptanceTest @@ -55,7 +55,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(FailedMessagesArchived).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_manually.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_manually.cs index 63b251a3d6..08107ef521 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_manually.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_resolved_manually.cs @@ -9,8 +9,8 @@ using NUnit.Framework; using Contracts; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; using System.Collections.Generic; + using AcceptanceTesting.EndpointTemplates; using JsonSerializer = System.Text.Json.JsonSerializer; class When_a_failed_message_is_resolved_manually : ExternalIntegrationAcceptanceTest @@ -66,7 +66,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailureResolvedManually).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_unarchived.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_unarchived.cs index 912701256c..2c14867ee5 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_unarchived.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_message_is_unarchived.cs @@ -9,9 +9,9 @@ using NUnit.Framework; using Contracts; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; using System.Collections.Generic; using System.Text.Json; + using AcceptanceTesting.EndpointTemplates; class When_a_failed_message_is_unarchived : ExternalIntegrationAcceptanceTest { @@ -74,7 +74,7 @@ public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() { - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(FailedMessagesUnArchived).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_group_is_archived.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_group_is_archived.cs index 75b172110a..e12fcc571a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_group_is_archived.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_group_is_archived.cs @@ -4,13 +4,13 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using ServiceBus.Management.Infrastructure.Settings; using NUnit.Framework; using ServiceControl.Contracts; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_group_is_archived : ExternalIntegrationAcceptanceTest { @@ -72,7 +72,7 @@ public async Task Should_publish_notification() public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(FailedMessagesArchived).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_message_has_failed_detected.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_message_has_failed_detected.cs index fa70da3fbe..3d93b91a96 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_message_has_failed_detected.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_message_has_failed_detected.cs @@ -4,13 +4,12 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; - using TestSupport.EndpointTemplates; - class When_a_message_has_failed_detected : AcceptanceTest { @@ -58,7 +57,7 @@ public class FailingReceiver : EndpointConfigurationBuilder { public FailingReceiver() { - EndpointSetup(c => { c.Recoverability().Immediate(s => s.NumberOfRetries(2)).Delayed(s => s.NumberOfRetries(0)); }); + EndpointSetup(c => { c.Recoverability().Immediate(s => s.NumberOfRetries(2)).Delayed(s => s.NumberOfRetries(0)); }); } public class MyMessageHandler : IHandleMessages @@ -70,7 +69,7 @@ public class MyMessageHandler : IHandleMessages public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs index 5c203ebf93..ff8f911b2a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_encountered_an_error.cs @@ -5,6 +5,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Contracts; using Contracts.HeartbeatMonitoring; using ExternalIntegrations; @@ -15,7 +16,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using ServiceControl.Operations; - using TestSupport.EndpointTemplates; /// /// The test simulates the heartbeat subsystem by publishing EndpointFailedToHeartbeat event. @@ -70,12 +70,8 @@ public async Task Should_restart_dispatch_thread() Assert.IsTrue(context.Failed); } - class FaultyPublisher : IEventPublisher + class FaultyPublisher(MyContext context) : IEventPublisher { - public FaultyPublisher(MyContext context) => this.context = context; - - readonly MyContext context; - public bool Handles(IDomainEvent @event) => false; public object CreateDispatchContext(IDomainEvent @event) => null; @@ -98,18 +94,14 @@ public Task> PublishEventsForOwnContexts(IEnumerable public class ExternalProcessor : EndpointConfigurationBuilder { public ExternalProcessor() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MessageFailed).Assembly, Settings.DEFAULT_SERVICE_NAME); }, publisherMetadata => { publisherMetadata.RegisterPublisherFor(Settings.DEFAULT_SERVICE_NAME); }); - public class FailureHandler : IHandleMessages + public class FailureHandler(MyContext testContext) : IHandleMessages { - readonly MyContext testContext; - - public FailureHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(HeartbeatStopped message, IMessageHandlerContext context) { testContext.NotificationDelivered = true; diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_archived.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_archived.cs index 615f6938c3..f8e198090b 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_archived.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_archived.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_group_is_archived : AcceptanceTest { @@ -225,26 +225,16 @@ await Define() public class Receiver : EndpointConfigurationBuilder { - public Receiver() - { - EndpointSetup(c => + public Receiver() => + EndpointSetup(c => { c.NoDelayedRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - } - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - public Task Handle(MyMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_retried.cs index 97d7c71ae5..938bda45fa 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_group_is_retried.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_group_is_retried : AcceptanceTest { @@ -88,23 +88,15 @@ await Define() public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { c.Recoverability().Delayed(x => x.NumberOfRetries(0)); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - public Task Handle(MyMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_message_fails_twice_with_different_exceptions.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_message_fails_twice_with_different_exceptions.cs index cc47abe928..580e85111c 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_message_fails_twice_with_different_exceptions.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_a_message_fails_twice_with_different_exceptions.cs @@ -5,6 +5,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.Groups using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.Groups using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.Recoverability; - using TestSupport.EndpointTemplates; class When_a_message_fails_twice_with_different_exceptions : AcceptanceTest { @@ -77,19 +77,11 @@ await Define() public class MeowReceiver : EndpointConfigurationBuilder { - public MeowReceiver() => EndpointSetup(c => { c.NoDelayedRetries(); }); + public MeowReceiver() => EndpointSetup(c => { c.NoDelayedRetries(); }); - public class FailingMessageHandler : IHandleMessages + public class FailingMessageHandler(MeowContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - public FailingMessageHandler(MeowContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - - readonly MeowContext scenarioContext; - readonly IReadOnlySettings settings; - public Task Handle(Meow message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); @@ -107,9 +99,7 @@ public Task Handle(Meow message, IMessageHandlerContext context) } } - public class Meow : ICommand - { - } + public class Meow : ICommand; public class MeowContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_message_groups_are_sorted_by_a_web_api_call.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_message_groups_are_sorted_by_a_web_api_call.cs index 91a6bac39c..80a3c3b744 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_message_groups_are_sorted_by_a_web_api_call.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_message_groups_are_sorted_by_a_web_api_call.cs @@ -4,6 +4,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.Groups using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; @@ -11,7 +12,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.Groups using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_message_groups_are_sorted_by_a_web_api_call : AcceptanceTest @@ -80,11 +80,9 @@ await Define() public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { - var recoverability = c.Recoverability(); - recoverability.Immediate(x => x.NumberOfRetries(0)); - recoverability.Delayed(x => x.NumberOfRetries(0)); + c.NoRetries(); c.LimitMessageProcessingConcurrencyTo(1); }); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_messages_have_failed.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_messages_have_failed.cs index e65ce8f487..fc92bb237d 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_messages_have_failed.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_messages_have_failed.cs @@ -6,6 +6,7 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.Recoverability; - using TestSupport.EndpointTemplates; class When_messages_have_failed : AcceptanceTest { @@ -93,7 +93,7 @@ public async Task Should_be_grouped() public class Receiver : EndpointConfigurationBuilder { - public Receiver() => EndpointSetup(c => { c.NoRetries(); }); + public Receiver() => EndpointSetup(c => { c.NoRetries(); }); public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) : IHandleMessages, @@ -114,13 +114,9 @@ public Task Handle(MyMessageB message, IMessageHandlerContext context) } } - public class MyMessageA : ICommand - { - } + public class MyMessageA : ICommand; - public class MyMessageB : ICommand - { - } + public class MyMessageB : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_two_similar_messages_have_failed.cs b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_two_similar_messages_have_failed.cs index c2bfe20443..37a048353a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_two_similar_messages_have_failed.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/Groups/When_two_similar_messages_have_failed.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.Recoverability; - using TestSupport.EndpointTemplates; class When_two_similar_messages_have_failed : AcceptanceTest { @@ -91,19 +91,11 @@ await Define() public class Receiver : EndpointConfigurationBuilder { - public Receiver() => EndpointSetup(c => { c.NoRetries(); }); + public Receiver() => EndpointSetup(c => { c.NoRetries(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/ErrorImportPerformanceTests.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/ErrorImportPerformanceTests.cs index 5e65f9d5fa..24061a6972 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/ErrorImportPerformanceTests.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/ErrorImportPerformanceTests.cs @@ -5,11 +5,11 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class ErrorImportPerformanceTests : AcceptanceTest { @@ -39,27 +39,17 @@ await Define() public class Receiver : EndpointConfigurationBuilder { - public Receiver() - { - EndpointSetup(c => c.Recoverability().Delayed(s => s.NumberOfRetries(0))); - } + public Receiver() => EndpointSetup(c => c.Recoverability().Delayed(s => s.NumberOfRetries(0))); public class MyMessageHandler : IHandleMessages { - public Task Handle(MyMessage message, IMessageHandlerContext context) - { - throw new Exception("Simulated exception"); - } + public Task Handle(MyMessage message, IMessageHandlerContext context) => throw new Exception("Simulated exception"); } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; - public class MyContext : ScenarioContext - { - } + public class MyContext : ScenarioContext; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/Is_System_Message_Tests.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/Is_System_Message_Tests.cs index 31dff7f9d9..ee25a731bd 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/Is_System_Message_Tests.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/Is_System_Message_Tests.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class Is_System_Message_Tests : AcceptanceTest { @@ -130,7 +130,7 @@ public async Task Should_set_the_IsSystemMessage_for_integration_scenario() public class ServerEndpoint : EndpointConfigurationBuilder { - public ServerEndpoint() => EndpointSetup(); + public ServerEndpoint() => EndpointSetup(); class Foo : DispatchRawMessages { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_SagaComplete_message_fails.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_SagaComplete_message_fails.cs index 555a6cbd99..f185cb5783 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_SagaComplete_message_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_SagaComplete_message_fails.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_SagaComplete_message_fails : AcceptanceTest @@ -36,7 +36,7 @@ await Define() public class FailureEndpoint : EndpointConfigurationBuilder { - public FailureEndpoint() => EndpointSetup(c => { c.NoDelayedRetries(); }); + public FailureEndpoint() => EndpointSetup(c => { c.NoDelayedRetries(); }); public class SendFailedMessage : DispatchRawMessages { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_failed_message_is_pending_retry.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_failed_message_is_pending_retry.cs index c6297685e6..de55004218 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_failed_message_is_pending_retry.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_failed_message_is_pending_retry.cs @@ -4,6 +4,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -13,7 +14,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_failed_message_is_pending_retry : AcceptanceTest { @@ -56,7 +56,7 @@ await Define() public class FailingEndpoint : EndpointConfigurationBuilder { public FailingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.GetSettings().Get().TransportTransactionMode = TransportTransactionMode.ReceiveOnly; @@ -81,17 +81,9 @@ class SendMessageAtStart : FeatureStartupTask } } - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -117,8 +109,6 @@ public class Context : ScenarioContext public bool AboutToSendRetry { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_invalid_id_is_sent_to_retry.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_invalid_id_is_sent_to_retry.cs index e3271aca1a..d7aff7e01e 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_invalid_id_is_sent_to_retry.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_invalid_id_is_sent_to_retry.cs @@ -3,12 +3,12 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Settings; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_a_invalid_id_is_sent_to_retry : AcceptanceTest { @@ -44,24 +44,14 @@ public async Task SubsequentBatchesShouldBeProcessed() public class FailureEndpoint : EndpointConfigurationBuilder { public FailureEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { - var recoverability = c.Recoverability(); - recoverability.Immediate(s => s.NumberOfRetries(0)); - recoverability.Delayed(s => s.NumberOfRetries(0)); + c.NoRetries(); }); - public class MessageThatWillFailHandler : IHandleMessages + public class MessageThatWillFailHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - - public MessageThatWillFailHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MessageThatWillFail message, IMessageHandlerContext context) { if (!scenarioContext.ExceptionThrown) //simulate that the exception will be resolved with the retry diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed.cs index f15b3c0035..3e79758dc4 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed.cs @@ -11,6 +11,7 @@ namespace ServiceControl.AcceptanceTests.Recoverability.MessageFailures using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using EventLog; using Infrastructure; @@ -29,7 +30,6 @@ namespace ServiceControl.AcceptanceTests.Recoverability.MessageFailures using ServiceControl.MessageFailures.Api; using ServiceControl.Persistence; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_message_has_failed : AcceptanceTest { @@ -272,7 +272,7 @@ await Define() public class EndpointThatUsesSignalR : EndpointConfigurationBuilder { public EndpointThatUsesSignalR() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MyMessage), typeof(Receiver)); @@ -331,7 +331,7 @@ void EnvelopeReceived(JsonElement jElement) public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); @@ -356,7 +356,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) public class ReceiverWithCustomSerializer : EndpointConfigurationBuilder { public ReceiverWithCustomSerializer() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); @@ -412,11 +412,9 @@ public object[] Deserialize(ReadOnlyMemory body, IList messageTypes public class FailingEndpoint : EndpointConfigurationBuilder { public FailingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { - var recoverability = c.Recoverability(); - recoverability.Immediate(x => x.NumberOfRetries(0)); - recoverability.Delayed(x => x.NumberOfRetries(0)); + c.NoRetries(); }); public class MyMessageHandler(QueueSearchContext queueSearchContext) : IHandleMessages diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed_from_send_only_endpoint.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed_from_send_only_endpoint.cs index b8cbdb6df8..417af2c973 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed_from_send_only_endpoint.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_message_has_failed_from_send_only_endpoint.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class When_a_message_has_failed_from_send_only_endpoint : AcceptanceTest { @@ -58,7 +58,7 @@ public async Task Should_be_listed_in_the_error_list_when_processing_endpoint_he public class SendOnlyEndpoint : EndpointConfigurationBuilder { - public SendOnlyEndpoint() => EndpointSetup(); + public SendOnlyEndpoint() => EndpointSetup(); class Foo : DispatchRawMessages { @@ -97,9 +97,7 @@ protected override TransportOperations CreateMessage(MyContext context) } } - public class MyMessage : IMessage - { - } + public class MyMessage : IMessage; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_messages_fails_multiple_times.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_messages_fails_multiple_times.cs index e31f8a4113..b9f91894be 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_messages_fails_multiple_times.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_messages_fails_multiple_times.cs @@ -10,7 +10,7 @@ using System; using System.Linq; using System.Threading.Tasks; - using TestSupport.EndpointTemplates; + using AcceptanceTesting.EndpointTemplates; using ServiceControl.Infrastructure; using ServiceControl.MessageFailures; @@ -51,7 +51,7 @@ class TestContext : ScenarioContext class AnEndpoint : EndpointConfigurationBuilder { - public AnEndpoint() => EndpointSetup(); + public AnEndpoint() => EndpointSetup(); class FailedMessagesSender : DispatchRawMessages { @@ -94,9 +94,7 @@ protected override TransportOperations CreateMessage(TestContext context) } } - class MyMessage : ICommand - { - } + class MyMessage : ICommand; } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_queue_and_timeframe.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_queue_and_timeframe.cs index c79919d407..490774404c 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_queue_and_timeframe.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_queue_and_timeframe.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_pending_retry_is_resolved_by_queue_and_timeframe : AcceptanceTest { @@ -59,7 +59,7 @@ await Define() public class Failing : EndpointConfigurationBuilder { public Failing() => - EndpointSetup(c => + EndpointSetup(c => { //Do not inform SC that the message has been already successfully handled c.DisableFeature(); @@ -67,19 +67,12 @@ public class Failing : EndpointConfigurationBuilder c.NoOutbox(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler( + Context scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - this.receiveAddresses = receiveAddresses; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -107,8 +100,6 @@ public class Context : ScenarioContext, ISequenceContext public int Step { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_selection.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_selection.cs index 22f0ce0217..f4af037187 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_selection.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_resolved_by_selection.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_pending_retry_is_resolved_by_selection : AcceptanceTest { @@ -51,7 +51,7 @@ await Define() public class FailingEndpoint : EndpointConfigurationBuilder { public FailingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { //Do not inform SC that the message has been already successfully handled c.DisableFeature(); @@ -59,19 +59,12 @@ public class FailingEndpoint : EndpointConfigurationBuilder c.NoOutbox(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler( + Context scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - this.receiveAddresses = receiveAddresses; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -99,8 +92,6 @@ public class Context : ScenarioContext, ISequenceContext public int Step { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_again.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_again.cs index 67324bd43e..39c67297e9 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_again.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_again.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_pending_retry_is_retried_again : AcceptanceTest { @@ -47,7 +47,7 @@ await Define() public class FailingEndpoint : EndpointConfigurationBuilder { public FailingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { //Do not inform SC that the message has been already successfully handled c.DisableFeature(); @@ -55,19 +55,12 @@ public class FailingEndpoint : EndpointConfigurationBuilder c.NoOutbox(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler( + Context scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - this.receiveAddresses = receiveAddresses; - } - - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -94,8 +87,6 @@ public class Context : ScenarioContext, ISequenceContext public int Step { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_by_queue_and_timeframe.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_by_queue_and_timeframe.cs index d17af4b20e..bc6a946bb8 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_by_queue_and_timeframe.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_pending_retry_is_retried_by_queue_and_timeframe.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_a_pending_retry_is_retried_by_queue_and_timeframe : AcceptanceTest { @@ -50,7 +50,7 @@ await Define() public class Failing : EndpointConfigurationBuilder { public Failing() => - EndpointSetup(c => + EndpointSetup(c => { //Do not inform SC that the message has been already successfully handled c.DisableFeature(); @@ -58,19 +58,12 @@ public class Failing : EndpointConfigurationBuilder c.NoOutbox(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler( + Context scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - - public MyMessageHandler(Context scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - this.receiveAddresses = receiveAddresses; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Message Handled"); @@ -97,8 +90,6 @@ public class Context : ScenarioContext, ISequenceContext public int Step { get; set; } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_fails_to_be_sent.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_fails_to_be_sent.cs index 3a6417b925..08627b84aa 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_fails_to_be_sent.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_fails_to_be_sent.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -18,7 +19,6 @@ using ServiceControl.Persistence; using ServiceControl.Recoverability; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_retry_fails_to_be_sent : AcceptanceTest { @@ -71,23 +71,15 @@ await Define() public class FailureEndpoint : EndpointConfigurationBuilder { public FailureEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MessageThatWillFailHandler : IHandleMessages + public class MessageThatWillFailHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - - public MessageThatWillFailHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MessageThatWillFail message, IMessageHandlerContext context) { scenarioContext.MessageThatWillFailUniqueMessageId = DeterministicGuid.MakeId(context.MessageId, settings.EndpointName()).ToString(); @@ -144,9 +136,7 @@ public class MyContext : ScenarioContext } - public class MessageThatWillFail : ICommand - { - } + public class MessageThatWillFail : ICommand; public class FakeReturnToSender(IErrorMessageDataStore errorMessageStore, MyContext myContext) : ReturnToSender(errorMessageStore) diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs index 9504e8be5b..e34856bf3a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -14,7 +15,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_retry_for_a_empty_body_message_is_successful : AcceptanceTest @@ -69,7 +69,7 @@ async Task IssueRetry(MyContext c, Func retryAction) public class FailureEndpoint : EndpointConfigurationBuilder { public FailureEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.NoDelayedRetries(); c.ReportSuccessfulRetriesToServiceControl(); @@ -112,10 +112,8 @@ protected override TransportOperations CreateMessage(MyContext context) } } - public class LookForControlMessage : Behavior + public class LookForControlMessage(MyContext myContext) : Behavior { - public LookForControlMessage(MyContext context) => myContext = context; - public override Task Invoke(IIncomingPhysicalMessageContext context, Func next) { if (context.Message.Headers[Headers.MessageId] == myContext.MessageId) @@ -125,8 +123,6 @@ public override Task Invoke(IIncomingPhysicalMessageContext context, Func return next(); } - - readonly MyContext myContext; } } diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_fails.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_fails.cs index e6cd159d1a..de39398996 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_fails.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_retry_for_a_failed_message_fails : AcceptanceTest { @@ -98,23 +98,15 @@ async Task> GetFailedMessage(MyContext c, Predicate< public class FailureEndpoint : EndpointConfigurationBuilder { public FailureEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.WriteLine("Attempting to process message"); @@ -135,9 +127,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext, ISequenceContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs index 54ef8c4939..de0b598899 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_a_retry_for_a_failed_message_is_successful.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using EventLog; using Infrastructure; using NServiceBus; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_retry_for_a_failed_message_is_successful : AcceptanceTest { @@ -193,25 +193,18 @@ async Task IssueRetry(MyContext c, Func retryAction) public class FailureEndpoint : EndpointConfigurationBuilder { public FailureEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler( + MyContext scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - this.receiveAddresses = receiveAddresses; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { Console.Out.WriteLine("Handling message"); @@ -230,9 +223,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_all_messages_are_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_all_messages_are_retried.cs index f2b8c688f0..76bb281258 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_all_messages_are_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_all_messages_are_retried.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using TestSupport; - using TestSupport.EndpointTemplates; class When_all_messages_are_retried : AcceptanceTest { @@ -88,23 +88,15 @@ await Define() public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.ReportSuccessfulRetriesToServiceControl(); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) + : IHandleMessages { - readonly MyContext scenarioContext; - readonly IReadOnlySettings settings; - - public MyMessageHandler(MyContext scenarioContext, IReadOnlySettings settings) - { - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_an_event_with_multiple_subscribers_fails.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_an_event_with_multiple_subscribers_fails.cs index 8a9baaeda1..e957bc2b68 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_an_event_with_multiple_subscribers_fails.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_an_event_with_multiple_subscribers_fails.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class When_an_event_with_multiple_subscribers_fails : AcceptanceTest { @@ -40,7 +40,7 @@ await Define() public class FakeFailedSubscribers : EndpointConfigurationBuilder { - public FakeFailedSubscribers() => EndpointSetup(); + public FakeFailedSubscribers() => EndpointSetup(); class SendDuplicateMessages : DispatchRawMessages { @@ -73,8 +73,6 @@ protected override TransportOperations CreateMessage(FailingEventContext context } } - public class FailingEventContext : ScenarioContext - { - } + public class FailingEventContext : ScenarioContext; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_errors_with_same_uniqueid_are_imported.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_errors_with_same_uniqueid_are_imported.cs index c50662e7d3..801526abe4 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_errors_with_same_uniqueid_are_imported.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_errors_with_same_uniqueid_are_imported.cs @@ -6,6 +6,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -15,7 +16,6 @@ using NUnit.Framework; using Operations; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; class When_errors_with_same_uniqueid_are_imported : AcceptanceTest { @@ -63,12 +63,8 @@ public async Task The_import_should_deduplicate_on_TimeOfFailure() CollectionAssert.AreEquivalent(context.FailureTimes, attempts.Select(a => a.AttemptedAt)); } - class CounterEnricher : IEnrichImportedErrorMessages + class CounterEnricher(MyContext testContext) : IEnrichImportedErrorMessages { - readonly MyContext testContext; - - public CounterEnricher(MyContext testContext) => this.testContext = testContext; - public void Enrich(ErrorEnricherContext context) { if (context.Headers.TryGetValue("Counter", out var counter)) @@ -84,7 +80,7 @@ public void Enrich(ErrorEnricherContext context) public class SourceEndpoint : EndpointConfigurationBuilder { - public SourceEndpoint() => EndpointSetup(); + public SourceEndpoint() => EndpointSetup(); class SendMultipleFailedMessagesWithSameUniqueId : DispatchRawMessages { @@ -140,7 +136,7 @@ class MyContext : ScenarioContext public void OnMessage(string counter) => receivedMessages.AddOrUpdate(counter, true, (id, old) => true); - readonly ConcurrentDictionary receivedMessages = new ConcurrentDictionary(); + readonly ConcurrentDictionary receivedMessages = new(); } } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_is_imported.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_is_imported.cs index 46930d7dbb..9bd02e78e3 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_is_imported.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_is_imported.cs @@ -3,9 +3,9 @@ using System; using System.Linq; using System.Text; - using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -13,7 +13,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.Persistence; - using TestSupport.EndpointTemplates; class When_failed_message_is_imported : AcceptanceTest @@ -84,7 +83,7 @@ public async Task Should_be_accessible_via_the_rest_api() public class Sender : EndpointConfigurationBuilder { public Sender() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MyMessage), typeof(Receiver)); @@ -94,7 +93,7 @@ public class Sender : EndpointConfigurationBuilder public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { var recoverability = c.Recoverability(); recoverability.Immediate(x => x.NumberOfRetries(0)); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_searched_by_body_content.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_searched_by_body_content.cs index 7a6fc2361f..6993ecd03a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_searched_by_body_content.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_failed_message_searched_by_body_content.cs @@ -3,12 +3,12 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_failed_message_searched_by_body_content : AcceptanceTest { @@ -82,7 +82,7 @@ public async Task Should_not_be_found_when_fulltext_search_disabled() public class Sender : EndpointConfigurationBuilder { public Sender() => - EndpointSetup(c => + EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(MyMessage), typeof(Receiver)); @@ -92,19 +92,10 @@ public class Sender : EndpointConfigurationBuilder public class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => - { - var recoverability = c.Recoverability(); - recoverability.Immediate(s => s.NumberOfRetries(0)); - recoverability.Delayed(s => s.NumberOfRetries(0)); - }); + EndpointSetup(c => c.NoRetries()); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext scenarioContext) : IHandleMessages { - readonly MyContext scenarioContext; - - public MyMessageHandler(MyContext scenarioContext) => this.scenarioContext = scenarioContext; - public Task Handle(MyMessage message, IMessageHandlerContext context) { scenarioContext.MessageId = context.MessageId; diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_processing_message_with_missing_metadata_failed.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_processing_message_with_missing_metadata_failed.cs index e6dbe2ad33..767b7b10e3 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_processing_message_with_missing_metadata_failed.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageFailures/When_processing_message_with_missing_metadata_failed.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_processing_message_with_missing_metadata_failed : AcceptanceTest @@ -76,7 +76,7 @@ await Define() public class Failing : EndpointConfigurationBuilder { - public Failing() => EndpointSetup(c => { c.Recoverability().Delayed(x => x.NumberOfRetries(0)); }); + public Failing() => EndpointSetup(c => { c.Recoverability().Delayed(x => x.NumberOfRetries(0)); }); class SendFailedMessage : DispatchRawMessages { diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_fails_a_retry_with_a_redirect.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_fails_a_retry_with_a_redirect.cs index 846fc85918..7b474f20f8 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_fails_a_retry_with_a_redirect.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_fails_a_retry_with_a_redirect.cs @@ -6,6 +6,7 @@ using System.Net; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_fails_a_retry_with_a_redirect : AcceptanceTest @@ -68,21 +68,14 @@ await Define() class OriginalEndpoint : EndpointConfigurationBuilder { - public OriginalEndpoint() => EndpointSetup(c => { c.NoRetries(); }); + public OriginalEndpoint() => EndpointSetup(c => c.NoRetries()); - public class MessageToRetryHandler : IHandleMessages + public class MessageToRetryHandler( + Context scenarioContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly Context scenarioContext; - readonly IReadOnlySettings settings; - readonly ReceiveAddresses receiveAddresses; - - public MessageToRetryHandler(Context scenarioContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.receiveAddresses = receiveAddresses; - this.scenarioContext = scenarioContext; - this.settings = settings; - } - public Task Handle(MessageToRetry message, IMessageHandlerContext context) { scenarioContext.FromAddress = receiveAddresses.MainReceiveAddress; @@ -94,14 +87,10 @@ public Task Handle(MessageToRetry message, IMessageHandlerContext context) class NewEndpoint : EndpointConfigurationBuilder { - public NewEndpoint() => EndpointSetup(c => { c.NoRetries(); }); + public NewEndpoint() => EndpointSetup(c => { c.NoRetries(); }); - public class MessageToRetryHandler : IHandleMessages + public class MessageToRetryHandler(Context testContext) : IHandleMessages { - readonly Context testContext; - - public MessageToRetryHandler(Context testContext) => this.testContext = testContext; - public Task Handle(MessageToRetry message, IMessageHandlerContext context) { testContext.ProcessedAgain = true; @@ -118,8 +107,6 @@ class Context : ScenarioContext public bool ProcessedAgain { get; set; } } - class MessageToRetry : ICommand - { - } + class MessageToRetry : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_is_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_is_retried.cs index 25b7bd0f67..993a67c928 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/MessageRedirects/When_a_message_is_retried.cs @@ -4,13 +4,13 @@ using System.Net; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.MessageFailures; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_is_retried_with_a_redirect : AcceptanceTest @@ -52,21 +52,14 @@ public async Task It_should_be_sent_to_the_correct_endpoint() public class FromEndpoint : EndpointConfigurationBuilder { - public FromEndpoint() => EndpointSetup(c => { c.NoRetries(); }); + public FromEndpoint() => EndpointSetup(c => { c.NoRetries(); }); - public class MessageToRetryHandler : IHandleMessages + public class MessageToRetryHandler( + Context testContext, + IReadOnlySettings settings, + ReceiveAddresses receiveAddresses) + : IHandleMessages { - readonly Context testContext; - readonly ReceiveAddresses receiveAddresses; - readonly IReadOnlySettings settings; - - public MessageToRetryHandler(Context testContext, IReadOnlySettings settings, ReceiveAddresses receiveAddresses) - { - this.testContext = testContext; - this.receiveAddresses = receiveAddresses; - this.settings = settings; - } - public Task Handle(MessageToRetry message, IMessageHandlerContext context) { testContext.FromAddress = receiveAddresses.MainReceiveAddress; @@ -78,14 +71,10 @@ public Task Handle(MessageToRetry message, IMessageHandlerContext context) public class ToNewEndpoint : EndpointConfigurationBuilder { - public ToNewEndpoint() => EndpointSetup(); + public ToNewEndpoint() => EndpointSetup(); - public class MessageToRetryHandler : IHandleMessages + public class MessageToRetryHandler(Context testContext) : IHandleMessages { - readonly Context testContext; - - public MessageToRetryHandler(Context testContext) => this.testContext = testContext; - public Task Handle(MessageToRetry message, IMessageHandlerContext context) { testContext.Received = true; @@ -102,8 +91,6 @@ public class Context : ScenarioContext public bool Received { get; set; } } - public class MessageToRetry : ICommand - { - } + public class MessageToRetry : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried.cs index 9faca8bbf4..da25c43708 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Pipeline; @@ -12,7 +13,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_is_retried : AcceptanceTest @@ -105,7 +105,7 @@ class TestContext : ScenarioContext class VerifyHeader : EndpointConfigurationBuilder { public VerifyHeader() => - EndpointSetup( + EndpointSetup( (c, r) => c.Pipeline.Register(new CaptureIncomingMessage((TestContext)r.ScenarioContext), "Captures the incoming message")); class FakeSender : DispatchRawMessages diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_and_succeeds_with_a_reply.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_and_succeeds_with_a_reply.cs index 5587f54e7d..c9c2ab3e5d 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_and_succeeds_with_a_reply.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_and_succeeds_with_a_reply.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NServiceBus.Settings; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_a_message_is_retried_and_succeeds_with_a_reply : AcceptanceTest @@ -63,18 +63,14 @@ class RetryReplyContext : ScenarioContext class Originator : EndpointConfigurationBuilder { - public Originator() => EndpointSetup(c => + public Originator() => EndpointSetup(c => { var routing = c.ConfigureRouting(); routing.RouteToEndpoint(typeof(OriginalMessage), typeof(Receiver)); }); - public class ReplyMessageHandler : IHandleMessages + public class ReplyMessageHandler(RetryReplyContext testContext) : IHandleMessages { - readonly RetryReplyContext testContext; - - public ReplyMessageHandler(RetryReplyContext testContext) => this.testContext = testContext; - public Task Handle(ReplyMessage message, IMessageHandlerContext context) { testContext.ReplyHandledBy = "Originating Endpoint"; @@ -85,19 +81,11 @@ public Task Handle(ReplyMessage message, IMessageHandlerContext context) class Receiver : EndpointConfigurationBuilder { - public Receiver() => EndpointSetup(c => c.NoRetries()); + public Receiver() => EndpointSetup(c => c.NoRetries()); - public class OriginalMessageHandler : IHandleMessages + public class OriginalMessageHandler(RetryReplyContext testContext, IReadOnlySettings settings) + : IHandleMessages { - readonly IReadOnlySettings settings; - readonly RetryReplyContext testContext; - - public OriginalMessageHandler(RetryReplyContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(OriginalMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); @@ -113,12 +101,8 @@ public Task Handle(OriginalMessage message, IMessageHandlerContext context) } } - public class ReplyMessageHandler : IHandleMessages + public class ReplyMessageHandler(RetryReplyContext testContext) : IHandleMessages { - readonly RetryReplyContext testContext; - - public ReplyMessageHandler(RetryReplyContext testContext) => this.testContext = testContext; - public Task Handle(ReplyMessage message, IMessageHandlerContext context) { testContext.ReplyHandledBy = "Receiving Endpoint"; diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_with_a_replyTo_header.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_with_a_replyTo_header.cs index 7fbb83ffaa..74d37cacc5 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_with_a_replyTo_header.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_is_retried_with_a_replyTo_header.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.MessageMutator; @@ -11,7 +12,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; @@ -52,7 +52,7 @@ class ReplyToContext : ScenarioContext class VerifyHeader : EndpointConfigurationBuilder { public VerifyHeader() => - EndpointSetup( + EndpointSetup( (c, r) => c.RegisterMessageMutator(new VerifyHeaderIsUnchanged((ReplyToContext)r.ScenarioContext)) ); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_without_a_correlationid_header_is_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_without_a_correlationid_header_is_retried.cs index cdb772c6a4..d33d15087e 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_without_a_correlationid_header_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_message_without_a_correlationid_header_is_retried.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -10,7 +11,6 @@ using NServiceBus.MessageMutator; using NServiceBus.Settings; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_a_message_without_a_correlationid_header_is_retried : AcceptanceTest @@ -61,23 +61,15 @@ class MyContext : ScenarioContext class Receiver : EndpointConfigurationBuilder { public Receiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); c.RegisterComponents(services => services.AddSingleton()); }); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings) + : IHandleMessages { - readonly IReadOnlySettings settings; - readonly MyContext testContext; - - public MyMessageHandler(MyContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { var messageId = context.MessageId.Replace(@"\", "-"); diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_native_integration_message_is_retried.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_native_integration_message_is_retried.cs index 829744001e..24a439e89a 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_a_native_integration_message_is_retried.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_a_native_integration_message_is_retried.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.MessageMutator; @@ -11,7 +12,6 @@ using NServiceBus.Transport; using NUnit.Framework; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; @@ -48,7 +48,7 @@ class TestContext : ScenarioContext class VerifyHeader : EndpointConfigurationBuilder { public VerifyHeader() => - EndpointSetup( + EndpointSetup( (c, r) => c.RegisterMessageMutator(new VerifyHeaderIsUnchanged((TestContext)r.ScenarioContext)) ); @@ -69,10 +69,8 @@ protected override TransportOperations CreateMessage(TestContext context) } } - class VerifyHeaderIsUnchanged : IMutateIncomingTransportMessages + class VerifyHeaderIsUnchanged(TestContext testContext) : IMutateIncomingTransportMessages { - public VerifyHeaderIsUnchanged(TestContext context) => testContext = context; - public Task MutateIncoming(MutateIncomingTransportMessageContext context) { testContext.Headers = context.Headers; @@ -80,8 +78,6 @@ public Task MutateIncoming(MutateIncomingTransportMessageContext context) testContext.Done = true; return Task.CompletedTask; } - - readonly TestContext testContext; } } } diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs index 3110fa72b1..c9448e6f8c 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_edited_message_fails_to_process.cs @@ -4,6 +4,7 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using AcceptanceTests; using Infrastructure; using NServiceBus; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class When_edited_message_fails_to_process : AcceptanceTest { @@ -90,16 +90,11 @@ class EditMessageFailureContext : ScenarioContext class FailingEditedMessageReceiver : EndpointConfigurationBuilder { - public FailingEditedMessageReceiver() => EndpointSetup(c => { c.NoRetries(); }); + public FailingEditedMessageReceiver() => EndpointSetup(c => { c.NoRetries(); }); - class FailingMessageHandler : IHandleMessages + class FailingMessageHandler(EditMessageFailureContext testContext, IReadOnlySettings settings) + : IHandleMessages { - public FailingMessageHandler(EditMessageFailureContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(FailingMessage message, IMessageHandlerContext context) { if (message.HasBeenEdited) @@ -113,9 +108,6 @@ public Task Handle(FailingMessage message, IMessageHandlerContext context) throw new SimulatedException(); } - - readonly EditMessageFailureContext testContext; - readonly IReadOnlySettings settings; } } diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_body.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_body.cs index 3586ed8289..8725729578 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_body.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_body.cs @@ -5,6 +5,7 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using AcceptanceTests; using Infrastructure; using NServiceBus; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class When_editing_message_body : AcceptanceTest { @@ -72,19 +72,14 @@ public async Task A_new_message_with_edited_body_is_sent() class EditedMessageReceiver : EndpointConfigurationBuilder { public EditedMessageReceiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); }); - class EditedMessageHandler : IHandleMessages + class EditedMessageHandler(EditMessageContext testContext, IReadOnlySettings settings) + : IHandleMessages { - public EditedMessageHandler(EditMessageContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(EditMessage message, IMessageHandlerContext context) { if (!testContext.EditedMessage) @@ -100,9 +95,6 @@ public Task Handle(EditMessage message, IMessageHandlerContext context) testContext.EditedMessageHeaders = context.MessageHeaders.Keys.ToHashSet(); return Task.CompletedTask; } - - readonly EditMessageContext testContext; - readonly IReadOnlySettings settings; } } diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs index dccd46c85a..3b5cdba5fd 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_editing_message_headers.cs @@ -5,6 +5,7 @@ using System.Text.Json; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using AcceptanceTests; using Infrastructure; using NServiceBus; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; class When_editing_message_headers : AcceptanceTest { @@ -71,7 +71,7 @@ public async Task A_new_message_with_edited_headers_is_sent() class EditedMessageReceiver : EndpointConfigurationBuilder { public EditedMessageReceiver() => - EndpointSetup(c => + EndpointSetup(c => { c.NoRetries(); }); @@ -106,8 +106,6 @@ class EditMessageContext : ScenarioContext public FailedMessage OriginalMessageFailure { get; set; } } - class EditMessage : IMessage - { - } + class EditMessage : IMessage; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_retry_is_confirmed.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_retry_is_confirmed.cs index b593393ab6..f698fb074d 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_retry_is_confirmed.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_retry_is_confirmed.cs @@ -5,13 +5,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceControl.MessageFailures; using ServiceControl.MessageFailures.Api; - using TestSupport.EndpointTemplates; - class When_retry_is_confirmed : AcceptanceTest { @@ -69,14 +68,10 @@ class Context : ScenarioContext, ISequenceContext class RetryingEndpoint : EndpointConfigurationBuilder { - public RetryingEndpoint() => EndpointSetup(c => c.NoRetries()); + public RetryingEndpoint() => EndpointSetup(c => c.NoRetries()); - class RetryMessageHandler : IHandleMessages + class RetryMessageHandler(Context testContext) : IHandleMessages { - readonly Context testContext; - - public RetryMessageHandler(Context testContext) => this.testContext = testContext; - public Task Handle(RetryMessage message, IMessageHandlerContext context) { if (testContext.ThrowOnHandler) @@ -91,8 +86,6 @@ public Task Handle(RetryMessage message, IMessageHandlerContext context) } } - class RetryMessage : IMessage - { - } + class RetryMessage : IMessage; } } \ No newline at end of file diff --git a/src/ServiceControl.AcceptanceTests/Recoverability/When_single_message_fails_in_batch.cs b/src/ServiceControl.AcceptanceTests/Recoverability/When_single_message_fails_in_batch.cs index b7731a4ef9..5b008ccd74 100644 --- a/src/ServiceControl.AcceptanceTests/Recoverability/When_single_message_fails_in_batch.cs +++ b/src/ServiceControl.AcceptanceTests/Recoverability/When_single_message_fails_in_batch.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using AcceptanceTests; using CompositeViews.Messages; using Microsoft.Extensions.DependencyInjection; @@ -15,7 +16,6 @@ using NServiceBus.Transport; using NUnit.Framework; using Operations; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_single_message_fails_in_batch : AcceptanceTest @@ -52,10 +52,8 @@ public async Task Should_import_all_messages() .Run(); } - class FailOnceEnricher : IEnrichImportedErrorMessages + class FailOnceEnricher(MyContext testContext) : IEnrichImportedErrorMessages { - public FailOnceEnricher(MyContext context) => testContext = context; - public void Enrich(ErrorEnricherContext context) { if (context.Headers[Headers.MessageId] == testContext.MessageId && Interlocked.Increment(ref attempt) == 1) @@ -67,13 +65,12 @@ public void Enrich(ErrorEnricherContext context) TestContext.WriteLine("Message processed correctly"); } - readonly MyContext testContext; int attempt; } class Sendonly : EndpointConfigurationBuilder { - public Sendonly() => EndpointSetup(); + public Sendonly() => EndpointSetup(); class SendMessage : DispatchRawMessages { diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs b/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs deleted file mode 100644 index a4f9e22bcb..0000000000 --- a/src/ServiceControl.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace ServiceControl.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using AcceptanceTesting.EndpointTemplates; - using Hosting.Commands; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - using NServiceBus.Features; - using Particular.ServiceControl; - - public class DefaultServer : IEndpointSetupTemplate - { - // TODO: Revisit the default server base having a bootstrapper reference - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - new DefaultServerBase().GetConfiguration(runDescriptor, endpointConfiguration, async b => - { - b.DisableFeature(); - - await configurationBuilderCustomization(b); - }); - } -} \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests.RavenDB/Auditing/When_critical_storage_threshold_reached.cs b/src/ServiceControl.Audit.AcceptanceTests.RavenDB/Auditing/When_critical_storage_threshold_reached.cs index eafd9fadd8..dcd1483d9a 100644 --- a/src/ServiceControl.Audit.AcceptanceTests.RavenDB/Auditing/When_critical_storage_threshold_reached.cs +++ b/src/ServiceControl.Audit.AcceptanceTests.RavenDB/Auditing/When_critical_storage_threshold_reached.cs @@ -3,13 +3,13 @@ using System; using System.Linq; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using Microsoft.Extensions.DependencyInjection; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using Persistence.RavenDB; using ServiceControl.AcceptanceTesting; - using ServiceControl.Audit.AcceptanceTests.TestSupport.EndpointTemplates; using ServiceControl.Audit.Auditing.MessagesView; @@ -102,10 +102,7 @@ await Define() public class Sender : EndpointConfigurationBuilder { - public Sender() - { - EndpointSetup(); - } + public Sender() => EndpointSetup(); public class MyMessageHandler : IHandleMessages { @@ -113,8 +110,6 @@ public class MyMessageHandler : IHandleMessages } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_fails_to_import.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_fails_to_import.cs index 4a4ce99025..a75e8e9972 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_fails_to_import.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_fails_to_import.cs @@ -2,6 +2,7 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing; using Audit.Auditing.MessagesView; using Microsoft.Extensions.DependencyInjection; @@ -9,7 +10,6 @@ using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; @@ -112,9 +112,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_sent_with_missing_metadata.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_sent_with_missing_metadata.cs index 893aea28ae..5497c58665 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_sent_with_missing_metadata.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_a_message_sent_with_missing_metadata.cs @@ -4,13 +4,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_sent_with_missing_metadata : AcceptanceTest diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_message_processed_successfully_from_sendonly.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_message_processed_successfully_from_sendonly.cs index cf0622dbae..3469a8d964 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_message_processed_successfully_from_sendonly.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_message_processed_successfully_from_sendonly.cs @@ -4,13 +4,13 @@ namespace ServiceControl.Audit.AcceptanceTests.Auditing using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_message_processed_successfully_from_sendonly : AcceptanceTest diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_are_marked_as_system_messages.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_are_marked_as_system_messages.cs index ea1fcf8ad5..d1d7770815 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_are_marked_as_system_messages.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_are_marked_as_system_messages.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_messages_are_marked_as_system_messages : AcceptanceTest { @@ -161,12 +161,8 @@ protected override Task AfterDispatch(IMessageSession session, SystemMessageTest } } - class MyHandler : IHandleMessages + class MyHandler(SystemMessageTestContext testContext) : IHandleMessages { - SystemMessageTestContext testContext; - - public MyHandler(SystemMessageTestContext context) => testContext = context; - public Task Handle(DoQueryAllowed message, IMessageHandlerContext context) { testContext.QueryForMessages = true; @@ -175,9 +171,7 @@ public Task Handle(DoQueryAllowed message, IMessageHandlerContext context) } } - public class DoQueryAllowed : IMessage - { - } + public class DoQueryAllowed : IMessage; public class SystemMessageTestContext : ScenarioContext { diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_with_big_bodies_are_ingested.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_with_big_bodies_are_ingested.cs index f632fdbae5..74457bebc4 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_with_big_bodies_are_ingested.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_messages_with_big_bodies_are_ingested.cs @@ -3,11 +3,11 @@ using System.Net; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_messages_with_big_bodies_are_ingested : AcceptanceTest { @@ -141,17 +141,13 @@ class FatMessageEndpoint : EndpointConfigurationBuilder { public FatMessageEndpoint() => EndpointSetup(); - public class BigFatMessageHandler : IHandleMessages + public class BigFatMessageHandler(Context testContext) : IHandleMessages { - public BigFatMessageHandler(Context testContext) => this.testContext = testContext; - public Task Handle(BigFatMessage message, IMessageHandlerContext context) { testContext.MessageId = context.MessageHeaders["NServiceBus.MessageId"]; return Task.CompletedTask; } - - readonly Context testContext; } } diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_is_imported.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_is_imported.cs index 79d43d531a..d942da67a9 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_is_imported.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_is_imported.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using Audit.Monitoring; using NServiceBus; @@ -14,7 +15,6 @@ using NServiceBus.Settings; using NUnit.Framework; using ServiceControl.Audit.Auditing; - using TestSupport.EndpointTemplates; class When_processed_message_is_imported : AcceptanceTest { @@ -130,17 +130,8 @@ public class Receiver : EndpointConfigurationBuilder { public Receiver() => EndpointSetup(); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings) : IHandleMessages { - MyContext testContext; - IReadOnlySettings settings; - - public MyMessageHandler(MyContext context, IReadOnlySettings settings) - { - testContext = context; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { testContext.EndpointNameOfReceivingEndpoint = settings.EndpointName(); diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_body_content.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_body_content.cs index 04266d2686..56e8717e69 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_body_content.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_body_content.cs @@ -2,12 +2,12 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_processed_message_searched_by_body_content : AcceptanceTest { diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_messageid.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_messageid.cs index 32a00313ef..ab99d5ad09 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_messageid.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_messageid.cs @@ -2,13 +2,13 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NServiceBus.Settings; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_processed_message_searched_by_messageid : AcceptanceTest { @@ -34,17 +34,9 @@ public class Receiver : EndpointConfigurationBuilder { public Receiver() => EndpointSetup(); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings) + : IHandleMessages { - MyContext testContext; - IReadOnlySettings settings; - - public MyMessageHandler(MyContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { testContext.EndpointNameOfReceivingEndpoint = settings.EndpointName(); @@ -54,9 +46,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_msgid_for_endpoint.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_msgid_for_endpoint.cs index 28bf97a916..a15f93f713 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_msgid_for_endpoint.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_processed_message_searched_by_msgid_for_endpoint.cs @@ -2,13 +2,13 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NServiceBus.Settings; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_processed_message_searched_by_msgid_for_endpoint : AcceptanceTest { @@ -34,17 +34,9 @@ public class Receiver : EndpointConfigurationBuilder { public Receiver() => EndpointSetup(); - public class MyMessageHandler : IHandleMessages + public class MyMessageHandler(MyContext testContext, IReadOnlySettings settings) + : IHandleMessages { - MyContext testContext; - IReadOnlySettings settings; - - public MyMessageHandler(MyContext testContext, IReadOnlySettings settings) - { - this.testContext = testContext; - this.settings = settings; - } - public Task Handle(MyMessage message, IMessageHandlerContext context) { testContext.EndpointNameOfReceivingEndpoint = settings.EndpointName(); @@ -54,9 +46,7 @@ public Task Handle(MyMessage message, IMessageHandlerContext context) } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_single_message_fails_in_batch.cs b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_single_message_fails_in_batch.cs index 74cd93ad72..99133a95ab 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_single_message_fails_in_batch.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Auditing/When_single_message_fails_in_batch.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing; using Audit.Auditing.MessagesView; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +15,6 @@ using NServiceBus.Routing; using NServiceBus.Transport; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_single_message_fails_in_batch : AcceptanceTest @@ -52,10 +52,8 @@ public async Task Should_import_all_messages() .Run(); } - class FailOnceEnricher : IEnrichImportedAuditMessages + class FailOnceEnricher(MyContext testContext) : IEnrichImportedAuditMessages { - public FailOnceEnricher(MyContext context) => testContext = context; - public void Enrich(AuditEnricherContext context) { if (context.Headers[Headers.MessageId] == testContext.MessageId && Interlocked.Increment(ref attempt) == 1) @@ -67,7 +65,6 @@ public void Enrich(AuditEnricherContext context) TestContext.WriteLine("Message processed correctly"); } - MyContext testContext; int attempt; } diff --git a/src/ServiceControl.Audit.AcceptanceTests/Monitoring/When_a_new_endpoint_is_detected.cs b/src/ServiceControl.Audit.AcceptanceTests/Monitoring/When_a_new_endpoint_is_detected.cs index b727e1a983..526688a53c 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Monitoring/When_a_new_endpoint_is_detected.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Monitoring/When_a_new_endpoint_is_detected.cs @@ -2,11 +2,11 @@ { using System.Linq; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_new_endpoint_is_detected : AcceptanceTest @@ -39,8 +39,6 @@ public class MyMessageHandler : IHandleMessages } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_at_old_endpoint_is_detected.cs b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_at_old_endpoint_is_detected.cs index db2fbb686f..de22ea4e97 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_at_old_endpoint_is_detected.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_at_old_endpoint_is_detected.cs @@ -2,13 +2,13 @@ { using System; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using Microsoft.Extensions.DependencyInjection; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Features; using NServiceBus.Pipeline; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; @@ -49,12 +49,8 @@ public class AckSpy : EndpointConfigurationBuilder cfg.Pipeline.Replace("DiscardMessagesBehavior", typeof(EmptyBehavior)); //Otherwise the confirmation generated by the audit instance will be discarded }); - public class SpyBehavior : Behavior + public class SpyBehavior(Context testContext) : Behavior { - Context testContext; - - public SpyBehavior(Context testContext) => this.testContext = testContext; - public override Task Invoke(ITransportReceiveContext context, Func next) { if (context.Message.Headers.ContainsKey("ServiceControl.Retry.Successful")) @@ -86,8 +82,6 @@ public class MyMessageHandler : IHandleMessages } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_from_old_SC_is_detected.cs b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_from_old_SC_is_detected.cs index 3ee0affd42..6e47f1bf3b 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_from_old_SC_is_detected.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_a_successful_retry_from_old_SC_is_detected.cs @@ -3,11 +3,11 @@ using System; using System.Linq; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_successful_retry_from_old_SC_is_detected : AcceptanceTest @@ -50,8 +50,6 @@ public class MyMessageHandler : IHandleMessages } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_importing_a_message_resolved_by_a_retry.cs b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_importing_a_message_resolved_by_a_retry.cs index 61981eaf1b..73d2310cf6 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_importing_a_message_resolved_by_a_retry.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/Recoverability/When_importing_a_message_resolved_by_a_retry.cs @@ -3,13 +3,13 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using Audit.Monitoring; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; class When_importing_a_message_resolved_by_a_retry : AcceptanceTest { @@ -58,8 +58,6 @@ public class MyMessageHandler : IHandleMessages } } - public class MyMessage : ICommand - { - } + public class MyMessage : ICommand; } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_emitted_by_a_saga_is_audited.cs b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_emitted_by_a_saga_is_audited.cs index e77dc1f046..bf4f8696f6 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_emitted_by_a_saga_is_audited.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_emitted_by_a_saga_is_audited.cs @@ -3,11 +3,11 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_a_message_emitted_by_a_saga_is_audited : AcceptanceTest { @@ -34,17 +34,10 @@ public async Task Info_on_emitted_saga_should_be_available_through_the_http_api( public class SagaEndpoint : EndpointConfigurationBuilder { - public SagaEndpoint() - { - EndpointSetup(); - } + public SagaEndpoint() => EndpointSetup(); - public class MySaga : Saga, IAmStartedByMessages + public class MySaga(MyContext testContext) : Saga, IAmStartedByMessages { - MyContext testContext; - - public MySaga(MyContext testContext) => this.testContext = testContext; - public Task Handle(MessageInitiatingSaga message, IMessageHandlerContext context) { testContext.SagaId = Data.Id; @@ -63,12 +56,8 @@ public class MySagaData : ContainSagaData public string MessageId { get; set; } } - class MessageSentBySagaHandler : IHandleMessages + class MessageSentBySagaHandler(MyContext testContext) : IHandleMessages { - MyContext testContext; - - public MessageSentBySagaHandler(MyContext testContext) => this.testContext = testContext; - public Task Handle(MessageSentBySaga message, IMessageHandlerContext context) { testContext.MessageId = context.MessageId; @@ -82,9 +71,7 @@ public class MessageInitiatingSaga : ICommand public string Id { get; set; } } - public class MessageSentBySaga : ICommand - { - } + public class MessageSentBySaga : ICommand; public class MyContext : ScenarioContext { diff --git a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_a_saga_is_audited.cs b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_a_saga_is_audited.cs index 0045bc15f9..b1222dc0ac 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_a_saga_is_audited.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_a_saga_is_audited.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Pipeline; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_hitting_a_saga_is_audited : AcceptanceTest @@ -59,12 +59,8 @@ public class SagaEndpoint : EndpointConfigurationBuilder //we need to enable the plugin for it to enrich the audited messages, state changes will go to input queue and just be discarded EndpointSetup(c => c.AuditSagaStateChanges(Conventions.EndpointNamingConvention(typeof(SagaAuditProcessorFake)))); - public class MySaga : Saga, IAmStartedByMessages + public class MySaga(MyContext testContext) : Saga, IAmStartedByMessages { - MyContext testContext; - - public MySaga(MyContext testContext) => this.testContext = testContext; - public Task Handle(MessageInitiatingSaga message, IMessageHandlerContext context) { testContext.SagaId = Data.Id; diff --git a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_multiple_sagas_is_audited.cs b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_multiple_sagas_is_audited.cs index 0492cab1c1..956541e7c3 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_multiple_sagas_is_audited.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_hitting_multiple_sagas_is_audited.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Pipeline; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_hitting_multiple_sagas_is_audited : AcceptanceTest @@ -63,12 +63,9 @@ public class SagaEndpoint : EndpointConfigurationBuilder //we need to enable the plugin for it to enrich the audited messages, state changes will go to input queue and just be discarded EndpointSetup(c => c.AuditSagaStateChanges(Conventions.EndpointNamingConvention(typeof(SagaAuditProcessorFake)))); - public class MySaga : Saga, IAmStartedByMessages + public class MySaga(MyContext testContext) + : Saga, IAmStartedByMessages { - MyContext testContext; - - public MySaga(MyContext testContext) => this.testContext = testContext; - public Task Handle(MessageInitiatingSaga message, IMessageHandlerContext context) { testContext.SagaId = Data.Id; @@ -84,12 +81,9 @@ public class MySagaData : ContainSagaData } } - public class MyOtherSaga : Saga, IAmStartedByMessages + public class MyOtherSaga(MyContext testContext) + : Saga, IAmStartedByMessages { - MyContext testContext; - - public MyOtherSaga(MyContext testContext) => this.testContext = testContext; - public Task Handle(MessageInitiatingSaga message, IMessageHandlerContext context) { testContext.OtherSagaId = Data.Id; diff --git a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_that_is_handled_by_a_saga.cs b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_that_is_handled_by_a_saga.cs index 1620dff5b7..ed9c7cd99b 100644 --- a/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_that_is_handled_by_a_saga.cs +++ b/src/ServiceControl.Audit.AcceptanceTests/SagaAudit/When_a_message_that_is_handled_by_a_saga.cs @@ -5,15 +5,14 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Audit.Auditing.MessagesView; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Pipeline; using NUnit.Framework; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; - class When_a_message_that_is_handled_by_a_saga : AcceptanceTest { [Test] @@ -87,12 +86,9 @@ public class SagasEndpoint : EndpointConfigurationBuilder //we need to enable the plugin for it to enrich the audited messages, state changes will go to input queue and just be discarded EndpointSetup(c => c.AuditSagaStateChanges(Conventions.EndpointNamingConvention(typeof(SagaAuditProcessorFake)))); - public class Saga1 : Saga, IAmStartedByMessages, IHandleMessages, IHandleMessages + public class Saga1(MyContext testContext) : Saga, IAmStartedByMessages, + IHandleMessages, IHandleMessages { - MyContext testContext; - - public Saga1(MyContext testContext) => this.testContext = testContext; - public Task Handle(InitiateSaga message, IMessageHandlerContext context) => context.SendLocal(new UpdateSaga1 { MyId = message.Saga1Id }); public Task Handle(CompleteSaga1 message, IMessageHandlerContext context) @@ -117,12 +113,9 @@ public class Saga1Data : ContainSagaData } } - public class Saga2 : Saga, IAmStartedByMessages, IHandleMessages, IHandleMessages + public class Saga2(MyContext testContext) : Saga, IAmStartedByMessages, + IHandleMessages, IHandleMessages { - MyContext testContext; - - public Saga2(MyContext testContext) => this.testContext = testContext; - public Task Handle(InitiateSaga message, IMessageHandlerContext context) => context.SendLocal(new UpdateSaga2 { MyId = message.Saga2Id }); public Task Handle(CompleteSaga2 message, IMessageHandlerContext context) @@ -180,7 +173,6 @@ public class MyContext : ScenarioContext public bool Saga2Complete { get; set; } public Guid Saga1Id { get; set; } public Guid Saga2Id { get; set; } - public string Messages { get; set; } } } } \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs deleted file mode 100644 index 72df6a9c8b..0000000000 --- a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace ServiceControl.Audit.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using AcceptanceTesting.EndpointTemplates; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - - public class DefaultServerWithAudit : IEndpointSetupTemplate - { - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - //TODO generic type used to be Bootstrapper, so figure out what we need to change to get this working again - new DefaultServerBase().GetConfiguration(runDescriptor, endpointConfiguration, async builder => - { - builder.AuditProcessedMessagesTo("audit"); - builder.EnableInstallers(); - - await configurationBuilderCustomization(builder); - }); - } -} \ No newline at end of file diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs deleted file mode 100644 index fc570cccd1..0000000000 --- a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace ServiceControl.Audit.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - using NServiceBus.Features; - - public class DefaultServerWithoutAudit : IEndpointSetupTemplate - { - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - new DefaultServerWithAudit().GetConfiguration(runDescriptor, endpointConfiguration, async b => - { - b.DisableFeature(); - b.EnableInstallers(); - - await configurationBuilderCustomization(b); - }); - } -} \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs deleted file mode 100644 index 58aee88eca..0000000000 --- a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServer.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace ServiceControl.Monitoring.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using AcceptanceTesting.EndpointTemplates; - using Infrastructure; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - using NServiceBus.Features; - using ServiceControl.AcceptanceTesting.InfrastructureConfig; - - public class DefaultServer : IEndpointSetupTemplate - { - // TODO: Revisit the default server base having a bootstrapper reference - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - new DefaultServerBase(new ConfigureEndpointLearningTransport()).GetConfiguration(runDescriptor, endpointConfiguration, async b => - { - b.DisableFeature(); - - await configurationBuilderCustomization(b); - }); - } -} \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs index 835fec4d94..9491833c0c 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_disconnected_count.cs @@ -2,12 +2,11 @@ { using System; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; - using NServiceBus.Logging; using NUnit.Framework; using ServiceControl.AcceptanceTesting; - using ServiceControl.Monitoring.AcceptanceTests.TestSupport.EndpointTemplates; class When_querying_disconnected_count : AcceptanceTest { @@ -50,7 +49,6 @@ await Define(ctx => context = ctx) if (!result.IsSuccessStatusCode) { - logger.Info(result.ReasonPhrase); await Task.Delay(1000); return false; } @@ -88,10 +86,7 @@ await Define(ctx => context = ctx) class MonitoredEndpoint : EndpointConfigurationBuilder { - public MonitoredEndpoint() - { - EndpointSetup(); - } + public MonitoredEndpoint() => EndpointSetup(); } class TestContext : ScenarioContext @@ -105,7 +100,5 @@ class TestContext : ScenarioContext public int AfterFirstStoppedCount { get; set; } = int.MinValue; public int AfterSecondStoppedCount { get; set; } = int.MinValue; } - - static readonly ILog logger = LogManager.GetLogger(); } } diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_queue_length_data.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_queue_length_data.cs index 95d625b18a..c050b129b4 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_queue_length_data.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_queue_length_data.cs @@ -4,11 +4,11 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Http.Diagrams; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_querying_queue_length_data : AcceptanceTest @@ -99,17 +99,13 @@ await Define() class SendingEndpoint : EndpointConfigurationBuilder { public SendingEndpoint() => - EndpointSetup(c => + EndpointSetup(c => { c.LimitMessageProcessingConcurrencyTo(1); }); - class Handler : IHandleMessages + class Handler(TestContext testContext) : IHandleMessages { - TestContext testContext; - - public Handler(TestContext testContext) => this.testContext = testContext; - public Task Handle(SampleMessage message, IMessageHandlerContext context) => //Concurrency limit 1 and this should block any processing on input queue Task.WhenAny( @@ -129,7 +125,7 @@ class SampleBaseMessage : IMessage class TestContext : ScenarioContext { - public TaskCompletionSource TestEnded = new TaskCompletionSource(); + public TaskCompletionSource TestEnded = new(); } } } \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_retries_data.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_retries_data.cs index 47a9878965..0a79b5dbad 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_retries_data.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_retries_data.cs @@ -3,11 +3,11 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Http.Diagrams; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_querying_retries_data : AcceptanceTest { @@ -44,17 +44,13 @@ await Define() class EndpointWithRetries : EndpointConfigurationBuilder { public EndpointWithRetries() => - EndpointSetup(c => + EndpointSetup(c => { c.EnableMetrics().SendMetricDataToServiceControl(Settings.DEFAULT_ENDPOINT_NAME, TimeSpan.FromSeconds(1)); }); - class Handler : IHandleMessages + class Handler(TestContext testContext) : IHandleMessages { - TestContext testContext; - - public Handler(TestContext testContext) => this.testContext = testContext; - public Task Handle(SampleMessage message, IMessageHandlerContext context) { if (testContext.ShuttingDown) @@ -72,12 +68,8 @@ class TestContext : ScenarioContext public bool ShuttingDown { get; set; } } - class SampleMessage : SampleBaseMessage - { - } + class SampleMessage : SampleBaseMessage; - class SampleBaseMessage : IMessage - { - } + class SampleBaseMessage : IMessage; } } \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_timings_data.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_timings_data.cs index 5f21e23821..38e2194808 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_timings_data.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/When_querying_timings_data.cs @@ -3,11 +3,11 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using Http.Diagrams; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_querying_timings_data : AcceptanceTest { @@ -35,7 +35,7 @@ await Define() class EndpointWithTimings : EndpointConfigurationBuilder { public EndpointWithTimings() => - EndpointSetup(c => + EndpointSetup(c => { c.EnableMetrics().SendMetricDataToServiceControl(Settings.DEFAULT_ENDPOINT_NAME, TimeSpan.FromSeconds(1)); }); @@ -49,19 +49,13 @@ public Task Handle(SampleMessage message, IMessageHandlerContext context) class MonitoringEndpoint : EndpointConfigurationBuilder { - public MonitoringEndpoint() => EndpointSetup(); + public MonitoringEndpoint() => EndpointSetup(); } - class Context : ScenarioContext - { - } + class Context : ScenarioContext; - class SampleMessage : SampleBaseMessage - { - } + class SampleMessage : SampleBaseMessage; - class SampleBaseMessage : IMessage - { - } + class SampleBaseMessage : IMessage; } } \ No newline at end of file diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/When_sending_legacy_metric_report.cs b/src/ServiceControl.Monitoring.AcceptanceTests/When_sending_legacy_metric_report.cs index 7e79955a1a..36bacafa7d 100644 --- a/src/ServiceControl.Monitoring.AcceptanceTests/When_sending_legacy_metric_report.cs +++ b/src/ServiceControl.Monitoring.AcceptanceTests/When_sending_legacy_metric_report.cs @@ -2,12 +2,12 @@ { using System.Linq; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using Infrastructure; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Metrics; using NUnit.Framework; - using TestSupport.EndpointTemplates; class When_sending_legacy_metric_report : AcceptanceTest { @@ -29,12 +29,9 @@ await Define() class EndpointSendingLegacyMetricReport : EndpointConfigurationBuilder { - public EndpointSendingLegacyMetricReport() => EndpointSetup(); + public EndpointSendingLegacyMetricReport() => EndpointSetup(); } - class SomeContext : ScenarioContext - { - - } + class SomeContext : ScenarioContext; } } \ No newline at end of file diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_endpoint_known_to_audit_instance.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_endpoint_known_to_audit_instance.cs index 1d4781f8a8..b5d8221e91 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_endpoint_known_to_audit_instance.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_endpoint_known_to_audit_instance.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceControl.Persistence; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_endpoint_known_to_audit_instance : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_event_processed_by_multiple_endpoints.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_event_processed_by_multiple_endpoints.cs index c299702583..b30de68c66 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_event_processed_by_multiple_endpoints.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_event_processed_by_multiple_endpoints.cs @@ -2,13 +2,13 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.Settings; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; // HINT: If this is included inside of the test class, the learning transport cannot set up the subscriptions diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_conversationId.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_conversationId.cs index 892ec9b911..853fd47c38 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_conversationId.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_conversationId.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; class When_message_searched_by_conversationId : AcceptanceTest { diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messages.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messages.cs index c4e2d20dbe..65ceaf2a13 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messages.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messages.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_message_searched_by_endpoint_by_messages : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messagetype.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messagetype.cs index 9247a1456a..e0438d382c 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messagetype.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_endpoint_by_messagetype.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_message_searched_by_endpoint_by_messagetype : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messageid.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messageid.cs index cc6fb7a351..f783d9f8d9 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messageid.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messageid.cs @@ -2,6 +2,7 @@ { using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -9,7 +10,6 @@ using NServiceBus.Settings; using NUnit.Framework; using TestSupport; - using TestSupport.EndpointTemplates; class When_message_searched_by_messageid : AcceptanceTest { diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messages.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messages.cs index e44bb9c340..1262ebb3e3 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messages.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messages.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; class When_message_searched_by_messages : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messagetype.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messagetype.cs index 3b2af714ff..dd95ec556a 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messagetype.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_message_searched_by_messagetype.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -12,7 +13,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; class When_message_searched_by_messagetype : AcceptanceTest { diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs index 0ca2ab8db6..637d76b200 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Auditing/When_requesting_a_message_body.cs @@ -7,6 +7,7 @@ using System.Net.Http; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -15,7 +16,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; class When_requesting_a_message_body : AcceptanceTest { diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Connection/PlatformConnectionTests.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Connection/PlatformConnectionTests.cs index a0d338bc07..55698a6583 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Connection/PlatformConnectionTests.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Connection/PlatformConnectionTests.cs @@ -2,12 +2,12 @@ { using System.Text.Json; using System.Threading.Tasks; + using AcceptanceTesting.EndpointTemplates; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using Particular.Approvals; using ServiceControl.AcceptanceTesting; using TestSupport; - using TestSupport.EndpointTemplates; class PlatformConnectionTests : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Infrastructure/When_remote_instance_is_not_reachable.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Infrastructure/When_remote_instance_is_not_reachable.cs index 3e7c285d6c..ccc269fdb5 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Infrastructure/When_remote_instance_is_not_reachable.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Infrastructure/When_remote_instance_is_not_reachable.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using CompositeViews.Messages; using Microsoft.Extensions.DependencyInjection; using NServiceBus; @@ -13,7 +14,6 @@ using NUnit.Framework; using ServiceBus.Management.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; class When_remote_instance_is_not_reachable : AcceptanceTest { diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_a_message_is_imported_twice.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_a_message_is_imported_twice.cs index bf4c591d70..f3c1fc320a 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_a_message_is_imported_twice.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_a_message_is_imported_twice.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NServiceBus.AcceptanceTesting.Customization; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.Persistence; using TestSupport; - using TestSupport.EndpointTemplates; using Conventions = NServiceBus.AcceptanceTesting.Customization.Conventions; class When_a_message_is_imported_twice : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_endpoint_detected_via_audits.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_endpoint_detected_via_audits.cs index 563fd7ec76..a3f91994e6 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_endpoint_detected_via_audits.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Monitoring/When_endpoint_detected_via_audits.cs @@ -4,13 +4,13 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceControl.Monitoring; using ServiceControl.Persistence; using TestSupport; - using TestSupport.EndpointTemplates; class When_endpoint_detected_via_audits : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_from_old_sc_is_sent_to_audit_instance.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_from_old_sc_is_sent_to_audit_instance.cs index 937d9cc993..571bb156b8 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_from_old_sc_is_sent_to_audit_instance.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_from_old_sc_is_sent_to_audit_instance.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using MessageFailures; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_message_retry_audit_from_old_sc_is_sent_to_audit_instance : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_is_sent_to_audit_instance.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_is_sent_to_audit_instance.cs index aaf7fa8615..ab36f12108 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_is_sent_to_audit_instance.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_a_message_retry_audit_is_sent_to_audit_instance.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using MessageFailures; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -10,7 +11,6 @@ using NUnit.Framework; using ServiceControl.Infrastructure; using TestSupport; - using TestSupport.EndpointTemplates; class When_a_message_retry_audit_is_sent_to_audit_instance : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_issuing_retry_by_specifying_instance_id.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_issuing_retry_by_specifying_instance_id.cs index 3dbe264416..f5a6c4c52a 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_issuing_retry_by_specifying_instance_id.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/Recoverability/When_issuing_retry_by_specifying_instance_id.cs @@ -3,6 +3,7 @@ using System; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using MessageFailures; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -11,7 +12,6 @@ using ServiceControl.Infrastructure; using ServiceControl.Infrastructure.Settings; using TestSupport; - using TestSupport.EndpointTemplates; // Tests https://docs.particular.net/servicecontrol/servicecontrol-instances/distributed-instances#advanced-scenarios-multi-region-deployments class When_issuing_retry_by_specifying_instance_id : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_audit_instance.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_audit_instance.cs index b7ea2ebfe2..08c7ec202c 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_audit_instance.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_audit_instance.cs @@ -5,12 +5,12 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceControl.SagaAudit; using TestSupport; - using TestSupport.EndpointTemplates; class When_sending_saga_audit_to_audit_instance : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_main_instance.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_main_instance.cs index da7a46f7c5..c7eaaa2ecd 100644 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_main_instance.cs +++ b/src/ServiceControl.MultiInstance.AcceptanceTests/SagaAudit/When_sending_saga_audit_to_main_instance.cs @@ -5,13 +5,13 @@ using System.Linq; using System.Threading.Tasks; using AcceptanceTesting; + using AcceptanceTesting.EndpointTemplates; using NServiceBus; using NServiceBus.AcceptanceTesting; using NUnit.Framework; using ServiceControl.EventLog; using ServiceControl.SagaAudit; using TestSupport; - using TestSupport.EndpointTemplates; class When_sending_saga_audit_to_main_instance : AcceptanceTest diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs deleted file mode 100644 index 7947dad7dc..0000000000 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithAudit.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace ServiceControl.MultiInstance.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using AcceptanceTesting.EndpointTemplates; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - - public class DefaultServerWithAudit : IEndpointSetupTemplate - { - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - //TODO generic type used to be Bootstrapper, so figure out what we need to change to get this working again - new DefaultServerBase().GetConfiguration(runDescriptor, endpointConfiguration, async builder => - { - builder.AuditProcessedMessagesTo("audit"); - - await configurationBuilderCustomization(builder); - }); - } -} \ No newline at end of file diff --git a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs b/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs deleted file mode 100644 index 39051d9212..0000000000 --- a/src/ServiceControl.MultiInstance.AcceptanceTests/TestSupport/EndpointTemplates/DefaultServerWithoutAudit.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace ServiceControl.MultiInstance.AcceptanceTests.TestSupport.EndpointTemplates -{ - using System; - using System.Threading.Tasks; - using NServiceBus; - using NServiceBus.AcceptanceTesting.Support; - using NServiceBus.Features; - - public class DefaultServerWithoutAudit : IEndpointSetupTemplate - { - public Task GetConfiguration(RunDescriptor runDescriptor, EndpointCustomizationConfiguration endpointConfiguration, Func configurationBuilderCustomization) => - new DefaultServerWithAudit().GetConfiguration(runDescriptor, endpointConfiguration, async b => - { - b.DisableFeature(); - await configurationBuilderCustomization(b); - }); - } -} \ No newline at end of file