1 files changed, 22 insertions, 20 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
index e9ff7a4..60075f3 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
@@ -7,6 +7,8 @@
 namespace DotNetOpenAuth.Test.OpenId.Extensions {
 	using System.Collections.Generic;
 	using System.Linq;
+	using System.Threading;
+	using System.Threading.Tasks;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OpenId;
 	using DotNetOpenAuth.OpenId.Extensions;
@@ -38,7 +40,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// Verifies no extensions appear as no extensions
 		/// </summary>
 		[Test]
-		public void NoRequestedExtensions() {
+		public async Task NoRequestedExtensions() {
 			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
 			Assert.IsNull(sreg);
 
@@ -47,22 +49,22 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			// to directly create a response without a request.
 			var sregResponse = new ClaimsResponse();
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
-			var extensions = this.GetResponseExtensions();
+			await ExtensionsInteropHelper.ConvertSregToMatchRequestAsync(this.request, CancellationToken.None);
+			var extensions = await this.GetResponseExtensionsAsync();
 			Assert.AreSame(sregResponse, extensions.Single());
 		}
 
 		[Test]
-		public void NegativeResponse() {
+		public async Task NegativeResponse() {
 			this.request.IsAuthenticated = false;
-			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
+			await ExtensionsInteropHelper.ConvertSregToMatchRequestAsync(this.request, CancellationToken.None);
 		}
 
 		/// <summary>
 		/// Verifies sreg coming in is seen as sreg.
 		/// </summary>
 		[Test]
-		public void UnifyExtensionsAsSregWithSreg() {
+		public async Task UnifyExtensionsAsSregWithSreg() {
 			var sregInjected = new ClaimsRequest(DotNetOpenAuth.OpenId.Extensions.SimpleRegistration.Constants.TypeUris.Standard) {
 				Nickname = DemandLevel.Request,
 			};
@@ -74,8 +76,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 
 			var sregResponse = sreg.CreateResponse();
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
-			var extensions = this.GetResponseExtensions();
+			await ExtensionsInteropHelper.ConvertSregToMatchRequestAsync(this.request, CancellationToken.None);
+			var extensions = await this.GetResponseExtensionsAsync();
 			Assert.AreSame(sregResponse, extensions.Single());
 		}
 
@@ -83,23 +85,23 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// Verifies AX coming in looks like sreg.
 		/// </summary>
 		[Test]
-		public void UnifyExtensionsAsSregWithAX() {
-			this.ParameterizedAXTest(AXAttributeFormats.AXSchemaOrg);
+		public async Task UnifyExtensionsAsSregWithAX() {
+			await this.ParameterizedAXTestAsync(AXAttributeFormats.AXSchemaOrg);
 		}
 
 		/// <summary>
 		/// Verifies AX coming in looks like sreg.
 		/// </summary>
 		[Test]
-		public void UnifyExtensionsAsSregWithAXSchemaOpenIdNet() {
-			this.ParameterizedAXTest(AXAttributeFormats.SchemaOpenIdNet);
+		public async Task UnifyExtensionsAsSregWithAXSchemaOpenIdNet() {
+			await this.ParameterizedAXTestAsync(AXAttributeFormats.SchemaOpenIdNet);
 		}
 
 		/// <summary>
 		/// Verifies sreg and AX in one request has a preserved sreg request.
 		/// </summary>
 		[Test]
-		public void UnifyExtensionsAsSregWithBothSregAndAX() {
+		public async Task UnifyExtensionsAsSregWithBothSregAndAX() {
 			var sregInjected = new ClaimsRequest(DotNetOpenAuth.OpenId.Extensions.SimpleRegistration.Constants.TypeUris.Standard) {
 				Nickname = DemandLevel.Request,
 			};
@@ -118,20 +120,20 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var axResponseInjected = new FetchResponse();
 			axResponseInjected.Attributes.Add(WellKnownAttributes.Contact.Email, "a@b.com");
 			this.request.AddResponseExtension(axResponseInjected);
-			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
-			var extensions = this.GetResponseExtensions();
+			await ExtensionsInteropHelper.ConvertSregToMatchRequestAsync(this.request, CancellationToken.None);
+			var extensions = await this.GetResponseExtensionsAsync();
 			var sregResponse = extensions.OfType<ClaimsResponse>().Single();
 			Assert.AreEqual("andy", sregResponse.Nickname);
 			var axResponse = extensions.OfType<FetchResponse>().Single();
 			Assert.AreEqual("a@b.com", axResponse.GetAttributeValue(WellKnownAttributes.Contact.Email));
 		}
 
-		private IList<IExtensionMessage> GetResponseExtensions() {
-			IProtocolMessageWithExtensions response = (IProtocolMessageWithExtensions)this.request.Response;
+		private async Task<IList<IExtensionMessage>> GetResponseExtensionsAsync() {
+			var response = (IProtocolMessageWithExtensions)await this.request.GetResponseAsync(CancellationToken.None);
 			return response.Extensions;
 		}
 
-		private void ParameterizedAXTest(AXAttributeFormats format) {
+		private async Task ParameterizedAXTestAsync(AXAttributeFormats format) {
 			var axInjected = new FetchRequest();
 			axInjected.Attributes.AddOptional(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format));
 			axInjected.Attributes.AddRequired(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.FullName, format));
@@ -145,8 +147,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var sregResponse = sreg.CreateResponse();
 			sregResponse.Nickname = "andy";
 			this.request.AddResponseExtension(sregResponse);
-			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
-			var extensions = this.GetResponseExtensions();
+			await ExtensionsInteropHelper.ConvertSregToMatchRequestAsync(this.request, CancellationToken.None);
+			var extensions = await this.GetResponseExtensionsAsync();
 			var axResponse = extensions.OfType<FetchResponse>().Single();
 			Assert.AreEqual("andy", axResponse.GetAttributeValue(ExtensionsInteropHelper.TransformAXFormatTestHook(WellKnownAttributes.Name.Alias, format)));
 		}