huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "[Fixes #7635] Provide a way to configure clients in WebApplicationFactory" 

This reverts commit 1e26571ba6.
This commit is contained in:
Javier Calvarro Nelson 2018-04-13 16:50:38 -07:00
parent 1e26571ba6
commit 86a036cf76
1 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
View File

@ -95,7 +95,6 @@ namespace Microsoft.AspNetCore.Mvc.Testing
CreateServer, CreateServer,
CreateWebHostBuilder, CreateWebHostBuilder,
GetTestAssemblies, GetTestAssemblies,
CreateDefaultClient,
builder => builder =>
{ {
_configuration(builder); _configuration(builder);
@ -301,11 +300,20 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the /// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the
/// <see cref="HttpClient"/>.</param> /// <see cref="HttpClient"/>.</param>
/// <returns>The <see cref="HttpClient"/>.</returns> /// <returns>The <see cref="HttpClient"/>.</returns>
public virtual HttpClient CreateDefaultClient(params DelegatingHandler[] handlers) public HttpClient CreateDefaultClient(params DelegatingHandler[] handlers) =>
CreateDefaultClient(new Uri("http://localhost"), handlers);
/// <summary>
/// Creates a new instance of an <see cref="HttpClient"/> that can be used to
/// send <see cref="HttpRequestMessage"/> to the server.
/// </summary>
/// <param name="baseAddress">The base address of the <see cref="HttpClient"/> instance.</param>
/// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the
/// <see cref="HttpClient"/>.</param>
/// <returns>The <see cref="HttpClient"/>.</returns>
public HttpClient CreateDefaultClient(Uri baseAddress, params DelegatingHandler[] handlers)
{ {
EnsureServer(); EnsureServer();
var baseAddress = new Uri("http://localhost");
if (handlers == null || handlers.Length == 0) if (handlers == null || handlers.Length == 0)
{ {
var client = _server.CreateClient(); var client = _server.CreateClient();
@ -334,22 +342,6 @@ namespace Microsoft.AspNetCore.Mvc.Testing
} }
} }
/// <summary>
/// Creates a new instance of an <see cref="HttpClient"/> that can be used to
/// send <see cref="HttpRequestMessage"/> to the server.
/// </summary>
/// <param name="baseAddress">The base address of the <see cref="HttpClient"/> instance.</param>
/// <param name="handlers">A list of <see cref="DelegatingHandler"/> instances to set up on the
/// <see cref="HttpClient"/>.</param>
/// <returns>The <see cref="HttpClient"/>.</returns>
public HttpClient CreateDefaultClient(Uri baseAddress, params DelegatingHandler[] handlers)
{
var client = CreateDefaultClient(handlers);
client.BaseAddress = baseAddress;
return client;
}
/// <inheritdoc /> /// <inheritdoc />
public void Dispose() public void Dispose()
{ {
@ -394,21 +386,18 @@ namespace Microsoft.AspNetCore.Mvc.Testing
private readonly Func<IWebHostBuilder, TestServer> _createServer; private readonly Func<IWebHostBuilder, TestServer> _createServer;
private readonly Func<IWebHostBuilder> _createWebHostBuilder; private readonly Func<IWebHostBuilder> _createWebHostBuilder;
private readonly Func<IEnumerable<Assembly>> _getTestAssemblies; private readonly Func<IEnumerable<Assembly>> _getTestAssemblies;
private readonly Func<DelegatingHandler[], HttpClient> _createDefaultClient;
public DelegatedWebApplicationFactory( public DelegatedWebApplicationFactory(
WebApplicationFactoryClientOptions options, WebApplicationFactoryClientOptions options,
Func<IWebHostBuilder, TestServer> createServer, Func<IWebHostBuilder, TestServer> createServer,
Func<IWebHostBuilder> createWebHostBuilder, Func<IWebHostBuilder> createWebHostBuilder,
Func<IEnumerable<Assembly>> getTestAssemblies, Func<IEnumerable<Assembly>> getTestAssemblies,
Func<DelegatingHandler[], HttpClient> createClient,
Action<IWebHostBuilder> configureWebHost) Action<IWebHostBuilder> configureWebHost)
{ {
ClientOptions = new WebApplicationFactoryClientOptions(options); ClientOptions = new WebApplicationFactoryClientOptions(options);
_createServer = createServer; _createServer = createServer;
_createWebHostBuilder = createWebHostBuilder; _createWebHostBuilder = createWebHostBuilder;
_getTestAssemblies = getTestAssemblies; _getTestAssemblies = getTestAssemblies;
_createDefaultClient = createClient;
_configuration = configureWebHost; _configuration = configureWebHost;
} }
@ -419,8 +408,6 @@ namespace Microsoft.AspNetCore.Mvc.Testing
protected override IEnumerable<Assembly> GetTestAssemblies() => _getTestAssemblies(); protected override IEnumerable<Assembly> GetTestAssemblies() => _getTestAssemblies();
protected override void ConfigureWebHost(IWebHostBuilder builder) => _configuration(builder); protected override void ConfigureWebHost(IWebHostBuilder builder) => _configuration(builder);
public override HttpClient CreateDefaultClient(params DelegatingHandler[] handlers) => _createDefaultClient(handlers);
} }
} }
} }