Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Android x86 double related issues #74080

Merged
merged 1 commit into from
Aug 18, 2022
Merged

Enable Android x86 double related issues #74080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Numerics/tests/BigInteger/ctor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ private static void VerifyCtorDecimal(decimal value)
VerifyBigIntegerUsingIdentities(bigInteger, 0 == expectedValue);
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotAndroidX86))] // disabled on Android x86, see https://github.com/dotnet/runtime/issues/37093
[Fact]
public static void RunCtorByteArrayTests()
{
ulong tempUInt64;
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Numerics/tests/ComplexTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ private static void VerifyPow_Complex_Complex(double realValue, double imaginary
VerifyRealImaginaryProperties(result, expectedReal, expectedImaginary);
}

[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotAndroidX86))] // disabled on Android x86, see https://github.com/dotnet/runtime/issues/37093
[Theory]
[MemberData(nameof(Boundaries_2_TestData))]
[MemberData(nameof(Primitives_2_TestData))]
[MemberData(nameof(SmallRandom_2_TestData))]
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime/tests/System/DoubleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,7 +1504,7 @@ public static void Atan2PiTest(double y, double x, double expectedResult, double
AssertExtensions.Equal(+expectedResult, double.Atan2Pi(+y, +x), allowedVariance);
}

[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotAndroidX86))] // disabled on Android x86, see https://github.com/dotnet/runtime/issues/71252
[Theory]
[InlineData( double.NaN, double.NaN, 0.0)]
[InlineData( 0.0, 0.0, 0.0)]
[InlineData( 1.5574077246549022, 0.31830988618379067, CrossPlatformMachineEpsilon)]
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.Cache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ public async Task MultipleThreadsLooping()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public async Task MultipleThreads()
{
// Verify the test class has >32 properties since that is a threshold for using the fallback dictionary.
Expand Down Expand Up @@ -105,7 +104,6 @@ public async Task PropertyCacheWithMinInputsFirst()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public async Task PropertyCacheWithMinInputsLast()
{
// Use local options to avoid obtaining already cached metadata from the default options.
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.Stream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public abstract partial class ConstructorTests
{
[Fact]
[SkipOnCoreClr("https://github.com/dotnet/runtime/issues/45464", ~RuntimeConfiguration.Release)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public async Task ReadSimpleObjectAsync()
{
if (StreamingSerializer is null)
Expand Down Expand Up @@ -66,7 +65,6 @@ async Task RunTestAsync<T>(byte[] testData)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public async Task ReadSimpleObjectWithTrailingTriviaAsync()
{
if (StreamingSerializer is null)
Expand Down
1 change: 0 additions & 1 deletion ...libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonNode/JsonNodeOperatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ public static void ExplicitOperators_FromProperties()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public static void ExplicitOperators_FromValues()
{
Assert.Equal(1, (short)(JsonNode)(short)1);
Expand Down
2 changes: 0 additions & 2 deletions ...ibraries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/ContinuationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ public static IEnumerable<object[]> TestData(bool enumeratePayloadTweaks)
[Theory]
[MemberData(nameof(TestData), /* enumeratePayloadTweaks: */ false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/42677", platforms: TestPlatforms.Windows, runtimes: TestRuntimes.Mono)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public static async Task ShouldWorkAtAnyPosition_Stream(
string json,
int bufferSize,
Expand Down Expand Up @@ -183,7 +182,6 @@ public static async Task InvalidJsonShouldFailAtAnyPosition_Stream(
[MemberData(nameof(TestData), /* enumeratePayloadTweaks: */ false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/42677", platforms: TestPlatforms.Windows, runtimes: TestRuntimes.Mono)]
[SkipOnCoreClr("https://github.com/dotnet/runtime/issues/45464", ~RuntimeConfiguration.Release)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public static void ShouldWorkAtAnyPosition_Sequence(
string json,
int bufferSize,
Expand Down
39 changes: 5 additions & 34 deletions ...raries/System.Text.Json/tests/System.Text.Json.Tests/Serialization/NumberHandlingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@ public static void Number_AsRootType_RoundTrip()
RunAsRootTypeTest(JsonNumberTestData.UInts);
RunAsRootTypeTest(JsonNumberTestData.ULongs);
RunAsRootTypeTest(JsonNumberTestData.Floats);
// https://github.com/dotnet/runtime/issues/72862
if (!PlatformDetection.IsAndroidX86)
{
RunAsRootTypeTest(JsonNumberTestData.Doubles);
}
RunAsRootTypeTest(JsonNumberTestData.Doubles);
RunAsRootTypeTest(JsonNumberTestData.Decimals);
RunAsRootTypeTest(JsonNumberTestData.NullableBytes);
RunAsRootTypeTest(JsonNumberTestData.NullableSBytes);
Expand All @@ -76,11 +72,7 @@ public static void Number_AsRootType_RoundTrip()
RunAsRootTypeTest(JsonNumberTestData.NullableUInts);
RunAsRootTypeTest(JsonNumberTestData.NullableULongs);
RunAsRootTypeTest(JsonNumberTestData.NullableFloats);
// https://github.com/dotnet/runtime/issues/72862
if (!PlatformDetection.IsAndroidX86)
{
RunAsRootTypeTest(JsonNumberTestData.NullableDoubles);
}
RunAsRootTypeTest(JsonNumberTestData.NullableDoubles);
RunAsRootTypeTest(JsonNumberTestData.NullableDecimals);
}

Expand All @@ -97,15 +89,6 @@ private static void RunAsRootTypeTest<T>(List<T> numbers)

private static string GetNumberAsString<T>(T number)
{
// Added float case for x86 android due to nan conversion in below switch
// There is active issue https://github.com/dotnet/runtime/issues/68906 on x86 Android
#if NETCOREAPP
if (OperatingSystem.IsAndroid() && RuntimeInformation.ProcessArchitecture == Architecture.X86 && Type.GetTypeCode(typeof(T)) == TypeCode.Single)
{
return Convert.ToSingle(number).ToString(JsonTestHelper.SingleFormatString, CultureInfo.InvariantCulture);
}
#endif

return number switch
{
double @double => @double.ToString(JsonTestHelper.DoubleFormatString, CultureInfo.InvariantCulture),
Expand Down Expand Up @@ -388,11 +371,7 @@ public static void Number_AsCollectionElement_RoundTrip()
RunAsCollectionElementTest(JsonNumberTestData.UInts);
RunAsCollectionElementTest(JsonNumberTestData.ULongs);
RunAsCollectionElementTest(JsonNumberTestData.Floats);
// https://github.com/dotnet/runtime/issues/72862
if (!PlatformDetection.IsAndroidX86)
{
RunAsCollectionElementTest(JsonNumberTestData.Doubles);
}
RunAsCollectionElementTest(JsonNumberTestData.Doubles);
RunAsCollectionElementTest(JsonNumberTestData.Decimals);

// https://github.com/dotnet/runtime/issues/66220
Expand All @@ -407,11 +386,7 @@ public static void Number_AsCollectionElement_RoundTrip()
RunAsCollectionElementTest(JsonNumberTestData.NullableUInts);
RunAsCollectionElementTest(JsonNumberTestData.NullableULongs);
RunAsCollectionElementTest(JsonNumberTestData.NullableFloats);
// https://github.com/dotnet/runtime/issues/72862
if (!PlatformDetection.IsAndroidX86)
{
RunAsCollectionElementTest(JsonNumberTestData.NullableDoubles);
}
RunAsCollectionElementTest(JsonNumberTestData.NullableDoubles);
RunAsCollectionElementTest(JsonNumberTestData.NullableDecimals);
}
}
Expand Down Expand Up @@ -637,11 +612,7 @@ public static void DictionariesRoundTrip()
{
RunAllDictionariessRoundTripTest(JsonNumberTestData.ULongs);
RunAllDictionariessRoundTripTest(JsonNumberTestData.Floats);
// https://github.com/dotnet/runtime/issues/72862
if (!PlatformDetection.IsAndroidX86)
{
RunAllDictionariessRoundTripTest(JsonNumberTestData.Doubles);
}
RunAllDictionariessRoundTripTest(JsonNumberTestData.Doubles);
}

private static void RunAllDictionariessRoundTripTest<T>(List<T> numbers)
Expand Down
2 changes: 0 additions & 2 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/Utf8JsonReaderTests.TryGet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace System.Text.Json.Tests
public static partial class Utf8JsonReaderTests
{
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public static void TestingNumbers_TryGetMethods()
{
byte[] dataUtf8 = JsonNumberTestData.JsonData;
Expand Down Expand Up @@ -154,7 +153,6 @@ public static void TestingNumbers_TryGetMethods()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/72862", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroidX86))]
public static void TestingNumbers_GetMethods()
{
byte[] dataUtf8 = JsonNumberTestData.JsonData;
Expand Down