Enable fixed tests, formatting update (#38909)

Author: buyaa-n

src/System.Text.Json/tests/Serialization/Object.ReadTests.cs

@@ -282,7 +282,6 @@ public static void ReadObject_PublicIndexer()
             Assert.Equal(-1, indexer[0]);
         }
 
-        [ActiveIssue(38414)]
         [Fact]
         public static void ReadSimpleStructWithSimpleClass()
         {
@@ -294,7 +293,6 @@ public static void ReadSimpleStructWithSimpleClass()
             obj.Verify();
         }
 
-        [ActiveIssue(38490)]
         [Fact]
         public static void ReadSimpleTestStructWithSimpleTestClass()
         {
@@ -304,7 +302,10 @@ public static void ReadSimpleTestStructWithSimpleTestClass()
 
             string json = JsonSerializer.ToString(testObject);
             SimpleTestStruct parsedObject = JsonSerializer.Parse<SimpleTestStruct>(json);
+
             parsedObject.Verify();
+            Assert.Equal(3.14, parsedObject.MySimpleTestClass.MyDouble);
+            Assert.Equal("Hello", parsedObject.MySimpleTestClass.MyString);
         }
 
         [Fact]
@@ -316,15 +317,18 @@ public static void ReadSimpleTestClassWithSimpleTestStruct()
 
             string json = JsonSerializer.ToString(testObject);
             SimpleTestClass parsedObject = JsonSerializer.Parse<SimpleTestClass>(json);
+
             parsedObject.Verify();
+            Assert.Equal(64, parsedObject.MySimpleTestStruct.MyInt64);
+            Assert.Equal("Hello", parsedObject.MySimpleTestStruct.MyString);
+            Assert.Equal(32, parsedObject.MySimpleTestStruct.MyInt32Array[0]);
         }
 
-        [ActiveIssue(38414)]
         [Fact]
         public static void OuterClassHavingPropertiesDefinedAfterClassWithDictionaryTest()
         {
             OuterClassHavingPropertiesDefinedAfterClassWithDictionary testObject = new OuterClassHavingPropertiesDefinedAfterClassWithDictionary { MyInt = 10, MyIntArray = new int[] { 3 },
-                MyDouble= 3.14, MyList =new List<string> { "Hello" }, MyString = "World",  MyInnerTestClass = new SimpleClassWithDictionary { MyInt = 2 } };
+                MyDouble= 3.14, MyList = new List<string> { "Hello" }, MyString = "World",  MyInnerTestClass = new SimpleClassWithDictionary { MyInt = 2 } };
             string json = JsonSerializer.ToString(testObject);
 
             OuterClassHavingPropertiesDefinedAfterClassWithDictionary parsedObject = JsonSerializer.Parse<OuterClassHavingPropertiesDefinedAfterClassWithDictionary>(json);
@@ -337,12 +341,14 @@ public static void OuterClassHavingPropertiesDefinedAfterClassWithDictionaryTest
             Assert.Equal(2, parsedObject.MyInnerTestClass.MyInt);
         }
 
-        [ActiveIssue(38435)]
         [Fact]
-        public static void ReadStructWithSimpleClassValueTest()
+        public static void ReadStructWithSimpleClassArrayValueTest()
         {
             string json = "{\"MySimpleTestClass\":{\"MyInt32Array\":[1],\"MyStringToStringDict\":null,\"MyStringToStringIDict\":null},\"MyInt32Array\":[2]}";
-            SimpleTestStruct obj3 = JsonSerializer.Parse<SimpleTestStruct>(json);
+            SimpleTestStruct parsedObject = JsonSerializer.Parse<SimpleTestStruct>(json);
+
+            Assert.Equal(1, parsedObject.MySimpleTestClass.MyInt32Array[0]);
+            Assert.Equal(2, parsedObject.MyInt32Array[0]);
         }
     }
 }

src/System.Text.Json/tests/Serialization/TestClasses.SimpleTestClass.cs

@@ -76,8 +76,7 @@ public class SimpleTestClass : ITestClass
         public IReadOnlyCollection<string> MyStringIReadOnlyCollectionT { get; set; }
         public IReadOnlyList<string> MyStringIReadOnlyListT { get; set; }
         public ISet<string> MyStringISetT { get; set; }
-        //todo: enable once we can write a custom converter for KeyValuePair:
-        // public KeyValuePair<string, string> MyStringToStringKeyValuePair { get; set; }
+        public KeyValuePair<string, string> MyStringToStringKeyValuePair { get; set; }
         public IDictionary MyStringToStringIDict { get; set; }
         public Dictionary<string, string> MyStringToStringGenericDict { get; set; }
         public IDictionary<string, string> MyStringToStringGenericIDict { get; set; }
@@ -127,7 +126,7 @@ public class SimpleTestClass : ITestClass
                 @"""MyEnum"" : 2," + // int by default
                 @"""MyInt64Enum"" : -9223372036854775808," +
                 @"""MyUInt64Enum"" : 18446744073709551615," +
-                 //@"""MyStringToStringKeyValuePair"" : {""Key"" : ""myKey"", ""Value"" : ""myValue""}," +
+                @"""MyStringToStringKeyValuePair"" : {""Key"" : ""myKey"", ""Value"" : ""myValue""}," +
                 @"""MyStringToStringIDict"" : {""key"" : ""value""}," +
                 @"""MyStringToStringGenericDict"" : {""key"" : ""value""}," +
                 @"""MyStringToStringGenericIDict"" : {""key"" : ""value""}," +
@@ -277,7 +276,7 @@ public void Initialize()
             MyStringIReadOnlyListT = new string[] { "Hello" };
             MyStringISetT = new HashSet<string> { "Hello" };
 
-            //MyStringToStringKeyValuePair = new KeyValuePair<string, string>("myKey", "myValue");
+            MyStringToStringKeyValuePair = new KeyValuePair<string, string>("myKey", "myValue");
             MyStringToStringIDict = new Dictionary<string, string> { { "key", "value" } };
 
             MyStringToStringGenericDict = new Dictionary<string, string> { { "key", "value" } };
@@ -477,8 +476,8 @@ public void Verify()
             Assert.Equal("value", MyStringToStringIImmutableDict["key"]);
             Assert.Equal("value", MyStringToStringImmutableSortedDict["key"]);
 
-            //Assert.Equal("myKey", MyStringToStringKeyValuePair.Key);
-            //Assert.Equal("myValue", MyStringToStringKeyValuePair.Value);
+            Assert.Equal("myKey", MyStringToStringKeyValuePair.Key);
+            Assert.Equal("myValue", MyStringToStringKeyValuePair.Value);
 
             Assert.Equal(2, MyStringStackT.Count);
             Assert.True(MyStringStackT.Contains("Hello"));