Some extensive refactoring around IIdentifierDiscoveryResult and ServiceEndpoint.

3 files changed, 41 insertions, 71 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
index 10497b2..62f9fc6 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
@@ -17,6 +17,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 	using DotNetOpenAuth.OpenId.Messages;
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using DotNetOpenAuth.OpenId.DiscoveryServices;
 
 	[TestClass]
 	public class AuthenticationRequestTests : OpenIdTestBase {
@@ -62,7 +63,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		[TestMethod]
 		public void ProviderVersion() {
 			var authRequest = this.CreateAuthenticationRequest(this.claimedId, this.claimedId);
-			Assert.AreEqual(this.protocol.Version, authRequest.endpoint.Protocol.Version);
+			Assert.AreEqual(this.protocol.Version, authRequest.Endpoint.ProviderEndpoint.GetProtocol().Version);
 		}
 
 		/// <summary>
@@ -183,8 +184,8 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 
 		private AuthenticationRequest_Accessor CreateAuthenticationRequest(Identifier claimedIdentifier, Identifier providerLocalIdentifier) {
 			ProviderEndpointDescription providerEndpoint = new ProviderEndpointDescription(OPUri, this.protocol.Version);
-			ServiceEndpoint endpoint = ServiceEndpoint.CreateForClaimedIdentifier(claimedIdentifier, providerLocalIdentifier, providerEndpoint, 10, 5);
-			ServiceEndpoint_Accessor endpointAccessor = ServiceEndpoint_Accessor.AttachShadow(endpoint);
+			IIdentifierDiscoveryResult endpoint = IdentifierDiscoveryResult.CreateForClaimedIdentifier(claimedIdentifier, providerLocalIdentifier, providerEndpoint, 10, 5);
+			IdentifierDiscoveryResult_Accessor endpointAccessor = IdentifierDiscoveryResult_Accessor.AttachShadow(endpoint);
 			OpenIdRelyingParty rp = this.CreateRelyingParty();
 			AuthenticationRequest_Accessor authRequest = new AuthenticationRequest_Accessor(endpointAccessor, this.realm, this.returnTo, rp);
 			return authRequest;
diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/PositiveAuthenticationResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/PositiveAuthenticationResponseTests.cs
index 701bcae..87969b1 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/PositiveAuthenticationResponseTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/PositiveAuthenticationResponseTests.cs
@@ -38,7 +38,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 			Assert.AreEqual(AuthenticationStatus.Authenticated, authResponse.Status);
 			Assert.IsNull(authResponse.Exception);
 			Assert.AreEqual<string>(assertion.ClaimedIdentifier, authResponse.ClaimedIdentifier);
-			Assert.AreEqual<string>(authResponse.Endpoint.FriendlyIdentifierForDisplay, authResponse.FriendlyIdentifierForDisplay);
+			Assert.AreEqual<string>(authResponse.Endpoint.GetFriendlyIdentifierForDisplay(), authResponse.FriendlyIdentifierForDisplay);
 			Assert.AreSame(extension, authResponse.GetUntrustedExtension(typeof(ClaimsResponse)));
 			Assert.AreSame(extension, authResponse.GetUntrustedExtension<ClaimsResponse>());
 			Assert.IsNull(authResponse.GetCallbackArgument("a"));
diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/ServiceEndpointTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/ServiceEndpointTests.cs
index ff15aa3..e8c9f68 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/ServiceEndpointTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/ServiceEndpointTests.cs
@@ -17,6 +17,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using DotNetOpenAuth.Test.Messaging;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using DotNetOpenAuth.OpenId.DiscoveryServices;
 
 	[TestClass]
 	public class ServiceEndpointTests : OpenIdTestBase {
@@ -32,41 +33,41 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 
 		[TestMethod]
 		public void Ctor() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreEqual(this.claimedId, se.ClaimedIdentifier);
 			Assert.AreSame(this.providerEndpoint, se.ProviderEndpoint);
 			Assert.AreSame(this.localId, se.ProviderLocalIdentifier);
-			CollectionAssert<string>.AreEquivalent(this.v20TypeUris, se.ProviderSupportedServiceTypeUris);
+			CollectionAssert<string>.AreEquivalent(this.v20TypeUris, se.ProviderEndpoint.Capabilities);
 			Assert.AreEqual(this.servicePriority, ((IXrdsProviderEndpoint)se).ServicePriority);
 		}
 
 		[TestMethod]
 		public void CtorImpliedLocalIdentifier() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, null, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, null, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreEqual(this.claimedId, se.ClaimedIdentifier);
 			Assert.AreSame(this.providerEndpoint, se.ProviderEndpoint);
 			Assert.AreSame(this.claimedId, se.ProviderLocalIdentifier);
-			CollectionAssert<string>.AreEquivalent(this.v20TypeUris, se.ProviderSupportedServiceTypeUris);
+			CollectionAssert<string>.AreEquivalent(this.v20TypeUris, se.ProviderEndpoint.Capabilities);
 		}
 
 		[TestMethod]
 		public void ProtocolDetection() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			Assert.AreSame(Protocol.V20, se.Protocol);
-			se = ServiceEndpoint.CreateForClaimedIdentifier(
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			Assert.AreSame(Protocol.V20, se.ProviderEndpoint.GetProtocol());
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(
 				this.claimedId,
 				this.localId,
 				new ProviderEndpointDescription(this.providerEndpoint, new[] { Protocol.V20.OPIdentifierServiceTypeURI }),
 				this.servicePriority,
 				this.uriPriority);
-			Assert.AreSame(Protocol.V20, se.Protocol);
-			se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v11TypeUris), this.servicePriority, this.uriPriority);
-			Assert.AreSame(Protocol.V11, se.Protocol);
+			Assert.AreSame(Protocol.V20, se.ProviderEndpoint.GetProtocol());
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v11TypeUris), this.servicePriority, this.uriPriority);
+			Assert.AreSame(Protocol.V11, se.ProviderEndpoint.GetProtocol());
 		}
 
 		[TestMethod, ExpectedException(typeof(ProtocolException))]
 		public void ProtocolDetectionWithoutClues() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(
 				this.claimedId,
 				this.localId,
 				new ProviderEndpointDescription(this.providerEndpoint, new[] { Protocol.V20.HtmlDiscoveryLocalIdKey }), // random type URI irrelevant to detection
@@ -75,121 +76,89 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		}
 
 		[TestMethod]
