From 24c2ba10dec6794fbda78e7c4630541fe7d18334 Mon Sep 17 00:00:00 2001 From: Tom Gardham-Pallister Date: Fri, 10 Nov 2017 18:11:50 +0000 Subject: [PATCH] found missing tests --- .../AuthenticationOptionsCreatorTests.cs | 179 ++++++------------ 1 file changed, 54 insertions(+), 125 deletions(-) diff --git a/test/Ocelot.UnitTests/Configuration/AuthenticationOptionsCreatorTests.cs b/test/Ocelot.UnitTests/Configuration/AuthenticationOptionsCreatorTests.cs index a4fe8a16..d6c62df0 100644 --- a/test/Ocelot.UnitTests/Configuration/AuthenticationOptionsCreatorTests.cs +++ b/test/Ocelot.UnitTests/Configuration/AuthenticationOptionsCreatorTests.cs @@ -1,133 +1,62 @@ -// using System.Collections.Generic; -// using Ocelot.Configuration; -// using Ocelot.Configuration.Builder; -// using Ocelot.Configuration.Creator; -// using Ocelot.Configuration.File; -// using Shouldly; -// using TestStack.BDDfy; -// using Xunit; +using System.Collections.Generic; +using Ocelot.Configuration; +using Ocelot.Configuration.Builder; +using Ocelot.Configuration.Creator; +using Ocelot.Configuration.File; +using Shouldly; +using TestStack.BDDfy; +using Xunit; -// namespace Ocelot.UnitTests.Configuration -// { -// public class AuthenticationOptionsCreatorTests -// { -// private readonly AuthenticationOptionsCreator _authOptionsCreator; -// private FileReRoute _fileReRoute; -// private AuthenticationOptions _result; +namespace Ocelot.UnitTests.Configuration +{ + public class AuthenticationOptionsCreatorTests + { + private readonly AuthenticationOptionsCreator _authOptionsCreator; + private FileReRoute _fileReRoute; + private AuthenticationOptions _result; -// public AuthenticationOptionsCreatorTests() -// { -// _authOptionsCreator = new AuthenticationOptionsCreator(new AuthenticationProviderConfigCreator()); -// } + public AuthenticationOptionsCreatorTests() + { + _authOptionsCreator = new AuthenticationOptionsCreator(); + } -// [Fact] -// public void should_return_auth_options() -// { -// var fileReRoute = new FileReRoute() -// { -// AuthenticationOptions = new FileAuthenticationOptions -// { -// Provider = "Geoff", -// IdentityServerConfig = new FileIdentityServerConfig() -// { -// ProviderRootUrl = "http://www.bbc.co.uk/", -// ApiName = "Laura", -// RequireHttps = true, -// ApiSecret = "secret" -// }, -// AllowedScopes = new List { "cheese" }, - -// } -// }; + [Fact] + public void should_return_auth_options() + { + var fileReRoute = new FileReRoute() + { + AuthenticationOptions = new FileAuthenticationOptions + { + AuthenticationProviderKey = "Test", + AllowedScopes = new List { "cheese" }, + } + }; -// var authenticationConfig = new IdentityServerConfigBuilder() -// .WithProviderRootUrl(fileReRoute.AuthenticationOptions?.IdentityServerConfig?.ProviderRootUrl) -// .WithApiName(fileReRoute.AuthenticationOptions?.IdentityServerConfig?.ApiName) -// .WithRequireHttps(fileReRoute.AuthenticationOptions.IdentityServerConfig.RequireHttps) -// .WithApiSecret(fileReRoute.AuthenticationOptions?.IdentityServerConfig?.ApiSecret) -// .Build(); + var expected = new AuthenticationOptionsBuilder() + .WithAllowedScopes(fileReRoute.AuthenticationOptions?.AllowedScopes) + .WithAuthenticationProviderKey("Test") + .Build(); -// var expected = new AuthenticationOptionsBuilder() -// .WithProvider(fileReRoute.AuthenticationOptions?.Provider) -// .WithAllowedScopes(fileReRoute.AuthenticationOptions?.AllowedScopes) -// .WithConfig(authenticationConfig) -// .Build(); + this.Given(x => x.GivenTheFollowing(fileReRoute)) + .When(x => x.WhenICreateTheAuthenticationOptions()) + .Then(x => x.ThenTheFollowingConfigIsReturned(expected)) + .BDDfy(); + } -// this.Given(x => x.GivenTheFollowing(fileReRoute)) -// .When(x => x.WhenICreateTheAuthenticationOptions()) -// .Then(x => x.ThenTheFollowingIdentityServerConfigIsReturned(expected)) -// .BDDfy(); -// } + private void GivenTheFollowing(FileReRoute fileReRoute) + { + _fileReRoute = fileReRoute; + } -// [Fact] -// public void should_return_Jwt_auth_options() -// { -// var fileReRoute = new FileReRoute() -// { -// AuthenticationOptions = new FileAuthenticationOptions -// { -// Provider = "Jwt", -// JwtConfig = new FileJwtConfig() -// { -// Audience = "Audience", -// Authority = "Authority" -// }, -// AllowedScopes = new List { "cheese" } -// } -// }; + private void WhenICreateTheAuthenticationOptions() + { + _result = _authOptionsCreator.Create(_fileReRoute); + } -// var authenticationConfig = new JwtConfigBuilder() -// .WithAudience(fileReRoute.AuthenticationOptions?.JwtConfig?.Audience) -// .WithAuthority(fileReRoute.AuthenticationOptions?.JwtConfig?.Authority) -// .Build(); - -// var expected = new AuthenticationOptionsBuilder() -// .WithProvider(fileReRoute.AuthenticationOptions?.Provider) -// .WithAllowedScopes(fileReRoute.AuthenticationOptions?.AllowedScopes) -// .WithConfig(authenticationConfig) -// .Build(); - -// this.Given(x => x.GivenTheFollowing(fileReRoute)) -// .When(x => x.WhenICreateTheAuthenticationOptions()) -// .Then(x => x.ThenTheFollowingJwtConfigIsReturned(expected)) -// .BDDfy(); -// } - -// private void GivenTheFollowing(FileReRoute fileReRoute) -// { -// _fileReRoute = fileReRoute; -// } - -// private void WhenICreateTheAuthenticationOptions() -// { -// _result = _authOptionsCreator.Create(_fileReRoute); -// } - -// private void ThenTheFollowingJwtConfigIsReturned(AuthenticationOptions expected) -// { -// _result.AllowedScopes.ShouldBe(expected.AllowedScopes); -// _result.Provider.ShouldBe(expected.Provider); - -// var _resultSettings = _result.Config as JwtConfig; -// var expectedSettngs = expected.Config as JwtConfig; - -// _resultSettings.Audience.ShouldBe(expectedSettngs.Audience); -// _resultSettings.Authority.ShouldBe(expectedSettngs.Authority); - -// } - -// private void ThenTheFollowingIdentityServerConfigIsReturned(AuthenticationOptions expected) -// { -// _result.AllowedScopes.ShouldBe(expected.AllowedScopes); -// _result.Provider.ShouldBe(expected.Provider); - -// var _resultSettings = _result.Config as IdentityServerConfig; -// var expectedSettngs = expected.Config as IdentityServerConfig; - -// _resultSettings.ProviderRootUrl.ShouldBe(expectedSettngs.ProviderRootUrl); -// _resultSettings.RequireHttps.ShouldBe(expectedSettngs.RequireHttps); -// _resultSettings.ApiName.ShouldBe(expectedSettngs.ApiName); -// _resultSettings.ApiSecret.ShouldBe(expectedSettngs.ApiSecret); -// } -// } -// } \ No newline at end of file + private void ThenTheFollowingConfigIsReturned(AuthenticationOptions expected) + { + _result.AllowedScopes.ShouldBe(expected.AllowedScopes); + _result.AuthenticationProviderKey.ShouldBe(expected.AuthenticationProviderKey); + } + } +} \ No newline at end of file