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

Unified Diff: ash/display/mouse_cursor_event_filter_unittest.cc

Issue 11574008: Disable ash tests on Windows that rely on multiple displays or display resizing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix comment Created 8 years 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_controller_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mouse_cursor_event_filter_unittest.cc
diff --git a/ash/display/mouse_cursor_event_filter_unittest.cc b/ash/display/mouse_cursor_event_filter_unittest.cc
index 6bdc907f761ad4454319b2371fb2df01a67f7c2d..c9af25d010819fa2c077669347de46ef7de62e24 100644
--- a/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -32,9 +32,16 @@ gfx::Display GetSecondaryDisplay() {
typedef test::AshTestBase MouseCursorEventFilterTest;
+#if defined(OS_WIN)
+// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
+#define MAYBE_WarpMouse DISABLED_WarpMouse
+#else
+#define MAYBE_WarpMouse WarpMouse
+#endif
+
// Verifies if the mouse pointer correctly moves to another display when there
// are two displays.
-TEST_F(MouseCursorEventFilterTest, WarpMouse) {
+TEST_F(MouseCursorEventFilterTest, MAYBE_WarpMouse) {
UpdateDisplay("500x500,500x500");
MouseCursorEventFilter* event_filter =
@@ -92,9 +99,18 @@ TEST_F(MouseCursorEventFilterTest, WarpMouse) {
EXPECT_FALSE(is_warped);
}
+
+#if defined(OS_WIN)
+// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
+#define MAYBE_WarpMouseDifferentSizeDisplays \
+ DISABLED_WarpMouseDifferentSizeDisplays
+#else
+#define MAYBE_WarpMouseDifferentSizeDisplays WarpMouseDifferentSizeDisplays
+#endif
+
// Verifies if the mouse pointer correctly moves to another display even when
// two displays are not the same size.
-TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
+TEST_F(MouseCursorEventFilterTest, MAYBE_WarpMouseDifferentSizeDisplays) {
UpdateDisplay("500x500,600x600"); // the second one is larger.
MouseCursorEventFilter* event_filter =
@@ -125,9 +141,17 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
aura::Env::GetInstance()->last_mouse_location().ToString());
}
+#if defined(OS_WIN)
+// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
+#define MAYBE_WarpMouseDifferentScaleDisplays \
+ DISABLED_WarpMouseDifferentScaleDisplays
+#else
+#define MAYBE_WarpMouseDifferentScaleDisplays WarpMouseDifferentScaleDisplays
+#endif
+
// Verifies if the mouse pointer correctly moves between displays with
// different scale factors.
-TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
+TEST_F(MouseCursorEventFilterTest, MAYBE_WarpMouseDifferentScaleDisplays) {
UpdateDisplay("500x500,600x600*2");
MouseCursorEventFilter* event_filter =
@@ -160,8 +184,15 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
aura::Env::GetInstance()->last_mouse_location().ToString());
}
+#if defined(OS_WIN)
+// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
+#define MAYBE_SetMouseWarpModeFlag DISABLED_SetMouseWarpModeFlag
+#else
+#define MAYBE_SetMouseWarpModeFlag SetMouseWarpModeFlag
+#endif
+
// Verifies if MouseCursorEventFilter::set_mouse_warp_mode() works as expected.
-TEST_F(MouseCursorEventFilterTest, SetMouseWarpModeFlag) {
+TEST_F(MouseCursorEventFilterTest, MAYBE_SetMouseWarpModeFlag) {
UpdateDisplay("500x500,500x500");
MouseCursorEventFilter* event_filter =
@@ -309,10 +340,18 @@ TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnTopBottom) {
event_filter->HideSharedEdgeIndicator();
}
+
+#if defined(OS_WIN)
+// Multiple displays are not supported on Windows Ash. http://crbug.com/165962
+#define MAYBE_CursorDeviceScaleFactor DISABLED_CursorDeviceScaleFactor
+#else
+#define MAYBE_CursorDeviceScaleFactor CursorDeviceScaleFactor
+#endif
+
// Verifies cursor's device scale factor is updated when a cursor has moved
// across root windows with different device scale factors
// (http://crbug.com/154183).
-TEST_F(MouseCursorEventFilterTest, CursorDeviceScaleFactor) {
+TEST_F(MouseCursorEventFilterTest, MAYBE_CursorDeviceScaleFactor) {
UpdateDisplay("400x400,800x800*2");
DisplayController* controller =
Shell::GetInstance()->display_controller();
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698