-		public void SerializationWithUri() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			StringBuilder sb = new StringBuilder();
-			using (StringWriter sw = new StringWriter(sb)) {
-				se.Serialize(sw);
-			}
-			using (StringReader sr = new StringReader(sb.ToString())) {
-				ServiceEndpoint se2 = ServiceEndpoint.Deserialize(sr);
-				Assert.AreEqual(se, se2);
-				Assert.AreEqual(se.Protocol.Version, se2.Protocol.Version, "Particularly interested in this, since type URIs are not serialized but version info is.");
-				Assert.AreEqual(se.UserSuppliedIdentifier, se2.UserSuppliedIdentifier);
-				Assert.AreEqual(se.FriendlyIdentifierForDisplay, se2.FriendlyIdentifierForDisplay);
-			}
-		}
-
-		[TestMethod]
-		public void SerializationWithXri() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			StringBuilder sb = new StringBuilder();
-			using (StringWriter sw = new StringWriter(sb)) {
-				se.Serialize(sw);
-			}
-			using (StringReader sr = new StringReader(sb.ToString())) {
-				ServiceEndpoint se2 = ServiceEndpoint.Deserialize(sr);
-				Assert.AreEqual(se, se2);
-				Assert.AreEqual(se.Protocol.Version, se2.Protocol.Version, "Particularly interested in this, since type URIs are not serialized but version info is.");
-				Assert.AreEqual(se.UserSuppliedIdentifier, se2.UserSuppliedIdentifier);
-				Assert.AreEqual(se.FriendlyIdentifierForDisplay, se2.FriendlyIdentifierForDisplay);
-			}
-		}
-
-		[TestMethod]
 		public void EqualsTests() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			ServiceEndpoint se2 = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), (int?)null, (int?)null);
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			IIdentifierDiscoveryResult se2 = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), (int?)null, (int?)null);
 			Assert.AreEqual(se2, se);
 			Assert.AreNotEqual(se, null);
 			Assert.AreNotEqual(null, se);
 
-			ServiceEndpoint se3 = ServiceEndpoint.CreateForClaimedIdentifier(new UriIdentifier(this.claimedId + "a"), this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			IIdentifierDiscoveryResult se3 = IdentifierDiscoveryResult.CreateForClaimedIdentifier(new UriIdentifier(this.claimedId + "a"), this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreNotEqual(se, se3);
-			se3 = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(new Uri(this.providerEndpoint.AbsoluteUri + "a"), this.v20TypeUris), this.servicePriority, this.uriPriority);
+			se3 = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(new Uri(this.providerEndpoint.AbsoluteUri + "a"), this.v20TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreNotEqual(se, se3);
-			se3 = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId + "a", new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			se3 = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId + "a", new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreNotEqual(se, se3);
-			se3 = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v11TypeUris), this.servicePriority, this.uriPriority);
+			se3 = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedId, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v11TypeUris), this.servicePriority, this.uriPriority);
 			Assert.AreNotEqual(se, se3);
 
 			// make sure that Collection<T>.Contains works as desired.
