From 5d6936abc5c49aeb721fb89b64653682a8ad3c93 Mon Sep 17 00:00:00 2001 From: Meri Khamoyan Date: Wed, 22 Jun 2022 15:00:31 +0200 Subject: [PATCH 1/2] #69800 disable failing test on android --- .../System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs index 27a565561c5e65..04724d19d63f81 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs @@ -87,6 +87,7 @@ public static void ExplicitOperators_FromProperties() } [Fact] + [ActiveIssue("https://github.com/dotnet/runtime/issues/69800", TestPlatforms.Android)] public static void ExplicitOperators_FromValues() { Assert.Equal(1, (short)(JsonNode)(short)1); From 7b26bf33c6046f6252ad0950a837de3512cbb916 Mon Sep 17 00:00:00 2001 From: Meri Khamoyan Date: Wed, 22 Jun 2022 16:18:12 +0200 Subject: [PATCH 2/2] #69800 add conditionalFact to skip android x86 --- .../Common/tests/TestUtilities/System/PlatformDetection.cs | 1 + .../System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs index 470a097e526f80..5d32bf9b826051 100644 --- a/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs +++ b/src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs @@ -37,6 +37,7 @@ public static partial class PlatformDetection public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD")); public static bool IsNetBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD")); public static bool IsAndroid => RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID")); + public static bool IsNotAndroid => !IsAndroid; public static bool IsiOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("IOS")); public static bool IstvOS => RuntimeInformation.IsOSPlatform(OSPlatform.Create("TVOS")); public static bool IsMacCatalyst => RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST")); diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs index 04724d19d63f81..f193a3e516fc98 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs @@ -86,8 +86,7 @@ public static void ExplicitOperators_FromProperties() Assert.Equal(new Guid("1B33498A-7B7D-4DDA-9C13-F6AA4AB449A6"), (Guid)jObject["MyGuid"]); } - [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/69800", TestPlatforms.Android)] + [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotAndroid), nameof(PlatformDetection.IsNotX86Process))] public static void ExplicitOperators_FromValues() { Assert.Equal(1, (short)(JsonNode)(short)1);