More build break fixes.

2 files changed, 15 insertions, 14 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/Provider/PerformanceTests.cs b/src/DotNetOpenAuth.Test/OpenId/Provider/PerformanceTests.cs
index e2c719d..1501150 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Provider/PerformanceTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Provider/PerformanceTests.cs
@@ -37,10 +37,10 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 		public void AssociateDH() {
 			var associateRequest = this.CreateAssociateRequest(OPUri);
 			MeasurePerformance(
-				() => {
-					IRequest request = this.provider.GetRequest(associateRequest);
-					var response = this.provider.PrepareResponse(request);
-					Assert.IsInstanceOf<AssociateSuccessfulResponse>(response.OriginalMessage);
+				async delegate {
+					IRequest request = await this.provider.GetRequestAsync(associateRequest);
+					var response = await this.provider.PrepareResponseAsync(request);
+					Assert.IsInstanceOf<AssociateSuccessfulResponse>(((HttpResponseMessageWithOriginal)response).OriginalMessage);
 				},
 				maximumAllowedUnitTime: 3.5e6f,
 				iterations: 1);
@@ -50,10 +50,10 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 		public void AssociateClearText() {
 			var associateRequest = this.CreateAssociateRequest(OPUriSsl); // SSL will cause a plaintext association
 			MeasurePerformance(
-				() => {
-					IRequest request = this.provider.GetRequest(associateRequest);
-					var response = this.provider.PrepareResponse(request);
-					Assert.IsInstanceOf<AssociateSuccessfulResponse>(response.OriginalMessage);
+				async delegate {
+					IRequest request = await this.provider.GetRequestAsync(associateRequest);
+					var response = await this.provider.PrepareResponseAsync(request);
+					Assert.IsInstanceOf<AssociateSuccessfulResponse>(((HttpResponseMessageWithOriginal)response).OriginalMessage);
 				},
 				maximumAllowedUnitTime: 1.5e4f,
 				iterations: 1000);
@@ -82,11 +82,11 @@ namespace DotNetOpenAuth.Test.OpenId.Provider {
 				this.provider.SecuritySettings);
 			var checkidRequest = this.CreateCheckIdRequest(true);
 			MeasurePerformance(
-				() => {
-					var request = (IAuthenticationRequest)this.provider.GetRequest(checkidRequest);
+				async delegate {
+					var request = (IAuthenticationRequest)await this.provider.GetRequestAsync(checkidRequest);
 					request.IsAuthenticated = true;
-					var response = this.provider.PrepareResponse(request);
-					Assert.IsInstanceOf<PositiveAssertionResponse>(response.OriginalMessage);
+					var response = await this.provider.PrepareResponseAsync(request);
+					Assert.IsInstanceOf<PositiveAssertionResponse>(((HttpResponseMessageWithOriginal)response).OriginalMessage);
 				},
 				maximumAllowedUnitTime: 6.8e4f);
 		}
diff --git a/src/DotNetOpenAuth.Test/TestBase.cs b/src/DotNetOpenAuth.Test/TestBase.cs
index 92adafa..612d871 100644
--- a/src/DotNetOpenAuth.Test/TestBase.cs
+++ b/src/DotNetOpenAuth.Test/TestBase.cs
@@ -8,6 +8,7 @@ namespace DotNetOpenAuth.Test {
 	using System;
 	using System.IO;
 	using System.Reflection;
+	using System.Threading.Tasks;
 	using System.Web;
 	using DotNetOpenAuth.Messaging.Reflection;
 	using DotNetOpenAuth.OAuth.Messages;
@@ -67,7 +68,7 @@ namespace DotNetOpenAuth.Test {
 			log4net.LogManager.Shutdown();
 		}
 
-		internal static Stats MeasurePerformance(Action action, float maximumAllowedUnitTime, int samples = 10, int iterations = 100, string name = null) {
+		internal static Stats MeasurePerformance(Func<Task> action, float maximumAllowedUnitTime, int samples = 10, int iterations = 100, string name = null) {
 			if (!PerformanceTestUtilities.IsOptimized(typeof(OpenIdRelyingParty).Assembly)) {
 				Assert.Inconclusive("Unoptimized code.");
 			}
@@ -75,7 +76,7 @@ namespace DotNetOpenAuth.Test {
 			var timer = new MultiSampleCodeTimer(samples, iterations);
 			Stats stats;
 			using (new HighPerformance()) {
-				stats = timer.Measure(name ?? TestContext.CurrentContext.Test.FullName, action);
+				stats = timer.Measure(name ?? TestContext.CurrentContext.Test.FullName, action().Wait());
 			}
 
 			stats.AdjustForScale(PerformanceTestUtilities.Baseline.Median);