-			List<ServiceEndpoint> list = new List<ServiceEndpoint>();
+			var list = new List<IIdentifierDiscoveryResult>();
 			list.Add(se);
 			Assert.IsTrue(list.Contains(se2));
 		}
 
 		[TestMethod]
-		public void FriendlyIdentifierForDisplay() {
+		public void GetFriendlyIdentifierForDisplay() {
 			Uri providerEndpoint = new Uri("http://someprovider");
 			Identifier localId = "someuser";
 			string[] serviceTypeUris = new string[] {
 				Protocol.V20.ClaimedIdentifierServiceTypeURI,
 			};
-			ServiceEndpoint se;
+			IIdentifierDiscoveryResult se;
 
 			// strip of protocol, port, query and fragment
-			se = ServiceEndpoint.CreateForClaimedIdentifier(
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(
 				"http://someprovider.somedomain.com:79/someuser?query#frag",
 				localId,
 				new ProviderEndpointDescription(providerEndpoint, serviceTypeUris),
 				null,
 				null);
-			Assert.AreEqual("someprovider.somedomain.com/someuser", se.FriendlyIdentifierForDisplay);
+			Assert.AreEqual("someprovider.somedomain.com/someuser", se.GetFriendlyIdentifierForDisplay());
 
 			// unescape characters
 			Uri foreignUri = new Uri("http://server崎/村");
-			se = ServiceEndpoint.CreateForClaimedIdentifier(foreignUri, localId, new ProviderEndpointDescription(providerEndpoint, serviceTypeUris), null, null);
-			Assert.AreEqual("server崎/村", se.FriendlyIdentifierForDisplay);
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(foreignUri, localId, new ProviderEndpointDescription(providerEndpoint, serviceTypeUris), null, null);
+			Assert.AreEqual("server崎/村", se.GetFriendlyIdentifierForDisplay());
 
 			// restore user supplied identifier to XRIs
-			se = ServiceEndpoint.CreateForClaimedIdentifier(
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(
 				new XriIdentifier("=!9B72.7DD1.50A9.5CCD"),
 				new XriIdentifier("=Arnott崎村"),
 				localId,
 				new ProviderEndpointDescription(providerEndpoint, serviceTypeUris),
 				null,
 				null);
-			Assert.AreEqual("=Arnott崎村", se.FriendlyIdentifierForDisplay);
+			Assert.AreEqual("=Arnott崎村", se.GetFriendlyIdentifierForDisplay());
 
 			// If UserSuppliedIdentifier is the same as the ClaimedIdentifier, don't display it twice...
-			se = ServiceEndpoint.CreateForClaimedIdentifier(
+			se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(
 				new XriIdentifier("=!9B72.7DD1.50A9.5CCD"),
 				new XriIdentifier("=!9B72.7DD1.50A9.5CCD"),
 				localId,
 				new ProviderEndpointDescription(providerEndpoint, serviceTypeUris),
 				null,
 				null);
-			Assert.AreEqual("=!9B72.7DD1.50A9.5CCD", se.FriendlyIdentifierForDisplay);
+			Assert.AreEqual("=!9B72.7DD1.50A9.5CCD", se.GetFriendlyIdentifierForDisplay());
 		}
 
 		[TestMethod]
 		public void IsTypeUriPresent() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			Assert.IsTrue(se.IsTypeUriPresent(Protocol.Default.ClaimedIdentifierServiceTypeURI));
-			Assert.IsFalse(se.IsTypeUriPresent("http://someother"));
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			Assert.IsTrue(se.ProviderEndpoint.IsTypeUriPresent(Protocol.Default.ClaimedIdentifierServiceTypeURI));
+			Assert.IsFalse(se.ProviderEndpoint.IsTypeUriPresent("http://someother"));
 		}
 
 		[TestMethod, ExpectedException(typeof(ArgumentException))]
 		public void IsTypeUriPresentNull() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			se.IsTypeUriPresent(null);
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			se.ProviderEndpoint.IsTypeUriPresent(null);
 		}
 
 		[TestMethod, ExpectedException(typeof(ArgumentException))]
 		public void IsTypeUriPresentEmpty() {
-			ServiceEndpoint se = ServiceEndpoint.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
-			se.IsTypeUriPresent(string.Empty);
+			IIdentifierDiscoveryResult se = IdentifierDiscoveryResult.CreateForClaimedIdentifier(this.claimedXri, this.userSuppliedXri, this.localId, new ProviderEndpointDescription(this.providerEndpoint, this.v20TypeUris), this.servicePriority, this.uriPriority);
+			se.ProviderEndpoint.IsTypeUriPresent(string.Empty);
 		}
 	}
 }