1 files changed, 23 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
index 7a60a32..389fa5d 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
@@ -8,19 +8,36 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions.UI {
 	using System.Globalization;
 	using DotNetOpenAuth.Messaging.Reflection;
 	using DotNetOpenAuth.OpenId.Extensions.UI;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using NUnit.Framework;
 
-	[TestClass]
+	[TestFixture]
 	public class UIRequestTests : OpenIdTestBase {
-		[TestMethod]
+		[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"]);
 		}
 
-		[TestMethod]
+		[TestCase]
 		public void LanguagePreferenceEncodingDecoding() {
 			var request = new UIRequest();
 			MessageDictionary dictionary = this.MessageDescriptions.GetAccessor(request);
@@ -42,7 +59,7 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions.UI {
 			Assert.AreEqual(new CultureInfo("es-ES"), request.LanguagePreference[1]);
 		}
 
-		[TestMethod]
+		[TestCase]
 		public void ModeEncoding() {
 			var request = new UIRequest();
 			MessageDictionary dictionary = this.MessageDescriptions.GetAccessor(request);