From d02e921a58c90545fed6e85b42069b3e09d5b710 Mon Sep 17 00:00:00 2001 From: Philip Wood Date: Tue, 18 Jul 2017 10:53:57 +0100 Subject: [PATCH] Moved ScopedRepository into test base class. --- .../AuthenticationMiddlewareTests.cs | 7 +-- .../AuthorisationMiddlewareTests.cs | 7 +-- .../Cache/OutputCacheMiddlewareTests.cs | 15 +++--- .../Claims/ClaimsBuilderMiddlewareTests.cs | 7 +-- .../DownstreamRouteFinderMiddlewareTests.cs | 7 +-- .../DownstreamUrlCreatorMiddlewareTests.cs | 8 ++- ...ttpRequestHeadersBuilderMiddlewareTests.cs | 9 ++-- .../LoadBalancerMiddlewareTests.cs | 22 ++++---- .../QueryStringBuilderMiddlewareTests.cs | 9 ++-- .../ClientRateLimitMiddlewareTests.cs | 51 ++++++++---------- .../RequestId/RequestIdMiddlewareTests.cs | 9 ++-- .../Requester/HttpRequesterMiddlewareTests.cs | 11 ++-- .../Responder/ResponderMiddlewareTests.cs | 54 +++++++++---------- ...eTest.cs => ServerHostedMiddlewareTest.cs} | 4 ++ 14 files changed, 91 insertions(+), 129 deletions(-) rename test/Ocelot.UnitTests/{HostedMiddlewareTest.cs => ServerHostedMiddlewareTest.cs} (89%) diff --git a/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs b/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs index be52e909..819c48d7 100644 --- a/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Authentication/AuthenticationMiddlewareTests.cs @@ -11,7 +11,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using Shouldly; @@ -20,13 +19,11 @@ public class AuthenticationMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly Mock _authFactory; private OkResponse _downstreamRoute; public AuthenticationMiddlewareTests() { - _scopedRepository = new Mock(); _authFactory = new Mock(); GivenTheTestServerIsConfigured(); @@ -49,7 +46,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_authFactory.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -71,7 +68,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/Authorization/AuthorisationMiddlewareTests.cs b/test/Ocelot.UnitTests/Authorization/AuthorisationMiddlewareTests.cs index 508db7ce..ca346974 100644 --- a/test/Ocelot.UnitTests/Authorization/AuthorisationMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Authorization/AuthorisationMiddlewareTests.cs @@ -10,7 +10,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using TestStack.BDDfy; @@ -18,14 +17,12 @@ public class AuthorisationMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly Mock _authService; private readonly Mock _authScopesService; private OkResponse _downstreamRoute; public AuthorisationMiddlewareTests() { - _scopedRepository = new Mock(); _authService = new Mock(); _authScopesService = new Mock(); @@ -52,7 +49,7 @@ services.AddLogging(); services.AddSingleton(_authService.Object); services.AddSingleton(_authScopesService.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -63,7 +60,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/Cache/OutputCacheMiddlewareTests.cs b/test/Ocelot.UnitTests/Cache/OutputCacheMiddlewareTests.cs index faade351..11c15d8d 100644 --- a/test/Ocelot.UnitTests/Cache/OutputCacheMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Cache/OutputCacheMiddlewareTests.cs @@ -12,7 +12,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using TestStack.BDDfy; @@ -21,15 +20,13 @@ public class OutputCacheMiddlewareTests : ServerHostedMiddlewareTest { private readonly Mock> _cacheManager; - private readonly Mock _scopedRepo; private HttpResponseMessage _response; public OutputCacheMiddlewareTests() { _cacheManager = new Mock>(); - _scopedRepo = new Mock(); - _scopedRepo + ScopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(new HttpRequestMessage(HttpMethod.Get, "https://some.url/blah?abcd=123"))); @@ -64,7 +61,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_cacheManager.Object); - services.AddSingleton(_scopedRepo.Object); + services.AddSingleton(ScopedRepository.Object); services.AddSingleton(); } @@ -83,7 +80,7 @@ private void GivenResponseIsNotCached() { - _scopedRepo + ScopedRepository .Setup(x => x.Get("HttpResponseMessage")) .Returns(new OkResponse(new HttpResponseMessage())); } @@ -98,21 +95,21 @@ var downstreamRoute = new DownstreamRoute(new List(), reRoute); - _scopedRepo + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(new OkResponse(downstreamRoute)); } private void GivenThereAreNoErrors() { - _scopedRepo + ScopedRepository .Setup(x => x.Get("OcelotMiddlewareError")) .Returns(new OkResponse(false)); } private void GivenThereIsADownstreamUrl() { - _scopedRepo + ScopedRepository .Setup(x => x.Get("DownstreamUrl")) .Returns(new OkResponse("anything")); } diff --git a/test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs index 8ac75ef4..3eb86d1e 100644 --- a/test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Claims/ClaimsBuilderMiddlewareTests.cs @@ -11,7 +11,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using TestStack.BDDfy; @@ -19,13 +18,11 @@ public class ClaimsBuilderMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly Mock _addHeaders; private Response _downstreamRoute; public ClaimsBuilderMiddlewareTests() { - _scopedRepository = new Mock(); _addHeaders = new Mock(); GivenTheTestServerIsConfigured(); @@ -56,7 +53,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_addHeaders.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -67,7 +64,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs index 367b9559..fb312e21 100644 --- a/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs @@ -9,7 +9,6 @@ using Ocelot.DownstreamRouteFinder.Finder; using Ocelot.DownstreamRouteFinder.Middleware; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using TestStack.BDDfy; @@ -18,13 +17,11 @@ public class DownstreamRouteFinderMiddlewareTests : ServerHostedMiddlewareTest { private readonly Mock _downstreamRouteFinder; - private readonly Mock _scopedRepository; private Response _downstreamRoute; public DownstreamRouteFinderMiddlewareTests() { _downstreamRouteFinder = new Mock(); - _scopedRepository = new Mock(); GivenTheTestServerIsConfigured(); } @@ -49,7 +46,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_downstreamRouteFinder.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -67,7 +64,7 @@ private void ThenTheScopedDataRepositoryIsCalledCorrectly() { - _scopedRepository + ScopedRepository .Verify(x => x.Add("DownstreamRoute", _downstreamRoute.Data), Times.Once()); } } diff --git a/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs b/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs index a538a9f8..1af70f71 100644 --- a/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/DownstreamUrlCreator/DownstreamUrlCreatorMiddlewareTests.cs @@ -23,7 +23,6 @@ public class DownstreamUrlCreatorMiddlewareTests : ServerHostedMiddlewareTest { private readonly Mock _downstreamUrlTemplateVariableReplacer; - private readonly Mock _scopedRepository; private readonly Mock _urlBuilder; private Response _downstreamRoute; private OkResponse _downstreamPath; @@ -32,12 +31,11 @@ public DownstreamUrlCreatorMiddlewareTests() { _downstreamUrlTemplateVariableReplacer = new Mock(); - _scopedRepository = new Mock(); _urlBuilder = new Mock(); _downstreamRequest = new HttpRequestMessage(HttpMethod.Get, "https://my.url/abc/?q=123"); - _scopedRepository + ScopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); @@ -67,7 +65,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_downstreamUrlTemplateVariableReplacer.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); services.AddSingleton(_urlBuilder.Object); } @@ -79,7 +77,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs index 26a4e541..76a75d0a 100644 --- a/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Headers/HttpRequestHeadersBuilderMiddlewareTests.cs @@ -11,7 +11,6 @@ using Ocelot.DownstreamRouteFinder.UrlMatcher; using Ocelot.Headers; using Ocelot.Headers.Middleware; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Responses; using TestStack.BDDfy; @@ -19,18 +18,16 @@ public class HttpRequestHeadersBuilderMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly Mock _addHeaders; private readonly HttpRequestMessage _downstreamRequest; private Response _downstreamRoute; public HttpRequestHeadersBuilderMiddlewareTests() { - _scopedRepository = new Mock(); _addHeaders = new Mock(); _downstreamRequest = new HttpRequestMessage(); - _scopedRepository + ScopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); @@ -62,7 +59,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_addHeaders.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -73,7 +70,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs index 6672a820..e483f31c 100644 --- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs @@ -8,7 +8,6 @@ namespace Ocelot.UnitTests.LoadBalancer using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.Errors; - using Ocelot.Infrastructure.RequestData; using Ocelot.LoadBalancer.LoadBalancers; using Ocelot.LoadBalancer.Middleware; using Ocelot.Logging; @@ -21,7 +20,6 @@ namespace Ocelot.UnitTests.LoadBalancer public class LoadBalancerMiddlewareTests : ServerHostedMiddlewareTest { private readonly Mock _loadBalancerHouse; - private readonly Mock _scopedRepository; private readonly Mock _loadBalancer; private HostAndPort _hostAndPort; private OkResponse _downstreamRoute; @@ -32,12 +30,12 @@ namespace Ocelot.UnitTests.LoadBalancer public LoadBalancerMiddlewareTests() { _loadBalancerHouse = new Mock(); - _scopedRepository = new Mock(); _loadBalancer = new Mock(); _loadBalancerHouse = new Mock(); _downstreamRequest = new HttpRequestMessage(HttpMethod.Get, ""); - _scopedRepository + + ScopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); @@ -99,7 +97,7 @@ namespace Ocelot.UnitTests.LoadBalancer services.AddSingleton(); services.AddLogging(); services.AddSingleton(_loadBalancerHouse.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -131,7 +129,7 @@ namespace Ocelot.UnitTests.LoadBalancer private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } @@ -157,28 +155,28 @@ namespace Ocelot.UnitTests.LoadBalancer private void ThenAnErrorStatingLoadBalancerCouldNotBeFoundIsSetOnPipeline() { - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareError", true), Times.Once); - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareErrors", _getLoadBalancerHouseError.Errors), Times.Once); } private void ThenAnErrorSayingReleaseFailedIsSetOnThePipeline() { - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareError", true), Times.Once); - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareErrors", It.IsAny>()), Times.Once); } private void ThenAnErrorStatingHostAndPortCouldNotBeFoundIsSetOnPipeline() { - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareError", true), Times.Once); - _scopedRepository + ScopedRepository .Verify(x => x.Add("OcelotMiddlewareErrors", _getHostAndPortError.Errors), Times.Once); } diff --git a/test/Ocelot.UnitTests/QueryStrings/QueryStringBuilderMiddlewareTests.cs b/test/Ocelot.UnitTests/QueryStrings/QueryStringBuilderMiddlewareTests.cs index 5897cd85..4bbcfd2c 100644 --- a/test/Ocelot.UnitTests/QueryStrings/QueryStringBuilderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/QueryStrings/QueryStringBuilderMiddlewareTests.cs @@ -8,7 +8,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.QueryStrings; using Ocelot.QueryStrings.Middleware; @@ -20,18 +19,16 @@ public class QueryStringBuilderMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly Mock _addQueries; private readonly HttpRequestMessage _downstreamRequest; private Response _downstreamRoute; public QueryStringBuilderMiddlewareTests() { - _scopedRepository = new Mock(); _addQueries = new Mock(); _downstreamRequest = new HttpRequestMessage(); - _scopedRepository.Setup(sr => sr.Get("DownstreamRequest")) + ScopedRepository.Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); GivenTheTestServerIsConfigured(); @@ -62,7 +59,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_addQueries.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -92,7 +89,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/RateLimit/ClientRateLimitMiddlewareTests.cs b/test/Ocelot.UnitTests/RateLimit/ClientRateLimitMiddlewareTests.cs index 9ff9c12c..1b73e233 100644 --- a/test/Ocelot.UnitTests/RateLimit/ClientRateLimitMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/RateLimit/ClientRateLimitMiddlewareTests.cs @@ -1,39 +1,30 @@ -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.TestHost; -using Microsoft.AspNetCore.Http; -using Moq; -using Ocelot.Infrastructure.RequestData; -using Ocelot.RateLimit; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Threading.Tasks; -using Microsoft.Extensions.DependencyInjection; -using Ocelot.Logging; -using System.IO; -using Ocelot.RateLimit.Middleware; -using Ocelot.DownstreamRouteFinder; -using Ocelot.Responses; -using Xunit; -using TestStack.BDDfy; -using Ocelot.Configuration.Builder; -using Shouldly; -using Ocelot.Configuration; - -namespace Ocelot.UnitTests.RateLimit +namespace Ocelot.UnitTests.RateLimit { + using System.Collections.Generic; + using System.Net.Http; + using Microsoft.AspNetCore.Hosting; + using Microsoft.AspNetCore.Builder; + using Microsoft.AspNetCore.Http; + using Microsoft.Extensions.DependencyInjection; + using Moq; + using Ocelot.Configuration; + using Ocelot.Configuration.Builder; + using Ocelot.DownstreamRouteFinder; + using Ocelot.Logging; + using Ocelot.RateLimit; + using Ocelot.RateLimit.Middleware; + using Ocelot.Responses; + using Shouldly; + using TestStack.BDDfy; + using Xunit; + public class ClientRateLimitMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private OkResponse _downstreamRoute; private int responseStatusCode; public ClientRateLimitMiddlewareTests() { - _scopedRepository = new Mock(); - GivenTheTestServerIsConfigured(); } @@ -75,7 +66,7 @@ namespace Ocelot.UnitTests.RateLimit services.AddLogging(); services.AddMemoryCache(); services.AddSingleton(); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -91,7 +82,7 @@ namespace Ocelot.UnitTests.RateLimit private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/RequestId/RequestIdMiddlewareTests.cs b/test/Ocelot.UnitTests/RequestId/RequestIdMiddlewareTests.cs index 6ae91b68..a34290f1 100644 --- a/test/Ocelot.UnitTests/RequestId/RequestIdMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/RequestId/RequestIdMiddlewareTests.cs @@ -12,7 +12,6 @@ using Ocelot.Configuration.Builder; using Ocelot.DownstreamRouteFinder; using Ocelot.DownstreamRouteFinder.UrlMatcher; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.RequestId.Middleware; using Ocelot.Responses; @@ -22,7 +21,6 @@ public class RequestIdMiddlewareTests : ServerHostedMiddlewareTest { - private readonly Mock _scopedRepository; private readonly HttpRequestMessage _downstreamRequest; private Response _downstreamRoute; private string _value; @@ -32,8 +30,7 @@ { _downstreamRequest = new HttpRequestMessage(); - _scopedRepository = new Mock(); - _scopedRepository + ScopedRepository .Setup(sr => sr.Get("DownstreamRequest")) .Returns(new OkResponse(_downstreamRequest)); @@ -79,7 +76,7 @@ { services.AddSingleton(); services.AddLogging(); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -96,7 +93,7 @@ private void GivenTheDownStreamRouteIs(DownstreamRoute downstreamRoute) { _downstreamRoute = new OkResponse(downstreamRoute); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_downstreamRoute); } diff --git a/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs b/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs index 8d227dce..f5570f15 100644 --- a/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Requester/HttpRequesterMiddlewareTests.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Moq; - using Ocelot.Infrastructure.RequestData; using Ocelot.Logging; using Ocelot.Requester; using Ocelot.Requester.Middleware; @@ -16,14 +15,12 @@ public class HttpRequesterMiddlewareTests : ServerHostedMiddlewareTest { private readonly Mock _requester; - private readonly Mock _scopedRepository; private OkResponse _response; private OkResponse _request; public HttpRequesterMiddlewareTests() { _requester = new Mock(); - _scopedRepository = new Mock(); GivenTheTestServerIsConfigured(); } @@ -44,7 +41,7 @@ services.AddSingleton(); services.AddLogging(); services.AddSingleton(_requester.Object); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -55,7 +52,7 @@ private void GivenTheRequestIs(Ocelot.Request.Request request) { _request = new OkResponse(request); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_request); } @@ -70,14 +67,14 @@ private void GivenTheScopedRepoReturns() { - _scopedRepository + ScopedRepository .Setup(x => x.Add(It.IsAny(), _response.Data)) .Returns(new OkResponse()); } private void ThenTheScopedRepoIsCalledCorrectly() { - _scopedRepository + ScopedRepository .Verify(x => x.Add("HttpResponseMessage", _response.Data), Times.Once()); } } diff --git a/test/Ocelot.UnitTests/Responder/ResponderMiddlewareTests.cs b/test/Ocelot.UnitTests/Responder/ResponderMiddlewareTests.cs index 36562abc..5c8a4ad9 100644 --- a/test/Ocelot.UnitTests/Responder/ResponderMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/Responder/ResponderMiddlewareTests.cs @@ -1,29 +1,27 @@ -using System.Net.Http; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.DependencyInjection; -using Moq; -using Ocelot.Infrastructure.RequestData; -using Ocelot.Logging; -using Ocelot.Responder; -using Ocelot.Responder.Middleware; -using Ocelot.Responses; -using TestStack.BDDfy; -using Xunit; -using Microsoft.AspNetCore.Builder; -using Shouldly; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Http; -using System.Collections.Generic; -using Ocelot.Errors; -using System.Net; -using Ocelot.Headers; - -namespace Ocelot.UnitTests.Responder +namespace Ocelot.UnitTests.Responder { + using System.Net.Http; + using System.Threading.Tasks; + using Microsoft.AspNetCore.Builder; + using Microsoft.AspNetCore.Hosting; + using Microsoft.AspNetCore.Http; + using Microsoft.Extensions.DependencyInjection; + using Moq; + using Ocelot.Errors; + using Ocelot.Headers; + using Ocelot.Logging; + using Ocelot.Responder; + using Ocelot.Responder.Middleware; + using Ocelot.Responses; + using Shouldly; + using System.Collections.Generic; + using System.Net; + using TestStack.BDDfy; + using Xunit; + public class ResponderMiddlewareTests : ServerHostedMiddlewareTest { private readonly IHttpResponder _responder; - private readonly Mock _scopedRepository; private readonly Mock _codeMapper; private readonly Mock _outputHeaderRemover; private HttpStatusCode _httpStatusFromController; @@ -35,10 +33,10 @@ namespace Ocelot.UnitTests.Responder public ResponderMiddlewareTests() { _outputHeaderRemover = new Mock(); - _responder = new HttpContextResponder(_outputHeaderRemover.Object); - _scopedRepository = new Mock(); _codeMapper = new Mock(); + _responder = new HttpContextResponder(_outputHeaderRemover.Object); + GivenTheTestServerIsConfigured(); } @@ -71,7 +69,7 @@ namespace Ocelot.UnitTests.Responder services.AddLogging(); services.AddSingleton(_codeMapper.Object); services.AddSingleton(_responder); - services.AddSingleton(_scopedRepository.Object); + services.AddSingleton(ScopedRepository.Object); } protected override void GivenTheTestServerPipelineIsConfigured(IApplicationBuilder app) @@ -102,11 +100,11 @@ namespace Ocelot.UnitTests.Responder { _pipelineErrors = pipelineErrors; - _scopedRepository + ScopedRepository .Setup(x => x.Get("OcelotMiddlewareError")) .Returns(new OkResponse(_pipelineErrors.Count != 0)); - _scopedRepository + ScopedRepository .Setup(sr => sr.Get>("OcelotMiddlewareErrors")) .Returns(new OkResponse>(_pipelineErrors)); } @@ -114,7 +112,7 @@ namespace Ocelot.UnitTests.Responder private void GivenTheIncomingHttpResponseMessageIs(HttpResponseMessage response) { _response = new OkResponse(response); - _scopedRepository + ScopedRepository .Setup(x => x.Get(It.IsAny())) .Returns(_response); } diff --git a/test/Ocelot.UnitTests/HostedMiddlewareTest.cs b/test/Ocelot.UnitTests/ServerHostedMiddlewareTest.cs similarity index 89% rename from test/Ocelot.UnitTests/HostedMiddlewareTest.cs rename to test/Ocelot.UnitTests/ServerHostedMiddlewareTest.cs index 8409588d..29a012b9 100644 --- a/test/Ocelot.UnitTests/HostedMiddlewareTest.cs +++ b/test/Ocelot.UnitTests/ServerHostedMiddlewareTest.cs @@ -7,6 +7,8 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.AspNetCore.Builder; + using Moq; + using Ocelot.Infrastructure.RequestData; public abstract class ServerHostedMiddlewareTest : IDisposable { @@ -14,10 +16,12 @@ protected HttpClient Client { get; private set; } protected string Url { get; private set; } protected HttpResponseMessage ResponseMessage { get; private set; } + protected Mock ScopedRepository { get; private set; } public ServerHostedMiddlewareTest() { Url = "http://localhost:51879"; + ScopedRepository = new Mock(); } protected virtual void GivenTheTestServerIsConfigured()