From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 18 May 2012 14:03:11 +0200 Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578) Weekly snapshot --- Source/WebKit/chromium/tests/CCTimerTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/WebKit/chromium/tests/CCTimerTest.cpp') diff --git a/Source/WebKit/chromium/tests/CCTimerTest.cpp b/Source/WebKit/chromium/tests/CCTimerTest.cpp index 398fca56e..c1b2efb77 100644 --- a/Source/WebKit/chromium/tests/CCTimerTest.cpp +++ b/Source/WebKit/chromium/tests/CCTimerTest.cpp @@ -55,8 +55,9 @@ TEST_F(CCTimerTest, OneShot) { CCTimer timer(&m_thread, this); timer.startOneShot(0.001); - + EXPECT_TRUE(timer.isActive()); m_thread.runPendingTask(); + EXPECT_FALSE(timer.isActive()); EXPECT_TRUE(m_flag); EXPECT_FALSE(m_thread.hasPendingTask()); } @@ -65,7 +66,9 @@ TEST_F(CCTimerTest, StopManually) { CCTimer timer(&m_thread, this); timer.startOneShot(0.001); + EXPECT_TRUE(timer.isActive()); timer.stop(); + EXPECT_FALSE(timer.isActive()); m_thread.runPendingTask(); EXPECT_FALSE(m_flag); -- cgit v1.2.1