diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2014-09-01 05:57:03 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2014-09-01 05:57:03 -0700 |
| commit | 647dc998e483334cdbd8883aa655ea8e0e9014de (patch) | |
| tree | ca6cca40e858b01d7805cef4b1912ba45fb28a90 /Source/UnitTests/Common/MathUtilTest.cpp | |
| parent | 5e9c910256c191d122c77a073818d4d95c977f31 (diff) | |
unittests: correct some integers which should have been floating point types
Diffstat (limited to 'Source/UnitTests/Common/MathUtilTest.cpp')
| -rw-r--r-- | Source/UnitTests/Common/MathUtilTest.cpp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Source/UnitTests/Common/MathUtilTest.cpp b/Source/UnitTests/Common/MathUtilTest.cpp index 3df22847be..8ae757962c 100644 --- a/Source/UnitTests/Common/MathUtilTest.cpp +++ b/Source/UnitTests/Common/MathUtilTest.cpp @@ -64,13 +64,15 @@ TEST(MathUtil, FlushToZero) // we want the multiplication to occur at test runtime. volatile float s = std::numeric_limits<float>::denorm_min(); volatile double d = std::numeric_limits<double>::denorm_min(); - EXPECT_LT(0, s * 2); - EXPECT_LT(0, d * 2); - - EXPECT_EQ(+0, MathUtil::FlushToZero(+std::numeric_limits<double>::denorm_min())); - EXPECT_EQ(-0, MathUtil::FlushToZero(-std::numeric_limits<double>::denorm_min())); - EXPECT_EQ(+0, MathUtil::FlushToZero(+std::numeric_limits<double>::min() / 2)); - EXPECT_EQ(-0, MathUtil::FlushToZero(-std::numeric_limits<double>::min() / 2)); + // Casting away the volatile attribute is required in order for msvc to resolve this to the + // correct instance of the comparison function. + EXPECT_LT(0.f, (float)(s * 2)); + EXPECT_LT(0.0, (double)(d * 2)); + + EXPECT_EQ(+0.0, MathUtil::FlushToZero(+std::numeric_limits<double>::denorm_min())); + EXPECT_EQ(-0.0, MathUtil::FlushToZero(-std::numeric_limits<double>::denorm_min())); + EXPECT_EQ(+0.0, MathUtil::FlushToZero(+std::numeric_limits<double>::min() / 2)); + EXPECT_EQ(-0.0, MathUtil::FlushToZero(-std::numeric_limits<double>::min() / 2)); EXPECT_EQ(std::numeric_limits<double>::min(), MathUtil::FlushToZero(std::numeric_limits<double>::min())); EXPECT_EQ(std::numeric_limits<double>::max(), MathUtil::FlushToZero(std::numeric_limits<double>::max())); EXPECT_EQ(+std::numeric_limits<double>::infinity(), MathUtil::FlushToZero(+std::numeric_limits<double>::infinity())); @@ -82,10 +84,10 @@ TEST(MathUtil, FlushToZero) for (u32 i = 0; i <= 0x007fffffu; ++i) { MathUtil::IntFloat x(i); - EXPECT_EQ(+0, MathUtil::FlushToZero(x.f)); + EXPECT_EQ(+0.f, MathUtil::FlushToZero(x.f)); x.i = i | 0x80000000u; - EXPECT_EQ(-0, MathUtil::FlushToZero(x.f)); + EXPECT_EQ(-0.f, MathUtil::FlushToZero(x.f)); x.i = dist(engine); MathUtil::IntFloat y(MathUtil::FlushToZero(x.f)); |