Fixes several more unit tests. 55 left

5 files changed, 19 insertions, 35 deletions

diff --git a/src/DotNetOpenAuth.Core/Messaging/Channel.cs b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
index 25ad84b..b65e2e3 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Channel.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Channel.cs
@@ -685,34 +685,29 @@ namespace DotNetOpenAuth.Messaging {
 			try {
 				using (var httpClient = this.HostFactories.CreateHttpClient()) {
 					using (var response = await httpClient.SendAsync(webRequest, cancellationToken)) {
-						if (response.IsSuccessStatusCode) {
-							if (response.Content == null) {
-								return null;
-							}
-
+						if (response.Content != null) {
 							var responseFields = await this.ReadFromResponseCoreAsync(response, cancellationToken);
-							if (responseFields == null) {
-								return null;
-							}
+							if (responseFields != null) {
+								var responseMessage = this.MessageFactory.GetNewResponseMessage(request, responseFields);
+								if (responseMessage != null) {
+									this.OnReceivingDirectResponse(response, responseMessage);
 
-							var responseMessage = this.MessageFactory.GetNewResponseMessage(request, responseFields);
-							if (responseMessage == null) {
-								return null;
-							}
-
-							this.OnReceivingDirectResponse(response, responseMessage);
+									var messageAccessor = this.MessageDescriptions.GetAccessor(responseMessage);
+									messageAccessor.Deserialize(responseFields);
 
-							var messageAccessor = this.MessageDescriptions.GetAccessor(responseMessage);
-							messageAccessor.Deserialize(responseFields);
+									return responseMessage;
+								}
+							}
+						}
 
-							return responseMessage;
-						} else {
+						if (!response.IsSuccessStatusCode) {
 							var errorContent = (response.Content != null) ? await response.Content.ReadAsStringAsync() : null;
 							Logger.Http.ErrorFormat(
 								"Error received in HTTP response: {0} {1}\n{2}", (int)response.StatusCode, response.ReasonPhrase, errorContent);
 							response.EnsureSuccessStatusCode(); // throw so we can wrap it in our catch block.
-							throw Assumes.NotReachable();
 						}
+
+						return null;
 					}
 				}
 			} catch (HttpRequestException requestException) {
@@ -1339,18 +1334,6 @@ namespace DotNetOpenAuth.Messaging {
 			return -((int)protection1).CompareTo((int)protection2); // descending flag ordinal order
 		}
 
-#if CONTRACTS_FULL
-		/// <summary>
-		/// Verifies conditions that should be true for any valid state of this object.
-		/// </summary>
-		[SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Called by code contracts.")]
-		[SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode", Justification = "Called by code contracts.")]
-		[ContractInvariantMethod]
-		private void ObjectInvariant() {
-			Contract.Invariant(this.MessageDescriptions != null);
-		}
-#endif
-
 		/// <summary>
 		/// Verifies that all required message parts are initialized to values
 		/// prior to sending the message to a remote party.
diff --git a/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs b/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
index 834aba2..c714e6f 100644
--- a/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth/ChannelElements/OAuthChannelTests.cs
@@ -301,7 +301,7 @@ namespace DotNetOpenAuth.Test.OAuth.ChannelElements {
 				HttpMethods = scheme,
 			};
 
-			Handle(request.Location).By(
+			Handle(request.Recipient).By(
 				async (req, ct) => {
 					Assert.IsNotNull(req);
 					Assert.AreEqual(MessagingUtilities.GetHttpVerb(scheme), req.Method);
diff --git a/src/DotNetOpenAuth.Test/OAuth2/AuthorizationServerTests.cs b/src/DotNetOpenAuth.Test/OAuth2/AuthorizationServerTests.cs
index 3302db7..be82f91 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/AuthorizationServerTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/AuthorizationServerTests.cs
@@ -176,7 +176,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 					return await server.HandleTokenRequestAsync(req, ct);
 				});
 
-			var client = new WebServerClient(AuthorizationServerDescription, hostFactories: this.HostFactories);
+			var client = new WebServerClient(AuthorizationServerDescription, ClientId, ClientSecret, this.HostFactories);
 			var authState = new AuthorizationState(TestScopes) {
 				Callback = ClientCallback,
 			};
diff --git a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
index 59d82d5..8241ead 100644
--- a/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth2/WebServerClientAuthorizeTests.cs
@@ -100,7 +100,7 @@ namespace DotNetOpenAuth.Test.OAuth2 {
 					var server = new AuthorizationServer(authServer.Object);
 					return await server.HandleTokenRequestAsync(req, ct);
 				});
-			var client = new WebServerClient(AuthorizationServerDescription);
+			var client = new WebServerClient(AuthorizationServerDescription, ClientId, ClientSecret, this.HostFactories);
 			var authState = await client.GetClientAccessTokenAsync(TestScopes);
 			Assert.That(authState.AccessToken, Is.Not.Null.And.Not.Empty);
 			Assert.That(authState.RefreshToken, Is.Null);
diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
index 1f21ce5..2d9413d 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/OpenIdRelyingPartyTests.cs
@@ -110,7 +110,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 		[Test]
 		public async Task AssertionWithEndpointFilter() {
 			var opStore = new StandardProviderApplicationStore();
-			Handle(RPRealmUri).By(
+			Handle(RPUri).By(
 				async req => {
 					var rp = new OpenIdRelyingParty(new StandardRelyingPartyApplicationStore(), this.HostFactories);
 
@@ -119,6 +119,7 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 
 					// Receive the unsolicited assertion
 					var response = await rp.GetResponseAsync(req);
+					Assert.That(response, Is.Not.Null);
 					Assert.AreEqual(AuthenticationStatus.Failed, response.Status);
 					return new HttpResponseMessage();
 				});