Attribute extension interop helper testing complete, along with several bug fixes.

3 files changed, 233 insertions, 7 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
new file mode 100644
index 0000000..9f849ea
--- /dev/null
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
@@ -0,0 +1,147 @@
+//-----------------------------------------------------------------------
+// <copyright file="ExtensionsInteropHelperOPTests.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.Test.OpenId.Extensions {
+	using System.Collections.Generic;
+	using System.Linq;
+	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OpenId;
+	using DotNetOpenAuth.OpenId.Extensions;
+	using DotNetOpenAuth.OpenId.Extensions.AttributeExchange;
+	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
+	using DotNetOpenAuth.OpenId.Messages;
+	using DotNetOpenAuth.OpenId.Provider;
+	using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+	[TestClass]
+	public class ExtensionsInteropHelperOPTests : OpenIdTestBase {
+		private AuthenticationRequest request;
+		private IList<IExtensionMessage> extensions;
+
+		[TestInitialize]
+		public override void SetUp() {
+			base.SetUp();
+
+			var op = this.CreateProvider();
+			var rpRequest = new CheckIdRequest(Protocol.Default.Version, OPUri, DotNetOpenAuth.OpenId.RelyingParty.AuthenticationRequestMode.Setup);
+			rpRequest.ReturnTo = RPUri;
+			this.extensions = rpRequest.Extensions;
+			this.request = new AuthenticationRequest(op, rpRequest);
+			this.request.IsAuthenticated = true;
+		}
+
+		/// <summary>
+		/// Verifies no extensions appear as no extensions
+		/// </summary>
+		[TestMethod]
+		public void NoRequestedExtensions() {
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
+			Assert.IsNull(sreg);
+
+			// Make sure we're still able to send an sreg response.
+			var sregResponse = new ClaimsResponse();
+			this.request.AddResponseExtension(sregResponse);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
+			var extensions = this.GetResponseExtensions();
+			Assert.AreSame(sregResponse, extensions.Single());
+		}
+
+		/// <summary>
+		/// Verifies sreg coming in is seen as sreg.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregWithSreg() {
+			var sregInjected = new ClaimsRequest {
+				Nickname = DemandLevel.Request,
+			};
+			this.extensions.Add(sregInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
+			Assert.AreSame(sregInjected, sreg);
+			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
+			Assert.AreEqual(DemandLevel.NoRequest, sreg.FullName);
+
+			var sregResponse = new ClaimsResponse();
+			this.request.AddResponseExtension(sregResponse);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
+			var extensions = this.GetResponseExtensions();
+			Assert.AreSame(sregResponse, extensions.Single());
+		}
+
+		/// <summary>
+		/// Verifies AX coming in looks like sreg.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregWithAX() {
+			this.ParameterizedAXTest(AXAttributeFormats.AXSchemaOrg);
+		}
+
+		/// <summary>
+		/// Verifies AX coming in looks like sreg.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregWithAXSchemaOpenIdNet() {
+			this.ParameterizedAXTest(AXAttributeFormats.SchemaOpenIdNet);
+		}
+
+		/// <summary>
+		/// Verifies sreg and AX in one request has a preserved sreg request.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregWithBothSregAndAX() {
+			var sregInjected = new ClaimsRequest {
+				Nickname = DemandLevel.Request,
+			};
+			this.extensions.Add(sregInjected);
+			var axInjected = new FetchRequest();
+			axInjected.Attributes.AddOptional(WellKnownAttributes.Contact.Email);
+			this.extensions.Add(axInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
+			Assert.AreSame(sregInjected, sreg);
+			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
+			Assert.AreEqual(DemandLevel.NoRequest, sreg.Email);
+
+			var sregResponseInjected = new ClaimsResponse {
+				Nickname = "andy",
+			};
+			this.request.AddResponseExtension(sregResponseInjected);
+			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();
+			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;
+			return response.Extensions;
+		}
+
+		private void ParameterizedAXTest(AXAttributeFormats format) {
+			var axInjected = new FetchRequest();
+			axInjected.Attributes.AddOptional(ExtensionsInteropHelper_Accessor.TransformAXFormat(WellKnownAttributes.Name.Alias, format));
+			axInjected.Attributes.AddRequired(ExtensionsInteropHelper_Accessor.TransformAXFormat(WellKnownAttributes.Name.FullName, format));
+			this.extensions.Add(axInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.request);
+			Assert.AreSame(sreg, this.request.GetExtension<ClaimsRequest>());
+			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
+			Assert.AreEqual(DemandLevel.Require, sreg.FullName);
+			Assert.AreEqual(DemandLevel.NoRequest, sreg.Language);
+
+			var sregResponse = new ClaimsResponse {
+				Nickname = "andy",
+			};
+			this.request.AddResponseExtension(sregResponse);
+			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
+			var extensions = this.GetResponseExtensions();
+			var axResponse = extensions.OfType<FetchResponse>().Single();
+			Assert.AreEqual("andy", axResponse.GetAttributeValue(ExtensionsInteropHelper_Accessor.TransformAXFormat(WellKnownAttributes.Name.Alias, format)));
+		}
+	}
+}
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
index ee6aded..ba5e335 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPRequestTests.cs
@@ -1,24 +1,20 @@
 //-----------------------------------------------------------------------
