From 29005af5eac173e3b0f8ee30b55529b84acf1faf Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 29 Aug 2023 14:51:46 +0800 Subject: [PATCH] `Obsolete` the `AbpAspNetCoreAsyncIntegratedTestBase` and `AbpAspNetCoreIntegratedTestBase ` --- .../AbpAspNetCoreAsyncIntegratedTestBase.cs | 1 + .../TestBase/AbpAspNetCoreIntegratedTestBase.cs | 3 ++- ...s => AbpWebApplicationFactoryIntegratedTest.cs} | 14 +++++++------- .../Mvc/UI/AbpAspNetCoreMvcUiTestBase.cs | 6 ++---- .../Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs | 2 +- .../MyProjectNameWebTestBase.cs | 3 ++- 6 files changed, 15 insertions(+), 14 deletions(-) rename framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/{AbpAspNetCoreWebApplicationFactoryIntegratedTestBase.cs => AbpWebApplicationFactoryIntegratedTest.cs} (83%) diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs index 8892623364..e6c49d475c 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreAsyncIntegratedTestBase.cs +++ b/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 where TModule : IAbpModule { diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs index c362d5074c..731b21ea03 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs +++ b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs @@ -14,6 +14,7 @@ namespace Volo.Abp.AspNetCore.TestBase; /// /// Can be a module type or old-style ASP.NET Core Startup class. /// +[Obsolete("Use AbpWebApplicationFactoryIntegratedTest instead.")] public abstract class AbpAspNetCoreIntegratedTestBase : AbpTestBaseWithServiceProvider, IDisposable where TStartupModule : class { @@ -51,7 +52,7 @@ public abstract class AbpAspNetCoreIntegratedTestBase : AbpTestB { webBuilder.UseStartup(); } - + webBuilder.UseAbpTestServer(); }) .UseAutofac() diff --git a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreWebApplicationFactoryIntegratedTestBase.cs b/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpWebApplicationFactoryIntegratedTest.cs similarity index 83% rename from framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreWebApplicationFactoryIntegratedTestBase.cs rename to framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpWebApplicationFactoryIntegratedTest.cs index 11d27221df..c7b5f48ebe 100644 --- a/framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreWebApplicationFactoryIntegratedTestBase.cs +++ b/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 : WebApplicationFactory +public abstract class AbpWebApplicationFactoryIntegratedTest : WebApplicationFactory 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() + protected virtual T? GetService() { - return ServiceProvider!.GetService(); + return Services.GetService(); } - public virtual T GetRequiredService() where T : notnull + protected virtual T GetRequiredService() where T : notnull { - return ServiceProvider!.GetRequiredService(); + return Services.GetRequiredService(); } protected virtual void ConfigureServices(IServiceCollection services) diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestBase.cs index d6f6402eca..43167ce47d 100644 --- a/framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo/Abp/AspNetCore/Mvc/UI/AbpAspNetCoreMvcUiTestBase.cs +++ b/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 +public abstract class AbpAspNetCoreMvcUiTestBase : AbpAspNetCoreTestBase { } diff --git a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs index 29a157a3f5..f78f27f141 100644 --- a/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs +++ b/framework/test/Volo.Abp.AspNetCore.Tests/Volo/Abp/AspNetCore/AbpAspNetCoreTestBase.cs @@ -13,7 +13,7 @@ public class AbpAspNetCoreTestBase : AbpAspNetCoreTestBase { } -public abstract class AbpAspNetCoreTestBase : AbpAspNetCoreWebApplicationFactoryIntegratedTestBase +public abstract class AbpAspNetCoreTestBase : AbpWebApplicationFactoryIntegratedTest where TProgram : class { protected virtual async Task GetResponseAsObjectAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK) diff --git a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs b/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs index 139ef8d69e..f6c290ef6d 100644 --- a/templates/app/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests/MyProjectNameWebTestBase.cs +++ b/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 +public abstract class MyProjectNameWebTestBase : AbpWebApplicationFactoryIntegratedTest { protected virtual async Task GetResponseAsObjectAsync(string url, HttpStatusCode expectedStatusCode = HttpStatusCode.OK) {