Add additional deserialization array tests (dotnet/corefx#38693)

Commit migrated from https://github.com/dotnet/corefx/commit/d612cbe52cd8213fb3f8141ca20b50fdf380b521

diff --git a/src/libraries/System.Text.Json/tests/Serialization/Array.ReadTests.cs b/src/libraries/System.Text.Json/tests/Serialization/Array.ReadTests.cs
index d19318f..20480ff 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Serialization/Array.ReadTests.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/Array.ReadTests.cs
@@ -71,18 +71,12 @@ namespace System.Text.Json.Serialization.Tests
             Assert.Equal(2, arr[1][1]);
         }
 
-        [Fact]
-        public static void ReadByteArrayFail()
-        {
-            Assert.Throws<JsonException>(() => JsonSerializer.Parse<byte[]>(@"""1"""));
-            Assert.Throws<JsonException>(() => JsonSerializer.Parse<byte[]>(@"""A==="""));
-        }
-
-        [Fact]
-        public static void ReadByteArrayAsJsonArrayFail()
+        [Theory]
+        [InlineData(@"""1""")]
+        [InlineData(@"""A===""")]
+        [InlineData(@"[1, 2]")]  // Currently not support deserializing JSON arrays as byte[] - only Base64 string.
+        public static void ReadByteArrayFail(string json)
         {
-            string json = $"[1, 2]";
-            // Currently no support deserializing JSON arrays as byte[] - only Base64 string.
             Assert.Throws<JsonException>(() => JsonSerializer.Parse<byte[]>(json));
         }
 

diff --git a/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs b/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs
index 590d580..ce2ca22 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/DictionaryTests.cs
@@ -217,7 +217,7 @@ namespace System.Text.Json.Serialization.Tests
         [InlineData(typeof(int[]), @"{}")]
         [InlineData(typeof(int[]), @"[""test""")]
         [InlineData(typeof(int[]), @"[true]")]
-        // [InlineData(typeof(int[]), @"[{}]")] TODO #38485: Uncomment when fixed
+        [InlineData(typeof(int[]), @"[{}]")]
         [InlineData(typeof(int[]), @"[[]]")]
         [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": {}}")]
         [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": ""test""}")]
@@ -225,7 +225,7 @@ namespace System.Text.Json.Serialization.Tests
         [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": true}")]
         [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": [""test""]}")]
         [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": [[]]}")]
-        // [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": [{}]}")] TODO #38485: Uncomment when fixed
+        [InlineData(typeof(Dictionary<string, int[]>), @"{""test"": [{}]}")]
         public static void InvalidJsonForArrayShouldFail(Type type, string json)
         {
             Assert.Throws<JsonException>(() => JsonSerializer.Parse(json, type));