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

Side by Side Diff: chromeos/login/login_state_unittest.cc

Issue 24072006: Return correct window when user is logged in but before session is started. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test compile error Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/login/login_state.h" 5 #include "chromeos/login/login_state.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 private: 52 private:
53 DISALLOW_COPY_AND_ASSIGN(LoginStateTest); 53 DISALLOW_COPY_AND_ASSIGN(LoginStateTest);
54 }; 54 };
55 55
56 TEST_F(LoginStateTest, TestLoginState) { 56 TEST_F(LoginStateTest, TestLoginState) {
57 EXPECT_EQ(LoginState::LOGGED_IN_OOBE, logged_in_state_); 57 EXPECT_EQ(LoginState::LOGGED_IN_OOBE, logged_in_state_);
58 EXPECT_EQ(LoginState::LOGGED_IN_OOBE, LoginState::Get()->GetLoggedInState()); 58 EXPECT_EQ(LoginState::LOGGED_IN_OOBE, LoginState::Get()->GetLoggedInState());
59 EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, logged_in_user_type_); 59 EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, logged_in_user_type_);
60 EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE, 60 EXPECT_EQ(LoginState::LOGGED_IN_USER_NONE,
61 LoginState::Get()->GetLoggedInUserType()); 61 LoginState::Get()->GetLoggedInUserType());
62 EXPECT_FALSE(LoginState::Get()->IsSessionStarted());
62 // Setting login state to ACTIVE. 63 // Setting login state to ACTIVE.
63 LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_ACTIVE, 64 LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_ACTIVE,
64 LoginState::LOGGED_IN_USER_REGULAR); 65 LoginState::LOGGED_IN_USER_REGULAR);
65 EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE, 66 EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE,
66 LoginState::Get()->GetLoggedInState()); 67 LoginState::Get()->GetLoggedInState());
67 EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR, 68 EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR,
68 LoginState::Get()->GetLoggedInUserType()); 69 LoginState::Get()->GetLoggedInUserType());
69 EXPECT_TRUE(LoginState::Get()->IsUserLoggedIn()); 70 EXPECT_TRUE(LoginState::Get()->IsUserLoggedIn());
71 // Set session started.
72 LoginState::Get()->SetSessionStarted(true);
73 EXPECT_TRUE(LoginState::Get()->IsSessionStarted());
70 // Run the message loop, observer should update members. 74 // Run the message loop, observer should update members.
71 message_loop_.RunUntilIdle(); 75 message_loop_.RunUntilIdle();
72 EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE, logged_in_state_); 76 EXPECT_EQ(LoginState::LOGGED_IN_ACTIVE, logged_in_state_);
73 EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR, logged_in_user_type_); 77 EXPECT_EQ(LoginState::LOGGED_IN_USER_REGULAR, logged_in_user_type_);
74 } 78 }
75 79
76 } // namespace 80 } // namespace chromeos
OLDNEW
« chrome/browser/chromeos/login/user_manager_impl.cc ('K') | « chromeos/login/login_state.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698