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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/power_button_controller_unittest.cc

Issue 10914016: ash: Extract animator from PowerButtonController (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Yet another attempt Created 8 years, 3 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
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | ash/wm/session_state_animator.h » ('j') | ash/wm/session_state_animator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/power_button_controller_unittest.cc
diff --git a/ash/wm/power_button_controller_unittest.cc b/ash/wm/power_button_controller_unittest.cc
index d6f5c1cc77d94f38f48a59b1158908607eafbe29..b7d6d071b49d30cc895b949bbeda32ed770ffca8 100644
--- a/ash/wm/power_button_controller_unittest.cc
+++ b/ash/wm/power_button_controller_unittest.cc
@@ -84,8 +84,8 @@ TEST_F(PowerButtonControllerTest, LegacyLockAndShutDown) {
controller_->OnPowerButtonEvent(true, base::TimeTicks::Now());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_FALSE(test_api_->hide_black_layer_timer_is_running());
EXPECT_FALSE(test_api_->lock_timer_is_running());
@@ -95,19 +95,19 @@ TEST_F(PowerButtonControllerTest, LegacyLockAndShutDown) {
controller_->OnStartingLock();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE));
// Notify that the lock window is visible. We should make it fade in.
controller_->OnLockStateChanged(true);
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FADE_IN));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FADE_IN));
// We shouldn't progress towards the shutdown state, however.
EXPECT_FALSE(test_api_->lock_to_shutdown_timer_is_running());
@@ -129,8 +129,8 @@ TEST_F(PowerButtonControllerTest, LegacyLockAndShutDown) {
// containers are animated during shutdown.
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_FALSE(cursor_visible());
EXPECT_TRUE(test_api_->real_shutdown_timer_is_running());
test_api_->trigger_real_shutdown_timeout();
@@ -171,8 +171,8 @@ TEST_F(PowerButtonControllerTest, ShutdownWhenNotLoggedIn) {
EXPECT_TRUE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllContainersMask(),
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::GetAllContainersMask(),
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// Release the power button before the shutdown timer fires.
@@ -180,14 +180,14 @@ TEST_F(PowerButtonControllerTest, ShutdownWhenNotLoggedIn) {
EXPECT_FALSE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllContainersMask(),
- PowerButtonController::ANIMATION_UNDO_SLOW_CLOSE));
+ SessionStateAnimator::GetAllContainersMask(),
+ SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// We should re-hide the black layer after waiting long enough for
// the animation to finish.
EXPECT_TRUE(test_api_->hide_black_layer_timer_is_running());
- test_api_->trigger_hide_black_layer_timeout();
+ test_api_->TriggerHideBlackLayerTimeout();
EXPECT_FALSE(test_api_->BlackLayerIsVisible());
// Press the button again and make the shutdown timeout fire this time.
@@ -199,12 +199,12 @@ TEST_F(PowerButtonControllerTest, ShutdownWhenNotLoggedIn) {
EXPECT_EQ(0, delegate_->num_shutdown_requests());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
// When the timout fires, we should request a shutdown.
test_api_->trigger_real_shutdown_timeout();
@@ -223,8 +223,8 @@ TEST_F(PowerButtonControllerTest, LockAndUnlock) {
// logging-in animation.
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_RESTORE));
+ SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_RESTORE));
// Press the power button and check that the lock timer is started and that we
// start scaling the non-screen-locker containers.
@@ -233,8 +233,8 @@ TEST_F(PowerButtonControllerTest, LockAndUnlock) {
EXPECT_FALSE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// Release the button before the lock timer fires.
@@ -242,8 +242,8 @@ TEST_F(PowerButtonControllerTest, LockAndUnlock) {
EXPECT_FALSE(test_api_->lock_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_UNDO_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_TRUE(test_api_->hide_black_layer_timer_is_running());
test_api_->trigger_hide_black_layer_timeout();
@@ -258,27 +258,27 @@ TEST_F(PowerButtonControllerTest, LockAndUnlock) {
EXPECT_EQ(1, delegate_->num_lock_requests());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// Notify that we locked successfully.
controller_->OnStartingLock();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE));
// Notify that the lock window is visible. We should make it fade in.
controller_->OnLockStateChanged(true);
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FADE_IN));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FADE_IN));
// When we release the power button, the lock-to-shutdown timer should be
// stopped.
@@ -291,9 +291,9 @@ TEST_F(PowerButtonControllerTest, LockAndUnlock) {
controller_->OnLockStateChanged(false);
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::DESKTOP_BACKGROUND |
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_RESTORE));
+ SessionStateAnimator::DESKTOP_BACKGROUND |
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_RESTORE));
EXPECT_FALSE(test_api_->BlackLayerIsVisible());
}
@@ -318,8 +318,8 @@ TEST_F(PowerButtonControllerTest, LockToShutdown) {
EXPECT_TRUE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllContainersMask(),
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::GetAllContainersMask(),
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
// Fire the shutdown timeout and check that we request shutdown.
test_api_->trigger_shutdown_timeout();
@@ -344,8 +344,8 @@ TEST_F(PowerButtonControllerTest, LockFail) {
EXPECT_TRUE(test_api_->lock_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_RESTORE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_RESTORE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
test_api_->trigger_lock_timeout();
EXPECT_EQ(1, delegate_->num_lock_requests());
@@ -359,8 +359,8 @@ TEST_F(PowerButtonControllerTest, LockFail) {
test_api_->trigger_lock_fail_timeout();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_RESTORE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_RESTORE));
EXPECT_FALSE(test_api_->BlackLayerIsVisible());
}
@@ -406,8 +406,8 @@ TEST_F(PowerButtonControllerTest, LockButtonBasic) {
EXPECT_TRUE(test_api_->lock_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// If the button is released immediately, we shouldn't lock the screen.
@@ -415,8 +415,8 @@ TEST_F(PowerButtonControllerTest, LockButtonBasic) {
EXPECT_FALSE(test_api_->lock_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_UNDO_SLOW_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_TRUE(test_api_->hide_black_layer_timer_is_running());
test_api_->trigger_hide_black_layer_timeout();
@@ -484,8 +484,8 @@ TEST_F(PowerButtonControllerTest, LockWithoutButton) {
controller_->OnStartingLock();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
}
@@ -496,8 +496,8 @@ TEST_F(PowerButtonControllerTest, ShutdownWithoutButton) {
controller_->OnAppTerminating();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllContainersMask(),
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::GetAllContainersMask(),
+ SessionStateAnimator::ANIMATION_HIDE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_FALSE(cursor_visible());
}
@@ -509,12 +509,12 @@ TEST_F(PowerButtonControllerTest, RequestShutdownFromLoginScreen) {
controller_->RequestShutdown();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_FALSE(cursor_visible());
@@ -530,12 +530,12 @@ TEST_F(PowerButtonControllerTest, RequestShutdownFromLockScreen) {
controller_->RequestShutdown();
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::NON_LOCK_SCREEN_CONTAINERS,
- PowerButtonController::ANIMATION_HIDE));
+ SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
+ SessionStateAnimator::ANIMATION_HIDE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_FAST_CLOSE));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_FAST_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
EXPECT_FALSE(cursor_visible());
@@ -555,8 +555,8 @@ TEST_F(PowerButtonControllerTest, RequestAndCancelShutdownFromLockScreen) {
EXPECT_TRUE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllContainersMask(),
- PowerButtonController::ANIMATION_SLOW_CLOSE));
+ SessionStateAnimator::GetAllContainersMask(),
+ SessionStateAnimator::ANIMATION_SLOW_CLOSE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
// Release the power button before the shutdown timer fires.
@@ -564,12 +564,12 @@ TEST_F(PowerButtonControllerTest, RequestAndCancelShutdownFromLockScreen) {
EXPECT_FALSE(test_api_->shutdown_timer_is_running());
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::GetAllLockScreenContainersMask(),
- PowerButtonController::ANIMATION_UNDO_SLOW_CLOSE));
+ SessionStateAnimator::GetAllLockScreenContainersMask(),
+ SessionStateAnimator::ANIMATION_UNDO_SLOW_CLOSE));
EXPECT_TRUE(
test_api_->ContainersAreAnimated(
- PowerButtonController::DESKTOP_BACKGROUND,
- PowerButtonController::ANIMATION_RESTORE));
+ SessionStateAnimator::DESKTOP_BACKGROUND,
+ SessionStateAnimator::ANIMATION_RESTORE));
EXPECT_TRUE(test_api_->BlackLayerIsVisible());
}
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | ash/wm/session_state_animator.h » ('j') | ash/wm/session_state_animator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698