diff options
| -rw-r--r-- | printing/units_unittest.cc | 4 | ||||
| -rw-r--r-- | ui/base/animation/multi_animation_unittest.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/printing/units_unittest.cc b/printing/units_unittest.cc index 82f9acb..4b7f4bf 100644 --- a/printing/units_unittest.cc +++ b/printing/units_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -39,7 +39,7 @@ TEST(UnitsTest, Convertions) { EXPECT_EQ(100, ConvertUnitDouble(100, 100, 100)); EXPECT_EQ(-100, ConvertUnitDouble(-100, 100, 100)); EXPECT_EQ(0, ConvertUnitDouble(0, 100, 100)); - EXPECT_EQ(0.000002, ConvertUnitDouble(2, 1000, 0.001)); + EXPECT_DOUBLE_EQ(0.000002, ConvertUnitDouble(2, 1000, 0.001)); EXPECT_EQ(2000000, ConvertUnitDouble(2, 0.001, 1000)); EXPECT_EQ(kHundrethsMMPerInch, ConvertMilliInchToHundredThousanthMeter(1000)); diff --git a/ui/base/animation/multi_animation_unittest.cc b/ui/base/animation/multi_animation_unittest.cc index dfc015d..9e0c339 100644 --- a/ui/base/animation/multi_animation_unittest.cc +++ b/ui/base/animation/multi_animation_unittest.cc @@ -28,14 +28,14 @@ TEST_F(MultiAnimationTest, Basic) { // Step to 120, which is 20% through the second part. as_element->Step(base::TimeTicks() + base::TimeDelta::FromMilliseconds(120)); - EXPECT_EQ(Tween::CalculateValue(Tween::EASE_OUT, .2), - animation.GetCurrentValue()); + EXPECT_DOUBLE_EQ(Tween::CalculateValue(Tween::EASE_OUT, .2), + animation.GetCurrentValue()); // Step to 320, which is 20% through the second part. as_element->Step(base::TimeTicks() + base::TimeDelta::FromMilliseconds(320)); - EXPECT_EQ(Tween::CalculateValue(Tween::EASE_OUT, .2), - animation.GetCurrentValue()); + EXPECT_DOUBLE_EQ(Tween::CalculateValue(Tween::EASE_OUT, .2), + animation.GetCurrentValue()); } TEST_F(MultiAnimationTest, DifferingStartAndEnd) { |