Refactored MessageDescription to be per-Channel instead of appdomain static.

This allows for special scenarios (like OSIS tests) where individual tests might need to contrive special message serialization rules.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs b/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
index 5467045..f611552 100644
--- a/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
+++ b/src/DotNetOpenAuth.Test/Mocks/CoordinatingHttpRequestInfo.cs
@@ -13,18 +13,22 @@ namespace DotNetOpenAuth.Test.Mocks {
 		private IDictionary<string, string> messageData;
 		private IMessageFactory messageFactory;
 		private MessageReceivingEndpoint recipient;
+		private Channel channel;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="CoordinatingHttpRequestInfo"/> class
 		/// that will generate a message when the <see cref="Message"/> property getter is called.
 		/// </summary>
+		/// <param name="channel">The channel.</param>
 		/// <param name="messageFactory">The message factory.</param>
 		/// <param name="messageData">The message data.</param>
 		/// <param name="recipient">The recipient.</param>
-		internal CoordinatingHttpRequestInfo(IMessageFactory messageFactory, IDictionary<string, string> messageData, MessageReceivingEndpoint recipient)
+		internal CoordinatingHttpRequestInfo(Channel channel, IMessageFactory messageFactory, IDictionary<string, string> messageData, MessageReceivingEndpoint recipient)
 			: this(recipient) {
+			Contract.Requires(channel != null);
 			Contract.Requires(messageFactory != null);
 			Contract.Requires(messageData != null);
+			this.channel = channel;
 			this.messageFactory = messageFactory;
 			this.messageData = messageData;
 		}
@@ -49,7 +53,7 @@ namespace DotNetOpenAuth.Test.Mocks {
 				if (base.Message == null && this.messageData != null) {
 					IDirectedProtocolMessage message = this.messageFactory.GetNewRequestMessage(this.recipient, this.messageData);
 					if (message != null) {
-						MessageSerializer.Get(message.GetType()).Deserialize(this.messageData, message);
+						this.channel.MessageDescriptions.GetAccessor(message).Deserialize(this.messageData);
 					}
 					base.Message = message;
 				}