mash: Run pre-unlock animation via SessionController

ash/common/session/session_controller_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/session/session_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/common/login_status.h"
 #include "ash/common/session/session_controller.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/public/interfaces/session_controller.mojom.h"
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_type.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using session_manager::SessionState;
+
 namespace ash {
 namespace {
 
 class TestSessionStateObserver : public SessionStateObserver {
  public:
   TestSessionStateObserver() : active_account_id_(EmptyAccountId()) {}
   ~TestSessionStateObserver() override {}
 
   // SessionStateObserver:
   void ActiveUserChanged(const AccountId& account_id) override {
     active_account_id_ = account_id;
   }
 
   void UserAddedToSession(const AccountId& account_id) override {
     user_session_account_ids_.push_back(account_id);
   }
 
-  void SessionStateChanged(session_manager::SessionState state) override {
-    state_ = state;
-  }
+  void SessionStateChanged(SessionState state) override { state_ = state; }
 
   std::string GetUserSessionEmails() const {
     std::string emails;
     for (const auto& account_id : user_session_account_ids_) {
       emails += account_id.GetUserEmail() + ",";
     }
     return emails;
   }
 
-  session_manager::SessionState state() const { return state_; }
+  SessionState state() const { return state_; }
   const AccountId& active_account_id() const { return active_account_id_; }
   const std::vector<AccountId>& user_session_account_ids() const {
     return user_session_account_ids_;
   }
 
  private:
-  session_manager::SessionState state_ = session_manager::SessionState::UNKNOWN;
+  SessionState state_ = SessionState::UNKNOWN;
   AccountId active_account_id_;
   std::vector<AccountId> user_session_account_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestSessionStateObserver);
 };
 
 void FillDefaultSessionInfo(mojom::SessionInfo* info) {
   info->can_lock_screen = true;
   info->should_lock_screen_automatically = true;
   info->add_user_session_policy = AddUserSessionPolicy::ALLOWED;
-  info->state = session_manager::SessionState::LOGIN_PRIMARY;
+  info->state = SessionState::LOGIN_PRIMARY;
 }
 
 class SessionControllerTest : public testing::Test {
  public:
   SessionControllerTest() {}
   ~SessionControllerTest() override {}
 
   // testing::Test:
   void SetUp() override {
     controller_ = base::MakeUnique<SessionController>();
@@ skipping 93 matching lines @@
     info.add_user_session_policy = policy;
     SetSessionInfo(info);
     EXPECT_EQ(policy, controller()->GetAddUserPolicy())
         << "Test case policy=" << static_cast<int>(policy);
   }
 }
 
 // Tests that session state can be set and reflected properly.
 TEST_F(SessionControllerTest, SessionState) {
   const struct {
-    session_manager::SessionState state;
+    SessionState state;
     bool expected_is_screen_locked;
     bool expected_is_user_session_blocked;
   } kTestCases[] = {
-      {session_manager::SessionState::OOBE, false, true},
-      {session_manager::SessionState::LOGIN_PRIMARY, false, true},
-      {session_manager::SessionState::LOGGED_IN_NOT_ACTIVE, false, true},
-      {session_manager::SessionState::ACTIVE, false, false},
-      {session_manager::SessionState::LOCKED, true, true},
-      {session_manager::SessionState::LOGIN_SECONDARY, false, true},
+      {SessionState::OOBE, false, true},
+      {SessionState::LOGIN_PRIMARY, false, true},
+      {SessionState::LOGGED_IN_NOT_ACTIVE, false, true},
+      {SessionState::ACTIVE, false, false},
+      {SessionState::LOCKED, true, true},
+      {SessionState::LOGIN_SECONDARY, false, true},
   };
 
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
   for (const auto& test_case : kTestCases) {
     info.state = test_case.state;
     SetSessionInfo(info);
 
     EXPECT_EQ(test_case.state, controller()->GetSessionState())
         << "Test case state=" << static_cast<int>(test_case.state);
     EXPECT_EQ(observer()->state(), controller()->GetSessionState())
         << "Test case state=" << static_cast<int>(test_case.state);
     EXPECT_EQ(test_case.expected_is_screen_locked,
               controller()->IsScreenLocked())
         << "Test case state=" << static_cast<int>(test_case.state);
     EXPECT_EQ(test_case.expected_is_user_session_blocked,
               controller()->IsUserSessionBlocked())
         << "Test case state=" << static_cast<int>(test_case.state);
   }
 }
 
 // Tests that LoginStatus is computed correctly for most session states.
 TEST_F(SessionControllerTest, GetLoginStatus) {
-  using session_manager::SessionState;
-
   const struct {
     SessionState state;
     LoginStatus expected_status;
   } kTestCases[] = {
       {SessionState::UNKNOWN, LoginStatus::NOT_LOGGED_IN},
       {SessionState::OOBE, LoginStatus::NOT_LOGGED_IN},
       {SessionState::LOGIN_PRIMARY, LoginStatus::NOT_LOGGED_IN},
       {SessionState::LOGGED_IN_NOT_ACTIVE, LoginStatus::NOT_LOGGED_IN},
       {SessionState::LOCKED, LoginStatus::LOCKED},
       // TODO: Add LOGIN_SECONDARY if we added a status for it.
   };
 
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
   for (const auto& test_case : kTestCases) {
     info.state = test_case.state;
     SetSessionInfo(info);
     EXPECT_EQ(test_case.expected_status, controller()->login_status())
         << "Test case state=" << static_cast<int>(test_case.state);
   }
 }
 
 // Tests that LoginStatus is computed correctly for active sessions.
 TEST_F(SessionControllerTest, GetLoginStateForActiveSession) {
   // Simulate an active user session.
   mojom::SessionInfo info;
   FillDefaultSessionInfo(&info);
-  info.state = session_manager::SessionState::ACTIVE;
+  info.state = SessionState::ACTIVE;
   SetSessionInfo(info);
 
   const struct {
     user_manager::UserType user_type;
     LoginStatus expected_status;
   } kTestCases[] = {
       {user_manager::USER_TYPE_REGULAR, LoginStatus::USER},
       {user_manager::USER_TYPE_GUEST, LoginStatus::GUEST},
       {user_manager::USER_TYPE_PUBLIC_ACCOUNT, LoginStatus::PUBLIC},
       {user_manager::USER_TYPE_SUPERVISED, LoginStatus::SUPERVISED},
@@ skipping 50 matching lines @@
   controller()->SetUserSessionOrder(order);
   EXPECT_EQ("user2@test.com,user1@test.com,", GetUserSessionEmails());
   EXPECT_EQ("user2@test.com", observer()->active_account_id().GetUserEmail());
 
   order = {1u, 2u};
   controller()->SetUserSessionOrder(order);
   EXPECT_EQ("user1@test.com,user2@test.com,", GetUserSessionEmails());
   EXPECT_EQ("user1@test.com", observer()->active_account_id().GetUserEmail());
 }
 
+// Tests that user session is unblocked with a running unlock animation so that
+// focus rules can find a correct activatable window after screen lock is
+// dismissed.
+TEST_F(SessionControllerTest, UserSessionUnblockedWithRunningUnlockAnimation) {
+  mojom::SessionInfo info;
+  FillDefaultSessionInfo(&info);
+
+  // LOCKED means blocked user session.
+  info.state = SessionState::LOCKED;
+  SetSessionInfo(info);
+  EXPECT_TRUE(controller()->IsUserSessionBlocked());
+
+  // Mark a running unlock animation unblocks user session.
+  controller()->RunUnlockAnimation(base::Closure());
+  EXPECT_FALSE(controller()->IsUserSessionBlocked());
+
+  const struct {
+    SessionState state;
+    bool expected_is_user_session_blocked;
+  } kTestCases[] = {
+      {SessionState::OOBE, true},
+      {SessionState::LOGIN_PRIMARY, true},
+      {SessionState::LOGGED_IN_NOT_ACTIVE, true},
+      {SessionState::ACTIVE, false},
+      {SessionState::LOGIN_SECONDARY, true},
+  };
+  for (const auto& test_case : kTestCases) {
+    info.state = test_case.state;
+    SetSessionInfo(info);
+
+    // Mark a running unlock animation.
+    controller()->RunUnlockAnimation(base::Closure());
+
+    EXPECT_EQ(test_case.expected_is_user_session_blocked,
+              controller()->IsUserSessionBlocked())
+        << "Test case state=" << static_cast<int>(test_case.state);
+  }
+}

[James Cook, 2017/04/07 20:26:55]

Thanks for adding a test.

[xiyuan, 2017/04/07 21:50:00]

Because I know you will ask for it. :)

+
 }  // namespace
 }  // namespace ash