diff options
| -rw-r--r-- | tests/test_showdesktop_handler.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/test_showdesktop_handler.cpp b/tests/test_showdesktop_handler.cpp index eaa5de936..920a2d7b3 100644 --- a/tests/test_showdesktop_handler.cpp +++ b/tests/test_showdesktop_handler.cpp @@ -408,6 +408,7 @@ TEST_F(UnityShowdesktopHandlerTest, TestAnimationPostPaintActions) TEST_F(UnityShowdesktopHandlerTest, TestAnimationOpacity) { MockUnityShowdesktopHandlerWindow mMockWindow; + using namespace testing; EXPECT_CALL (mMockWindow, GetInputRemover ()).WillOnce (Invoke (UnityShowdesktopHandlerTest::getLock <MockWindowInputRemoverTestFadeOutFadeIn>)); ShowdesktopHandler mMockHandler (static_cast <ShowdesktopHandlerWindowInterface *> (&mMockWindow), static_cast <compiz::WindowInputRemoverLockAcquireInterface *> (&mMockWindow)); @@ -431,12 +432,13 @@ TEST_F(UnityShowdesktopHandlerTest, TestAnimationOpacity) mMockHandler.Animate (1); - if (i == 300) + if (i == ShowdesktopHandler::fade_time) EXPECT_EQ (opacity, std::numeric_limits <unsigned short>::max ()); else { float rem = opacity - std::numeric_limits <unsigned short>::max () * (1.0f - i / static_cast <float> (ShowdesktopHandler::fade_time)); - EXPECT_TRUE (rem <= 1.0f && rem >= -1.0f); + EXPECT_THAT(rem, AllOf(AnyOf(FloatEq(1.0f), Le(1.0f)), + AnyOf(FloatEq(-1.0f), Ge(-1.0f)))); } } @@ -449,12 +451,13 @@ TEST_F(UnityShowdesktopHandlerTest, TestAnimationOpacity) mMockHandler.Animate (1); - if (i == 300) + if (i == ShowdesktopHandler::fade_time) EXPECT_EQ (opacity, std::numeric_limits <unsigned short>::max ()); else { float rem = opacity - std::numeric_limits <unsigned short>::max () * (i / static_cast <float> (ShowdesktopHandler::fade_time)); - EXPECT_TRUE (rem <= 1.0f && rem >= -1.0f); + EXPECT_THAT(rem, AllOf(AnyOf(FloatEq(1.0f), Le(1.0f)), + AnyOf(FloatEq(-1.0f), Ge(-1.0f)))); } } |