Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 6 insertions, 2 deletions

diff --git a/src/DotNetOpenId.Test/Extensions/PapeTests.cs b/src/DotNetOpenId.Test/Extensions/PapeTests.cs
index f8acb79..6fb693d 100644
--- a/src/DotNetOpenId.Test/Extensions/PapeTests.cs
+++ b/src/DotNetOpenId.Test/Extensions/PapeTests.cs
@@ -11,7 +11,7 @@ namespace DotNetOpenId.Test.Extensions {
 		[Test]

 		public void None() {

 			var response = ParameterizedTest<PolicyResponse>(

-				TestSupport.GetIdentityUrl(TestSupport.Scenarios.ExtensionFullCooperation, Version), null);

+				TestSupport.Scenarios.ExtensionFullCooperation, Version, null);

 			Assert.IsNull(response);

 		}

 

@@ -19,11 +19,15 @@ namespace DotNetOpenId.Test.Extensions {
 		public void Full() {

 			var request = new PolicyRequest();

 			request.MaximumAuthenticationAge = TimeSpan.FromMinutes(10);

+			request.PreferredAuthLevelTypes.Add(Constants.AuthenticationLevels.NistTypeUri);

 			var response = ParameterizedTest<PolicyResponse>(

-				TestSupport.GetIdentityUrl(TestSupport.Scenarios.ExtensionFullCooperation, Version), request);

+				TestSupport.Scenarios.ExtensionFullCooperation, Version, request);

 			Assert.IsNotNull(response);

 			Assert.IsNotNull(response.AuthenticationTimeUtc);

 			Assert.IsTrue(response.AuthenticationTimeUtc.Value > DateTime.UtcNow - request.MaximumAuthenticationAge);

+			Assert.IsTrue(response.AssuranceLevels.ContainsKey(Constants.AuthenticationLevels.NistTypeUri));

+			Assert.AreEqual("1", response.AssuranceLevels[Constants.AuthenticationLevels.NistTypeUri]);

+			Assert.AreEqual(NistAssuranceLevel.Level1, response.NistAssuranceLevel);

 		}

 	}

 }