3 files changed, 16 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs b/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
index 6980761..48547b7 100644
--- a/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/InMemoryTokenManager.cs
@@ -102,6 +102,10 @@ namespace DotNetOpenAuth.Test.Mocks {
 			return this.tokens[token];
 		}
 
+		public IServiceProviderAccessToken GetAccessToken(string token) {
+			return this.tokens[token];
+		}
+
 		#endregion
 
 		/// <summary>
@@ -125,7 +129,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 			this.requestTokens[requestToken] = true;
 		}
 
-		private class TokenInfo : IServiceProviderRequestToken {
+		private class TokenInfo : IServiceProviderRequestToken, IServiceProviderAccessToken {
 			internal TokenInfo() {
 				this.CreatedOn = DateTime.Now;
 			}
@@ -142,6 +146,12 @@ namespace DotNetOpenAuth.Test.Mocks {
 
 			public Version ConsumerVersion { get; set; }
 
+			public string Username { get; set; }
+
+			public string[] Roles { get; set; }
+
+			public DateTime? ExpirationDate { get; set; }
+
 			internal string Secret { get; set; }
 		}
 
diff --git a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
index d2e1f0b..66f258d 100644
--- a/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/MockHttpRequest.cs
@@ -152,6 +152,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 		<Service priority='10'>
 			<Type>{0}</Type>
 			<URI>{1}</URI>
+			<URI>{2}</URI>
 		</Service>
 	</XRD>
 </xrds:XRDS>";
@@ -159,9 +160,11 @@ namespace DotNetOpenAuth.Test.Mocks {
 				CultureInfo.InvariantCulture,
 				template,
 				HttpUtility.HtmlEncode(Protocol.V20.RPReturnToTypeURI),
-				HttpUtility.HtmlEncode(OpenIdTestBase.RPRealmUri.AbsoluteUri));
+				HttpUtility.HtmlEncode(OpenIdTestBase.RPRealmUri.AbsoluteUri),
+				HttpUtility.HtmlEncode(OpenIdTestBase.RPRealmUriSsl.AbsoluteUri));
 
 			this.RegisterMockResponse(OpenIdTestBase.RPRealmUri, ContentTypes.Xrds, xrds);
+			this.RegisterMockResponse(OpenIdTestBase.RPRealmUriSsl, ContentTypes.Xrds, xrds);
 		}
 
 		internal void DeleteResponse(Uri requestUri) {
diff --git a/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs b/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs
index 4e29bba..ae39ebb 100644
--- a/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/MockRealm.cs
@@ -35,7 +35,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 		/// <returns>
 		/// The details of the endpoints if found, otherwise null.
 		/// </returns>
-		internal override IEnumerable<RelyingPartyEndpointDescription> Discover(IDirectWebRequestHandler requestHandler, bool allowRedirects) {
+		internal override IEnumerable<RelyingPartyEndpointDescription> DiscoverReturnToEndpoints(IDirectWebRequestHandler requestHandler, bool allowRedirects) {
 			return this.relyingPartyDescriptions;
 		}
 	}