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

Side by Side Diff: ash/tray_action/tray_action_unittest.cc

Issue 2876993002: Introduce window container to be used by lock screen app windows (Closed)
Patch Set: . Created 3 years, 7 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 | « ash/tray_action/tray_action.cc ('k') | ash/wm/event_client_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "ash/tray_action/tray_action.h" 5 #include "ash/tray_action/tray_action.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 TEST_F(TrayActionTest, NormalStateProgression) { 148 TEST_F(TrayActionTest, NormalStateProgression) {
149 TrayAction* tray_action = Shell::Get()->tray_action(); 149 TrayAction* tray_action = Shell::Get()->tray_action();
150 150
151 ScopedTestStateObserver observer(tray_action); 151 ScopedTestStateObserver observer(tray_action);
152 TestTrayActionClient action_client; 152 TestTrayActionClient action_client;
153 tray_action->SetClient(action_client.CreateInterfacePtrAndBind(), 153 tray_action->SetClient(action_client.CreateInterfacePtrAndBind(),
154 TrayActionState::kNotAvailable); 154 TrayActionState::kNotAvailable);
155 155
156 tray_action->UpdateLockScreenNoteState(TrayActionState::kAvailable); 156 tray_action->UpdateLockScreenNoteState(TrayActionState::kAvailable);
157 EXPECT_EQ(TrayActionState::kAvailable, tray_action->GetLockScreenNoteState()); 157 EXPECT_EQ(TrayActionState::kAvailable, tray_action->GetLockScreenNoteState());
158 EXPECT_FALSE(tray_action->IsLockScreenNoteActive());
158 ASSERT_EQ(1u, observer.observed_states().size()); 159 ASSERT_EQ(1u, observer.observed_states().size());
159 EXPECT_EQ(TrayActionState::kAvailable, observer.observed_states()[0]); 160 EXPECT_EQ(TrayActionState::kAvailable, observer.observed_states()[0]);
160 observer.ClearObservedStates(); 161 observer.ClearObservedStates();
161 162
162 tray_action->UpdateLockScreenNoteState(TrayActionState::kLaunching); 163 tray_action->UpdateLockScreenNoteState(TrayActionState::kLaunching);
163 EXPECT_EQ(TrayActionState::kLaunching, tray_action->GetLockScreenNoteState()); 164 EXPECT_EQ(TrayActionState::kLaunching, tray_action->GetLockScreenNoteState());
165 EXPECT_FALSE(tray_action->IsLockScreenNoteActive());
164 ASSERT_EQ(1u, observer.observed_states().size()); 166 ASSERT_EQ(1u, observer.observed_states().size());
165 EXPECT_EQ(TrayActionState::kLaunching, observer.observed_states()[0]); 167 EXPECT_EQ(TrayActionState::kLaunching, observer.observed_states()[0]);
166 observer.ClearObservedStates(); 168 observer.ClearObservedStates();
167 169
170 tray_action->UpdateLockScreenNoteState(TrayActionState::kActive);
171 EXPECT_EQ(TrayActionState::kActive, tray_action->GetLockScreenNoteState());
172 EXPECT_TRUE(tray_action->IsLockScreenNoteActive());
173 ASSERT_EQ(1u, observer.observed_states().size());
174 EXPECT_EQ(TrayActionState::kActive, observer.observed_states()[0]);
175
176 observer.ClearObservedStates();
168 tray_action->UpdateLockScreenNoteState(TrayActionState::kBackground); 177 tray_action->UpdateLockScreenNoteState(TrayActionState::kBackground);
169 EXPECT_EQ(TrayActionState::kBackground, 178 EXPECT_EQ(TrayActionState::kBackground,
170 tray_action->GetLockScreenNoteState()); 179 tray_action->GetLockScreenNoteState());
180 EXPECT_FALSE(tray_action->IsLockScreenNoteActive());
171 ASSERT_EQ(1u, observer.observed_states().size()); 181 ASSERT_EQ(1u, observer.observed_states().size());
172 EXPECT_EQ(TrayActionState::kBackground, observer.observed_states()[0]); 182 EXPECT_EQ(TrayActionState::kBackground, observer.observed_states()[0]);
173 observer.ClearObservedStates(); 183 observer.ClearObservedStates();
174 184
175 tray_action->UpdateLockScreenNoteState(TrayActionState::kNotAvailable); 185 tray_action->UpdateLockScreenNoteState(TrayActionState::kNotAvailable);
176 EXPECT_EQ(TrayActionState::kNotAvailable, 186 EXPECT_EQ(TrayActionState::kNotAvailable,
177 tray_action->GetLockScreenNoteState()); 187 tray_action->GetLockScreenNoteState());
188 EXPECT_FALSE(tray_action->IsLockScreenNoteActive());
178 ASSERT_EQ(1u, observer.observed_states().size()); 189 ASSERT_EQ(1u, observer.observed_states().size());
179 EXPECT_EQ(TrayActionState::kNotAvailable, observer.observed_states()[0]); 190 EXPECT_EQ(TrayActionState::kNotAvailable, observer.observed_states()[0]);
180 } 191 }
181 192
182 TEST_F(TrayActionTest, ObserversNotNotifiedOnDuplicateState) { 193 TEST_F(TrayActionTest, ObserversNotNotifiedOnDuplicateState) {
183 TrayAction* tray_action = Shell::Get()->tray_action(); 194 TrayAction* tray_action = Shell::Get()->tray_action();
184 195
185 ScopedTestStateObserver observer(tray_action); 196 ScopedTestStateObserver observer(tray_action);
186 TestTrayActionClient action_client; 197 TestTrayActionClient action_client;
187 tray_action->SetClient(action_client.CreateInterfacePtrAndBind(), 198 tray_action->SetClient(action_client.CreateInterfacePtrAndBind(),
(...skipping 29 matching lines...) Expand all
217 } 228 }
218 229
219 // Tests that there is no crash if handler is not set. 230 // Tests that there is no crash if handler is not set.
220 TEST_F(TrayActionTest, RequestActionWithNoHandler) { 231 TEST_F(TrayActionTest, RequestActionWithNoHandler) {
221 TrayAction* tray_action = Shell::Get()->tray_action(); 232 TrayAction* tray_action = Shell::Get()->tray_action();
222 tray_action->RequestNewLockScreenNote(); 233 tray_action->RequestNewLockScreenNote();
223 base::RunLoop().RunUntilIdle(); 234 base::RunLoop().RunUntilIdle();
224 } 235 }
225 236
226 } // namespace ash 237 } // namespace ash
OLDNEW
« no previous file with comments | « ash/tray_action/tray_action.cc ('k') | ash/wm/event_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698