Align controller loading for ATTs

Particular · Mar 12, 2024 · 68f81db · 68f81db
1 parent ab09a43
commit 68f81db
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/ServiceControl.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs b/src/ServiceControl.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs
@@ -1,7 +1,6 @@
 namespace ServiceControl.AcceptanceTests.RavenDB.Shared;
 
 using System;
-using Infrastructure.WebApi;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.TestHost;
@@ -28,7 +27,7 @@ public static void AddServiceControlTesting(this WebApplicationBuilder hostBuild
         // inside a test runner the runner exe becomes the entry point which obviously has no controllers in it ;)
         // so we are explicitly registering all necessary application parts.
         var addControllers = hostBuilder.Services.AddControllers();
-        addControllers.AddApplicationPart(typeof(WebApiHostBuilderExtensions).Assembly);
+        addControllers.AddApplicationPart(typeof(Settings).Assembly);
         addControllers.AddApplicationPart(typeof(AcceptanceTest).Assembly);
 
         hostBuilder.Services.AddHttpClientDefaultsOverrides(settings);

diff --git a/src/ServiceControl.Audit.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs b/src/ServiceControl.Audit.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs
@@ -25,7 +25,7 @@ public static void AddServiceControlAuditTesting(this WebApplicationBuilder host
         // inside a test runner the runner exe becomes the entry point which obviously has no controllers in it ;)
         // so we are explicitly registering all necessary application parts.
         var addControllers = hostBuilder.Services.AddControllers();
-        addControllers.AddApplicationPart(typeof(WebApiHostBuilderExtensions).Assembly);
-        addControllers.AddApplicationPart(typeof(FailedAuditsController).Assembly);
+        addControllers.AddApplicationPart(typeof(Settings).Assembly);
+        addControllers.AddApplicationPart(typeof(AcceptanceTest).Assembly);
     }
 }
diff --git a/...ure/WebApi/WebApiHostBuilderExtensions.cs → ...WebApi/WebApplicationBuilderExtensions.cs b/...ure/WebApi/WebApiHostBuilderExtensions.cs → ...WebApi/WebApplicationBuilderExtensions.cs
@@ -4,7 +4,7 @@
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.Extensions.DependencyInjection;
 
-    static class WebApiHostBuilderExtensions
+    static class WebApplicationBuilderExtensions
     {
         public static void AddWebApi(this WebApplicationBuilder builder, string rootUrl)
         {

diff --git a/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs b/src/ServiceControl.Monitoring.AcceptanceTests/TestSupport/WebApplicationBuilderExtensions.cs
@@ -1,6 +1,7 @@
 namespace ServiceControl.Monitoring.AcceptanceTests.TestSupport;
 
 using System;
+using Infrastructure;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.TestHost;
@@ -21,6 +22,7 @@ public static void AddServiceControlMonitoringTesting(this WebApplicationBuilder
         // inside a test runner the runner exe becomes the entry point which obviously has no controllers in it ;)
         // so we are explicitly registering all necessary application parts.
         var addControllers = hostBuilder.Services.AddControllers();
-        addControllers.AddApplicationPart(typeof(WebApplicationBuilderExtensions).Assembly);
+        addControllers.AddApplicationPart(typeof(Settings).Assembly);
+        addControllers.AddApplicationPart(typeof(AcceptanceTest).Assembly);
     }
 }