tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-18 23:08:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

regex for url match, means annoying constructor ocelot configuration object but cant work out a better way to do this at the moment

Browse Source
This commit is contained in:
TomPallister
2016-10-09 15:40:13 +01:00
parent f8ea87c91b
commit 1fddcf0836
38 changed files with 675 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/Ocelot.UnitTests/Configuration/ConfigurationValidationTests.cs
View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using Ocelot.Library.Infrastructure.Configuration;
using Ocelot.Library.Infrastructure.Configuration.Yaml;
using Ocelot.Library.Infrastructure.Responses;
using Shouldly;
using TestStack.BDDfy;
@ -9,7 +9,7 @@ namespace Ocelot.UnitTests.Configuration
{
public class ConfigurationValidationTests
{
private Library.Infrastructure.Configuration.Configuration _configuration;
private YamlConfiguration _yamlConfiguration;
private readonly IConfigurationValidator _configurationValidator;
private Response<ConfigurationValidationResult> _result;
@ -21,11 +21,11 @@ namespace Ocelot.UnitTests.Configuration
[Fact]
public void configuration_is_valid_with_one_reroute()
{
this.Given(x => x.GivenAConfiguration(new Library.Infrastructure.Configuration.Configuration()
this.Given(x => x.GivenAConfiguration(new YamlConfiguration()
{
ReRoutes = new List<ReRoute>
ReRoutes = new List<YamlReRoute>
{
new ReRoute
new YamlReRoute
{
DownstreamTemplate = "http://www.bbc.co.uk",
UpstreamTemplate = "http://asdf.com"
@ -40,16 +40,16 @@ namespace Ocelot.UnitTests.Configuration
[Fact]
public void configuration_is_not_valid_with_duplicate_reroutes()
{
this.Given(x => x.GivenAConfiguration(new Library.Infrastructure.Configuration.Configuration()
this.Given(x => x.GivenAConfiguration(new YamlConfiguration()
{
ReRoutes = new List<ReRoute>
ReRoutes = new List<YamlReRoute>
{
new ReRoute
new YamlReRoute
{
DownstreamTemplate = "http://www.bbc.co.uk",
UpstreamTemplate = "http://asdf.com"
},
new ReRoute
new YamlReRoute
{
DownstreamTemplate = "http://www.bbc.co.uk",
UpstreamTemplate = "http://lol.com"
@ -62,14 +62,14 @@ namespace Ocelot.UnitTests.Configuration
.BDDfy();
}
private void GivenAConfiguration(Library.Infrastructure.Configuration.Configuration configuration)
private void GivenAConfiguration(YamlConfiguration yamlConfiguration)
{
_configuration = configuration;
_yamlConfiguration = yamlConfiguration;
}
private void WhenIValidateTheConfiguration()
{
_result = _configurationValidator.IsValid(_configuration);
_result = _configurationValidator.IsValid(_yamlConfiguration);
}
private void ThenTheResultIsValid()