Remove Ocelot specific Middleware to make Ocelot more compatible with kestrel middleware and get ready for YARP

This commit is contained in:
Tom Pallister
2020-05-23 15:48:51 +01:00
committed by GitHub
parent 99a15d8668
commit fe3e8bd23a
214 changed files with 9574 additions and 9919 deletions

View File

@ -1,59 +1,59 @@
namespace Ocelot.UnitTests.Eureka
{
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Ocelot.DependencyInjection;
using Ocelot.Middleware;
using Ocelot.Middleware.Pipeline;
using Steeltoe.Discovery.Client;
using Shouldly;
using Steeltoe.Common.Discovery;
using Steeltoe.Discovery.Eureka;
using TestStack.BDDfy;
using Xunit;
//namespace Ocelot.UnitTests.Eureka
//{
// using Microsoft.Extensions.Configuration;
// using Microsoft.Extensions.DependencyInjection;
// using Ocelot.DependencyInjection;
// using Ocelot.Middleware;
// using Ocelot.Middleware.Pipeline;
// using Steeltoe.Discovery.Client;
// using Shouldly;
// using Steeltoe.Common.Discovery;
// using Steeltoe.Discovery.Eureka;
// using TestStack.BDDfy;
// using Xunit;
public class OcelotPipelineExtensionsTests
{
private OcelotPipelineBuilder _builder;
private OcelotRequestDelegate _handlers;
// public class OcelotPipelineExtensionsTests
// {
// private OcelotPipelineBuilder _builder;
// private OcelotRequestDelegate _handlers;
[Fact]
public void should_set_up_pipeline()
{
this.Given(_ => GivenTheDepedenciesAreSetUp())
.When(_ => WhenIBuild())
.Then(_ => ThenThePipelineIsBuilt())
.BDDfy();
}
// [Fact]
// public void should_set_up_pipeline()
// {
// this.Given(_ => GivenTheDepedenciesAreSetUp())
// .When(_ => WhenIBuild())
// .Then(_ => ThenThePipelineIsBuilt())
// .BDDfy();
// }
private void ThenThePipelineIsBuilt()
{
_handlers.ShouldNotBeNull();
}
// private void ThenThePipelineIsBuilt()
// {
// _handlers.ShouldNotBeNull();
// }
private void WhenIBuild()
{
_handlers = _builder.BuildOcelotPipeline(new OcelotPipelineConfiguration());
}
// private void WhenIBuild()
// {
// _handlers = _builder.BuildOcelotPipeline(new OcelotPipelineConfiguration());
// }
private void GivenTheDepedenciesAreSetUp()
{
IConfigurationBuilder test = new ConfigurationBuilder();
var root = test.Build();
var services = new ServiceCollection();
services.AddSingleton<IConfiguration>(root);
services.AddDiscoveryClient(new DiscoveryOptions
{
ClientType = DiscoveryClientType.EUREKA,
ClientOptions = new EurekaClientOptions()
{
ShouldFetchRegistry = false,
ShouldRegisterWithEureka = false
}
});
services.AddOcelot();
var provider = services.BuildServiceProvider();
_builder = new OcelotPipelineBuilder(provider);
}
}
}
// private void GivenTheDepedenciesAreSetUp()
// {
// IConfigurationBuilder test = new ConfigurationBuilder();
// var root = test.Build();
// var services = new ServiceCollection();
// services.AddSingleton<IConfiguration>(root);
// services.AddDiscoveryClient(new DiscoveryOptions
// {
// ClientType = DiscoveryClientType.EUREKA,
// ClientOptions = new EurekaClientOptions()
// {
// ShouldFetchRegistry = false,
// ShouldRegisterWithEureka = false
// }
// });
// services.AddOcelot();
// var provider = services.BuildServiceProvider();
// _builder = new OcelotPipelineBuilder(provider);
// }
// }
//}