1 files changed, 63 insertions, 13 deletions
diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/HostProcessedRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/HostProcessedRequestTests.cs
index e8668a0..d308271 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/HostProcessedRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/HostProcessedRequestTests.cs
@@ -13,23 +13,73 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 
 	[TestClass]
 	public class HostProcessedRequestTests : OpenIdTestBase {
+		private Protocol protocol;
+		private OpenIdProvider provider;
+		private CheckIdRequest checkIdRequest;
+		private AuthenticationRequest request;
+
+		[TestInitialize]
+		public override void SetUp() {
+			base.SetUp();
+
+			this.protocol = Protocol.Default;
+			this.provider = this.CreateProvider();
+			this.checkIdRequest = new CheckIdRequest(this.protocol.Version, OPUri, DotNetOpenAuth.OpenId.RelyingParty.AuthenticationRequestMode.Setup);
+			this.checkIdRequest.Realm = RPRealmUri;
+			this.checkIdRequest.ReturnTo = RPUri;
+			this.request = new AuthenticationRequest(this.provider, this.checkIdRequest);
+		}
+
 		[TestMethod]
-		public void IsReturnUrlDiscoverable() {
-			Protocol protocol = Protocol.Default;
-			OpenIdProvider provider = this.CreateProvider();
-			CheckIdRequest checkIdRequest = new CheckIdRequest(protocol.Version, OPUri, DotNetOpenAuth.OpenId.RelyingParty.AuthenticationRequestMode.Setup);
-			checkIdRequest.Realm = RPRealmUri;
-			checkIdRequest.ReturnTo = RPUri;
-			AuthenticationRequest request = new AuthenticationRequest(provider, checkIdRequest);
-			Assert.AreEqual(RelyingPartyDiscoveryResult.NoServiceDocument, request.IsReturnUrlDiscoverable(this.MockResponder.MockWebRequestHandler));
+		public void IsReturnUrlDiscoverableNoResponse() {
+			Assert.AreEqual(RelyingPartyDiscoveryResult.NoServiceDocument, this.request.IsReturnUrlDiscoverable(this.provider));
+		}
 
+		[TestMethod]
+		public void IsReturnUrlDiscoverableValidResponse() {
 			this.MockResponder.RegisterMockRPDiscovery();
-			request = new AuthenticationRequest(provider, checkIdRequest);
-			Assert.AreEqual(RelyingPartyDiscoveryResult.Success, request.IsReturnUrlDiscoverable(this.MockResponder.MockWebRequestHandler));
+			this.request = new AuthenticationRequest(this.provider, this.checkIdRequest);
+			Assert.AreEqual(RelyingPartyDiscoveryResult.Success, this.request.IsReturnUrlDiscoverable(this.provider));
+		}
 
-			checkIdRequest.ReturnTo = new Uri("http://somerandom/host");
-			request = new AuthenticationRequest(provider, checkIdRequest);
-			Assert.AreEqual(RelyingPartyDiscoveryResult.NoMatchingReturnTo, request.IsReturnUrlDiscoverable(this.MockResponder.MockWebRequestHandler));
+		/// <summary>
+		/// Verifies that when discovery would be performed over standard HTTP and RequireSsl
+		/// is set, that discovery fails.
+		/// </summary>
+		[TestMethod]
+		public void IsReturnUrlDiscoverableNotSsl() {
+			this.provider.SecuritySettings.RequireSsl = true;
+			this.MockResponder.RegisterMockRPDiscovery();
+			Assert.AreEqual(RelyingPartyDiscoveryResult.NoServiceDocument, this.request.IsReturnUrlDiscoverable(this.provider));
+		}
+
+		/// <summary>
+		/// Verifies that when discovery would be performed over HTTPS that discovery succeeds.
+		/// </summary>
+		[TestMethod]
+		public void IsReturnUrlDiscoverableRequireSsl() {
+			this.MockResponder.RegisterMockRPDiscovery();
+			this.checkIdRequest.Realm = RPRealmUriSsl;
+			this.checkIdRequest.ReturnTo = RPUriSsl;
+
+			// Try once with RequireSsl
+			this.provider.SecuritySettings.RequireSsl = true;
+			this.request = new AuthenticationRequest(this.provider, this.checkIdRequest);
+			Assert.AreEqual(RelyingPartyDiscoveryResult.Success, this.request.IsReturnUrlDiscoverable(this.provider));
+
+			// And again without RequireSsl
+			this.provider.SecuritySettings.RequireSsl = false;
+			this.request = new AuthenticationRequest(this.provider, this.checkIdRequest);
+			Assert.AreEqual(RelyingPartyDiscoveryResult.Success, this.request.IsReturnUrlDiscoverable(this.provider));
+		}
+
+		[TestMethod]
+		public void IsReturnUrlDiscoverableValidButNoMatch() {
+			this.MockResponder.RegisterMockRPDiscovery();
+			this.provider.SecuritySettings.RequireSsl = false; // reset for another failure test case
+			this.checkIdRequest.ReturnTo = new Uri("http://somerandom/host");
+			this.request = new AuthenticationRequest(this.provider, this.checkIdRequest);
+			Assert.AreEqual(RelyingPartyDiscoveryResult.NoMatchingReturnTo, this.request.IsReturnUrlDiscoverable(this.provider));
 		}
 	}
 }