Merge branch 'v2.5' into monoorigin/mono

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

1 files changed, 0 insertions, 41 deletions

diff --git a/src/DotNetOpenId.Test/Provider/IdentityEndpointTest.cs b/src/DotNetOpenId.Test/Provider/IdentityEndpointTest.cs
deleted file mode 100644
index 3fef4ec..0000000
--- a/src/DotNetOpenId.Test/Provider/IdentityEndpointTest.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using NUnit.Framework;

-using System.IO;

-using System.Diagnostics;

-using DotNetOpenId.Test.Hosting;

-using System.Text.RegularExpressions;

-using System.Net;

-using System.Globalization;

-

-namespace DotNetOpenId.Test.Provider {

-	[TestFixture]

-	public class IdentityEndpointTest {

-		void parameterizedIdentityEndpointPage(ProtocolVersion version) {

-			Protocol protocol = Protocol.Lookup(version);

-			TestSupport.Scenarios scenario = TestSupport.Scenarios.AutoApproval;

-			UriIdentifier identityUrl = TestSupport.GetIdentityUrl(scenario, version);

-			string html = TestSupport.Host.ProcessRequest(identityUrl.Uri.AbsoluteUri);

-			Trace.TraceInformation("{0} response:{1}{2}", identityUrl, Environment.NewLine, html);

-			Assert.IsTrue(Regex.IsMatch(html, string.Format(CultureInfo.InvariantCulture,

-				@"\<link rel=""{1}"" href=""http://[^/]+/{0}""\>\</link\>",

-				Regex.Escape(TestSupport.ProviderPage),

-				Regex.Escape(protocol.HtmlDiscoveryProviderKey))));

-			Assert.IsTrue(Regex.IsMatch(html, string.Format(CultureInfo.InvariantCulture,

-				@"\<link rel=""{1}"" href=""http://[^/]+{0}""\>\</link\>",

-				Regex.Escape(new Uri(TestSupport.GetDelegateUrl(scenario).ToString()).AbsolutePath),

-				Regex.Escape(protocol.HtmlDiscoveryLocalIdKey))));

-		}

-

-		[Test]

-		public void IdentityEndpoint20Page() {

-			parameterizedIdentityEndpointPage(ProtocolVersion.V20);

-		}

-

-		[Test]

-		public void IdentityEndpoint11Page() {

-			parameterizedIdentityEndpointPage(ProtocolVersion.V11);

-		}

-	}

-}