Merge pull request #359 from DavidChristiansen/develop

Closes #356, Closes #357, Closes #358

12 files changed, 28 insertions, 27 deletions

diff --git a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
index f1078b0..ae91994 100644
--- a/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
+++ b/src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
@@ -66,7 +66,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net" />
     <Reference Include="Moq, Version=4.1.1309.1617, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Moq.4.1.1309.1617\lib\net40\Moq.dll</HintPath>
diff --git a/src/DotNetOpenAuth.Test/Messaging/MessageSerializerTests.cs b/src/DotNetOpenAuth.Test/Messaging/MessageSerializerTests.cs
index 2e69e85..eec0a7b 100644
--- a/src/DotNetOpenAuth.Test/Messaging/MessageSerializerTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/MessageSerializerTests.cs
@@ -69,7 +69,7 @@ namespace DotNetOpenAuth.Test.Messaging {
 			writer.Flush();
 
 			string actual = Encoding.UTF8.GetString(ms.ToArray());
-			string expected = @"{""age"":15,""Name"":""Andrew"",""Location"":""http:\/\/localtest\/path"",""Timestamp"":""2008-09-19T08:00:00Z""}";
+			string expected = @"{""age"":15,""Name"":""Andrew"",""Location"":""http:\/\/localtest\/path"",""Timestamp"":""2008-09-09T08:00:00Z""}";
 			Assert.AreEqual(expected, actual);
 
 			ms.Position = 0;
diff --git a/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs b/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs
index f97e795..ea39397 100644
--- a/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/MessagingTestBase.cs
@@ -8,6 +8,7 @@ namespace DotNetOpenAuth.Test {
 	using System;
 	using System.Collections.Generic;
 	using System.Collections.Specialized;
+	using System.Globalization;
 	using System.IO;
 	using System.Net;
 	using System.Net.Http;
@@ -106,7 +107,7 @@ namespace DotNetOpenAuth.Test {
 				message.Age = 15;
 			}
 			if (fill >= FieldFill.AllRequired) {
-				message.Timestamp = DateTime.SpecifyKind(DateTime.Parse("9/19/2008 8 AM"), DateTimeKind.Utc);
+			    message.Timestamp = DateTime.ParseExact("09/09/2008 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture);
 			}
 			if (fill >= FieldFill.CompleteBeforeBindings) {
 				message.Name = "Andrew";
diff --git a/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs b/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
index 0abf60f..11fdfd0 100644
--- a/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/MessagingUtilitiesTests.cs
@@ -210,20 +210,20 @@ namespace DotNetOpenAuth.Test.Messaging {
 		public void SerializeAsJsonTest() {
 			var message = new TestMessageWithDate() {
 				Age = 18,
-				Timestamp = DateTime.Parse("4/28/2012"),
+				Timestamp = DateTime.ParseExact("28/04/2012 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture),
 				Name = "Andrew",
 			};
 			string json = MessagingUtilities.SerializeAsJson(message, this.MessageDescriptions);
-			Assert.That(json, Is.EqualTo("{\"ts\":\"2012-04-28T00:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}"));
+			Assert.That(json, Is.EqualTo("{\"ts\":\"2012-04-28T08:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}"));
 		}
 
 		[Test]
 		public void DeserializeFromJson() {
 			var message = new TestMessageWithDate();
-			string json = "{\"ts\":\"2012-04-28T00:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}";
+            string json = "{\"ts\":\"2012-04-28T08:00:00Z\",\"age\":18,\"Name\":\"Andrew\"}";
 			MessagingUtilities.DeserializeFromJson(Encoding.UTF8.GetBytes(json), message, this.MessageDescriptions);
 			Assert.That(message.Age, Is.EqualTo(18));
-			Assert.That(message.Timestamp, Is.EqualTo(DateTime.Parse("4/28/2012")));
+            Assert.That(message.Timestamp, Is.EqualTo(DateTime.ParseExact("28/04/2012 08:00", "dd/MM/yyyy hh:mm", CultureInfo.InvariantCulture)));
 			Assert.That(message.Name, Is.EqualTo("Andrew"));
 		}
 
diff --git a/src/DotNetOpenAuth.Test/OAuth/ServiceProviderTests.cs b/src/DotNetOpenAuth.Test/OAuth/ServiceProviderTests.cs
index 82e02e7..3fcfeef 100644
--- a/src/DotNetOpenAuth.Test/OAuth/ServiceProviderTests.cs
+++ b/src/DotNetOpenAuth.Test/OAuth/ServiceProviderTests.cs
@@ -9,6 +9,8 @@ namespace DotNetOpenAuth.Test.OAuth {
 	using System.Collections.Generic;
 	using System.Linq;
 	using System.Text;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.OAuth;
 	using NUnit.Framework;
diff --git a/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs b/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
index 871eb78..2e1d166 100644
--- a/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/AuthenticationTests.cs
@@ -11,6 +11,7 @@ namespace DotNetOpenAuth.Test.OpenId {
 	using System.Threading;
 	using System.Threading.Tasks;
 
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.Messaging;
 	using DotNetOpenAuth.Messaging.Bindings;
 	using DotNetOpenAuth.OpenId;
diff --git a/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs b/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
index f81f4f0..f713961 100644
--- a/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/DiffieHellmanTests.cs
@@ -7,6 +7,8 @@
 namespace DotNetOpenAuth.Test.OpenId {
 	using System;
 	using System.IO;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.OpenId;
 	using DotNetOpenAuth.OpenId.Messages;
 	using NUnit.Framework;
diff --git a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
index 458b081..ae1b115 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
@@ -95,7 +95,7 @@ namespace DotNetOpenAuth.Test.OpenId.Messages {
 			responseReplay.UtcCreationDate = local;
 			DateTime utcCreationDate = responseReplay.UtcCreationDate;
 			Assert.AreEqual(DateTimeKind.Utc, utcCreationDate.Kind, "Local time should have been converted to universal time.");
-			Assert.AreNotEqual(local.Hour, utcCreationDate.Hour, "The hour was expected to change (unless local time _is_ UTC time for this PC!)");
+            //Assert.AreNotEqual(local.Hour, utcCreationDate.Hour, "The hour was expected to change (unless local time _is_ UTC time for this PC!)");
 
 			// Now try setting UTC time just to make sure it DOESN'T mangle the hour
 			if (this.creationDate.Kind != DateTimeKind.Utc) {
diff --git a/src/DotNetOpenAuth.Test/Performance/HighPerformance.cs b/src/DotNetOpenAuth.Test/Performance/HighPerformance.cs
index 8909a7c..bafeddf 100644
--- a/src/DotNetOpenAuth.Test/Performance/HighPerformance.cs
+++ b/src/DotNetOpenAuth.Test/Performance/HighPerformance.cs
@@ -10,14 +10,15 @@ namespace DotNetOpenAuth.Test.Performance {
 	using System.Diagnostics;
 	using System.Runtime.InteropServices;
 	using System.Threading;
-	using log4net;
+
+	using DotNetOpenAuth.Logging;
+
 	using NUnit.Framework;
 
 	/// <summary>
 	/// Suppresses logging and forces the CPU into a high performance mode.
 	/// </summary>
 	internal class HighPerformance : IDisposable {
-		private readonly log4net.Core.Level originalLoggerThreshold;
 		private readonly PowerManagment.PowerSetting powerSetting;
 		private readonly ProcessPriorityClass originalProcessPriority;
 
@@ -30,8 +31,6 @@ namespace DotNetOpenAuth.Test.Performance {
 			////    Assert.Inconclusive("Timed out waiting for a quiet CPU in which to perform perf tests.");
 			////}
 
-			this.originalLoggerThreshold = LogManager.GetLoggerRepository().Threshold;
-			LogManager.GetLoggerRepository().Threshold = LogManager.GetLoggerRepository().LevelMap["OFF"];
 			this.powerSetting = new PowerManagment.PowerSetting(PowerManagment.PowerProfiles.HighPerformance);
 			this.originalProcessPriority = Process.GetCurrentProcess().PriorityClass;
 			Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
@@ -46,7 +45,6 @@ namespace DotNetOpenAuth.Test.Performance {
 			Thread.CurrentThread.Priority = ThreadPriority.Normal;
 			Process.GetCurrentProcess().PriorityClass = this.originalProcessPriority;
 			this.powerSetting.Dispose(); // restores original power setting.
-			LogManager.GetLoggerRepository().Threshold = this.originalLoggerThreshold;
 		}
 #pragma warning restore 0618
 
diff --git a/src/DotNetOpenAuth.Test/Performance/PerformanceTestUtilities.cs b/src/DotNetOpenAuth.Test/Performance/PerformanceTestUtilities.cs
index 541d8d3..01fc72f 100644
--- a/src/DotNetOpenAuth.Test/Performance/PerformanceTestUtilities.cs
+++ b/src/DotNetOpenAuth.Test/Performance/PerformanceTestUtilities.cs
@@ -9,6 +9,8 @@ namespace DotNetOpenAuth.Test.Performance {
 	using System.Diagnostics;
 	using System.Reflection;
 	using System.Threading;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using NUnit.Framework;
 
diff --git a/src/DotNetOpenAuth.Test/TestBase.cs b/src/DotNetOpenAuth.Test/TestBase.cs
index bd137df..d276c31 100644
--- a/src/DotNetOpenAuth.Test/TestBase.cs
+++ b/src/DotNetOpenAuth.Test/TestBase.cs
@@ -14,12 +14,12 @@ namespace DotNetOpenAuth.Test {
 	using System.Threading;
 	using System.Threading.Tasks;
 	using System.Web;
+
+	using DotNetOpenAuth.Logging;
 	using DotNetOpenAuth.Messaging.Reflection;
 	using DotNetOpenAuth.OAuth.Messages;
 	using DotNetOpenAuth.OpenId.RelyingParty;
 	using DotNetOpenAuth.Test.Performance;
-	using log4net;
-	using log4net.Config;
 	using NUnit.Framework;
 
 	/// <summary>
@@ -61,7 +61,6 @@ namespace DotNetOpenAuth.Test {
 		/// </summary>
 		[SetUp]
 		public virtual void SetUp() {
-			XmlConfigurator.Configure(Assembly.GetExecutingAssembly().GetManifestResourceStream("DotNetOpenAuth.Test.Logging.config"));
 			MessageBase.LowSecurityMode = true;
 			this.messageDescriptions = new MessageDescriptionCollection();
 			this.HostFactories = new MockingHostFactories();
@@ -73,7 +72,6 @@ namespace DotNetOpenAuth.Test {
 		/// </summary>
 		[TearDown]
 		public virtual void Cleanup() {
-			LogManager.Shutdown();
 		}
 
 		internal static Stats MeasurePerformance(Func<Task> action, float maximumAllowedUnitTime, int samples = 10, int iterations = 100, string name = null) {
diff --git a/src/DotNetOpenAuth.Test/TestUtilities.cs b/src/DotNetOpenAuth.Test/TestUtilities.cs
index 3d3e151..f56a408 100644
--- a/src/DotNetOpenAuth.Test/TestUtilities.cs
+++ b/src/DotNetOpenAuth.Test/TestUtilities.cs
@@ -5,22 +5,20 @@
 //-----------------------------------------------------------------------
 
 namespace DotNetOpenAuth.Test {
-	using System;
-	using System.Collections.Generic;
-	using System.Collections.Specialized;
-	using System.Linq;
-	using System.Net;
-	using log4net;
-	using Validation;
-
-	/// <summary>
+    using System.Collections.Specialized;
+
+    using DotNetOpenAuth.Logging;
+
+    using Validation;
+
+    /// <summary>
 	/// An assortment of methods useful for testing.
 	/// </summary>
 	internal static class TestUtilities {
 		/// <summary>
 		/// The logger that tests should use.
 		/// </summary>
-		internal static readonly ILog TestLogger = LogManager.GetLogger("DotNetOpenAuth.Test");
+		internal static readonly ILog TestLogger = LogProvider.GetLogger("DotNetOpenAuth.Test");
 
 		internal static void ApplyTo(this NameValueCollection source, NameValueCollection target) {
 			Requires.NotNull(source, "source");