tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-11-04 15:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed some async we dont need

Browse Source
This commit is contained in:
Tom Pallister
2018-04-13 17:16:43 +01:00
parent 060dd1dc78
commit f88e1f65ef
16 changed files with 58 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/Ocelot.ManualTest/Program.cs
View File

@@ -22,6 +22,12 @@ namespace Ocelot.ManualTest
.AddJsonFile("appsettings.json", true, true)
.AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true)
.AddJsonFile("ocelot.json")
//.AddOcelot();
//load all the ocelot.xxx.json files that are not environments from asp.net core
//merge them into megaconfig
//save megaconfig to disk as ocelot.json
//then add to asp.net config stuff..
.AddEnvironmentVariables();
})
.ConfigureServices(s => {

4
test/Ocelot.UnitTests/Configuration/InMemoryConfigurationRepositoryTests.cs
View File

@@ -49,7 +49,7 @@ namespace Ocelot.UnitTests.Configuration
private void WhenIGetTheConfiguration()
{
_getResult = _repo.Get().Result;
_getResult = _repo.Get();
}
private void GivenThereIsASavedConfiguration()
@@ -65,7 +65,7 @@ namespace Ocelot.UnitTests.Configuration
private void WhenIAddOrReplaceTheConfig()
{
_result = _repo.AddOrReplace(_config).Result;
_result = _repo.AddOrReplace(_config);
}
private void ThenNoErrorsAreReturned()

4
test/Ocelot.UnitTests/Configuration/OcelotConfigurationProviderTests.cs
View File

@@ -56,12 +56,12 @@ namespace Ocelot.UnitTests.Configuration
{
_configurationRepository
.Setup(x => x.Get())
.ReturnsAsync(config);
.Returns(config);
}
private void WhenIGetTheConfig()
{
_result = _ocelotConfigurationProvider.Get().Result;
_result = _ocelotConfigurationProvider.Get();
}
private void TheFollowingIsReturned(Response<IOcelotConfiguration> expected)

2
test/Ocelot.UnitTests/DownstreamRouteFinder/DownstreamRouteFinderMiddlewareTests.cs
View File

@@ -79,7 +79,7 @@ namespace Ocelot.UnitTests.DownstreamRouteFinder
_config = config;
_provider
.Setup(x => x.Get())
.ReturnsAsync(new OkResponse<IOcelotConfiguration>(_config));
.Returns(new OkResponse<IOcelotConfiguration>(_config));
}
private void GivenTheDownStreamRouteFinderReturns(DownstreamRoute downstreamRoute)

6
test/Ocelot.UnitTests/Errors/ExceptionHandlerMiddlewareTests.cs
View File

@@ -134,7 +134,7 @@ namespace Ocelot.UnitTests.Errors
{
var ex = new Exception("outer", new Exception("inner"));
_provider
.Setup(x => x.Get()).ThrowsAsync(ex);
.Setup(x => x.Get()).Throws(ex);
}
private void ThenAnExceptionIsThrown()
@@ -146,7 +146,7 @@ namespace Ocelot.UnitTests.Errors
{
var response = new Responses.ErrorResponse<IOcelotConfiguration>(new FakeError());
_provider
.Setup(x => x.Get()).ReturnsAsync(response);
.Setup(x => x.Get()).Returns(response);
}
private void TheRequestIdIsSet(string key, string value)
@@ -158,7 +158,7 @@ namespace Ocelot.UnitTests.Errors
{
var response = new Responses.OkResponse<IOcelotConfiguration>(config);
_provider
.Setup(x => x.Get()).ReturnsAsync(response);
.Setup(x => x.Get()).Returns(response);
}
private void GivenAnExceptionWillNotBeThrownDownstream()