From 9c42a719994be7656b07ab63f0347e23cef251ef Mon Sep 17 00:00:00 2001 From: Peter Western Date: Mon, 19 Oct 2020 16:41:16 +0100 Subject: [PATCH] [5860] Dispose IHost in AbpAspNetCoreIntegratedTestBase at end of test run --- .../AbpAspNetCoreIntegratedTestBase.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) 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 d1881b0cbd..a3ed8798d3 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 @@ -3,7 +3,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Http; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,7 @@ using Microsoft.Extensions.Hosting; namespace Volo.Abp.AspNetCore.TestBase { - public abstract class AbpAspNetCoreIntegratedTestBase : AbpTestBaseWithServiceProvider + public abstract class AbpAspNetCoreIntegratedTestBase : AbpTestBaseWithServiceProvider, IDisposable where TStartup : class { protected TestServer Server { get; } @@ -20,15 +19,17 @@ namespace Volo.Abp.AspNetCore.TestBase protected override IServiceProvider ServiceProvider { get; } + private readonly IHost _host; + protected AbpAspNetCoreIntegratedTestBase() { var builder = CreateHostBuilder(); - var host = builder.Build(); - host.Start(); + _host = builder.Build(); + _host.Start(); - Server = host.GetTestServer(); - Client = host.GetTestClient(); + Server = _host.GetTestServer(); + Client = _host.GetTestClient(); ServiceProvider = Server.Services; @@ -49,7 +50,7 @@ namespace Volo.Abp.AspNetCore.TestBase protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services) { - + } #region GetUrl @@ -90,5 +91,10 @@ namespace Volo.Abp.AspNetCore.TestBase } #endregion + + public void Dispose() + { + _host?.Dispose(); + } } }