Cleanup tests

msmolka · Jan 30, 2022 · 23bf9b8 · 23bf9b8
1 parent 3dec062
commit 23bf9b8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 42 deletions.
diff --git a/test/ZNetCS.AspNetCore.Authentication.BasicTests/EmptyWebApplicationFactory.cs b/test/ZNetCS.AspNetCore.Authentication.BasicTests/EmptyWebApplicationFactory.cs
@@ -24,35 +24,28 @@ namespace ZNetCS.AspNetCore.Authentication.BasicTests;
 internal class EmptyWebApplicationFactory : WebApplicationFactory<EmptyStartup>
 {
     /// <inheritdoc/>
-    protected override IHostBuilder CreateHostBuilder()
-    {
-        return Host.CreateDefaultBuilder()
-            .ConfigureWebHostDefaults(
-                builder =>
-                {
-                    builder.ConfigureServices(s => { s.AddMvc(); })
-                        .Configure(
-                            app =>
-                            {
-                                app.UseRouting();
-                                app.UseAuthentication();
-                                app.UseAuthorization();
-                                app.UseEndpoints(o => o.MapControllers());
-                            })
-                        .ConfigureLogging(
-                            (_, logging) =>
-                            {
-                                logging
-                                    .AddFilter("Default", LogLevel.Debug)
-                                    .AddDebug();
-                            });
-                });
-    }
+    protected override IHostBuilder CreateHostBuilder() => Host.CreateDefaultBuilder().ConfigureWebHostDefaults(_ => { });
 
     /// <inheritdoc />
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.UseContentRoot(GetPath() ?? string.Empty);
+        builder.ConfigureServices(s => { s.AddMvc(); });
+        builder.Configure(
+            app =>
+            {
+                app.UseRouting();
+                app.UseAuthentication();
+                app.UseAuthorization();
+                app.UseEndpoints(o => o.MapControllers());
+            });
+        builder.ConfigureLogging(
+            (_, logging) =>
+            {
+                logging
+                    .AddFilter("Default", LogLevel.Debug)
+                    .AddDebug();
+            });
     }
 
     /// <summary>

diff --git a/test/ZNetCS.AspNetCore.Authentication.BasicTests/StartupWebApplicationFactory.cs b/test/ZNetCS.AspNetCore.Authentication.BasicTests/StartupWebApplicationFactory.cs
@@ -6,7 +6,7 @@
 
 namespace ZNetCS.AspNetCore.Authentication.BasicTests;
 
-    #region Usings
+#region Usings
 
 using System.IO;
 using System.Reflection;
@@ -24,28 +24,20 @@ namespace ZNetCS.AspNetCore.Authentication.BasicTests;
 internal class StartupWebApplicationFactory : WebApplicationFactory<Startup>
 {
     /// <inheritdoc/>
-    protected override IHostBuilder CreateHostBuilder()
-    {
-        return Host.CreateDefaultBuilder()
-            .ConfigureWebHostDefaults(
-                builder =>
-                {
-                    builder
-                        .UseStartup<Startup>()
-                        .ConfigureLogging(
-                            (_, logging) =>
-                            {
-                                logging
-                                    .AddFilter("Default", LogLevel.Debug)
-                                    .AddDebug();
-                            });
-                });
-    }
+    protected override IHostBuilder CreateHostBuilder() => Host.CreateDefaultBuilder().ConfigureWebHostDefaults(_ => { });
 
     /// <inheritdoc />
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
         builder.UseContentRoot(GetPath() ?? string.Empty);
+        builder.UseStartup<Startup>();
+        builder.ConfigureLogging(
+            (_, logging) =>
+            {
+                logging
+                    .AddFilter("Default", LogLevel.Debug)
+                    .AddDebug();
+            });
     }
 
     /// <summary>