Browse Source

Merge pull request #5862 from pwestern/issue/5860

Dispose IHost in AbpAspNetCoreIntegratedTestBase at end of test run
pull/5887/head
Halil İbrahim Kalkan 6 years ago
committed by GitHub
parent
commit
76f664e5be
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      framework/src/Volo.Abp.AspNetCore.TestBase/Volo/Abp/AspNetCore/TestBase/AbpAspNetCoreIntegratedTestBase.cs

20
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.Linq;
using System.Net.Http; using System.Net.Http;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Routing; using Microsoft.AspNetCore.Routing;
using Microsoft.AspNetCore.TestHost; using Microsoft.AspNetCore.TestHost;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -11,7 +10,7 @@ using Microsoft.Extensions.Hosting;
namespace Volo.Abp.AspNetCore.TestBase namespace Volo.Abp.AspNetCore.TestBase
{ {
public abstract class AbpAspNetCoreIntegratedTestBase<TStartup> : AbpTestBaseWithServiceProvider public abstract class AbpAspNetCoreIntegratedTestBase<TStartup> : AbpTestBaseWithServiceProvider, IDisposable
where TStartup : class where TStartup : class
{ {
protected TestServer Server { get; } protected TestServer Server { get; }
@ -20,15 +19,17 @@ namespace Volo.Abp.AspNetCore.TestBase
protected override IServiceProvider ServiceProvider { get; } protected override IServiceProvider ServiceProvider { get; }
private readonly IHost _host;
protected AbpAspNetCoreIntegratedTestBase() protected AbpAspNetCoreIntegratedTestBase()
{ {
var builder = CreateHostBuilder(); var builder = CreateHostBuilder();
var host = builder.Build(); _host = builder.Build();
host.Start(); _host.Start();
Server = host.GetTestServer(); Server = _host.GetTestServer();
Client = host.GetTestClient(); Client = _host.GetTestClient();
ServiceProvider = Server.Services; ServiceProvider = Server.Services;
@ -49,7 +50,7 @@ namespace Volo.Abp.AspNetCore.TestBase
protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services) protected virtual void ConfigureServices(HostBuilderContext context, IServiceCollection services)
{ {
} }
#region GetUrl #region GetUrl
@ -90,5 +91,10 @@ namespace Volo.Abp.AspNetCore.TestBase
} }
#endregion #endregion
public void Dispose()
{
_host?.Dispose();
}
} }
} }

Loading…
Cancel
Save