started refactoring request builder

This commit is contained in:
TomPallister
2016-10-30 18:35:05 +00:00
parent 56bf4014bd
commit 5fc04a0514
13 changed files with 248 additions and 134 deletions

View File

@ -10,12 +10,12 @@ namespace Ocelot.UnitTests.Headers
public class RemoveHeaders
{
private HttpResponseHeaders _headers;
private readonly Ocelot.Headers.RemoveHeaders _removeHeaders;
private readonly Ocelot.Headers.RemoveOutputHeaders _removeOutputHeaders;
private Response _result;
public RemoveHeaders()
{
_removeHeaders = new Ocelot.Headers.RemoveHeaders();
_removeOutputHeaders = new Ocelot.Headers.RemoveOutputHeaders();
}
[Fact]
@ -39,7 +39,7 @@ namespace Ocelot.UnitTests.Headers
private void WhenIRemoveTheHeaders()
{
_result = _removeHeaders.Remove(_headers);
_result = _removeOutputHeaders.Remove(_headers);
}
private void TheHeaderIsNoLongerInTheContext()

View File

@ -22,7 +22,7 @@ namespace Ocelot.UnitTests.Request
{
public class HttpRequestBuilderMiddlewareTests : IDisposable
{
private readonly Mock<IRequestBuilder> _requestBuilder;
private readonly Mock<IRequestCreator> _requestBuilder;
private readonly Mock<IRequestScopedDataRepository> _scopedRepository;
private readonly string _url;
private readonly TestServer _server;
@ -35,7 +35,7 @@ namespace Ocelot.UnitTests.Request
public HttpRequestBuilderMiddlewareTests()
{
_url = "http://localhost:51879";
_requestBuilder = new Mock<IRequestBuilder>();
_requestBuilder = new Mock<IRequestCreator>();
_scopedRepository = new Mock<IRequestScopedDataRepository>();
var builder = new WebHostBuilder()

View File

@ -22,14 +22,14 @@ namespace Ocelot.UnitTests.Request
private IRequestCookieCollection _cookies;
private QueryString _query;
private string _contentType;
private readonly IRequestBuilder _requestBuilder;
private readonly IRequestCreator _requestCreator;
private Response<Ocelot.Request.Request> _result;
private Ocelot.RequestId.RequestId _requestId;
public RequestBuilderTests()
{
_content = new StringContent(string.Empty);
_requestBuilder = new HttpRequestBuilder();
_requestCreator = new HttpRequestCreator();
}
[Fact]
@ -280,7 +280,7 @@ namespace Ocelot.UnitTests.Request
private void WhenICreateARequest()
{
_result = _requestBuilder.Build(_httpMethod, _downstreamUrl, _content?.ReadAsStreamAsync().Result, _headers,
_result = _requestCreator.Build(_httpMethod, _downstreamUrl, _content?.ReadAsStreamAsync().Result, _headers,
_cookies, _query, _contentType, _requestId).Result;
}