Index: Source/core/animation/animatable/AnimatableUnknownTest.cpp |
diff --git a/Source/core/animation/animatable/AnimatableUnknownTest.cpp b/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
index d4c2c0f0b0ebdbfbe42e47443d9ca0ec86502fbb..c2f3d40299e993d472adf0464bf80a0326e10194 100644 |
--- a/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
+++ b/Source/core/animation/animatable/AnimatableUnknownTest.cpp |
@@ -37,35 +37,25 @@ |
namespace blink { |
-class AnimationAnimatableUnknownTest : public ::testing::Test { |
-protected: |
- virtual void SetUp() |
- { |
- cssValue = cssValuePool().createIdentifierValue(CSSValueYellow); |
- animatableUnknown = AnimatableUnknown::create(cssValue); |
- |
- otherCSSValue = cssValuePool().createIdentifierValue(CSSValueOrange); |
- otherAnimatableUnknown = AnimatableUnknown::create(otherCSSValue); |
- } |
- |
- RefPtrWillBePersistent<CSSValue> cssValue; |
- RefPtrWillBePersistent<AnimatableValue> animatableUnknown; |
- RefPtrWillBePersistent<CSSValue> otherCSSValue; |
- RefPtrWillBePersistent<AnimatableValue> otherAnimatableUnknown; |
-}; |
- |
-TEST_F(AnimationAnimatableUnknownTest, Create) |
+TEST(AnimationAnimatableUnknownTest, Create) |
{ |
- EXPECT_TRUE(animatableUnknown); |
+ CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow); |
+ EXPECT_TRUE(AnimatableUnknown::create(cssValue)); |
} |
-TEST_F(AnimationAnimatableUnknownTest, ToCSSValue) |
+TEST(AnimationAnimatableUnknownTest, ToCSSValue) |
{ |
- EXPECT_EQ(cssValue, toAnimatableUnknown(animatableUnknown.get())->toCSSValue()); |
+ CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow); |
+ EXPECT_EQ(cssValue, AnimatableUnknown::create(cssValue)->toCSSValue()); |
} |
-TEST_F(AnimationAnimatableUnknownTest, Interpolate) |
+TEST(AnimationAnimatableUnknownTest, Interpolate) |
{ |
+ CSSValue cssValue = cssValuePool().createIdentifierValue(CSSValueYellow); |
+ CSSValue otherCSSValue = cssValuePool().createIdentifierValue(CSSValueOrange); |
+ RefPtrWillBePersistent<AnimatableValue> animatableUnknown = AnimatableUnknown::create(cssValue); |
+ RefPtrWillBePersistent<AnimatableValue> otherAnimatableUnknown = AnimatableUnknown::create(otherCSSValue); |
+ |
EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0).get())->toCSSValue()); |
EXPECT_EQ(cssValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.4).get())->toCSSValue()); |
EXPECT_EQ(otherCSSValue, toAnimatableUnknown(AnimatableValue::interpolate(animatableUnknown.get(), otherAnimatableUnknown.get(), 0.5).get())->toCSSValue()); |