Skip to content

Commit

Permalink
Reenabling some tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Nick Sharp committed Jun 29, 2017
1 parent 9532d94 commit 1168eb3
Show file tree
Hide file tree
Showing 2 changed files with 197 additions and 140 deletions.
248 changes: 108 additions & 140 deletions test/Ocelot.UnitTests/Configuration/FileConfigurationCreatorTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

namespace Ocelot.UnitTests.Configuration
{
using System.Collections;

using Ocelot.UnitTests.TestData;

public class FileConfigurationCreatorTests
{
private readonly Mock<IOptions<FileConfiguration>> _fileConfig;
Expand Down Expand Up @@ -393,132 +397,82 @@ public void should_call_request_id_creator()
.BDDfy();
}

//[Fact]
//public void should_create_with_headers_to_extract()
//{
// var reRouteOptions = new ReRouteOptionsBuilder()
// .WithIsAuthenticated(true)
// .Build();

// var authenticationOptions = new AuthenticationOptionsBuilder()
// .WithProvider("IdentityServer")
// .WithProviderRootUrl("http://localhost:51888")
// .WithRequireHttps(false)
// .WithApiSecret("secret")
// .WithApiName("api")
// .WithAllowedScopes(new List<string>())
// .Build();

// var expected = new List<ReRoute>
// {
// new ReRouteBuilder()
// .WithDownstreamPathTemplate("/products/{productId}")
// .WithUpstreamPathTemplate("/api/products/{productId}")
// .WithUpstreamHttpMethod(new List<string> { "Get" })
// .WithAuthenticationOptions(authenticationOptions)
// .WithClaimsToHeaders(new List<ClaimToThing>
// {
// new ClaimToThing("CustomerId", "CustomerId", "", 0),
// })
// .Build()
// };

// this.Given(x => x.GivenTheConfigIs(new FileConfiguration
// {
// ReRoutes = new List<FileReRoute>
// {
// new FileReRoute
// {
// UpstreamPathTemplate = "/api/products/{productId}",
// DownstreamPathTemplate = "/products/{productId}",
// UpstreamHttpMethod = new List<string> { "Get" },
// ReRouteIsCaseSensitive = true,
// AuthenticationOptions = new FileAuthenticationOptions
// {
//AllowedScopes= new List<string>(),
// Provider = "IdentityServer",
// ProviderRootUrl = "http://localhost:51888",
// RequireHttps = false,
//ApiName= "api",
// ApiSecret = "secret"
// },
// AddHeadersToRequest =
// {
// {"CustomerId", "Claims[CustomerId] > value"},
// }
// }
// }
// }))
// .And(x => x.GivenTheConfigIsValid())
// .And(x => x.GivenTheAuthOptionsCreatorReturns(authenticationOptions))
// .And(x => x.GivenTheFollowingOptionsAreReturned(reRouteOptions))
// .And(x => x.GivenTheClaimsToThingCreatorReturns(new List<ClaimToThing>{new ClaimToThing("CustomerId", "CustomerId", "", 0)}))
// .And(x => x.GivenTheLoadBalancerFactoryReturns())
// .When(x => x.WhenICreateTheConfig())
// .Then(x => x.ThenTheReRoutesAre(expected))
// .And(x => x.ThenTheAuthenticationOptionsAre(expected))
// .And(x => x.ThenTheAuthOptionsCreatorIsCalledCorrectly())
// .BDDfy();
//}

//[Fact]
//public void should_create_with_authentication_properties()
//{
// var reRouteOptions = new ReRouteOptionsBuilder()
// .WithIsAuthenticated(true)
// .Build();

// var authenticationOptions = new AuthenticationOptionsBuilder()
// .WithProvider("IdentityServer")
// .WithProviderRootUrl("http://localhost:51888")
// .WithRequireHttps(false)
// .WithApiSecret("secret")
// .WithApiName("api")
// .WithAllowedScopes(new List<string>())
// .Build();

// var expected = new List<ReRoute>
// {
// new ReRouteBuilder()
// .WithDownstreamPathTemplate("/products/{productId}")
// .WithUpstreamPathTemplate("/api/products/{productId}")
// .WithUpstreamHttpMethod(new List<string> { "Get" })
// .WithAuthenticationOptions(authenticationOptions)
// .Build()
// };

// this.Given(x => x.GivenTheConfigIs(new FileConfiguration
// {
// ReRoutes = new List<FileReRoute>
// {
// new FileReRoute
// {
// UpstreamPathTemplate = "/api/products/{productId}",
// DownstreamPathTemplate = "/products/{productId}",
// UpstreamHttpMethod = new List<string> { "Get" },
// ReRouteIsCaseSensitive = true,
// AuthenticationOptions = new FileAuthenticationOptions
// {
//AllowedScopes = new List<string>(),
// Provider = "IdentityServer",
// ProviderRootUrl = "http://localhost:51888",
// RequireHttps = false,
//ApiName= "api",
// ApiSecret = "secret"
// }
// }
// }
// }))
// .And(x => x.GivenTheConfigIsValid())
// .And(x => x.GivenTheFollowingOptionsAreReturned(reRouteOptions))
// .And(x => x.GivenTheAuthOptionsCreatorReturns(authenticationOptions))
// .And(x => x.GivenTheLoadBalancerFactoryReturns())
// .When(x => x.WhenICreateTheConfig())
// .Then(x => x.ThenTheReRoutesAre(expected))
// .And(x => x.ThenTheAuthenticationOptionsAre(expected))
// .And(x => x.ThenTheAuthOptionsCreatorIsCalledCorrectly())
// .BDDfy();
//}
[Theory]
[MemberData(nameof(AuthenticationConfigTestData.GetAuthenticationData), MemberType = typeof(AuthenticationConfigTestData))]
public void should_create_with_headers_to_extract(string provider, IAuthenticationConfig config, FileConfiguration fileConfig)
{
var reRouteOptions = new ReRouteOptionsBuilder()
.WithIsAuthenticated(true)
.Build();

var authenticationOptions = new AuthenticationOptionsBuilder()
.WithProvider(provider)
.WithAllowedScopes(new List<string>())
.WithConfig(config)
.Build();

var expected = new List<ReRoute>
{
new ReRouteBuilder()
.WithDownstreamPathTemplate("/products/{productId}")
.WithUpstreamPathTemplate("/api/products/{productId}")
.WithUpstreamHttpMethod(new List<string> { "Get" })
.WithAuthenticationOptions(authenticationOptions)
.WithClaimsToHeaders(new List<ClaimToThing>
{
new ClaimToThing("CustomerId", "CustomerId", "", 0),
})
.Build()
};

this.Given(x => x.GivenTheConfigIs(fileConfig))
.And(x => x.GivenTheConfigIsValid())
.And(x => x.GivenTheAuthOptionsCreatorReturns(authenticationOptions))
.And(x => x.GivenTheFollowingOptionsAreReturned(reRouteOptions))
.And(x => x.GivenTheClaimsToThingCreatorReturns(new List<ClaimToThing> { new ClaimToThing("CustomerId", "CustomerId", "", 0) }))
.And(x => x.GivenTheLoadBalancerFactoryReturns())
.When(x => x.WhenICreateTheConfig())
.Then(x => x.ThenTheReRoutesAre(expected))
.And(x => x.ThenTheAuthenticationOptionsAre(provider, expected))
.And(x => x.ThenTheAuthOptionsCreatorIsCalledCorrectly())
.BDDfy();
}

[Theory]
[MemberData(nameof(AuthenticationConfigTestData.GetAuthenticationData), MemberType = typeof(AuthenticationConfigTestData))]
public void should_create_with_authentication_properties(string provider, IAuthenticationConfig config, FileConfiguration fileConfig)
{
var reRouteOptions = new ReRouteOptionsBuilder()
.WithIsAuthenticated(true)
.Build();

var authenticationOptions = new AuthenticationOptionsBuilder()
.WithProvider(provider)
.WithAllowedScopes(new List<string>())
.WithConfig(config)
.Build();

var expected = new List<ReRoute>
{
new ReRouteBuilder()
.WithDownstreamPathTemplate("/products/{productId}")
.WithUpstreamPathTemplate("/api/products/{productId}")
.WithUpstreamHttpMethod(new List<string> { "Get" })
.WithAuthenticationOptions(authenticationOptions)
.Build()
};

this.Given(x => x.GivenTheConfigIs(fileConfig))
.And(x => x.GivenTheConfigIsValid())
.And(x => x.GivenTheFollowingOptionsAreReturned(reRouteOptions))
.And(x => x.GivenTheAuthOptionsCreatorReturns(authenticationOptions))
.And(x => x.GivenTheLoadBalancerFactoryReturns())
.When(x => x.WhenICreateTheConfig())
.Then(x => x.ThenTheReRoutesAre(expected))
.And(x => x.ThenTheAuthenticationOptionsAre(provider, expected))
.And(x => x.ThenTheAuthOptionsCreatorIsCalledCorrectly())
.BDDfy();
}

private void GivenTheFollowingOptionsAreReturned(ReRouteOptions fileReRouteOptions)
{
Expand Down Expand Up @@ -586,22 +540,36 @@ private void ThenTheServiceConfigurationIs(ServiceProviderConfiguration expected
}
}

//private void ThenTheAuthenticationOptionsAre(List<ReRoute> expectedReRoutes)
//{
// for (int i = 0; i < _config.Data.ReRoutes.Count; i++)
// {
// var result = _config.Data.ReRoutes[i].AuthenticationOptions;
// var expected = expectedReRoutes[i].AuthenticationOptions;
private void ThenTheAuthenticationOptionsAre(string provider, List<ReRoute> expectedReRoutes)
{
for (int i = 0; i < _config.Data.ReRoutes.Count; i++)
{
var result = _config.Data.ReRoutes[i].AuthenticationOptions;
var expected = expectedReRoutes[i].AuthenticationOptions;

result.AllowedScopes.ShouldBe(expected.AllowedScopes);
result.Provider.ShouldBe(expected.Provider);

// result.AllowedScopes.ShouldBe(expected.AllowedScopes);
// result.Provider.ShouldBe(expected.Provider);
// result.ProviderRootUrl.ShouldBe(expected.ProviderRootUrl);
// result.RequireHttps.ShouldBe(expected.RequireHttps);
// result.ApiName.ShouldBe(expected.ApiName);
// result.ApiSecret.ShouldBe(expected.ApiSecret);
if (provider.ToLower() == "identityserver")
{
var config = result.Config as IdentityServerConfig;
var expectedConfig = expected.Config as IdentityServerConfig;

// }
//}
config.ProviderRootUrl.ShouldBe(expectedConfig.ProviderRootUrl);
config.RequireHttps.ShouldBe(expectedConfig.RequireHttps);
config.ApiName.ShouldBe(expectedConfig.ApiName);
config.ApiSecret.ShouldBe(expectedConfig.ApiSecret);
}
else
{
var config = result.Config as JwtConfig;
var expectedConfig = expected.Config as JwtConfig;

config.Audience.ShouldBe(expectedConfig.Audience);
config.Authority.ShouldBe(expectedConfig.Authority);
}
}
}

private void GivenTheLoadBalancerFactoryReturns()
{
Expand Down
89 changes: 89 additions & 0 deletions test/Ocelot.UnitTests/TestData/AuthenticationConfigTestData.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
namespace Ocelot.UnitTests.TestData
{
using System.Collections.Generic;

using Ocelot.Configuration.Builder;
using Ocelot.Configuration.File;

public class AuthenticationConfigTestData
{
public static IEnumerable<object[]> GetAuthenticationData()
{
yield return new object[]
{
"IdentityServer",
new IdentityServerConfigBuilder()
.WithRequireHttps(true)
.WithApiName("test")
.WithApiSecret("test")
.WithProviderRootUrl("test")
.Build(),
new FileConfiguration
{
ReRoutes = new List<FileReRoute>
{
new FileReRoute
{
UpstreamPathTemplate = "/api/products/{productId}",
DownstreamPathTemplate = "/products/{productId}",
UpstreamHttpMethod = new List<string> { "Get" },
ReRouteIsCaseSensitive = true,
AuthenticationOptions = new FileAuthenticationOptions
{
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
IdentityServerConfig = new FileIdentityServerConfig
{
ProviderRootUrl = "http://localhost:51888",
RequireHttps = false,
ApiName = "api",
ApiSecret = "secret"
}
},
AddHeadersToRequest =
{
{ "CustomerId", "Claims[CustomerId] > value" },
}
}
}
}
};

yield return new object[]
{
"Jwt",
new JwtConfigBuilder()
.WithAudience("a")
.WithAuthority("au")
.Build(),
new FileConfiguration
{
ReRoutes = new List<FileReRoute>
{
new FileReRoute
{
UpstreamPathTemplate = "/api/products/{productId}",
DownstreamPathTemplate = "/products/{productId}",
UpstreamHttpMethod = new List<string> { "Get" },
ReRouteIsCaseSensitive = true,
AuthenticationOptions = new FileAuthenticationOptions
{
AllowedScopes = new List<string>(),
Provider = "IdentityServer",
JwtConfig = new FileJwtConfig
{
Audience = "a",
Authority = "au"
}
},
AddHeadersToRequest =
{
{ "CustomerId", "Claims[CustomerId] > value" },
}
}
}
}
};
}
}
}

0 comments on commit 1168eb3

Please sign in to comment.