Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Unified Diff: Source/core/animation/animatable/AnimatableUnknownTest.cpp

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More oilpan fixes & oilpan review feedback ; still failing tests Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/animatable/AnimatableUnknownTest.cpp
diff --git a/Source/core/animation/animatable/AnimatableUnknownTest.cpp b/Source/core/animation/animatable/AnimatableUnknownTest.cpp
index 4ed811d930d3461d3df62dc0239045b0dd6bb3f4..7fe8b5d97176b498a47db66ac15e898681d6120c 100644
--- a/Source/core/animation/animatable/AnimatableUnknownTest.cpp
+++ b/Source/core/animation/animatable/AnimatableUnknownTest.cpp
@@ -40,35 +40,25 @@ using namespace blink;
namespace {
-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());

Powered by Google App Engine
This is Rietveld 408576698