diff options
Diffstat (limited to 'src/DotNetOpenAuth.Test/Mocks')
| -rw-r--r-- | src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs | 23 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs | 7 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.Test/Mocks/MockIdentifierDiscoveryService.cs | 4 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs index 0213a33..bd10f54 100644 --- a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs +++ b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs @@ -18,6 +18,7 @@ namespace DotNetOpenAuth.Test.Mocks { using DotNetOpenAuth.OpenId.RelyingParty; using DotNetOpenAuth.Test.OpenId; using DotNetOpenAuth.Yadis; + using DotNetOpenAuth.OpenId.DiscoveryServices; internal class MockHttpRequest { private readonly Dictionary<Uri, IncomingWebResponse> registeredMockResponses = new Dictionary<Uri, IncomingWebResponse>(); @@ -83,19 +84,19 @@ namespace DotNetOpenAuth.Test.Mocks { } } - internal void RegisterMockXrdsResponse(ServiceEndpoint endpoint) { + internal void RegisterMockXrdsResponse(IIdentifierDiscoveryResult endpoint) { Contract.Requires<ArgumentNullException>(endpoint != null); string identityUri; - if (endpoint.ClaimedIdentifier == endpoint.Protocol.ClaimedIdentifierForOPIdentifier) { + if (endpoint.ClaimedIdentifier == endpoint.ProviderEndpoint.GetProtocol().ClaimedIdentifierForOPIdentifier) { identityUri = endpoint.UserSuppliedIdentifier; } else { identityUri = endpoint.UserSuppliedIdentifier ?? endpoint.ClaimedIdentifier; } - this.RegisterMockXrdsResponse(new Uri(identityUri), new ServiceEndpoint[] { endpoint }); + this.RegisterMockXrdsResponse(new Uri(identityUri), new IIdentifierDiscoveryResult[] { endpoint }); } - internal void RegisterMockXrdsResponse(Uri respondingUri, IEnumerable<ServiceEndpoint> endpoints) { + internal void RegisterMockXrdsResponse(Uri respondingUri, IEnumerable<IIdentifierDiscoveryResult> endpoints) { Contract.Requires<ArgumentNullException>(endpoints != null); StringBuilder xrds = new StringBuilder(); @@ -110,16 +111,16 @@ namespace DotNetOpenAuth.Test.Mocks { <openid:Delegate xmlns:openid='http://openid.net/xmlns/1.0'>{2}</openid:Delegate> </Service>"; string serviceTypeUri; - if (endpoint.ClaimedIdentifier == endpoint.Protocol.ClaimedIdentifierForOPIdentifier) { - serviceTypeUri = endpoint.Protocol.OPIdentifierServiceTypeURI; + if (endpoint.ClaimedIdentifier == endpoint.ProviderEndpoint.GetProtocol().ClaimedIdentifierForOPIdentifier) { + serviceTypeUri = endpoint.ProviderEndpoint.GetProtocol().OPIdentifierServiceTypeURI; } else { - serviceTypeUri = endpoint.Protocol.ClaimedIdentifierServiceTypeURI; + serviceTypeUri = endpoint.ProviderEndpoint.GetProtocol().ClaimedIdentifierServiceTypeURI; } string xrd = string.Format( CultureInfo.InvariantCulture, template, HttpUtility.HtmlEncode(serviceTypeUri), - HttpUtility.HtmlEncode(endpoint.ProviderEndpoint.AbsoluteUri), + HttpUtility.HtmlEncode(endpoint.ProviderEndpoint.Uri.AbsoluteUri), HttpUtility.HtmlEncode(endpoint.ProviderLocalIdentifier)); xrds.Append(xrd); } @@ -130,12 +131,12 @@ namespace DotNetOpenAuth.Test.Mocks { this.RegisterMockResponse(respondingUri, ContentTypes.Xrds, xrds.ToString()); } - internal void RegisterMockXrdsResponse(UriIdentifier directedIdentityAssignedIdentifier, ServiceEndpoint providerEndpoint) { - ServiceEndpoint identityEndpoint = ServiceEndpoint.CreateForClaimedIdentifier( + internal void RegisterMockXrdsResponse(UriIdentifier directedIdentityAssignedIdentifier, IIdentifierDiscoveryResult providerEndpoint) { + IIdentifierDiscoveryResult identityEndpoint = IdentifierDiscoveryResult.CreateForClaimedIdentifier( directedIdentityAssignedIdentifier, directedIdentityAssignedIdentifier, + providerEndpoint.ProviderLocalIdentifier, providerEndpoint.ProviderEndpoint, - providerEndpoint.ProviderDescription, 10, 10); this.RegisterMockXrdsResponse(identityEndpoint); diff --git a/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs b/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs index 73fd8c3..d03582d 100644 --- a/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs +++ b/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs @@ -11,6 +11,7 @@ namespace DotNetOpenAuth.Test.Mocks { using DotNetOpenAuth.Messaging; using DotNetOpenAuth.OpenId; using DotNetOpenAuth.OpenId.RelyingParty; + using DotNetOpenAuth.OpenId.DiscoveryServices; /// <summary> /// Performs similar to an ordinary <see cref="Identifier"/>, but when called upon @@ -18,13 +19,13 @@ namespace DotNetOpenAuth.Test.Mocks { /// having a dependency on a hosted web site to actually perform discovery on. /// </summary> internal class MockIdentifier : Identifier { - private IEnumerable<ServiceEndpoint> endpoints; + private IEnumerable<IIdentifierDiscoveryResult> endpoints; private MockHttpRequest mockHttpRequest; private Identifier wrappedIdentifier; - public MockIdentifier(Identifier wrappedIdentifier, MockHttpRequest mockHttpRequest, IEnumerable<ServiceEndpoint> endpoints) + public MockIdentifier(Identifier wrappedIdentifier, MockHttpRequest mockHttpRequest, IEnumerable<IIdentifierDiscoveryResult> endpoints) : base(wrappedIdentifier.OriginalString, false) { Contract.Requires<ArgumentNullException>(wrappedIdentifier != null); Contract.Requires<ArgumentNullException>(mockHttpRequest != null); @@ -39,7 +40,7 @@ namespace DotNetOpenAuth.Test.Mocks { mockHttpRequest.RegisterMockXrdsResponse(new Uri(wrappedIdentifier.ToString()), endpoints); } - internal IEnumerable<ServiceEndpoint> DiscoveryEndpoints { + internal IEnumerable<IIdentifierDiscoveryResult> DiscoveryEndpoints { get { return this.endpoints; } } diff --git a/src/DotNetOpenAuth.Test/Mocks/MockIdentifierDiscoveryService.cs b/src/DotNetOpenAuth.Test/Mocks/MockIdentifierDiscoveryService.cs index e02fa1f..8aea7e5 100644 --- a/src/DotNetOpenAuth.Test/Mocks/MockIdentifierDiscoveryService.cs +++ b/src/DotNetOpenAuth.Test/Mocks/MockIdentifierDiscoveryService.cs @@ -32,11 +32,11 @@ namespace DotNetOpenAuth.Test.Mocks { /// <returns> /// A sequence of service endpoints yielded by discovery. Must not be null, but may be empty. /// </returns> - public IEnumerable<ServiceEndpoint> Discover(Identifier identifier, IDirectWebRequestHandler requestHandler, out bool abortDiscoveryChain) { + public IEnumerable<IIdentifierDiscoveryResult> Discover(Identifier identifier, IDirectWebRequestHandler requestHandler, out bool abortDiscoveryChain) { var mockIdentifier = identifier as MockIdentifier; if (mockIdentifier == null) { abortDiscoveryChain = false; - return Enumerable.Empty<ServiceEndpoint>(); + return Enumerable.Empty<IIdentifierDiscoveryResult>(); } abortDiscoveryChain = true; |