Fix for UIRequest.Icon deserialization exception due to nullable struct types.

Fixes Trac #195

2 files changed, 24 insertions, 2 deletions

diff --git a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
index 524f440..66237e7 100644
--- a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessagePartTests.cs
@@ -28,7 +28,12 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 
 		[TestCase]
 		public void OptionalNullableStruct() {
-			this.ParameterizedMessageTypeTest(typeof(MessageWithNullableOptionalStruct));
+			var message = new MessageWithNullableOptionalStruct();
+			var part = this.ParameterizedMessageTypeTest(message.GetType());
+
+			Assert.IsNull(part.GetValue(message));
+			part.SetValue(message, "3");
+			Assert.AreEqual("3", part.GetValue(message));
 		}
 
 		[TestCase]
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
index c216a4d..389fa5d 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
@@ -14,10 +14,27 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions.UI {
 	public class UIRequestTests : OpenIdTestBase {
 		[TestCase]
 		public void Defaults() {
-			UIRequest request = new UIRequest();
+			var request = new UIRequest();
 			Assert.AreEqual("popup", request.Mode);
 			Assert.AreEqual(1, request.LanguagePreference.Length);
 			Assert.AreEqual(CultureInfo.CurrentUICulture, request.LanguagePreference[0]);
+			Assert.IsFalse(request.Icon.HasValue);
+		}
+
+		[TestCase]
+		public void IconEncodingDecoding()
+		{
+			var request = new UIRequest();
+			MessageDictionary dictionary = this.MessageDescriptions.GetAccessor(request);
+			Assert.IsFalse(dictionary.ContainsKey("icon"));
+
+			Assert.IsFalse(request.Icon.HasValue);
+			dictionary["icon"] = "true";
+			Assert.IsTrue(request.Icon.Value);
+
+			dictionary.ClearValues();
+			request.Icon = true;
+			Assert.AreEqual("true", dictionary["icon"]);
 		}
 
 		[TestCase]