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

Side by Side Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 2739703003: Last sets of tests that can move to common_unittests (Closed)
Patch Set: comments 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/common/wm/window_cycle_controller.h" 5 #include "ash/common/wm/window_cycle_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/common/focus_cycler.h" 10 #include "ash/common/focus_cycler.h"
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); 473 EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
474 474
475 // Showing the Alt+Tab UI does however deactivate the erstwhile active window. 475 // Showing the Alt+Tab UI does however deactivate the erstwhile active window.
476 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); 476 EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
477 477
478 controller->CompleteCycling(); 478 controller->CompleteCycling();
479 } 479 }
480 480
481 // Tests that beginning window selection hides the app list. 481 // Tests that beginning window selection hides the app list.
482 TEST_F(WindowCycleControllerTest, SelectingHidesAppList) { 482 TEST_F(WindowCycleControllerTest, SelectingHidesAppList) {
483 // TODO: fails in mash because of AppListPresenter. http://crbug.com/696028.
484 if (WmShell::Get()->IsRunningInMash())
485 return;
486
483 // The tested behavior relies on the app list presenter implementation. 487 // The tested behavior relies on the app list presenter implementation.
484 test::TestAppListViewPresenterImpl app_list_presenter_impl; 488 test::TestAppListViewPresenterImpl app_list_presenter_impl;
485 489
486 WindowCycleController* controller = WmShell::Get()->window_cycle_controller(); 490 WindowCycleController* controller = WmShell::Get()->window_cycle_controller();
487 491
488 std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0)); 492 std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
489 std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1)); 493 std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
490 app_list_presenter_impl.Show(display_manager()->first_display_id()); 494 app_list_presenter_impl.Show(display_manager()->first_display_id());
491 EXPECT_TRUE(app_list_presenter_impl.IsVisible()); 495 EXPECT_TRUE(app_list_presenter_impl.IsVisible());
492 controller->HandleCycleWindow(WindowCycleController::FORWARD); 496 controller->HandleCycleWindow(WindowCycleController::FORWARD);
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 // the next window to be selected. 604 // the next window to be selected.
601 panel0.reset(); 605 panel0.reset();
602 // Cycling again should now select panel1. 606 // Cycling again should now select panel1.
603 controller->HandleCycleWindow(WindowCycleController::FORWARD); 607 controller->HandleCycleWindow(WindowCycleController::FORWARD);
604 controller->CompleteCycling(); 608 controller->CompleteCycling();
605 EXPECT_TRUE(wm::IsActiveWindow(panel1.get())); 609 EXPECT_TRUE(wm::IsActiveWindow(panel1.get()));
606 } 610 }
607 611
608 // Tests that the tab key events are not sent to the window. 612 // Tests that the tab key events are not sent to the window.
609 TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) { 613 TEST_F(WindowCycleControllerTest, TabKeyNotLeaked) {
614 // TODO: investigate failure in mash. http://crbug.com/698894.
615 if (WmShell::Get()->IsRunningInMash())
616 return;
617
610 std::unique_ptr<Window> w0(CreateTestWindowInShellWithId(0)); 618 std::unique_ptr<Window> w0(CreateTestWindowInShellWithId(0));
611 std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1)); 619 std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
612 EventCounter event_count; 620 EventCounter event_count;
613 w0->AddPreTargetHandler(&event_count); 621 w0->AddPreTargetHandler(&event_count);
614 w1->AddPreTargetHandler(&event_count); 622 w1->AddPreTargetHandler(&event_count);
615 ui::test::EventGenerator& generator = GetEventGenerator(); 623 ui::test::EventGenerator& generator = GetEventGenerator();
616 wm::GetWindowState(w0.get())->Activate(); 624 wm::GetWindowState(w0.get())->Activate();
617 generator.PressKey(ui::VKEY_MENU, ui::EF_NONE); 625 generator.PressKey(ui::VKEY_MENU, ui::EF_NONE);
618 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset()); 626 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset());
619 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); 627 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
620 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset()); 628 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
621 generator.ReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); 629 generator.ReleaseKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
622 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset()); 630 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
623 generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE); 631 generator.ReleaseKey(ui::VKEY_MENU, ui::EF_NONE);
624 EXPECT_TRUE(wm::GetWindowState(w1.get())->IsActive()); 632 EXPECT_TRUE(wm::GetWindowState(w1.get())->IsActive());
625 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset()); 633 EXPECT_EQ(0, event_count.GetKeyEventCountAndReset());
626 } 634 }
627 635
628 // While the UI is active, mouse events are captured. 636 // While the UI is active, mouse events are captured.
629 TEST_F(WindowCycleControllerTest, MouseEventsCaptured) { 637 TEST_F(WindowCycleControllerTest, MouseEventsCaptured) {
638 // TODO: investigate failure in mash. http://crbug.com/698894.
639 if (WmShell::Get()->IsRunningInMash())
640 return;
641
630 // This delegate allows the window to receive mouse events. 642 // This delegate allows the window to receive mouse events.
631 aura::test::TestWindowDelegate delegate; 643 aura::test::TestWindowDelegate delegate;
632 std::unique_ptr<Window> w0(CreateTestWindowInShellWithDelegate( 644 std::unique_ptr<Window> w0(CreateTestWindowInShellWithDelegate(
633 &delegate, 0, gfx::Rect(0, 0, 100, 100))); 645 &delegate, 0, gfx::Rect(0, 0, 100, 100)));
634 std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1)); 646 std::unique_ptr<Window> w1(CreateTestWindowInShellWithId(1));
635 EventCounter event_count; 647 EventCounter event_count;
636 w0->AddPreTargetHandler(&event_count); 648 w0->AddPreTargetHandler(&event_count);
637 w1->SetTargetHandler(&event_count); 649 w1->SetTargetHandler(&event_count);
638 ui::test::EventGenerator& generator = GetEventGenerator(); 650 ui::test::EventGenerator& generator = GetEventGenerator();
639 wm::ActivateWindow(w0.get()); 651 wm::ActivateWindow(w0.get());
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
694 EventCounter event_count; 706 EventCounter event_count;
695 w0->AddPreTargetHandler(&event_count); 707 w0->AddPreTargetHandler(&event_count);
696 w1->AddPreTargetHandler(&event_count); 708 w1->AddPreTargetHandler(&event_count);
697 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); 709 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN);
698 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset()); 710 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset());
699 } 711 }
700 712
701 // Tests that the Alt+Tab UI's position isn't affected by the origin of the 713 // Tests that the Alt+Tab UI's position isn't affected by the origin of the
702 // display it's on. See crbug.com/675718 714 // display it's on. See crbug.com/675718
703 TEST_F(WindowCycleControllerTest, MultiDisplayPositioning) { 715 TEST_F(WindowCycleControllerTest, MultiDisplayPositioning) {
716 // TODO: investigate failure in mash. http://crbug.com/698894.
717 if (WmShell::Get()->IsRunningInMash())
718 return;
719
704 int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id(); 720 int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
705 display::DisplayIdList list = 721 display::DisplayIdList list =
706 display::test::CreateDisplayIdListN(2, primary_id, primary_id + 1); 722 display::test::CreateDisplayIdListN(2, primary_id, primary_id + 1);
707 723
708 auto placements = { 724 auto placements = {
709 display::DisplayPlacement::BOTTOM, display::DisplayPlacement::TOP, 725 display::DisplayPlacement::BOTTOM, display::DisplayPlacement::TOP,
710 display::DisplayPlacement::LEFT, display::DisplayPlacement::RIGHT, 726 display::DisplayPlacement::LEFT, display::DisplayPlacement::RIGHT,
711 }; 727 };
712 728
713 gfx::Rect expected_bounds; 729 gfx::Rect expected_bounds;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 // Base case sets the expectation for other cases. 762 // Base case sets the expectation for other cases.
747 if (expected_bounds.IsEmpty()) 763 if (expected_bounds.IsEmpty())
748 expected_bounds = display_relative_bounds; 764 expected_bounds = display_relative_bounds;
749 else 765 else
750 EXPECT_EQ(expected_bounds, display_relative_bounds); 766 EXPECT_EQ(expected_bounds, display_relative_bounds);
751 controller->CompleteCycling(); 767 controller->CompleteCycling();
752 } 768 }
753 } 769 }
754 770
755 } // namespace ash 771 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/system_modal_container_layout_manager_unittest.cc ('k') | ash/wm/window_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698