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

Side by Side Diff: chrome/browser/android/vr_shell/ui_scene_manager_unittest.cc

Issue 2921383002: [vr] Close exit prompt when clicking on background (Closed)
Patch Set: fix diff Created 3 years, 6 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
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 "chrome/browser/android/vr_shell/ui_scene_manager.h" 5 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/test/scoped_task_environment.h" 8 #include "base/test/scoped_task_environment.h"
9 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h" 9 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h"
10 #include "chrome/browser/android/vr_shell/ui_elements/ui_element_debug_id.h" 10 #include "chrome/browser/android/vr_shell/ui_elements/ui_element_debug_id.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 manager_->OnExitPromptPrimaryButtonClicked(); 284 manager_->OnExitPromptPrimaryButtonClicked();
285 for (const auto& element : scene_->GetUiElements()) { 285 for (const auto& element : scene_->GetUiElements()) {
286 SCOPED_TRACE(element->debug_id()); 286 SCOPED_TRACE(element->debug_id());
287 bool should_be_visible = 287 bool should_be_visible =
288 kElementsVisibleInBrowsing.find(element->debug_id()) != 288 kElementsVisibleInBrowsing.find(element->debug_id()) !=
289 kElementsVisibleInBrowsing.end(); 289 kElementsVisibleInBrowsing.end();
290 EXPECT_EQ(should_be_visible, element->visible()); 290 EXPECT_EQ(should_be_visible, element->visible());
291 } 291 }
292 } 292 }
293 293
294 TEST_F(UiSceneManagerTest, BackplaneClickClosesExitPrompt) {
295 std::set<UiElementDebugId> visible_when_prompting = {kExitPrompt, kBackplane,
296 kCeiling, kFloor};
297 MakeManager(kNotInCct, kNotInWebVr);
298
299 manager_->SetWebVrSecureOrigin(true);
300
301 // Initial state.
302 for (const auto& element : scene_->GetUiElements()) {
303 SCOPED_TRACE(element->debug_id());
304 bool should_be_visible =
305 kElementsVisibleInBrowsing.find(element->debug_id()) !=
306 kElementsVisibleInBrowsing.end();
307 EXPECT_EQ(should_be_visible, element->visible());
308 }
309
310 // Exit prompt visible state.
311 manager_->OnSecurityIconClicked();
312 for (const auto& element : scene_->GetUiElements()) {
cjgrant 2017/06/06 19:42:13 Based on how many of these loops we have throughou
ymalik 2017/06/06 21:11:58 Done. Much cleaner.
313 SCOPED_TRACE(element->debug_id());
314 bool should_be_visible = visible_when_prompting.find(element->debug_id()) !=
315 visible_when_prompting.end();
316 EXPECT_EQ(should_be_visible, element->visible());
317 }
318
319 // Back to initial state.
320 manager_->OnBackplaneClicked();
321 for (const auto& element : scene_->GetUiElements()) {
cjgrant 2017/06/06 19:42:13 Originally I thought it's weird so many tests chec
ymalik 2017/06/06 21:11:58 Agreed, we want to check the visibility of these e
322 SCOPED_TRACE(element->debug_id());
323 bool should_be_visible =
324 kElementsVisibleInBrowsing.find(element->debug_id()) !=
325 kElementsVisibleInBrowsing.end();
326 EXPECT_EQ(should_be_visible, element->visible());
327 }
328 }
329
294 TEST_F(UiSceneManagerTest, UiUpdatesForWebVR) { 330 TEST_F(UiSceneManagerTest, UiUpdatesForWebVR) {
295 MakeManager(kNotInCct, kInWebVr); 331 MakeManager(kNotInCct, kInWebVr);
296 332
297 manager_->SetWebVrSecureOrigin(true); 333 manager_->SetWebVrSecureOrigin(true);
298 manager_->SetAudioCapturingIndicator(true); 334 manager_->SetAudioCapturingIndicator(true);
299 manager_->SetVideoCapturingIndicator(true); 335 manager_->SetVideoCapturingIndicator(true);
300 manager_->SetScreenCapturingIndicator(true); 336 manager_->SetScreenCapturingIndicator(true);
301 337
302 // All elements should be hidden. 338 // All elements should be hidden.
303 for (const auto& element : scene_->GetUiElements()) { 339 for (const auto& element : scene_->GetUiElements()) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 385
350 manager_->SetAudioCapturingIndicator(false); 386 manager_->SetAudioCapturingIndicator(false);
351 manager_->SetVideoCapturingIndicator(false); 387 manager_->SetVideoCapturingIndicator(false);
352 manager_->SetScreenCapturingIndicator(false); 388 manager_->SetScreenCapturingIndicator(false);
353 389
354 EXPECT_FALSE(IsVisible(kAudioCaptureIndicator)); 390 EXPECT_FALSE(IsVisible(kAudioCaptureIndicator));
355 EXPECT_FALSE(IsVisible(kVideoCaptureIndicator)); 391 EXPECT_FALSE(IsVisible(kVideoCaptureIndicator));
356 EXPECT_FALSE(IsVisible(kScreenCaptureIndicator)); 392 EXPECT_FALSE(IsVisible(kScreenCaptureIndicator));
357 } 393 }
358 } // namespace vr_shell 394 } // namespace vr_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698