Merge branch 'v3.4' into oauth2

Conflicts:
	src/DotNetOpenAuth/Configuration/MessagingElement.cs
	src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs

3 files changed, 33 insertions, 16 deletions

diff --git a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
index fbb7779..26d870b 100644
--- a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
+++ b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
@@ -138,18 +138,10 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\log4net.dll</HintPath>
-    </Reference>
+    <Reference Include="log4net" />
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-    <Reference Include="Moq, Version=3.1.416.3, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\Moq.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\lib\nunit.framework.dll</HintPath>
-    </Reference>
+    <Reference Include="Moq" />
+    <Reference Include="NUnit.Framework"/>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Core">
diff --git a/src/DotNetOpenAuth.Test/Messaging/Reflection/ValueMappingTests.cs b/src/DotNetOpenAuth.Test/Messaging/Reflection/ValueMappingTests.cs
index d556b11..60c8bc3 100644
--- a/src/DotNetOpenAuth.Test/Messaging/Reflection/ValueMappingTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/Reflection/ValueMappingTests.cs
@@ -13,12 +13,12 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 	public class ValueMappingTests {
 		[TestCase, ExpectedException(typeof(ArgumentNullException))]
 		public void CtorNullToString() {
-			new ValueMapping(null, str => new object());
+			new ValueMapping(null, null, str => new object());
 		}
 
 		[TestCase, ExpectedException(typeof(ArgumentNullException))]
 		public void CtorNullToObject() {
-			new ValueMapping(obj => obj.ToString(), null);
+			new ValueMapping(obj => obj.ToString(), null, null);
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.Test/OpenId/Messages/CheckAuthenticationRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Messages/CheckAuthenticationRequestTests.cs
index cf6b814..d2d2cc4 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Messages/CheckAuthenticationRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Messages/CheckAuthenticationRequestTests.cs
@@ -6,12 +6,37 @@
 
 namespace DotNetOpenAuth.Test.OpenId.Messages {
 	using System;
-	using System.Collections.Generic;
-	using System.Linq;
-	using System.Text;
+	using DotNetOpenAuth.OpenId;
+	using DotNetOpenAuth.OpenId.Messages;
 	using NUnit.Framework;
 
 	[TestFixture]
 	public class CheckAuthenticationRequestTests : OpenIdTestBase {
+		/// <summary>
+		/// Verifies that the check_auth request is sent preserving EXACTLY (non-normalized)
+		/// what is in the positive assertion.
+		/// </summary>
+		/// <remarks>
+		/// This is very important because any normalization
+		/// (like changing https://host:443/ to https://host/) in the message will invalidate the signature
+		/// and cause the authentication to inappropriately fail.
+		/// Designed to verify fix to Trac #198.
+		/// </remarks>
+		[TestCase]
+		public void ExactPositiveAssertionPreservation() {
+			var rp = CreateRelyingParty(true);
+
+			// Initialize the positive assertion response with some data that is NOT in normalized form.
+			var positiveAssertion = new PositiveAssertionResponse(Protocol.Default.Version, RPUri)
+			{
+				ClaimedIdentifier = "https://HOST:443/a",
+				ProviderEndpoint = new Uri("https://anotherHOST:443/b"),
+			};
+
+			var checkAuth = new CheckAuthenticationRequest(positiveAssertion, rp.Channel);
+			var actual = rp.Channel.MessageDescriptions.GetAccessor(checkAuth);
+			Assert.AreEqual("https://HOST:443/a", actual["openid.claimed_id"]);
+			Assert.AreEqual("https://anotherHOST:443/b", actual["openid.op_endpoint"]);
+		}
 	}
 }