Use WebApplicationFactory as the base class for Web integration testing.

docs/en/UI/AspNetCore/Testing.md

@@ -198,23 +198,10 @@ ABP Framework doesn't provide any infrastructure to test your JavaScript code. Y
 
 > Volo.Abp.AspNetCore.TestBase package is already installed in the `.Web.Tests` project.
 
-This package provides the `AbpAspNetCoreIntegratedTestBase` as the fundamental base class to derive the test classes from. The `MyProjectWebTestBase` base class used above inherits from the `AbpAspNetCoreIntegratedTestBase`, so we indirectly inherited the `AbpAspNetCoreIntegratedTestBase`.
+This package provides the `AbpWebApplicationFactoryIntegratedTest` as the fundamental base class to derive the test classes from.  It's inherited from the [WebApplicationFactory](https://learn.microsoft.com/en-us/aspnet/core/test/integration-tests) class provided by the ASP.NET Core.
 
-### Base Properties
-
-The `AbpAspNetCoreIntegratedTestBase` provides the following base properties those are used in the tests:
-
-* `Server`: A `TestServer` instance that hosts the web application in tests.
-* `Client`: An `HttpClient` instance that is configured to perform requests to the test server.
-* `ServiceProvider`: The service provider that you can resolve services in case of need.
-
-### Base Methods
-
-`AbpAspNetCoreIntegratedTestBase` provides the following methods that you can override if you need to customize the test server:
-
-* `ConfigureServices` can be overridden to register/replace services only for the derived test class.
-* `CreateHostBuilder` can be used to customize building the `IHostBuilder`.
+The `MyProjectWebTestBase` base class used above inherits from the `AbpWebApplicationFactoryIntegratedTest`, so we indirectly inherited the `AbpWebApplicationFactoryIntegratedTest`.
 
 See Also
