49936 text json failures (dotnet#68758)

* dotnet#49936 fixed text json failures and enabled System.Text.Json\tests
jkotas · May 10, 2022 · 43dd0a7 · 43dd0a7
1 parent 97622df
commit 43dd0a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...raries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/NumberHandlingTests.cs b/...raries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/NumberHandlingTests.cs
@@ -88,10 +88,16 @@ private static void RunAsRootTypeTest<T>(List<T> numbers)
 
         private static string GetNumberAsString<T>(T number)
         {
+            // Took out float case from switch due to nan conversion
+            // There is active issue https://github.com/dotnet/runtime/issues/68906 on x86 Android 
+            if (number is float)
+            {
+                return ((float)(object)number).ToString(JsonTestHelper.SingleFormatString, CultureInfo.InvariantCulture);
+            }
+
             return number switch
             {
                 double @double => @double.ToString(JsonTestHelper.DoubleFormatString, CultureInfo.InvariantCulture),
-                float @float => @float.ToString(JsonTestHelper.SingleFormatString, CultureInfo.InvariantCulture),
                 decimal @decimal => @decimal.ToString(CultureInfo.InvariantCulture),
                 _ => number.ToString()
             };
@@ -359,7 +365,6 @@ public class Class_With_ListsOfBoxedNonNumbers
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/49936", TestPlatforms.Android)]
         public static void Number_AsCollectionElement_RoundTrip()
         {
             RunAsCollectionElementTest(JsonNumberTestData.Bytes);
@@ -986,7 +991,6 @@ private static void AssertUnsupportedFormatThrows<T>()
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/49936", TestPlatforms.Android)]
         public static void EscapingTest()
         {
             // Cause all characters to be escaped.

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
@@ -156,9 +156,6 @@
     <!-- https://github.com/dotnet/runtime/issues/50926 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Diagnostics.Tracing\tests\System.Diagnostics.Tracing.Tests.csproj" />
 
-    <!-- https://github.com/dotnet/runtime/issues/49936 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj" />
-
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Net.Http\tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj" />
 
     <!-- Execution may be compromised -->