From 297b86c460377f00f39bed5e69a8508c88d4b68c Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Tue, 16 Apr 2019 13:43:45 -0700 Subject: [PATCH] Fixing the Min/Max and MinMagnitude/MaxMagnitude for System.Math and System.MathF to expect NaN propagation --- src/System.Runtime.Extensions/tests/System/Math.cs | 8 ++++---- .../tests/System/MathF.netcoreapp.cs | 8 ++++---- .../tests/System/MathTests.netcoreapp.cs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/System.Runtime.Extensions/tests/System/Math.cs b/src/System.Runtime.Extensions/tests/System/Math.cs index c066a1f8e0fc..c7ff12f1d066 100644 --- a/src/System.Runtime.Extensions/tests/System/Math.cs +++ b/src/System.Runtime.Extensions/tests/System/Math.cs @@ -1080,7 +1080,7 @@ public static void Max_Double_NetFramework() [InlineData(-0.0, 0.0, 0.0)] [InlineData(2.0, -3.0, 2.0)] [InlineData(3.0, -2.0, 3.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Max_Double_NotNetFramework(double x, double y, double expectedResult) { @@ -1133,7 +1133,7 @@ public static void Max_Single_NetFramework() [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Max_Single_NotNetFramework(float x, float y, float expectedResult) { @@ -1193,7 +1193,7 @@ public static void Min_Double_NetFramework() [InlineData(-0.0, 0.0, -0.0)] [InlineData(2.0, -3.0, -3.0)] [InlineData(3.0, -2.0, -2.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Min_Double_NotNetFramework(double x, double y, double expectedResult) { @@ -1246,7 +1246,7 @@ public static void Min_Single_NetFramework() [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework)] public static void Min_Single_NotNetFramework(float x, float y, float expectedResult) { diff --git a/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs b/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs index 905ebf9de7aa..89836e9c3a05 100644 --- a/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs +++ b/src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs @@ -1208,7 +1208,7 @@ public static void Log10(float value, float expectedResult, float allowedVarianc [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void Max(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.Max(x, y), 0.0f); @@ -1221,7 +1221,7 @@ public static void Max(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, 0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, 3.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void MaxMagnitude(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.MaxMagnitude(x, y), 0.0f); @@ -1234,7 +1234,7 @@ public static void MaxMagnitude(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, -3.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void Min(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.Min(x, y), 0.0f); @@ -1247,7 +1247,7 @@ public static void Min(float x, float y, float expectedResult) [InlineData(-0.0f, 0.0f, -0.0f)] [InlineData(2.0f, -3.0f, 2.0f)] [InlineData(3.0f, -2.0f, -2.0f)] - [InlineData(float.PositiveInfinity, float.NaN, float.PositiveInfinity)] + [InlineData(float.PositiveInfinity, float.NaN, float.NaN)] public static void MinMagnitude(float x, float y, float expectedResult) { AssertEqual(expectedResult, MathF.MinMagnitude(x, y), 0.0f); diff --git a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs index 682c8a904364..71c5de3e3398 100644 --- a/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs +++ b/src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs @@ -599,7 +599,7 @@ public static void Log2(double value, double expectedResult, double allowedVaria [InlineData(-0.0, 0.0, 0.0)] [InlineData(2.0, -3.0, -3.0)] [InlineData(3.0, -2.0, 3.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] public static void MaxMagnitude(double x, double y, double expectedResult) { AssertEqual(expectedResult, Math.MaxMagnitude(x, y), 0.0); @@ -612,7 +612,7 @@ public static void MaxMagnitude(double x, double y, double expectedResult) [InlineData(-0.0, 0.0, -0.0)] [InlineData(2.0, -3.0, 2.0)] [InlineData(3.0, -2.0, -2.0)] - [InlineData(double.PositiveInfinity, double.NaN, double.PositiveInfinity)] + [InlineData(double.PositiveInfinity, double.NaN, double.NaN)] public static void MinMagnitude(double x, double y, double expectedResult) { AssertEqual(expectedResult, Math.MinMagnitude(x, y), 0.0);