From bc1ba53f214252630036198a2102eca9940fa705 Mon Sep 17 00:00:00 2001 From: Tom Gardham-Pallister Date: Thu, 9 Nov 2017 08:19:36 +0000 Subject: [PATCH] unit tests passing again --- .../LoadBalancerMiddlewareTests.cs | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs index 6ef4029b..987b75ea 100644 --- a/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs +++ b/test/Ocelot.UnitTests/LoadBalancer/LoadBalancerMiddlewareTests.cs @@ -7,6 +7,7 @@ namespace Ocelot.UnitTests.LoadBalancer using Moq; using Ocelot.Configuration; using Ocelot.Configuration.Builder; + using Ocelot.Configuration.Provider; using Ocelot.DownstreamRouteFinder; using Ocelot.Errors; using Ocelot.LoadBalancer.LoadBalancers; @@ -22,18 +23,20 @@ namespace Ocelot.UnitTests.LoadBalancer { private readonly Mock _loadBalancerHouse; private readonly Mock _loadBalancer; + private readonly Mock _configProvider; private HostAndPort _hostAndPort; private OkResponse _downstreamRoute; private ErrorResponse _getLoadBalancerHouseError; private ErrorResponse _getHostAndPortError; private HttpRequestMessage _downstreamRequest; + private ServiceProviderConfiguration _config; public LoadBalancerMiddlewareTests() { + _configProvider = new Mock(); _loadBalancerHouse = new Mock(); _loadBalancer = new Mock(); _loadBalancerHouse = new Mock(); - _downstreamRequest = new HttpRequestMessage(HttpMethod.Get, ""); ScopedRepository @@ -51,7 +54,11 @@ namespace Ocelot.UnitTests.LoadBalancer .WithUpstreamHttpMethod(new List { "Get" }) .Build()); + var serviceProviderConfig = new ServiceProviderConfigurationBuilder() + .Build(); + this.Given(x => x.GivenTheDownStreamUrlIs("http://my.url/abc?q=123")) + .And(x => GivenTheConfigurationIs(serviceProviderConfig)) .And(x => x.GivenTheDownStreamRouteIs(downstreamRoute)) .And(x => x.GivenTheLoadBalancerHouseReturns()) .And(x => x.GivenTheLoadBalancerReturns()) @@ -68,7 +75,11 @@ namespace Ocelot.UnitTests.LoadBalancer .WithUpstreamHttpMethod(new List { "Get" }) .Build()); + var serviceProviderConfig = new ServiceProviderConfigurationBuilder() + .Build(); + this.Given(x => x.GivenTheDownStreamUrlIs("http://my.url/abc?q=123")) + .And(x => GivenTheConfigurationIs(serviceProviderConfig)) .And(x => x.GivenTheDownStreamRouteIs(downstreamRoute)) .And(x => x.GivenTheLoadBalancerHouseReturnsAnError()) .When(x => x.WhenICallTheMiddleware()) @@ -83,8 +94,12 @@ namespace Ocelot.UnitTests.LoadBalancer new ReRouteBuilder() .WithUpstreamHttpMethod(new List { "Get" }) .Build()); + + var serviceProviderConfig = new ServiceProviderConfigurationBuilder() + .Build(); this.Given(x => x.GivenTheDownStreamUrlIs("http://my.url/abc?q=123")) + .And(x => GivenTheConfigurationIs(serviceProviderConfig)) .And(x => x.GivenTheDownStreamRouteIs(downstreamRoute)) .And(x => x.GivenTheLoadBalancerHouseReturns()) .And(x => x.GivenTheLoadBalancerReturnsAnError()) @@ -93,11 +108,19 @@ namespace Ocelot.UnitTests.LoadBalancer .BDDfy(); } + private void GivenTheConfigurationIs(ServiceProviderConfiguration config) + { + _config = config; + _configProvider + .Setup(x => x.Get()).ReturnsAsync(new OkResponse(new OcelotConfiguration(null, null, _config))); + } + protected override void GivenTheTestServerServicesAreConfigured(IServiceCollection services) { services.AddSingleton(); services.AddLogging(); services.AddSingleton(_loadBalancerHouse.Object); + services.AddSingleton(_configProvider.Object); services.AddSingleton(ScopedRepository.Object); }