Merge branch 'sersync'

1 files changed, 14 insertions, 6 deletions

diff --git a/src/DotNetOAuth.Test/Mocks/TestMessage.cs b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
index e67b582..aede676 100644
--- a/src/DotNetOAuth.Test/Mocks/TestMessage.cs
+++ b/src/DotNetOAuth.Test/Mocks/TestMessage.cs
@@ -6,29 +6,33 @@
 

 namespace DotNetOAuth.Test.Mocks {

 	using System;

+	using System.Collections.Generic;

 	using System.Runtime.Serialization;

 	using DotNetOAuth.Messaging;

+	using DotNetOAuth.Messaging.Reflection;

 

 	[DataContract(Namespace = Protocol.DataContractNamespaceV10)]

 	internal class TestMessage : IProtocolMessage {

 		private MessageTransport transport;

+		private Dictionary<string, string> extraData = new Dictionary<string, string>();

 

-		internal TestMessage() : this(MessageTransport.Direct) {

+		internal TestMessage()

+			: this(MessageTransport.Direct) {

 		}

 

 		internal TestMessage(MessageTransport transport) {

 			this.transport = transport;

 		}

 

-		[DataMember(Name = "age", IsRequired = true)]

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

 		public int Age { get; set; }

-		[DataMember]

+		[MessagePart("Name")]

 		public string Name { get; set; }

-		[DataMember]

+		[MessagePart]

 		public string EmptyMember { get; set; }

-		[DataMember]

+		[MessagePart(Name = null)] // null name tests that Location is still the name.

 		public Uri Location { get; set; }

-		[DataMember]

+		[MessagePart(IsRequired = true)]

 		public DateTime Timestamp { get; set; }

 

 		#region IProtocolMessage Members

@@ -45,6 +49,10 @@ namespace DotNetOAuth.Test.Mocks {
 			get { return this.transport; }

 		}

 

+		IDictionary<string, string> IProtocolMessage.ExtraData {

+			get { return this.extraData; }

+		}

+

 		void IProtocolMessage.EnsureValidMessage() {

 			if (this.EmptyMember != null || this.Age < 0) {

 				throw new ProtocolException();