Merge branch 'master' into openidux

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/InfoCard/InfoCardSelector.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.Test/TestBase.cs b/src/DotNetOpenAuth.Test/TestBase.cs
index f9db40c..9185874 100644
--- a/src/DotNetOpenAuth.Test/TestBase.cs
+++ b/src/DotNetOpenAuth.Test/TestBase.cs
@@ -7,6 +7,7 @@
 namespace DotNetOpenAuth.Test {
 	using System.IO;
 	using System.Reflection;
+	using System.Web;
 	using DotNetOpenAuth.Messaging.Reflection;
 	using DotNetOpenAuth.OAuth.Messages;
 	using log4net;
@@ -48,6 +49,7 @@ namespace DotNetOpenAuth.Test {
 			log4net.Config.XmlConfigurator.Configure(Assembly.GetExecutingAssembly().GetManifestResourceStream("DotNetOpenAuth.Test.Logging.config"));
 			MessageBase.LowSecurityMode = true;
 			this.messageDescriptions = new MessageDescriptionCollection();
+			SetMockHttpContext();
 		}
 
 		/// <summary>
@@ -58,6 +60,15 @@ namespace DotNetOpenAuth.Test {
 			log4net.LogManager.Shutdown();
 		}
 
+		/// <summary>
+		/// Sets HttpContext.Current to some empty (but non-null!) value.
+		/// </summary>
+		protected internal static void SetMockHttpContext() {
+			HttpContext.Current = new HttpContext(
+				new HttpRequest("mock", "http://mock", "mock"),
+				new HttpResponse(new StringWriter()));
+		}
+
 		protected internal static void SuspendLogging() {
 			LogManager.GetLoggerRepository().Threshold = LogManager.GetLoggerRepository().LevelMap["OFF"];
 		}