Merge branch 'v3.3' into v3.4

2 files changed, 10 insertions, 10 deletions

diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
index 2206c79..1b1dd49 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/ExtensionsInteropHelperOPTests.cs
@@ -42,6 +42,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			Assert.IsNull(sreg);
 
 			// Make sure we're still able to send an sreg response.
+			// (not really a valid scenario, since OPs don't have public access
+			// to directly create a response without a request.
 			var sregResponse = new ClaimsResponse();
 			this.request.AddResponseExtension(sregResponse);
 			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
@@ -60,7 +62,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// </summary>
 		[TestCase]
 		public void UnifyExtensionsAsSregWithSreg() {
-			var sregInjected = new ClaimsRequest {
+			var sregInjected = new ClaimsRequest(DotNetOpenAuth.OpenId.Extensions.SimpleRegistration.Constants.sreg_ns) {
 				Nickname = DemandLevel.Request,
 			};
 			this.extensions.Add(sregInjected);
@@ -69,7 +71,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
 			Assert.AreEqual(DemandLevel.NoRequest, sreg.FullName);
 
-			var sregResponse = new ClaimsResponse();
+			var sregResponse = sreg.CreateResponse();
 			this.request.AddResponseExtension(sregResponse);
 			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
@@ -97,7 +99,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 		/// </summary>
 		[TestCase]
 		public void UnifyExtensionsAsSregWithBothSregAndAX() {
-			var sregInjected = new ClaimsRequest {
+			var sregInjected = new ClaimsRequest(DotNetOpenAuth.OpenId.Extensions.SimpleRegistration.Constants.sreg_ns) {
 				Nickname = DemandLevel.Request,
 			};
 			this.extensions.Add(sregInjected);
@@ -109,9 +111,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			Assert.AreEqual(DemandLevel.Request, sreg.Nickname);
 			Assert.AreEqual(DemandLevel.NoRequest, sreg.Email);
 
-			var sregResponseInjected = new ClaimsResponse {
-				Nickname = "andy",
-			};
+			var sregResponseInjected = sreg.CreateResponse();
+			sregResponseInjected.Nickname = "andy";
 			this.request.AddResponseExtension(sregResponseInjected);
 			var axResponseInjected = new FetchResponse();
 			axResponseInjected.Attributes.Add(WellKnownAttributes.Contact.Email, "a@b.com");
@@ -140,9 +141,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			Assert.AreEqual(DemandLevel.Require, sreg.FullName);
 			Assert.AreEqual(DemandLevel.NoRequest, sreg.Language);
 
-			var sregResponse = new ClaimsResponse {
-				Nickname = "andy",
-			};
+			var sregResponse = sreg.CreateResponse();
+			sregResponse.Nickname = "andy";
 			this.request.AddResponseExtension(sregResponse);
 			ExtensionsInteropHelper.ConvertSregToMatchRequest(this.request);
 			var extensions = this.GetResponseExtensions();
diff --git a/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs b/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
index c6aa027..1b58c2f 100644
--- a/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
+++ b/src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs
@@ -149,7 +149,7 @@ namespace DotNetOpenAuth.OpenId.Extensions {
 
 			var ax = req.GetExtension<FetchRequest>();
 			if (ax != null) {
-				sreg = new ClaimsRequest();
+				sreg = new ClaimsRequest(SimpleRegistration.Constants.sreg_ns);
 				sreg.Synthesized = true;
 				((IProtocolMessageWithExtensions)req.RequestMessage).Extensions.Add(sreg);
 				sreg.BirthDate = GetDemandLevelFor(ax, WellKnownAttributes.BirthDate.WholeBirthDate);