`Obsolete` the `AbpAspNetCoreAsyncIntegratedTestBase` and `AbpAspNetCoreIntegratedTestBase `

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

@@ -13,6 +13,7 @@ using Volo.Abp.Modularity;
 
 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 @@ public abstract class AbpAspNetCoreIntegratedTestBase<TStartupModule> : AbpTestB
                 {
                     webBuilder.UseStartup<TStartupModule>();
                 }
-                
+
                 webBuilder.UseAbpTestServer();
             })
             .UseAutofac()

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

@@ -9,14 +9,14 @@ using Microsoft.Extensions.Hosting;
 
 namespace Volo.Abp.AspNetCore.TestBase;
 
-public abstract class AbpAspNetCoreWebApplicationFactoryIntegratedTestBase<TProgram> : WebApplicationFactory<TProgram>
+public abstract class AbpWebApplicationFactoryIntegratedTest<TProgram> : WebApplicationFactory<TProgram>
     where TProgram : class
 {
     protected HttpClient Client { get; set; }
 
-    public IServiceProvider ServiceProvider => Services;
+    protected IServiceProvider ServiceProvider => Services;
 
-    protected AbpAspNetCoreWebApplicationFactoryIntegratedTestBase()
+    protected AbpWebApplicationFactoryIntegratedTest()
     {
         Client = CreateClient(new WebApplicationFactoryClientOptions
         {
@@ -31,14 +31,14 @@ public abstract class AbpAspNetCoreWebApplicationFactoryIntegratedTestBase<TProg
         return base.CreateHost(builder);
     }
 
-    public virtual T? GetService<T>()
+    protected virtual T? GetService<T>()
     {
-        return ServiceProvider!.GetService<T>();
+        return Services.GetService<T>();
     }
 
-    public virtual T GetRequiredService<T>() where T : notnull
+    protected virtual T GetRequiredService<T>() where T : notnull
     {
-        return ServiceProvider!.GetRequiredService<T>();
+        return Services.GetRequiredService<T>();
     }
 
     protected virtual void ConfigureServices(IServiceCollection services)

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestBase.cs

@@ -1,8 +1,6 @@
-using Volo.Abp.AspNetCore.TestBase;
+namespace Volo.Abp.AspNetCore.Mvc.UI;
 
-namespace Volo.Abp.AspNetCore.Mvc.UI;
-
-public abstract class AbpAspNetCoreMvcUiTestBase : AbpAspNetCoreIntegratedTestBase<Program>
+public abstract class AbpAspNetCoreMvcUiTestBase : AbpAspNetCoreTestBase<Program>
 {
 
 }

framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs

@@ -13,7 +13,7 @@ public class AbpAspNetCoreTestBase : AbpAspNetCoreTestBase<Program>
 {
 }
 
-public abstract class AbpAspNetCoreTestBase<TProgram> : AbpAspNetCoreWebApplicationFactoryIntegratedTestBase<TProgram>
+public abstract class AbpAspNetCoreTestBase<TProgram> : AbpWebApplicationFactoryIntegratedTest<TProgram>
     where TProgram : class
 {
     protected virtual async Task<T> GetResponseAsObjectAsync<T>(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs

@@ -3,11 +3,12 @@ using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
 using Shouldly;
+using Volo.Abp.AspNetCore;
 using Volo.Abp.AspNetCore.TestBase;
 
 namespace MyCompanyName.MyProjectName;
 
-public abstract class MyProjectNameWebTestBase : AbpAspNetCoreWebApplicationFactoryIntegratedTestBase<Program>
+public abstract class MyProjectNameWebTestBase : AbpWebApplicationFactoryIntegratedTest<Program>
 {
     protected virtual async Task<T?> GetResponseAsObjectAsync<T>(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
     {