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

Side by Side Diff: chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc

Issue 2724163002: ash: Use enum for SessionController::CycleActiveUser (Closed)
Patch Set: fix ash_shell_with_content compile Created 3 years, 9 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
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/ui/ash/session_state_delegate_chromeos.h" 5 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 FakeChromeUserManager* user_manager_; 132 FakeChromeUserManager* user_manager_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeOSTest); 134 DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeOSTest);
135 }; 135 };
136 136
137 // Make sure that cycling one user does not cause any harm. 137 // Make sure that cycling one user does not cause any harm.
138 TEST_F(SessionStateDelegateChromeOSTest, CyclingOneUser) { 138 TEST_F(SessionStateDelegateChromeOSTest, CyclingOneUser) {
139 UserAddedToSession("firstuser@test.com"); 139 UserAddedToSession("firstuser@test.com");
140 140
141 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 141 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
142 session_state_delegate()->CycleActiveUser( 142 session_state_delegate()->CycleActiveUser(ash::CycleUserDirection::NEXT);
143 ash::SessionStateDelegate::CYCLE_TO_NEXT_USER);
144 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 143 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
145 session_state_delegate()->CycleActiveUser( 144 session_state_delegate()->CycleActiveUser(ash::CycleUserDirection::PREVIOUS);
146 ash::SessionStateDelegate::CYCLE_TO_PREVIOUS_USER);
147 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 145 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
148 } 146 }
149 147
150 // Cycle three users forwards and backwards to see that it works. 148 // Cycle three users forwards and backwards to see that it works.
151 TEST_F(SessionStateDelegateChromeOSTest, CyclingThreeUsers) { 149 TEST_F(SessionStateDelegateChromeOSTest, CyclingThreeUsers) {
152 UserAddedToSession("firstuser@test.com"); 150 UserAddedToSession("firstuser@test.com");
153 UserAddedToSession("seconduser@test.com"); 151 UserAddedToSession("seconduser@test.com");
154 UserAddedToSession("thirduser@test.com"); 152 UserAddedToSession("thirduser@test.com");
155 const ash::SessionStateDelegate::CycleUser forward = 153 const ash::CycleUserDirection forward = ash::CycleUserDirection::NEXT;
156 ash::SessionStateDelegate::CYCLE_TO_NEXT_USER;
157 154
158 // Cycle forward. 155 // Cycle forward.
159 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 156 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
160 session_state_delegate()->CycleActiveUser(forward); 157 session_state_delegate()->CycleActiveUser(forward);
161 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); 158 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail());
162 session_state_delegate()->CycleActiveUser(forward); 159 session_state_delegate()->CycleActiveUser(forward);
163 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); 160 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail());
164 session_state_delegate()->CycleActiveUser(forward); 161 session_state_delegate()->CycleActiveUser(forward);
165 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 162 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
166 163
167 // Cycle backwards. 164 // Cycle backwards.
168 const ash::SessionStateDelegate::CycleUser backward = 165 const ash::CycleUserDirection backward = ash::CycleUserDirection::PREVIOUS;
169 ash::SessionStateDelegate::CYCLE_TO_PREVIOUS_USER;
170 session_state_delegate()->CycleActiveUser(backward); 166 session_state_delegate()->CycleActiveUser(backward);
171 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail()); 167 EXPECT_EQ("thirduser@test.com", GetActiveUserEmail());
172 session_state_delegate()->CycleActiveUser(backward); 168 session_state_delegate()->CycleActiveUser(backward);
173 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail()); 169 EXPECT_EQ("seconduser@test.com", GetActiveUserEmail());
174 session_state_delegate()->CycleActiveUser(backward); 170 session_state_delegate()->CycleActiveUser(backward);
175 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail()); 171 EXPECT_EQ("firstuser@test.com", GetActiveUserEmail());
176 } 172 }
177 173
178 // Make sure MultiProfile disabled by primary user policy. 174 // Make sure MultiProfile disabled by primary user policy.
179 TEST_F(SessionStateDelegateChromeOSTest, MultiProfileDisallowedByUserPolicy) { 175 TEST_F(SessionStateDelegateChromeOSTest, MultiProfileDisallowedByUserPolicy) {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 user_manager()->LoginUser(account_id); 279 user_manager()->LoginUser(account_id);
284 user_profile_->GetPrefs()->SetString( 280 user_profile_->GetPrefs()->SetString(
285 prefs::kMultiProfileUserBehavior, 281 prefs::kMultiProfileUserBehavior,
286 chromeos::MultiProfileUserController::kBehaviorNotAllowed); 282 chromeos::MultiProfileUserController::kBehaviorNotAllowed);
287 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b")); 283 user_manager()->AddUser(AccountId::FromUserEmail("bb@b.b"));
288 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER, 284 EXPECT_EQ(ash::AddUserSessionPolicy::ERROR_NOT_ALLOWED_PRIMARY_USER,
289 session_state_delegate()->GetAddUserSessionPolicy()); 285 session_state_delegate()->GetAddUserSessionPolicy());
290 } 286 }
291 287
292 } // namespace chromeos 288 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/session_state_delegate_chromeos.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698