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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/display/display_manager_unittest.cc

Issue 2653593004: chromeos: Remove AshTestBase::SupportsMultipleDisplays (Closed)
Patch Set: Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/display_util_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_manager_unittest.cc
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index cf6fcf6d0f97d9add99221bf4f315e08c2eaa26d..e6d7313e0ccca7c69c00351217c0e2ff9b88f966 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -150,9 +150,6 @@ INSTANTIATE_TEST_CASE_P(
MaterialDesignController::MATERIAL_EXPERIMENTAL));
TEST_P(DisplayManagerTest, UpdateDisplayTest) {
- if (!SupportsMultipleDisplays())
- return;
-
EXPECT_EQ(1U, display_manager()->GetNumDisplays());
// Update primary and add seconary.
@@ -255,8 +252,6 @@ TEST_P(DisplayManagerTest, UpdateDisplayTest) {
}
TEST_P(DisplayManagerTest, ScaleOnlyChange) {
- if (!SupportsMultipleDisplays())
- return;
display_manager()->ToggleDisplayScaleFactor();
EXPECT_TRUE(changed_metrics() &
display::DisplayObserver::DISPLAY_METRIC_BOUNDS);
@@ -266,9 +261,6 @@ TEST_P(DisplayManagerTest, ScaleOnlyChange) {
// Test in emulation mode (use_fullscreen_host_window=false)
TEST_P(DisplayManagerTest, EmulatorTest) {
- if (!SupportsMultipleDisplays())
- return;
-
EXPECT_EQ(1U, display_manager()->GetNumDisplays());
display_manager()->AddRemoveDisplay();
@@ -289,9 +281,6 @@ TEST_P(DisplayManagerTest, EmulatorTest) {
// Tests support for 3 displays.
TEST_P(DisplayManagerTest, UpdateThreeDisplaysWithDefaultLayout) {
- if (!SupportsMultipleDisplays())
- return;
-
EXPECT_EQ(1U, display_manager()->GetNumDisplays());
// Test with three displays. Native origin will not affect ash
@@ -351,9 +340,6 @@ TEST_P(DisplayManagerTest, UpdateThreeDisplaysWithDefaultLayout) {
}
TEST_P(DisplayManagerTest, LayoutMorethanThreeDisplaysTest) {
- if (!SupportsMultipleDisplays())
- return;
-
int64_t primary_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
display::DisplayIdList list = display::test::CreateDisplayIdListN(
3, primary_id, primary_id + 1, primary_id + 2);
@@ -466,24 +452,16 @@ TEST_P(DisplayManagerTest, LayoutMorethanThreeDisplaysTest) {
}
TEST_P(DisplayManagerTest, NoMirrorInThreeDisplays) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("640x480,320x200,400x300");
ash::Shell::GetInstance()->display_configuration_controller()->SetMirrorMode(
true, true);
EXPECT_FALSE(display_manager()->IsInMirrorMode());
EXPECT_EQ(3u, display_manager()->GetNumDisplays());
-#if defined(OS_CHROMEOS)
EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_DISPLAY_MIRRORING_NOT_SUPPORTED),
GetDisplayErrorNotificationMessageForTest());
-#endif
}
TEST_P(DisplayManagerTest, OverscanInsetsTest) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("0+0-500x500,0+501-400x400");
reset();
ASSERT_EQ(2u, display_manager()->GetNumDisplays());
@@ -606,9 +584,6 @@ TEST_P(DisplayManagerTest, OverscanInsetsTest) {
}
TEST_P(DisplayManagerTest, ZeroOverscanInsets) {
- if (!SupportsMultipleDisplays())
- return;
-
// Make sure the display change events is emitted for overscan inset changes.
UpdateDisplay("0+0-500x500,0+501-400x400");
ASSERT_EQ(2u, display_manager()->GetNumDisplays());
@@ -629,11 +604,7 @@ TEST_P(DisplayManagerTest, ZeroOverscanInsets) {
EXPECT_EQ(display2_id, changed()[0].id());
}
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, TouchCalibrationTest) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("0+0-500x500,0+501-1024x600");
reset();
@@ -702,10 +673,7 @@ TEST_P(DisplayManagerTest, TouchCalibrationTest) {
EXPECT_FALSE(updated_display_info2.has_touch_calibration_data());
EXPECT_EQ(touch_data, updated_display_info2.GetTouchCalibrationData());
}
-#endif // defined(OS_CHROMEOS)
-#if !defined(OS_WIN)
-// Disabled on windows because of http://crbug.com/650326.
TEST_P(DisplayManagerTest, TestDeviceScaleOnlyChange) {
UpdateDisplay("1000x600");
aura::WindowTreeHost* host = Shell::GetPrimaryRootWindow()->GetHost();
@@ -720,7 +688,6 @@ TEST_P(DisplayManagerTest, TestDeviceScaleOnlyChange) {
EXPECT_EQ("500x300",
Shell::GetPrimaryRootWindow()->bounds().size().ToString());
}
-#endif
display::ManagedDisplayInfo CreateDisplayInfo(int64_t id,
const gfx::Rect& bounds) {
@@ -757,9 +724,6 @@ TEST_P(DisplayManagerTest, TestNativeDisplaysChanged) {
EXPECT_EQ(1U, display_manager()->num_connected_displays());
EXPECT_FALSE(display_manager()->IsInMirrorMode());
- if (!SupportsMultipleDisplays())
- return;
-
// External connected while primary was disconnected.
display_info_list.push_back(external_display_info);
display_manager()->OnNativeDisplaysChanged(display_info_list);
@@ -898,9 +862,6 @@ TEST_P(DisplayManagerTest, TestNativeDisplaysChanged) {
// Make sure crash does not happen if add and remove happens at the same time.
// See: crbug.com/414394
TEST_P(DisplayManagerTest, DisplayAddRemoveAtTheSameTime) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("100+0-500x500,0+501-400x400");
const int64_t primary_id = WindowTreeHostManager::GetPrimaryDisplayId();
@@ -928,9 +889,6 @@ TEST_P(DisplayManagerTest, DisplayAddRemoveAtTheSameTime) {
EXPECT_EQ("600x600", GetDisplayForId(third_id).size().ToString());
}
-// TODO(scottmg): RootWindow doesn't get resized on Windows
-// Ash. http://crbug.com/247916.
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, TestNativeDisplaysChangedNoInternal) {
EXPECT_EQ(1U, display_manager()->GetNumDisplays());
@@ -953,12 +911,8 @@ TEST_P(DisplayManagerTest, TestNativeDisplaysChangedNoInternal) {
.size()
.ToString());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) {
- if (!SupportsMultipleDisplays())
- return;
-
const int64_t internal_display_id =
display::test::DisplayManagerTestApi(display_manager())
.SetFirstDisplayAsInternalDisplay();
@@ -990,8 +944,6 @@ TEST_P(DisplayManagerTest, NativeDisplaysChangedAfterPrimaryChange) {
EXPECT_EQ("0,0 100x100", GetDisplayForId(10).bounds().ToString());
}
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, DontRememberBestResolution) {
int display_id = 1000;
display::ManagedDisplayInfo native_display_info =
@@ -1058,10 +1010,7 @@ TEST_P(DisplayManagerTest, DontRememberBestResolution) {
EXPECT_TRUE(expected_mode->IsEquivalent(
display_manager()->GetActiveModeForDisplayId(display_id)));
}
-#endif // defined(OS_CHROMEOS)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, ResolutionFallback) {
int display_id = 1000;
display::ManagedDisplayInfo native_display_info =
@@ -1118,12 +1067,8 @@ TEST_P(DisplayManagerTest, ResolutionFallback) {
EXPECT_TRUE(mode->native());
}
}
-#endif // defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, Rotate) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("100x200/r,300x400/l");
EXPECT_EQ("1,1 100x200", GetDisplayInfoAt(0).bounds_in_native().ToString());
EXPECT_EQ("200x100", GetDisplayInfoAt(0).size_in_pixel().ToString());
@@ -1208,8 +1153,6 @@ TEST_P(DisplayManagerTest, Rotate) {
post_rotation_info.GetActiveRotation());
}
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, UIScale) {
display::test::ScopedDisable125DSFForUIScaling disable;
@@ -1335,7 +1278,6 @@ TEST_P(DisplayManagerTest, UIScale) {
EXPECT_EQ(1.0f, display.device_scale_factor());
EXPECT_EQ("1280x850", display.bounds().size().ToString());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, UIScaleWithDisplayMode) {
int display_id = 1000;
@@ -1472,8 +1414,6 @@ TEST_P(DisplayManagerTest, ResetInternalDisplayZoomFor1_25x) {
EXPECT_EQ("1536x864", GetDisplayForId(display_id).size().ToString());
}
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, Use125DSFForUIScaling) {
int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ -1501,10 +1441,7 @@ TEST_P(DisplayManagerTest, Use125DSFForUIScaling) {
EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveUIScale());
EXPECT_EQ("2400x1350", GetDisplayForId(display_id).size().ToString());
}
-#endif // defined(OS_CHROMEOS)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScaling) {
int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
@@ -1532,10 +1469,7 @@ TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScaling) {
EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
}
-#endif // defined(OS_CHROMEOS)
-// TODO(msw): Broken on Windows. http://crbug.com/584038
-#if defined(OS_CHROMEOS)
// Don't default to 1.25 DSF if the user already has a prefrence stored for
// the internal display.
TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScalingNoOverride) {
@@ -1569,11 +1503,8 @@ TEST_P(DisplayManagerTest, FHD125DefaultsTo08UIScalingNoOverride) {
EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveUIScale());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
- if (!SupportsMultipleDisplays())
- return;
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -1618,9 +1549,6 @@ TEST_P(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
EXPECT_EQ("1200x600", active_mode->size().ToString());
}
-// TODO(scottmg): RootWindow doesn't get resized on Windows
-// Ash. http://crbug.com/247916.
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, UpdateMouseCursorAfterRotateZoom) {
// Make sure just rotating will not change native location.
UpdateDisplay("300x200,200x150");
@@ -1668,7 +1596,6 @@ TEST_P(DisplayManagerTest, UpdateMouseCursorAfterRotateZoom) {
UpdateDisplay("600x400,400x200*2@1.5");
EXPECT_EQ("750,75", env->last_mouse_location().ToString());
}
-#endif // defined(OS_CHROMEOS)
class TestDisplayObserver : public display::DisplayObserver {
public:
@@ -1704,9 +1631,6 @@ class TestDisplayObserver : public display::DisplayObserver {
};
TEST_P(DisplayManagerTest, SoftwareMirroring) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("300x400,400x500");
test::MirrorWindowTestApi test_api;
@@ -1770,9 +1694,6 @@ TEST_P(DisplayManagerTest, SoftwareMirroring) {
}
TEST_P(DisplayManagerTest, RotateInSoftwareMirroring) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("600x400,500x300");
display_manager()->SetMirrorMode(true);
@@ -1785,8 +1706,6 @@ TEST_P(DisplayManagerTest, RotateInSoftwareMirroring) {
}
TEST_P(DisplayManagerTest, SingleDisplayToSoftwareMirroring) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("600x400");
display_manager()->SetMultiDisplayMode(display::DisplayManager::MIRRORING);
@@ -1806,14 +1725,8 @@ TEST_P(DisplayManagerTest, SingleDisplayToSoftwareMirroring) {
window_tree_host_manager->mirror_window_controller()->GetWindow());
}
-#if defined(OS_CHROMEOS)
// Make sure this does not cause any crashes. See http://crbug.com/412910
-// This test is limited to OS_CHROMEOS because CursorCompositingEnabled is only
-// for ChromeOS.
TEST_P(DisplayManagerTest, SoftwareMirroringWithCompositingCursor) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("300x400,400x500");
test::MirrorWindowTestApi test_api;
@@ -1844,12 +1757,8 @@ TEST_P(DisplayManagerTest, SoftwareMirroringWithCompositingCursor) {
Shell::GetInstance()->SetCursorCompositingEnabled(false);
}
-#endif // OS_CHROMEOS
TEST_P(DisplayManagerTest, MirroredLayout) {
- if (!SupportsMultipleDisplays())
- return;
-
UpdateDisplay("500x500,400x400");
EXPECT_FALSE(display_manager()->GetCurrentDisplayLayout().mirrored);
EXPECT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
@@ -1921,8 +1830,6 @@ TEST_P(DisplayManagerTest, InvertLayout) {
}
TEST_P(DisplayManagerTest, NotifyPrimaryChange) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("500x500,500x500");
SwapPrimaryDisplay();
reset();
@@ -1946,8 +1853,6 @@ TEST_P(DisplayManagerTest, NotifyPrimaryChange) {
}
TEST_P(DisplayManagerTest, NotifyPrimaryChangeUndock) {
- if (!SupportsMultipleDisplays())
- return;
// Assume the default display is an external display, and
// emulates undocking by switching to another display.
display::ManagedDisplayInfo another_display_info =
@@ -1964,9 +1869,6 @@ TEST_P(DisplayManagerTest, NotifyPrimaryChangeUndock) {
display::DisplayObserver::DISPLAY_METRIC_PRIMARY);
}
-// TODO(scottmg): RootWindow doesn't get resized on Windows
-// Ash. http://crbug.com/247916.
-#if defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, UpdateDisplayWithHostOrigin) {
UpdateDisplay("100x200,300x400");
ASSERT_EQ(2, display::Screen::GetScreen()->GetNumDisplays());
@@ -2003,12 +1905,8 @@ TEST_P(DisplayManagerTest, UpdateDisplayWithHostOrigin) {
EXPECT_EQ("300,500", host1->GetBoundsInPixels().origin().ToString());
EXPECT_EQ("200x300", host1->GetBoundsInPixels().size().ToString());
}
-#endif // defined(OS_CHROMEOS)
TEST_P(DisplayManagerTest, UnifiedDesktopBasic) {
- if (!SupportsMultipleDisplays())
- return;
-
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -2068,8 +1966,6 @@ TEST_P(DisplayManagerTest, UnifiedDesktopBasic) {
}
TEST_P(DisplayManagerTest, UnifiedDesktopWithHardwareMirroring) {
- if (!SupportsMultipleDisplays())
- return;
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -2108,8 +2004,6 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWithHardwareMirroring) {
}
TEST_P(DisplayManagerTest, UnifiedDesktopEnabledWithExtended) {
- if (!SupportsMultipleDisplays())
- return;
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -2125,8 +2019,6 @@ TEST_P(DisplayManagerTest, UnifiedDesktopEnabledWithExtended) {
}
TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
- if (!SupportsMultipleDisplays())
- return;
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -2229,8 +2121,6 @@ TEST_P(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
// Updating displays again in unified desktop mode should not crash.
// crbug.com/491094.
TEST_P(DisplayManagerTest, ConfigureUnifiedTwice) {
- if (!SupportsMultipleDisplays())
- return;
// Don't check root window destruction in unified mode.
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
@@ -2243,8 +2133,6 @@ TEST_P(DisplayManagerTest, ConfigureUnifiedTwice) {
}
TEST_P(DisplayManagerTest, NoRotateUnifiedDesktop) {
- if (!SupportsMultipleDisplays())
- return;
display_manager()->SetUnifiedDesktopEnabled(true);
// Don't check root window destruction in unified mode.
@@ -2271,9 +2159,6 @@ TEST_P(DisplayManagerTest, NoRotateUnifiedDesktop) {
// Makes sure the transition from unified to single won't crash
// with docked windows.
TEST_P(DisplayManagerTest, UnifiedWithDockWindows) {
- if (!SupportsMultipleDisplays())
- return;
-
// Enable window docking for this test.
base::CommandLine::ForCurrentProcess()->AppendSwitch(
ash::switches::kAshEnableDockedWindows);
@@ -2302,8 +2187,6 @@ TEST_P(DisplayManagerTest, UnifiedWithDockWindows) {
}
TEST_P(DisplayManagerTest, DockMode) {
- if (!SupportsMultipleDisplays())
- return;
const int64_t internal_id = 1;
const int64_t external_id = 2;
@@ -2338,8 +2221,6 @@ TEST_P(DisplayManagerTest, DockMode) {
// Make sure that bad layout information is ignored and does not crash.
TEST_P(DisplayManagerTest, DontRegisterBadConfig) {
- if (!SupportsMultipleDisplays())
- return;
display::DisplayIdList list = display::test::CreateDisplayIdList2(1, 2);
display::DisplayLayoutBuilder builder(1);
builder.AddDisplayPlacement(2, 1, display::DisplayPlacement::LEFT, 0);
@@ -2357,8 +2238,6 @@ class ScreenShutdownTest : public test::AshTestBase {
void TearDown() override {
display::Screen* orig_screen = display::Screen::GetScreen();
AshTestBase::TearDown();
- if (!SupportsMultipleDisplays())
- return;
display::Screen* screen = display::Screen::GetScreen();
EXPECT_NE(orig_screen, screen);
EXPECT_EQ(2, screen->GetNumDisplays());
@@ -2373,12 +2252,9 @@ class ScreenShutdownTest : public test::AshTestBase {
};
TEST_F(ScreenShutdownTest, ScreenAfterShutdown) {
- if (!SupportsMultipleDisplays())
- return;
UpdateDisplay("500x300,800x400");
}
-#if defined(OS_CHROMEOS)
namespace {
// A helper class that sets the display configuration and starts ash.
@@ -2567,6 +2443,4 @@ TEST_P(DisplayManagerTest, GuessDisplayIdFieldsInDisplayLayout) {
EXPECT_EQ(id2, stored.placement_list[0].display_id);
}
-#endif // OS_CHROMEOS
-
} // namespace ash
« no previous file with comments | « ash/display/display_error_observer_chromeos_unittest.cc ('k') | ash/display/display_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698