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

Unified Diff: ash/display/mouse_cursor_event_filter_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again, and comment Created 7 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 side-by-side diff with in-line comments
Download patch
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 73f282f1fd55c7aaafb8adb98b647cc3aa9ba888..b190c744f513ff22c994b6be942f65a24d070893 100644
--- a/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -34,6 +34,8 @@ typedef test::AshTestBase MouseCursorEventFilterTest;
// Verifies if the mouse pointer correctly moves to another display when there
// are two displays.
TEST_F(MouseCursorEventFilterTest, WarpMouse) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("500x500,500x500");
MouseCursorEventFilter* event_filter =
@@ -94,6 +96,8 @@ TEST_F(MouseCursorEventFilterTest, WarpMouse) {
// Verifies if the mouse pointer correctly moves to another display even when
// two displays are not the same size.
TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("500x500,600x600"); // the second one is larger.
MouseCursorEventFilter* event_filter =
@@ -126,6 +130,8 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
// Verifies if the mouse pointer correctly moves between displays with
// different scale factors.
TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("500x500,600x600*2");
MouseCursorEventFilter* event_filter =
@@ -159,6 +165,8 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
// Verifies if MouseCursorEventFilter::set_mouse_warp_mode() works as expected.
TEST_F(MouseCursorEventFilterTest, SetMouseWarpModeFlag) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("500x500,500x500");
MouseCursorEventFilter* event_filter =
@@ -184,6 +192,8 @@ TEST_F(MouseCursorEventFilterTest, SetMouseWarpModeFlag) {
// Verifies if MouseCursorEventFilter's bounds calculation works correctly.
TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnRight) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("360x360,700x700");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -239,6 +249,8 @@ TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnRight) {
}
TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnLeft) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("360x360,700x700");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -267,6 +279,8 @@ TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnLeft) {
}
TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnTopBottom) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("360x360,700x700");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
@@ -309,6 +323,8 @@ TEST_F(MouseCursorEventFilterTest, IndicatorBoundsTestOnTopBottom) {
// across root windows with different device scale factors
// (http://crbug.com/154183).
TEST_F(MouseCursorEventFilterTest, CursorDeviceScaleFactor) {
+ RETURN_IF_WIN8;
+
UpdateDisplay("400x400,800x800*2");
DisplayController* controller =
Shell::GetInstance()->display_controller();

Powered by Google App Engine
This is Rietveld 408576698