chromeos: makes more tests run in both mash and ash
BUG=693114,581462,647438,695628,695629,695632,695640,695686,695751,695758,695887,696006,696028
TEST=test only changes
[email protected]
Review-Url: https://codereview.chromium.org/2718763003
Cr-Commit-Position: refs/heads/master@{#453280}
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 56b06555..074b48e 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -135,6 +135,10 @@
};
TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
+ // TODO: triggers shutdown crash in mash. http://crbug.com/695632.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
// Windows origin should be doubled when moved to the 1st display.
UpdateDisplay("600x600,300x300");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
@@ -159,8 +163,7 @@
EXPECT_EQ("550,10 200x200", minimized->GetWindowBoundsInScreen().ToString());
views::Widget* fullscreen = CreateTestWidget(gfx::Rect(850, 10, 200, 200));
- display::Display secondary_display =
- Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
+ display::Display secondary_display = GetSecondaryDisplay();
gfx::Rect orig_bounds = fullscreen->GetWindowBoundsInScreen();
EXPECT_TRUE(secondary_display.work_area().Intersects(orig_bounds));
EXPECT_FALSE(secondary_display.work_area().Contains(orig_bounds));
@@ -291,6 +294,10 @@
// Make sure lock related windows moves.
TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
+ // TODO: requires unified desktop mode. http://crbug.com/581462.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
display_manager()->SetUnifiedDesktopEnabled(true);
UpdateDisplay("500x500");
@@ -749,6 +756,10 @@
// a display which has touch capability.
TEST_F(VirtualKeyboardRootWindowControllerTest,
VirtualKeyboardOnTouchableDisplayOnly) {
+ // TODO: investigate failure in mash. http://crbug.com/695640.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
UpdateDisplay("500x500,500x500");
display::Display secondary_display =
Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
@@ -799,6 +810,10 @@
// Test for http://crbug.com/303429. If both of displays have touch capability,
// virtual keyboard follows the input focus.
TEST_F(VirtualKeyboardRootWindowControllerTest, FollowInputFocus) {
+ // TODO: investigate failure in mash. http://crbug.com/695640.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
UpdateDisplay("500x500,500x500");
const int64_t primary_display_id =
display::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ -867,9 +882,12 @@
// capability, the virtual keyboard shows up on the specified display.
TEST_F(VirtualKeyboardRootWindowControllerTest,
VirtualKeyboardShowOnSpecifiedDisplay) {
+ // TODO: fails in mash. http://crbug.com/695640.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
UpdateDisplay("500x500,500x500");
- display::Display secondary_display =
- Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
+ display::Display secondary_display = GetSecondaryDisplay();
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
aura::Window* primary_root_window = Shell::GetPrimaryRootWindow();
@@ -1058,11 +1076,14 @@
TEST_F(VirtualKeyboardRootWindowControllerTest,
EnsureCaretInWorkAreaWithMultipleDisplays) {
+ // TODO: fails in mash. http://crbug.com/695640.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
UpdateDisplay("500x500,600x600");
const int64_t primary_display_id =
display::Screen::GetScreen()->GetPrimaryDisplay().id();
- const int64_t secondary_display_id =
- Shell::GetInstance()->display_manager()->GetSecondaryDisplay().id();
+ const int64_t secondary_display_id = GetSecondaryDisplay().id();
ASSERT_NE(primary_display_id, secondary_display_id);
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
