X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fplatform%2Fanimation%2FTimingFunctionTestHelperTest.cpp;h=2eefd12c0a0734add7f991a8bdd3cd1aff5c303a;hb=ff3e2503a20db9193d323c1d19c38c68004dec4a;hp=ed4ff21a3a6790455b07422816edf4d1a4af45d3;hpb=d482483c7e386df3f789b1cb1845b73bfcaae2bd;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/WebKit/Source/platform/animation/TimingFunctionTestHelperTest.cpp b/src/third_party/WebKit/Source/platform/animation/TimingFunctionTestHelperTest.cpp index ed4ff21..2eefd12 100644 --- a/src/third_party/WebKit/Source/platform/animation/TimingFunctionTestHelperTest.cpp +++ b/src/third_party/WebKit/Source/platform/animation/TimingFunctionTestHelperTest.cpp @@ -95,7 +95,7 @@ TEST_F(TimingFunctionTestHelperTest, LinearPrintTo) RefPtr linearTiming = LinearTimingFunction::create(); EXPECT_THAT( PrintToString(linearTiming), - ::testing::MatchesRegex("LinearTimingFunction@.*")); + ::testing::MatchesRegex("linear")); } TEST_F(TimingFunctionTestHelperTest, CubicPrintTo) @@ -103,12 +103,12 @@ TEST_F(TimingFunctionTestHelperTest, CubicPrintTo) RefPtr cubicEaseTiming = CubicBezierTimingFunction::preset(CubicBezierTimingFunction::EaseIn); EXPECT_THAT( PrintToString(cubicEaseTiming), - ::testing::MatchesRegex("CubicBezierTimingFunction@.*\\(EaseIn, 0.42, 0, 1, 1\\)")); + ::testing::MatchesRegex("ease-in")); RefPtr cubicCustomTiming = CubicBezierTimingFunction::create(0.17, 0.67, 1, -1.73); EXPECT_THAT( PrintToString(cubicCustomTiming), - ::testing::MatchesRegex("CubicBezierTimingFunction@.*\\(Custom, 0.17, 0.67, 1, -1.73\\)")); + ::testing::MatchesRegex("cubic-bezier\\(0.17, 0.67, 1, -1.73\\)")); } TEST_F(TimingFunctionTestHelperTest, StepPrintTo) @@ -116,12 +116,12 @@ TEST_F(TimingFunctionTestHelperTest, StepPrintTo) RefPtr stepTimingStart = StepsTimingFunction::preset(StepsTimingFunction::Start); EXPECT_THAT( PrintToString(stepTimingStart), - ::testing::MatchesRegex("StepsTimingFunction@.*\\(Start, 1, true\\)")); + ::testing::MatchesRegex("step-start")); RefPtr stepTimingCustom = StepsTimingFunction::create(5, false); EXPECT_THAT( PrintToString(stepTimingCustom), - ::testing::MatchesRegex("StepsTimingFunction@.*\\(Custom, 5, false\\)")); + ::testing::MatchesRegex("steps\\(5, end\\)")); } TEST_F(TimingFunctionTestHelperTest, ChainedPrintTo) @@ -132,8 +132,8 @@ TEST_F(TimingFunctionTestHelperTest, ChainedPrintTo) EXPECT_THAT( PrintToString(chainedLinearSingle), ::testing::MatchesRegex( - "ChainedTimingFunction@.*\\(" - "LinearTimingFunction@.*\\[0 -> 1\\]" + "chained\\(" + "linear\\[0 -> 1\\]" "\\)")); RefPtr cubicCustomTiming = CubicBezierTimingFunction::create(1.0, 0.0, 1, -1); @@ -144,11 +144,11 @@ TEST_F(TimingFunctionTestHelperTest, ChainedPrintTo) EXPECT_THAT( PrintToString(chainedMixed), ::testing::MatchesRegex( - "ChainedTimingFunction@.*\\(" - "ChainedTimingFunction@.*\\(" - "LinearTimingFunction@.*\\[0 -> 1\\]" + "chained\\(" + "chained\\(" + "linear\\[0 -> 1\\]" "\\)\\[0 -> 0.75\\], " - "CubicBezierTimingFunction@.*\\(Custom, 1, 0, 1, -1\\)\\[0.75 -> 1\\]" + "cubic-bezier\\(1, 0, 1, -1\\)\\[0.75 -> 1\\]" "\\)")); }