1 files changed, 12 insertions, 61 deletions

diff --git a/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs b/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
index 162d456..a41753b 100644
--- a/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
+++ b/src/DotNetOAuth.Test/Messaging/MessageSerializerTests.cs
@@ -9,30 +9,19 @@ namespace DotNetOAuth.Test.Messaging {
 	using System.Collections.Generic;

 	using DotNetOAuth.Messaging;

 	using Microsoft.VisualStudio.TestTools.UnitTesting;

+	using System.Xml;

 

 	/// <summary>

 	/// Tests for the <see cref="MessageSerializer"/> class.

 	/// </summary>

 	[TestClass()]

-	public class MessageSerializerTests : TestBase {

+	public class MessageSerializerTests : MessagingTestBase {

 		[TestMethod, ExpectedException(typeof(ArgumentNullException))]

 		public void SerializeNull() {

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

 			serializer.Serialize(null);

 		}

 

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

-		public void SerializeNullFields() {

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

-			serializer.Serialize(null, new Mocks.TestMessage());

-		}

-

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

-		public void SerializeNullMessage() {

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

-			serializer.Serialize(new Dictionary<string, string>(), null);

-		}

-

 		[TestMethod, ExpectedException(typeof(ArgumentException))]

 		public void GetInvalidMessageType() {

 			MessageSerializer.Get(typeof(string));

@@ -43,29 +32,11 @@ namespace DotNetOAuth.Test.Messaging {
 			MessageSerializer.Get(null);

 		}

 

-		[TestMethod]

-		public void GetReturnsSameSerializerTwice() {

-			Assert.AreSame(MessageSerializer.Get(typeof(Mocks.TestMessage)), MessageSerializer.Get(typeof(Mocks.TestMessage)));

-		}

-

-		[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));

-			var message = new Mocks.TestMessage {

-				Age = 15,

-				Name = "Andrew",

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

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

-			};

+			var message = GetStandardTestMessage(FieldFill.CompleteBeforeBindings);

+			var expected = GetStandardTestFields(FieldFill.CompleteBeforeBindings);

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

 			Assert.AreEqual(4, actual.Count);

 

@@ -74,26 +45,13 @@ namespace DotNetOAuth.Test.Messaging {
 			Assert.IsTrue(actual.ContainsKey("age"));

 

 			// Test contents of dictionary

-			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(expected["age"], actual["age"]);

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

+			Assert.AreEqual(expected["Location"], actual["Location"]);

+			Assert.AreEqual(expected["Timestamp"], actual["Timestamp"]);

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

 		}

 

-		[TestMethod]

-		public void SerializeToExistingDictionary() {

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

-			var message = new Mocks.TestMessage { Age = 15, Name = "Andrew" };

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

-			fields["someExtraField"] = "someValue";

-			serializer.Serialize(fields, message);

-			Assert.AreEqual(4, fields.Count);

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

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

-			Assert.AreEqual("someValue", fields["someExtraField"]);

-		}

-

 		[TestMethod, ExpectedException(typeof(ArgumentNullException))]

 		public void DeserializeNull() {

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

@@ -115,7 +73,7 @@ namespace DotNetOAuth.Test.Messaging {
 		}

 

 		/// <summary>

-		/// This tests deserialization of a message that is comprised of [DataMember]'s

+		/// This tests deserialization of a message that is comprised of [MessagePart]'s

 		/// that are defined in multiple places in the inheritance tree.

 		/// </summary>

 		/// <remarks>

@@ -151,6 +109,7 @@ namespace DotNetOAuth.Test.Messaging {
 			Dictionary<string, string> fields = new Dictionary<string, string>(StringComparer.Ordinal);

 			fields["age"] = "15";

 			fields["Name"] = "Andrew";

+			fields["Timestamp"] = XmlConvert.ToString(DateTime.UtcNow, XmlDateTimeSerializationMode.Utc);

 			// Add some field that is not recognized by the class.  This simulates a querystring with

 			// more parameters than are actually interesting to the protocol message.

 			fields["someExtraField"] = "asdf";

@@ -161,18 +120,10 @@ 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);

-			// Set an disallowed value.

-			fields["age"] = "-1";

+			var fields = GetStandardTestFields(FieldFill.AllRequired);

+			fields["age"] = "-1"; // Set an disallowed value.

 			serializer.Deserialize(fields);

 		}

 	}