Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Add tests for dotnet/coreclr#20815 - new Math and MathF rounding modes #33297

Merged
merged 6 commits into from
Mar 4, 2019
Merged

Add tests for dotnet/coreclr#20815 - new Math and MathF rounding modes #33297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e7f071
add tests for new midpointrounding modes
hamish-rose Oct 30, 2018
bdc24a1
add tests for float, decimal
hamish-rose Nov 3, 2018
a4661c1
Update tests
hamish-rose Nov 5, 2018
4456db8
add tests for existing modes
hamish-rose Nov 7, 2018
b21a1e4
code review feedback
hamish-rose Nov 26, 2018
3dba4ce
move math tests to mathtests.netcoreapp.cs
hamish-rose Mar 4, 2019
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
65 changes: 57 additions & 8 deletions src/System.Runtime.Extensions/tests/System/MathF.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

using Xunit;
using Xunit.Sdk;
using System.Collections.Generic;

namespace System.Tests
{
Expand Down Expand Up @@ -1426,6 +1427,47 @@ public static void Pow_IEEE_Legacy(float x, float y, float expectedResult, float
AssertEqual(expectedResult, MathF.Pow(x, y), allowedVariance);
}

public static IEnumerable<object[]> Round_Digits_TestData
{
get
{
yield return new object[] {float.NaN, float.NaN, 3, MidpointRounding.ToEven};
yield return new object[] {float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.ToEven};
yield return new object[] {float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.ToEven};
yield return new object[] {0, 0, 3, MidpointRounding.ToEven};
yield return new object[] {3.42156f, 3.422f, 3, MidpointRounding.ToEven};
yield return new object[] {-3.42156f, -3.422f, 3, MidpointRounding.ToEven};

yield return new object[] {float.NaN, float.NaN, 3, MidpointRounding.AwayFromZero};
yield return new object[] {float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.AwayFromZero};
yield return new object[] {float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.AwayFromZero};
yield return new object[] {0, 0, 3, MidpointRounding.AwayFromZero};
yield return new object[] {3.42156f, 3.422f, 3, MidpointRounding.AwayFromZero};
yield return new object[] {-3.42156f, -3.422f, 3, MidpointRounding.AwayFromZero};

yield return new object[] {float.NaN, float.NaN, 3, MidpointRounding.ToZero};
yield return new object[] {float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.ToZero};
yield return new object[] {float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.ToZero};
yield return new object[] {0, 0, 3, MidpointRounding.ToZero};
yield return new object[] {3.42156f, 3.421f, 3, MidpointRounding.ToZero};
yield return new object[] {-3.42156f, -3.421f, 3, MidpointRounding.ToZero};

yield return new object[] {float.NaN, float.NaN, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {0, 0, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {3.42156f, 3.421f, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-3.42156f, -3.422f, 3, MidpointRounding.ToNegativeInfinity};

yield return new object[] {float.NaN, float.NaN, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {float.PositiveInfinity, float.PositiveInfinity, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {float.NegativeInfinity, float.NegativeInfinity, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {0, 0, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {3.42156f, 3.422f, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-3.42156f, -3.421f, 3, MidpointRounding.ToPositiveInfinity};
}
}

[Fact]
public static void Round()
{
Expand All @@ -1439,15 +1481,22 @@ public static void Round()
Assert.Equal(-2e7f, MathF.Round(-2e7f));
}

[Fact]
public static void Round_Digits()
[Theory]
[InlineData(MidpointRounding.ToEven)]
[InlineData(MidpointRounding.AwayFromZero)]
[InlineData(MidpointRounding.ToNegativeInfinity)]
[InlineData(MidpointRounding.ToPositiveInfinity)]
public static void Round_Digits(MidpointRounding mode)
{
Assert.Equal(float.PositiveInfinity, MathF.Round(float.PositiveInfinity, 3, mode));
Assert.Equal(float.NegativeInfinity, MathF.Round(float.NegativeInfinity, 3, mode));
}

[Theory]
[MemberData(nameof(Round_Digits_TestData))]
public static void Round_Digits(float x, float expected, int digits, MidpointRounding mode)
{
AssertEqual(3.422f, MathF.Round(3.42156f, 3, MidpointRounding.AwayFromZero), CrossPlatformMachineEpsilon * 10);
AssertEqual(-3.422f, MathF.Round(-3.42156f, 3, MidpointRounding.AwayFromZero), CrossPlatformMachineEpsilon * 10);
Assert.Equal(0.0f, MathF.Round(0.0f, 3, MidpointRounding.AwayFromZero));
Assert.Equal(float.NaN, MathF.Round(float.NaN, 3, MidpointRounding.AwayFromZero));
Assert.Equal(float.PositiveInfinity, MathF.Round(float.PositiveInfinity, 3, MidpointRounding.AwayFromZero));
Assert.Equal(float.NegativeInfinity, MathF.Round(float.NegativeInfinity, 3, MidpointRounding.AwayFromZero));
AssertEqual(expected, MathF.Round(x, digits, mode), CrossPlatformMachineEpsilon * 10);
}

[Theory]
Expand Down
131 changes: 131 additions & 0 deletions src/System.Runtime.Extensions/tests/System/MathTests.netcoreapp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,5 +658,136 @@ public static void ScaleB(double x, int n, double expectedResult, double allowed
{
AssertEqual(expectedResult, Math.ScaleB(x, n), allowedVariance);
}


public static IEnumerable<object[]> Round_Digits_TestData
{
get
{
yield return new object[] {0, 0, 3, MidpointRounding.ToEven};
yield return new object[] {3.42156, 3.422, 3, MidpointRounding.ToEven};
yield return new object[] {-3.42156, -3.422, 3, MidpointRounding.ToEven};

yield return new object[] {0, 0, 3, MidpointRounding.AwayFromZero};
yield return new object[] {3.42156, 3.422, 3, MidpointRounding.AwayFromZero};
yield return new object[] {-3.42156, -3.422, 3, MidpointRounding.AwayFromZero};

yield return new object[] {0, 0, 3, MidpointRounding.ToZero};
yield return new object[] {3.42156, 3.421, 3, MidpointRounding.ToZero};
yield return new object[] {-3.42156, -3.421, 3, MidpointRounding.ToZero};

yield return new object[] {0, 0, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {3.42156, 3.421, 3, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-3.42156, -3.422, 3, MidpointRounding.ToNegativeInfinity};

yield return new object[] {0, 0, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {3.42156, 3.422, 3, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-3.42156, -3.421, 3, MidpointRounding.ToPositiveInfinity};
}
}

[Theory]
[InlineData(MidpointRounding.ToEven)]
[InlineData(MidpointRounding.AwayFromZero)]
[InlineData(MidpointRounding.ToZero)]
[InlineData(MidpointRounding.ToNegativeInfinity)]
[InlineData(MidpointRounding.ToPositiveInfinity)]
public static void Round_Double_Digits(MidpointRounding mode)
{
Assert.Equal(double.NaN, Math.Round(double.NaN, 3, mode));
Assert.Equal(double.PositiveInfinity, Math.Round(double.PositiveInfinity, 3, mode));
Assert.Equal(double.NegativeInfinity, Math.Round(double.NegativeInfinity, 3, mode));
}

[Theory]
[MemberData(nameof(Round_Digits_TestData))]
public static void Round_Double_Digits(double x, double expected, int digits, MidpointRounding mode)
{
Assert.Equal(expected, Math.Round(x, digits, mode));
}

[Theory]
[MemberData(nameof(Round_Digits_TestData))]
public static void Round_Decimal_Digits(decimal x, decimal expected, int digits, MidpointRounding mode)
{
Assert.Equal(expected, Math.Round(x, digits, mode));
}

[Theory]
[InlineData(MidpointRounding.ToEven)]
[InlineData(MidpointRounding.AwayFromZero)]
[InlineData(MidpointRounding.ToZero)]
[InlineData(MidpointRounding.ToNegativeInfinity)]
[InlineData(MidpointRounding.ToPositiveInfinity)]
public static void Round_Decimal_Digits(MidpointRounding mode)
{
Assert.Equal(decimal.Zero, Math.Round(decimal.Zero, 3, mode));
}

public static IEnumerable<object[]> Round_Modes_TestData
{
get
{
yield return new object[] {11, 11, MidpointRounding.ToEven};
yield return new object[] {11.4, 11, MidpointRounding.ToEven};
yield return new object[] {11.5, 12, MidpointRounding.ToEven};
yield return new object[] {11.6, 12, MidpointRounding.ToEven};
yield return new object[] {-11, -11, MidpointRounding.ToEven};
yield return new object[] {-11.4, -11, MidpointRounding.ToEven};
yield return new object[] {-11.5, -12, MidpointRounding.ToEven};
yield return new object[] {-11.6, -12, MidpointRounding.ToEven};
yield return new object[] {11, 11, MidpointRounding.AwayFromZero};
yield return new object[] {11.4, 11, MidpointRounding.AwayFromZero};
yield return new object[] {11.5, 12, MidpointRounding.AwayFromZero};
yield return new object[] {11.6, 12, MidpointRounding.AwayFromZero};
yield return new object[] {-11, -11, MidpointRounding.AwayFromZero};
yield return new object[] {-11.4, -11, MidpointRounding.AwayFromZero};
yield return new object[] {-11.5, -12, MidpointRounding.AwayFromZero};
yield return new object[] {-11.6, -12, MidpointRounding.AwayFromZero};
yield return new object[] {11, 11, MidpointRounding.ToPositiveInfinity};
yield return new object[] {11.4, 12, MidpointRounding.ToPositiveInfinity};
yield return new object[] {11.5, 12, MidpointRounding.ToPositiveInfinity};
yield return new object[] {11.6, 12, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-11, -11, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-11.4, -11, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-11.5, -11, MidpointRounding.ToPositiveInfinity};
yield return new object[] {-11.6, -11, MidpointRounding.ToPositiveInfinity};
yield return new object[] {11.0, 11, MidpointRounding.ToNegativeInfinity};
yield return new object[] {11.4, 11, MidpointRounding.ToNegativeInfinity};
yield return new object[] {11.5, 11, MidpointRounding.ToNegativeInfinity};
yield return new object[] {11.6, 11, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-11.0, -11, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-11.4, -12, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-11.5, -12, MidpointRounding.ToNegativeInfinity};
yield return new object[] {-11.6, -12, MidpointRounding.ToNegativeInfinity};
yield return new object[] {11.0, 11, MidpointRounding.ToZero};
yield return new object[] {11.4, 11, MidpointRounding.ToZero};
yield return new object[] {11.5, 11, MidpointRounding.ToZero};
yield return new object[] {11.6, 11, MidpointRounding.ToZero};
yield return new object[] {-11.0, -11, MidpointRounding.ToZero};
yield return new object[] {-11.4, -11, MidpointRounding.ToZero};
yield return new object[] {-11.5, -11, MidpointRounding.ToZero};
yield return new object[] {-11.6, -11, MidpointRounding.ToZero};
}
}

[MemberData(nameof(Round_Modes_TestData))]
public static void Round_Double_Modes(double x, double expected, MidpointRounding mode)
{
Assert.Equal(expected, Math.Round(x, 0, mode));
}

[MemberData(nameof(Round_Modes_TestData))]
public static void Round_Float_Modes(float x, float expected, MidpointRounding mode)
{
Assert.Equal(expected, MathF.Round(x, 0, mode));
}

[MemberData(nameof(Round_Modes_TestData))]
public static void Round_Decimal_Modes(decimal x, decimal expected, MidpointRounding mode)
{
Assert.Equal(expected, Math.Round(x, 0, mode));
Assert.Equal(expected, decimal.Round(x, 0, mode));
}
}
}