1 files changed, 18 insertions, 3 deletions
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
index f69fc8b..7a60a32 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/UI/UIRequestTests.cs
@@ -16,15 +16,30 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions.UI {
 		public void Defaults() {
 			UIRequest request = new UIRequest();
 			Assert.AreEqual("popup", request.Mode);
-			Assert.AreEqual(CultureInfo.CurrentUICulture, request.LanguagePreference);
+			Assert.AreEqual(1, request.LanguagePreference.Length);
+			Assert.AreEqual(CultureInfo.CurrentUICulture, request.LanguagePreference[0]);
 		}
 
 		[TestMethod]
-		public void LanguagePreferenceEncoding() {
+		public void LanguagePreferenceEncodingDecoding() {
 			var request = new UIRequest();
-			request.LanguagePreference = new CultureInfo("en-US");
 			MessageDictionary dictionary = this.MessageDescriptions.GetAccessor(request);
+
+			request.LanguagePreference = new[] { new CultureInfo("en-US") };
 			Assert.AreEqual("en-US", dictionary["lang"]);
+
+			request.LanguagePreference = new[] { new CultureInfo("en-US"), new CultureInfo("es-ES") };
+			Assert.AreEqual("en-US,es-ES", dictionary["lang"]);
+
+			// Now test decoding
+			dictionary["lang"] = "en-US";
+			Assert.AreEqual(1, request.LanguagePreference.Length);
+			Assert.AreEqual(new CultureInfo("en-US"), request.LanguagePreference[0]);
+
+			dictionary["lang"] = "en-US,es-ES";
+			Assert.AreEqual(2, request.LanguagePreference.Length);
+			Assert.AreEqual(new CultureInfo("en-US"), request.LanguagePreference[0]);
+			Assert.AreEqual(new CultureInfo("es-ES"), request.LanguagePreference[1]);
 		}
 
 		[TestMethod]