Fix a test suppression caused by windows floating point differences.

In https://codereview.chromium.org/11567020, I disabled a test failing due
to difference use of the intel FPU between windows and other platforms.
Fix the test and re-enable on windows.

BUG=166038

Review URL: https://chromiumcodereview.appspot.com/11659017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174810 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 31 deletions

diff --git a/ui/base/gestures/velocity_calculator_unittest.cc b/ui/base/gestures/velocity_calculator_unittest.cc
index 8778823..424079a 100644
--- a/ui/base/gestures/velocity_calculator_unittest.cc
+++ b/ui/base/gestures/velocity_calculator_unittest.cc
@@ -87,16 +87,8 @@ TEST(VelocityCalculatorTest, IsAccurateWithLargeTimes) {
   EXPECT_LT(velocity_calculator.YVelocity(), -124000);
 }
 
-
-// TODO(rjkroege): Fix this test on windows.
-#if defined(OS_WIN)
-#define MAYBE_RequiresEnoughData DISABLED_RequiresEnoughData
-#else
-#define MAYBE_RequiresEnoughData RequiresEnoughData
-#endif
-
 // Check that the right values are returned for insufficient data.
-TEST(VelocityCalculatorTest, MAYBE_RequiresEnoughData) {
+TEST(VelocityCalculatorTest, RequiresEnoughData) {
   VelocityCalculator velocity_calculator(3);
   int64 start_time = 0;
 
@@ -111,23 +103,17 @@ TEST(VelocityCalculatorTest, MAYBE_RequiresEnoughData) {
 
   // 2 points has non-zero velocity.
   velocity_calculator.PointSeen(20, 20, start_time + 5);
-  EXPECT_GT(velocity_calculator.XVelocity(), 1923076.9);
-  EXPECT_LT(velocity_calculator.XVelocity(), 1923077.1);
-  EXPECT_GT(velocity_calculator.YVelocity(), 1923076.9);
-  EXPECT_LT(velocity_calculator.YVelocity(), 1923077.1);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 1923077.f);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), 1923077.f);
 
   velocity_calculator.PointSeen(30, 30, start_time + 10);
   velocity_calculator.PointSeen(40, 40, start_time + 15);
-  EXPECT_GT(velocity_calculator.XVelocity(), 1999999.9);
-  EXPECT_LT(velocity_calculator.XVelocity(), 2000000.1);
-  EXPECT_GT(velocity_calculator.YVelocity(), 1999999.9);
-  EXPECT_LT(velocity_calculator.YVelocity(), 2000000.1);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 2000000.f);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), 2000000.f);
 
   velocity_calculator.PointSeen(50, 50, start_time + 20);
-  EXPECT_GT(velocity_calculator.XVelocity(), 1999999.9);
-  EXPECT_LT(velocity_calculator.XVelocity(), 2000000.1);
-  EXPECT_GT(velocity_calculator.YVelocity(), 1999999.9);
-  EXPECT_LT(velocity_calculator.YVelocity(), 2000000.1);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 2000000.f);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), 2000000.f);
 }
 
 // Ensures ClearHistory behaves correctly
@@ -135,10 +121,8 @@ TEST(VelocityCalculatorTest, ClearsHistory) {
   VelocityCalculator velocity_calculator(5);
   AddPoints(&velocity_calculator, 10, -10, 1, 7);
 
-  EXPECT_GT(velocity_calculator.XVelocity(), 9.9);
-  EXPECT_LT(velocity_calculator.XVelocity(), 10.1);
-  EXPECT_GT(velocity_calculator.YVelocity(), -10.1);
-  EXPECT_LT(velocity_calculator.YVelocity(), -9.9);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 10.f);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), -10.f);
 
   velocity_calculator.ClearHistory();
 
@@ -151,15 +135,13 @@ TEST(VelocityCalculatorTest, IgnoresOldData) {
   VelocityCalculator velocity_calculator(5);
   AddPoints(&velocity_calculator, 10, -10, 1, 7);
 
-  EXPECT_GT(velocity_calculator.XVelocity(), 9.9);
-  EXPECT_LT(velocity_calculator.XVelocity(), 10.1);
-  EXPECT_GT(velocity_calculator.YVelocity(), -10.1);
-  EXPECT_LT(velocity_calculator.YVelocity(), -9.9);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 10.f);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), -10.f);
 
   AddPoints(&velocity_calculator, 0, 0, 1, 5);
 
-  EXPECT_EQ(velocity_calculator.XVelocity(), 0);
-  EXPECT_EQ(velocity_calculator.YVelocity(), 0);
+  EXPECT_FLOAT_EQ(velocity_calculator.XVelocity(), 0);
+  EXPECT_FLOAT_EQ(velocity_calculator.YVelocity(), 0);
 }
 
 }  // namespace test