-// <copyright file="InteropHelperTests.cs" company="Andrew Arnott">
+// <copyright file="ExtensionsInteropHelperRPRequestTests.cs" company="Andrew Arnott">
 //     Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
 namespace DotNetOpenAuth.Test.OpenId {
-	using System;
-	using System.Collections.Generic;
 	using System.Linq;
-	using System.Text;
 	using DotNetOpenAuth.OpenId;
+	using DotNetOpenAuth.OpenId.Extensions;
 	using DotNetOpenAuth.OpenId.Extensions.AttributeExchange;
 	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
-	using Moq;
-	using DotNetOpenAuth.OpenId.Extensions;
 
 	[TestClass]
-	public class ExtensionsInteropHelperTests : OpenIdTestBase {
+	public class ExtensionsInteropHelperRPRequestTests : OpenIdTestBase {
 		private AuthenticationRequest authReq;
 		private ClaimsRequest sreg;
 
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs
new file mode 100644
index 0000000..5fe05c1
--- /dev/null
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperRPResponseTests.cs
@@ -0,0 +1,83 @@
+//-----------------------------------------------------------------------
+// <copyright file="ExtensionsInteropHelperRPResponseTests.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.Test.OpenId {
+	using System.Collections.Generic;
+	using DotNetOpenAuth.Messaging;
+	using DotNetOpenAuth.OpenId;
+	using DotNetOpenAuth.OpenId.Extensions;
+	using DotNetOpenAuth.OpenId.Extensions.AttributeExchange;
+	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
+	using DotNetOpenAuth.OpenId.Messages;
+	using DotNetOpenAuth.OpenId.RelyingParty;
+	using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+	[TestClass]
+	public class ExtensionsInteropHelperRPResponseTests : OpenIdTestBase {
+		private IAuthenticationResponse response;
+		private IList<IExtensionMessage> extensions;
+
+		[TestInitialize]
+		public override void SetUp() {
+			base.SetUp();
+
+			IndirectSignedResponse responseMessage = new IndirectSignedResponse(Protocol.Default.Version, RPUri);
+			this.extensions = responseMessage.Extensions;
+			this.response = new DotNetOpenAuth.OpenId.RelyingParty.PositiveAnonymousResponse(responseMessage);
+		}
+
+		/// <summary>
+		/// Verifies that with no extensions present, UnifyExtensionsAsSreg returns an empty ClaimsResponse.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregNoExtensions() {
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.response, true);
+			Assert.IsNotNull(sreg);
+			Assert.IsNull(sreg.Nickname);
+		}
+
+		/// <summary>
+		/// Verifies that with sreg and AX extensions present, the sreg extension is returned.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregWithSreg() {
+			var sregInjected = new ClaimsResponse {
+				Nickname = "andy",
+			};
+			var axInjected = new FetchResponse();
+			axInjected.Attributes.Add(WellKnownAttributes.Name.Alias, "nate");
+			this.extensions.Add(sregInjected);
+			this.extensions.Add(axInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.response, true);
+			Assert.AreSame(sregInjected, sreg);
+			Assert.AreEqual("andy", sreg.Nickname);
+		}
+
+		/// <summary>
+		/// Verifies UnifyExtensionsAsSreg correctly converts AX to sreg.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsAsSregFromAXSchemaOrg() {
+			var axInjected = new FetchResponse();
+			axInjected.Attributes.Add(WellKnownAttributes.Name.Alias, "nate");
+			this.extensions.Add(axInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.response, true);
+			Assert.AreEqual("nate", sreg.Nickname);
+		}
+
+		/// <summary>
+		/// Verifies UnifyExtensionsAsSreg correctly converts AX in a non-standard format to sreg.
+		/// </summary>
+		[TestMethod]
+		public void UnifyExtensionsasSregFromSchemaOpenIdNet() {
+			var axInjected = new FetchResponse();
+			axInjected.Attributes.Add(ExtensionsInteropHelper_Accessor.TransformAXFormat(WellKnownAttributes.Name.Alias, AXAttributeFormats.SchemaOpenIdNet), "nate");
+			this.extensions.Add(axInjected);
+			var sreg = ExtensionsInteropHelper.UnifyExtensionsAsSreg(this.response, true);
+			Assert.AreEqual("nate", sreg.Nickname);
+		}
+	}
+}