New tests that JsonIncludeAttribute and JsonNumberHandlingAttribute are honored durin...

* New test that JsonIncludeAttribute is honored during deserialization

ArgumentDeserialization_Honors_JsonInclude test is added #47855

* New test that JsonNumberHandlingAttribute is honored during deserialization

ArgumentDeserialization_Honors_JsonNumberHandling test is added #47855

* Extended Point_MembersHave_JsonInclude class for variety of test cases

Added new lines

diff --git a/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs b/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs
index ac6718a..ae8da63 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.ParameterMatching.cs
@@ -835,6 +835,36 @@ namespace System.Text.Json.Serialization.Tests
         }
 
         [Fact]
+        public async Task ArgumentDeserialization_Honors_JsonInclude()
+        {
+            Point_MembersHave_JsonInclude point = new Point_MembersHave_JsonInclude(1, 2,3);
+
+            string json = JsonSerializer.Serialize(point);
+            Assert.Contains(@"""X"":1", json);
+            Assert.Contains(@"""Y"":2", json);
+            //We should add another test for non-public members
+            //when https://github.com/dotnet/runtime/issues/31511 is implemented
+            Assert.Contains(@"""Z"":3", json);
+
+            point = await Serializer.DeserializeWrapper<Point_MembersHave_JsonInclude>(json);
+            point.Verify();
+        }
+
+        [Fact]
+        public async Task ArgumentDeserialization_Honors_JsonNumberHandling()
+        {
+            ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes obj = await Serializer.DeserializeWrapper<ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes>(ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes.s_json);
+            obj.Verify();
+
+            string json = JsonSerializer.Serialize(obj);
+            Assert.Contains(@"""A"":1", json);
+            Assert.Contains(@"""B"":""NaN""", json);
+            Assert.Contains(@"""C"":2", json);
+            Assert.Contains(@"""D"":""3""", json);
+            Assert.Contains(@"""E"":""4""", json);
+        }
+
+        [Fact]
         public async Task ArgumentDeserialization_Honors_JsonPropertyName()
         {
             Point_MembersHave_JsonPropertyName point = new Point_MembersHave_JsonPropertyName(1, 2);

diff --git a/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.Stream.cs b/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.Stream.cs
index e89ec54..8f0f166 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.Stream.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/ConstructorTests/ConstructorTests.Stream.cs
@@ -29,7 +29,7 @@ namespace System.Text.Json.Serialization.Tests
             }
 
             // Array size is the count of the following tests.
-            Task[] tasks = new Task[14];
+            Task[] tasks = new Task[16];
 
             // Simple models can be deserialized.
             tasks[0] = Task.Run(async () => await RunTestAsync<Parameterized_IndexViewModel_Immutable>(Parameterized_IndexViewModel_Immutable.s_data));
@@ -48,10 +48,12 @@ namespace System.Text.Json.Serialization.Tests
             tasks[8] = Task.Run(async () => await RunTestAsync<Point_MembersHave_JsonPropertyName>(Point_MembersHave_JsonPropertyName.s_data));
             tasks[9] = Task.Run(async () => await RunTestAsync<Point_MembersHave_JsonConverter>(Point_MembersHave_JsonConverter.s_data));
             tasks[10] = Task.Run(async () => await RunTestAsync<Point_MembersHave_JsonIgnore>(Point_MembersHave_JsonIgnore.s_data));
+            tasks[11] = Task.Run(async () => await RunTestAsync<Point_MembersHave_JsonInclude>(Point_MembersHave_JsonInclude.s_data));
+            tasks[12] = Task.Run(async () => await RunTestAsync<ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes>(ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes.s_data));
             // Complex JSON as last argument works
-            tasks[11] = Task.Run(async () => await RunTestAsync<Point_With_Array>(Point_With_Array.s_data));
-            tasks[12] = Task.Run(async () => await RunTestAsync<Point_With_Dictionary>(Point_With_Dictionary.s_data));
-            tasks[13] = Task.Run(async () => await RunTestAsync<Point_With_Object>(Point_With_Object.s_data));
+            tasks[13] = Task.Run(async () => await RunTestAsync<Point_With_Array>(Point_With_Array.s_data));
+            tasks[14] = Task.Run(async () => await RunTestAsync<Point_With_Dictionary>(Point_With_Dictionary.s_data));
+            tasks[15] = Task.Run(async () => await RunTestAsync<Point_With_Object>(Point_With_Object.s_data));
 
             await Task.WhenAll(tasks);
         }

diff --git a/src/libraries/System.Text.Json/tests/Serialization/TestClasses/TestClasses.Constructor.cs b/src/libraries/System.Text.Json/tests/Serialization/TestClasses/TestClasses.Constructor.cs
index 8dcd74e..e4d25ea 100644 (file)
--- a/src/libraries/System.Text.Json/tests/Serialization/TestClasses/TestClasses.Constructor.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/TestClasses/TestClasses.Constructor.cs
@@ -2059,6 +2059,67 @@ namespace System.Text.Json.Serialization.Tests
             Assert.Equal(0, Y); // We don't set parameter default value here.
         }
     }
+    
+    public class Point_MembersHave_JsonInclude : ITestClass
+    {
+        [JsonInclude]
+        public int X { get; }
+
+        [JsonInclude]
+        public int Y { get; private set; }
+
+        public int Z { get; private set; }
+
+        public Point_MembersHave_JsonInclude(int x, int y, int z) => (X, Y, Z) = (x, y, z);
+
+        public void Initialize() { }
+
+        public static readonly string s_json = @"{""X"":1,""Y"":2,""Z"":3}";
+
+        public static readonly byte[] s_data = Encoding.UTF8.GetBytes(s_json);
+
+        public void Verify()
+        {
+            Assert.Equal(1, X);
+            Assert.Equal(2, Y);
+            Assert.Equal(3, Z);
+        }
+    }
+
+    public class ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes : ITestClass
+    {
+        [JsonNumberHandling(JsonNumberHandling.Strict)]
+        public int A { get; }
+
+        [JsonNumberHandling(JsonNumberHandling.AllowNamedFloatingPointLiterals)]
+        public float B { get; }
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString)]
+        public int C { get; }
+
+        [JsonNumberHandling(JsonNumberHandling.WriteAsString)]
+        public int D { get; }
+
+        [JsonNumberHandling(JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.WriteAsString)]
+        public int E { get; }
+
+        public ClassWithFiveArgs_MembersHave_JsonNumberHandlingAttributes(int a, float b, int c, int d, int e) => (A, B, C, D, E) = (a, b, c, d, e);
+
+        public void Initialize() { }
+
+        public static readonly string s_json = @"{""A"":1,""B"":""NaN"",""C"":""2"",""D"": 3,""E"":""4""}";
+
+        public static readonly byte[] s_data = Encoding.UTF8.GetBytes(s_json);
+
+        public void Verify()
+        {
+            Assert.Equal(1, A);
+            Assert.Equal(float.NaN, B);
+            Assert.Equal(2, C);
+            Assert.Equal(3, D);
+            Assert.Equal(4, E);
+        }
+    }
 
     public class Point_MultipleMembers_BindTo_OneConstructorParameter
     {