diff options
Diffstat (limited to 'src/DotNetOpenAuth.Test/Messaging')
3 files changed, 7 insertions, 6 deletions
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")); } |