Fixed a few bugs and got all tests passing.

5 files changed, 28 insertions, 26 deletions

diff --git a/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs b/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
index 2eb1dbf..25dd8e3 100644
--- a/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
@@ -31,15 +31,6 @@ namespace DotNetOAuth.Test.Messaging {
 			MessageSerializer.Get(null);

 		}

 

-		[TestMethod, ExpectedException(typeof(ProtocolException))]

-		public void SerializeInvalidMessage() {

-			var serializer = MessageSerializer.Get(typeof(Mocks.TestMessage));

-			Dictionary<string, string> fields = new Dictionary<string, string>(StringComparer.Ordinal);

-			Mocks.TestMessage message = new Mocks.TestMessage();

-			message.EmptyMember = "invalidvalue";

-			serializer.Serialize(message);

-		}

-

 		[TestMethod()]

 		public void SerializeTest() {

 			var serializer = MessageSerializer.Get(typeof(Mocks.TestMessage));

@@ -47,7 +38,7 @@ namespace DotNetOAuth.Test.Messaging {
 				Age = 15,

 				Name = "Andrew",

 				Location = new Uri("http://localhost"),

-				Timestamp = DateTime.Parse("1/1/1990"),

+				Timestamp = DateTime.SpecifyKind(DateTime.Parse("1/1/1990"), DateTimeKind.Utc),

 			};

 			IDictionary<string, string> actual = serializer.Serialize(message);

 			Assert.AreEqual(4, actual.Count);

@@ -60,7 +51,7 @@ namespace DotNetOAuth.Test.Messaging {
 			Assert.AreEqual("15", actual["age"]);

 			Assert.AreEqual("Andrew", actual["Name"]);

 			Assert.AreEqual("http://localhost/", actual["Location"]);

-			Assert.AreEqual("1990-01-01T00:00:00", actual["Timestamp"]);

+			Assert.AreEqual("1990-01-01T00:00:00Z", actual["Timestamp"]);

 			Assert.IsFalse(actual.ContainsKey("EmptyMember"));

 		}

 

@@ -131,13 +122,6 @@ namespace DotNetOAuth.Test.Messaging {
 		}

 

 		[TestMethod, ExpectedException(typeof(ProtocolException))]

-		public void DeserializeEmpty() {

-			var serializer = MessageSerializer.Get(typeof(Mocks.TestMessage));

-			var fields = new Dictionary<string, string>(StringComparer.Ordinal);

-			serializer.Deserialize(fields);

-		}

-

-		[TestMethod, ExpectedException(typeof(ProtocolException))]

 		public void DeserializeInvalidMessage() {

 			var serializer = MessageSerializer.Get(typeof(Mocks.TestMessage));

 			Dictionary<string, string> fields = new Dictionary<string, string>(StringComparer.Ordinal);

diff --git a/src/DotNetOAuth.Test/Messaging/Reflection/MessageDictionaryTest.cs b/src/DotNetOAuth.Test/Messaging/Reflection/MessageDictionaryTest.cs
index f798bde..f6b1f38 100644
--- a/src/DotNetOAuth.Test/Messaging/Reflection/MessageDictionaryTest.cs
+++ b/src/DotNetOAuth.Test/Messaging/Reflection/MessageDictionaryTest.cs
@@ -12,6 +12,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 	using DotNetOAuth.Messaging;

 	using DotNetOAuth.Messaging.Reflection;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

+	using System.Xml;

 

 	[TestClass]

 	public class MessageDictionaryTest : MessagingTestBase {

@@ -37,7 +38,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 			IDictionary<string, string> target = new MessageDictionary(this.message);

 			Collection<string> expected = new Collection<string> {

 				this.message.Age.ToString(),

-				this.message.Timestamp.ToString(),

+				XmlConvert.ToString(DateTime.SpecifyKind(this.message.Timestamp, DateTimeKind.Utc), XmlDateTimeSerializationMode.Utc),

 			};

 			CollectionAssert<string>.AreEquivalent(expected, target.Values);

 

@@ -49,7 +50,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 				this.message.Age.ToString(),

 				this.message.Location.AbsoluteUri,

 				this.message.Name,

-				this.message.Timestamp.ToString(),

+				XmlConvert.ToString(DateTime.SpecifyKind(this.message.Timestamp, DateTimeKind.Utc), XmlDateTimeSerializationMode.Utc),

 				"a",

 			};

 			CollectionAssert<string>.AreEquivalent(expected, target.Values);

@@ -80,7 +81,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 		[TestMethod]

 		public void ItemTest() {

 			IDictionary<string, string> target = new MessageDictionary(this.message);

-			

+

 			// Test setting of declared message properties.

 			this.message.Age = 15;

 			Assert.AreEqual("15", target["age"]);

@@ -194,7 +195,7 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 			Assert.IsTrue(target.Remove("Name"));

 			Assert.IsNull(this.message.Name);

 			Assert.IsFalse(target.Remove("Name"));

-			

+

 			Assert.IsFalse(target.Remove("extra"));

 			target["extra"] = "value";

 			Assert.IsTrue(target.Remove("extra"));

diff --git a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
index 646599c..1d7e1b8 100644
--- a/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/Reflection/MessagePartTests.cs
@@ -16,12 +16,29 @@ namespace DotNetOAuth.Test.Messaging.Reflection {
 			[MessagePart(IsRequired = false)]

 			internal int optionalInt;

 		}

+		class MessageWithNullableOptionalStruct {

+			/// <summary>

+			/// Optional structs like int must be nullable for Optional to make sense.

+			/// </summary>

+			[MessagePart(IsRequired = false)]

+			internal int? optionalInt;

+		}

+		

 

 		[TestMethod, ExpectedException(typeof(ArgumentException))]

 		public void OptionalNonNullableStruct() {

-			FieldInfo field = typeof(MessageWithNonNullableOptionalStruct).GetField("optionalInt", BindingFlags.NonPublic | BindingFlags.Instance);

+			ParameterizedMessageTypeTest(typeof(MessageWithNonNullableOptionalStruct));

+		}

+

+		[TestMethod]

+		public void OptionalNullableStruct() {

+			ParameterizedMessageTypeTest(typeof(MessageWithNullableOptionalStruct));

+		}

+

+		private void ParameterizedMessageTypeTest(Type messageType) {

+			FieldInfo field = messageType.GetField("optionalInt", BindingFlags.NonPublic | BindingFlags.Instance);

 			MessagePartAttribute attribute = field.GetCustomAttributes(typeof(MessagePartAttribute), true).OfType<MessagePartAttribute>().Single();

-			new MessagePart(field, attribute); // should recognize invalid optional non-nullable struct

+			new MessagePart(field, attribute);

 		}

 	}

 }

diff --git a/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs b/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
index fbe0d9a..1b06969 100644
--- a/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestExpiringMessage.cs
@@ -25,7 +25,7 @@ namespace DotNetOAuth.Test.Mocks {
 

 		#region IExpiringProtocolMessage Members

 

-		[MessagePart(Name = "created_on")]

+		[MessagePart(Name = "created_on", IsRequired = true)]

 		DateTime IExpiringProtocolMessage.UtcCreationDate {

 			get { return this.utcCreationDate; }

 			set { this.utcCreationDate = value.ToUniversalTime(); }

diff --git a/src/DotNetOAuth.Test/Mocks/TestMessage.cs b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
index ceb6dbd..1bd94bf 100644
--- a/src/DotNetOAuth.Test/Mocks/TestMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
@@ -32,7 +32,7 @@ namespace DotNetOAuth.Test.Mocks {
 		public string EmptyMember { get; set; }

 		[MessagePart]

 		public Uri Location { get; set; }

-		[MessagePart]

+		[MessagePart(IsRequired = true)]

 		public DateTime Timestamp { get; set; }

 

 		#region IProtocolMessage Members