Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
	src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessageReceivingEndpoint.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthServiceProviderMessageFactory.cs
	src/DotNetOpenAuth/OAuth/Protocol.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Association.cs
	src/DotNetOpenAuth/OpenId/Behaviors/PpidGeneration.cs
	src/DotNetOpenAuth/OpenId/NoDiscoveryIdentifier.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IDirectedIdentityIdentifierProvider.cs
	src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs
	src/DotNetOpenAuth/OpenId/Realm.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponseSnapshot.cs
	src/DotNetOpenAuth/OpenId/UriIdentifier.cs
	src/DotNetOpenAuth/OpenId/XriIdentifier.cs
	src/DotNetOpenAuth/Util.cs

3 files changed, 47 insertions, 1 deletions

diff --git a/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs b/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
index 48547b7..35672d7 100644
--- a/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
@@ -106,6 +106,10 @@ namespace DotNetOpenAuth.Test.Mocks {
 			return this.tokens[token];
 		}
 
+		public void UpdateToken(IServiceProviderRequestToken token) {
+			// Nothing to do here, since we're using Linq To SQL.
+		}
+
 		#endregion
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs b/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
index 2788435..346dde9 100644
--- a/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
@@ -25,7 +25,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 		private Identifier wrappedIdentifier;
 
 		public MockIdentifier(Identifier wrappedIdentifier, MockHttpRequest mockHttpRequest, IEnumerable<ServiceEndpoint> endpoints)
-			: base(false) {
+			: base(wrappedIdentifier.OriginalString, false) {
 			Contract.Requires<ArgumentNullException>(wrappedIdentifier != null);
 			Contract.Requires<ArgumentNullException>(mockHttpRequest != null);
 			Contract.Requires<ArgumentNullException>(endpoints != null);
diff --git a/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs b/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs
new file mode 100644
index 0000000..4e29bba
--- /dev/null
+++ b/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs
@@ -0,0 +1,42 @@
+//-----------------------------------------------------------------------
+// <copyright file="MockRealm.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.Test.Mocks {
+	using System.Collections.Generic;
+	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OpenId;
+
+	internal class MockRealm : Realm {
+		private RelyingPartyEndpointDescription[] relyingPartyDescriptions;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="MockRealm"/> class.
+		/// </summary>
+		/// <param name="wrappedRealm">The wrapped realm.</param>
+		/// <param name="relyingPartyDescriptions">The relying party descriptions.</param>
+		internal MockRealm(Realm wrappedRealm, params RelyingPartyEndpointDescription[] relyingPartyDescriptions)
+			: base(wrappedRealm) {
+			ErrorUtilities.VerifyArgumentNotNull(relyingPartyDescriptions, "relyingPartyDescriptions");
+
+			this.relyingPartyDescriptions = relyingPartyDescriptions;
+		}
+
+		/// <summary>
+		/// Searches for an XRDS document at the realm URL, and if found, searches
+		/// for a description of a relying party endpoints (OpenId login pages).
+		/// </summary>
+		/// <param name="requestHandler">The mechanism to use for sending HTTP requests.</param>
+		/// <param name="allowRedirects">Whether redirects may be followed when discovering the Realm.
+		/// This may be true when creating an unsolicited assertion, but must be
+		/// false when performing return URL verification per 2.0 spec section 9.2.1.</param>
+		/// <returns>
+		/// The details of the endpoints if found, otherwise null.
+		/// </returns>
+		internal override IEnumerable<RelyingPartyEndpointDescription> Discover(IDirectWebRequestHandler requestHandler, bool allowRedirects) {
+			return this.relyingPartyDescriptions;
+		}
+	}
+}