-
+* [Integration tests in ASP.NET Core](https://learn.microsoft.com/en-us/aspnet/core/test/integration-tests)
 * [Overall / Server Side Testing](../../Testing.md)

docs/zh-Hans/UI/AspNetCore/Testing.md

@@ -198,23 +198,10 @@ ABP框架不提供任何基础设施来测试JavaScript代码. 你可以使用
 
 > Volo.Abp.AspNetCore.TestBase 已经安装在 `.Web.Tests` 项目中.
 
-此包提供的`AbpAspNetCoreIntegratedTestBase`作为派生测试类的基类. 上面使用的`MyProjectWebTestBase`继承自`AbpAspNetCoreIntegratedTestBase`, 因此我们间接继承了`AbpAspNetCoreIntegratedTestBase`.
-
-### 基本属性
-
-`AbpAspNetCoreIntegratedTestBase` 提供了测试中使用的以下基本属性:
-
-* `Server`: 在测试中托管web应用程序的`TestServer`实例.
-* `Client`: 为执行对测试服务器的请求配置`HttpClient`实例.
-* `ServiceProvider`: 可以在你需要时处理服务提供服务.
-
-### 基本方法
-
-`AbpAspNetCoreIntegratedTestBase` 提供了以下方法, 如果需要自定义测试服务器, 可以重写这些方法:
-
-* `ConfigureServices` 仅为派生测试类注册/替换服务时可以重写使用.
-* `CreateHostBuilder` 可用于自定义生成 `IHostBuilder`.
+此包提供的`AbpWebApplicationFactoryIntegratedTest`作为派生测试类的基类. 它继承自ASP.NET Core提供的[WebApplicationFactory](https://learn.microsoft.com/zh-cn/aspnet/core/test/integration-tests)类。
+上面使用的`MyProjectWebTestBase`继承自`AbpWebApplicationFactoryIntegratedTest`, 因此我们间接继承了`AbpWebApplicationFactoryIntegratedTest`.
 
 另请参阅
 
+* [ASP.NET Core 中的集成测试](https://learn.microsoft.com/zh-cn/aspnet/core/test/integration-tests)
 * [总览/服务器端测试](../../Testing.md)

framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj

@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(MicrosoftAspNetCorePackageVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(MicrosoftAspNetCorePackageVersion)" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs

@@ -13,6 +13,7 @@
 
 namespace Volo.Abp.AspNetCore.TestBase;
 
+[Obsolete("Use AbpWebApplicationFactoryIntegratedTest instead.")]
 public class AbpAspNetCoreAsyncIntegratedTestBase<TModule>
     where TModule : IAbpModule
 {

framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs

@@ -14,6 +14,7 @@ namespace Volo.Abp.AspNetCore.TestBase;
 /// <typeparam name="TStartupModule">
 /// Can be a module type or old-style ASP.NET Core Startup class.
 /// </typeparam>
+[Obsolete("Use AbpWebApplicationFactoryIntegratedTest instead.")]
 public abstract class AbpAspNetCoreIntegratedTestBase<TStartupModule> : AbpTestBaseWithServiceProvider, IDisposable
     where TStartupModule : class
 {
@@ -51,7 +52,7 @@ protected virtual IHostBuilder CreateHostBuilder()
                 {
                     webBuilder.UseStartup<TStartupModule>();
                 }
-                
+
                 webBuilder.UseAbpTestServer();
             })
             .UseAutofac()

framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpWebApplicationFactoryIntegratedTest.cs

@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc.Testing;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+namespace Volo.Abp.AspNetCore.TestBase;
+
+public abstract class AbpWebApplicationFactoryIntegratedTest<TProgram> : WebApplicationFactory<TProgram>
+    where TProgram : class
+{
+    protected HttpClient Client { get; set; }
+
+    protected IServiceProvider ServiceProvider => Services;
+
+    protected AbpWebApplicationFactoryIntegratedTest()
+    {
+        Client = CreateClient(new WebApplicationFactoryClientOptions
+        {
+            AllowAutoRedirect = false
+        });
+        ServiceProvider.GetRequiredService<ITestServerAccessor>().Server = Server;
+    }
+
+    protected override IHost CreateHost(IHostBuilder builder)
+    {
+        builder.ConfigureServices(ConfigureServices);
+        return base.CreateHost(builder);
+    }
+
+    protected virtual T? GetService<T>()
+    {
+        return Services.GetService<T>();
+    }
+
+    protected virtual T GetRequiredService<T>() where T : notnull
+    {
+        return Services.GetRequiredService<T>();
+    }
+
+    protected virtual void ConfigureServices(IServiceCollection services)
+    {
+
+    }
+
+    #region GetUrl
+
+    /// <summary>
+    /// Gets default URL for given controller type.
+    /// </summary>
+    /// <typeparam name="TController">The type of the controller.</typeparam>
+    protected virtual string GetUrl<TController>()
+    {
+        return "/" + typeof(TController).Name.RemovePostFix("Controller", "AppService", "ApplicationService", "IntService", "IntegrationService", "Service");
+    }
+
+    /// <summary>
+    /// Gets default URL for given controller type's given action.
+    /// </summary>
+    /// <typeparam name="TController">The type of the controller.</typeparam>
+    protected virtual string GetUrl<TController>(string actionName)
+    {
+        return GetUrl<TController>() + "/" + actionName;
+    }
+
+    /// <summary>
+    /// Gets default URL for given controller type's given action with query string parameters (as anonymous object).
+    /// </summary>
+    /// <typeparam name="TController">The type of the controller.</typeparam>
+    protected virtual string GetUrl<TController>(string actionName, object queryStringParamsAsAnonymousObject)
+    {
+        var url = GetUrl<TController>(actionName);
+
+        var dictionary = new RouteValueDictionary(queryStringParamsAsAnonymousObject);
+        if (dictionary.Any())
+        {
+            url += "?" + dictionary.Select(d => $"{d.Key}={d.Value}").JoinAsString("&");
+        }
+
+        return url;
+    }
+
+    #endregion
+}

framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/WebApplicationBuilderExtensions.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.AspNetCore.TestBase;
+
+public static class WebApplicationBuilderExtensions
+{
+    public async static Task RunAbpModuleAsync<TModule>(this WebApplicationBuilder builder,  Action<AbpApplicationCreationOptions>? optionsAction = null)
+        where TModule : IAbpModule
+    {
+        var assemblyName = typeof(TModule).Assembly.GetName()?.Name;
+        if (!assemblyName.IsNullOrWhiteSpace())
+        {
+            // Set the application name as the assembly name of the module will automatically add assembly to the ApplicationParts of MVC application.
+            builder.Environment.ApplicationName = assemblyName!;
+        }
+        builder.Host.UseAutofac();
+        await builder.AddApplicationAsync<TModule>(optionsAction);
+        var app = builder.Build();
+        await app.InitializeApplicationAsync();
+        await app.RunAsync();
+    }
+}

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/App/Program.cs

@@ -0,0 +1,11 @@
+using Microsoft.AspNetCore.Builder;
+using Volo.Abp.AspNetCore;
+using Volo.Abp.AspNetCore.App;
+using Volo.Abp.AspNetCore.TestBase;
+
+var builder = WebApplication.CreateBuilder();
+await builder.RunAbpModuleAsync<AppModule>();
+
+public partial class Program
+{
+}

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancyTestBase.cs

@@ -1,7 +1,7 @@
 
 namespace Volo.Abp.AspNetCore.MultiTenancy;
 
-public abstract class AspNetCoreMultiTenancyTestBase : AbpAspNetCoreTestBase<App.Startup>
+public abstract class AspNetCoreMultiTenancyTestBase : AbpAspNetCoreTestBase<Program>
 {
 
 }

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs

@@ -24,23 +24,22 @@ public AspNetCoreMultiTenancy_WithDomainResolver_Tests()
         _options = ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreMultiTenancyOptions>>().Value;
     }
 
-    protected override IHostBuilder CreateHostBuilder()
+    protected override void ConfigureServices(IServiceCollection services)
     {
-        return base.CreateHostBuilder().ConfigureServices(services =>
+        services.Configure<AbpDefaultTenantStoreOptions>(options =>
         {
-            services.Configure<AbpDefaultTenantStoreOptions>(options =>
+            options.Tenants = new[]
             {
-                options.Tenants = new[]
-                {
-                        new TenantConfiguration(_testTenantId, _testTenantName)
-                };
-            });
+                new TenantConfiguration(_testTenantId, _testTenantName)
+            };
+        });
 
-            services.Configure<AbpTenantResolveOptions>(options =>
-            {
-                options.AddDomainTenantResolver("{0}.abp.io:8080");
-            });
+        services.Configure<AbpTenantResolveOptions>(options =>
+        {
+            options.AddDomainTenantResolver("{0}.abp.io:8080");
         });
+
+        base.ConfigureServices(services);
     }
 
     [Fact]

framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs

@@ -25,18 +25,17 @@ public AspNetCoreMultiTenancy_Without_DomainResolver_Tests()
         _options = ServiceProvider.GetRequiredService<IOptions<AbpAspNetCoreMultiTenancyOptions>>().Value;
     }
 
-    protected override IHostBuilder CreateHostBuilder()
+    protected override void ConfigureServices(IServiceCollection services)
     {
-        return base.CreateHostBuilder().ConfigureServices(services =>
+        services.Configure<AbpDefaultTenantStoreOptions>(options =>
         {
-            services.Configure<AbpDefaultTenantStoreOptions>(options =>
+            options.Tenants = new[]
             {
-                options.Tenants = new[]
-                {
-                        new TenantConfiguration(_testTenantId, _testTenantName)
-                };
-            });
+                new TenantConfiguration(_testTenantId, _testTenantName)
+            };
         });
+
+        base.ConfigureServices(services);
     }
 
     [Fact]

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/AspNetCoreMvcTestBase.cs

@@ -1,41 +1,6 @@
-using System.IO;
-using System.Linq;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-
 namespace Volo.Abp.AspNetCore.Mvc;
 
-public abstract class AspNetCoreMvcTestBase : AbpAspNetCoreTestBase<Startup>
+public abstract class AspNetCoreMvcTestBase : AbpAspNetCoreTestBase<Program>
 {
-    protected override IHostBuilder CreateHostBuilder()
-    {
-        var contentRootPath = CalculateContentRootPath(
-            "Volo.Abp.AspNetCore.Mvc.Tests.csproj",
-            string.Format(
-                "Volo{0}Abp{0}AspNetCore{0}App",
-                Path.DirectorySeparatorChar
-            )
-        );
-
-        return base.CreateHostBuilder()
-            .UseContentRoot(contentRootPath);
-    }
-
-    private static string CalculateContentRootPath(string projectFileName, string contentPath)
-    {
-        var currentDirectory = Directory.GetCurrentDirectory();
-        while (!ContainsFile(currentDirectory, projectFileName))
-        {
-            currentDirectory = new DirectoryInfo(currentDirectory).Parent.FullName;
-        }
-
-        return Path.Combine(currentDirectory, contentPath);
-    }
 
-    private static bool ContainsFile(string currentDirectory, string projectFileName)
-    {
-        return Directory
-            .GetFiles(currentDirectory, "*.*", SearchOption.TopDirectoryOnly)
-            .Any(f => Path.GetFileName(f) == projectFileName);
-    }
 }

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditIntegrationServiceTestController_Tests.cs

@@ -22,12 +22,12 @@
         _auditingStore = ServiceProvider.GetRequiredService<IAuditingStore>();
     }
 
-    protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+    protected override void ConfigureServices(IServiceCollection services)
     {
         _auditingStore = Substitute.For<IAuditingStore>();
         services.Replace(ServiceDescriptor.Singleton(_auditingStore));
-        base.ConfigureServices(context, services);
+        base.ConfigureServices(services);
     }
 
     [Fact]
     public async Task Should_Write_Audit_Log_For_Controllers_With_IntegrationService_Attribute_If_IsEnabledForIntegrationServices()
@@ -55,4 +55,4 @@
         await GetResponseAsync("/integration-api/audit-test/");
         await _auditingStore.DidNotReceive().SaveAsync(Arg.Any<AuditLogInfo>());
     }
-}
+}

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs

@@ -23,11 +23,11 @@ public AuditTestController_Tests()
         _auditingStore = ServiceProvider.GetRequiredService<IAuditingStore>();
     }
 
-    protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+    protected override void ConfigureServices(IServiceCollection services)
     {
         _auditingStore = Substitute.For<IAuditingStore>();
         services.Replace(ServiceDescriptor.Singleton(_auditingStore));
-        base.ConfigureServices(context, services);
+        base.ConfigureServices(services);
     }
 
     [Fact]

framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestPage_Tests.cs

@@ -22,11 +22,11 @@
         _auditingStore = ServiceProvider.GetRequiredService<IAuditingStore>();
     }
 
-    protected override void ConfigureServices(HostBuilderContext context, IServiceCollection services)
+    protected override void ConfigureServices(IServiceCollection services)
     {
         _auditingStore = Substitute.For<IAuditingStore>();
         services.Replace(ServiceDescriptor.Singleton(_auditingStore));
-        base.ConfigureServices(context, services);
+        base.ConfigureServices(services);
     }
 
     [Fact]