Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions
--- a/mcs/class/System.Web.Extensions/Test/System.Web.Script.Serialization/JavaScriptSerializerTest.cs
+++ b/mcs/class/System.Web.Extensions/Test/System.Web.Script.Serialization/JavaScriptSerializerTest.cs
@ -1365,5 +1365,28 @@ namespace MonoTests.System.Web.Script.Serialization
 			var ret2vad = (IDictionary<string,object>) ret2va [0];
 			Assert.AreEqual ("subval", ret2vad ["subkey"], "#2.4");
 		}
+		
+		class ClassWithNullableEnum
+		{
+			public MyEnum? Value { get; set; }
+		}
+		
+		[Test]
+		public void DeserializeNullableEnum ()
+		{		
+			var jsonValues = new Dictionary<string, MyEnum?> {
+				{ "{\"Value\":0}", MyEnum.AAA},
+				{ "{\"Value\":\"0\"}", MyEnum.AAA},
+				{ "{\"Value\":null}", null}
+			};
+			
+			var ser = new JavaScriptSerializer ();
+			
+			foreach (var kv in jsonValues)
+			{
+				var obj = ser.Deserialize<ClassWithNullableEnum> (kv.Key);
+				Assert.AreEqual (kv.Value, obj.Value);
+			}
+		}
 	}
 }