diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-18 14:03:11 +0200 |
| commit | 8d473cf9743f1d30a16a27114e93bd5af5648d23 (patch) | |
| tree | cdca40d0353886b3ca52f33a2d7b8f1c0011aafc /Source/WebKit/chromium/tests/CCTimerTest.cpp | |
| parent | 1b914638db989aaa98631a1c1e02c7b2d44805d8 (diff) | |
| download | qtwebkit-8d473cf9743f1d30a16a27114e93bd5af5648d23.tar.gz | |
Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4 (http://svn.webkit.org/repository/webkit/trunk@117578)
Weekly snapshot
Diffstat (limited to 'Source/WebKit/chromium/tests/CCTimerTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/CCTimerTest.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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); |