diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_0.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_0.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_0.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_0.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_1.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_1.ref.png index c35e23bf1..e8f9130b7 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_1.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_1.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_2.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_2.ref.png index 083750c84..ed17ed5c5 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_2.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_2.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_3.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_3.ref.png index 61cb65d1a..3221e04a2 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_3.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_3.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_4.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_4.ref.png index 3153e6d76..ac49d292a 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_4.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_4.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_5.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_5.ref.png index 06373fd95..4a0512c1f 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_5.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_5.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_6.ref.png b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_6.ref.png index 0d2cac218..33461046a 100644 Binary files a/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_6.ref.png and b/src/tests/ref-tests/wayland_buffer_single-pixel-buffer_6.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_0.ref.png b/src/tests/ref-tests/wayland_buffer_transform_0.ref.png index 24f2f80b8..e9963a35c 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_0.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_0.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_1.ref.png b/src/tests/ref-tests/wayland_buffer_transform_1.ref.png index c9242749a..5a24a4cd1 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_1.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_1.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_2.ref.png b/src/tests/ref-tests/wayland_buffer_transform_2.ref.png index 8bf3fc7ca..806687608 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_2.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_2.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_3.ref.png b/src/tests/ref-tests/wayland_buffer_transform_3.ref.png index 9a6809107..d7d49eea9 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_3.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_3.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_4.ref.png b/src/tests/ref-tests/wayland_buffer_transform_4.ref.png index b39b9c654..d9aa99b3a 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_4.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_4.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_5.ref.png b/src/tests/ref-tests/wayland_buffer_transform_5.ref.png index fcbcb54a1..017e99767 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_5.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_5.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_6.ref.png b/src/tests/ref-tests/wayland_buffer_transform_6.ref.png index 9833db07c..ba21fac8f 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_6.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_6.ref.png differ diff --git a/src/tests/ref-tests/wayland_buffer_transform_7.ref.png b/src/tests/ref-tests/wayland_buffer_transform_7.ref.png index 31a32fb25..be2b76128 100644 Binary files a/src/tests/ref-tests/wayland_buffer_transform_7.ref.png and b/src/tests/ref-tests/wayland_buffer_transform_7.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_0.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_0.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_0.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_0.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_1.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_1.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_1.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_1.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_10.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_10.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_10.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_10.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_11.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_11.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_11.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_11.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_12.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_12.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_12.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_12.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_13.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_13.ref.png index fd9d9b719..bc6339ddf 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_13.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_13.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_14.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_14.ref.png index fd9d9b719..bc6339ddf 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_14.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_14.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_2.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_2.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_2.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_2.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_3.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_3.ref.png index a3ddbd6ad..5e26e4d1a 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_3.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_3.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_4.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_4.ref.png index a3ddbd6ad..5e26e4d1a 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_4.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_4.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_5.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_5.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_5.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_5.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_6.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_6.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_6.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_6.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_7.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_7.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_7.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_7.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_8.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_8.ref.png index 4cf29195d..605a73ec3 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_8.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_8.ref.png differ diff --git a/src/tests/ref-tests/wayland_subsurface_corner-cases_9.ref.png b/src/tests/ref-tests/wayland_subsurface_corner-cases_9.ref.png index 9e67c4083..71a9e9581 100644 Binary files a/src/tests/ref-tests/wayland_subsurface_corner-cases_9.ref.png and b/src/tests/ref-tests/wayland_subsurface_corner-cases_9.ref.png differ diff --git a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_1.ref.png b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_1.ref.png index e2d380188..fbfd8ef1c 100644 Binary files a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_1.ref.png and b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_1.ref.png differ diff --git a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_2.ref.png b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_2.ref.png index 0822d9dfb..8329693af 100644 Binary files a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_2.ref.png and b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_2.ref.png differ diff --git a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_3.ref.png b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_3.ref.png index e2d380188..fbfd8ef1c 100644 Binary files a/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_3.ref.png and b/src/tests/ref-tests/wayland_toplevel_fullscreen-ref-test_3.ref.png differ diff --git a/src/tests/wayland-fullscreen-test.c b/src/tests/wayland-fullscreen-test.c index 0d9604223..959b236ba 100644 --- a/src/tests/wayland-fullscreen-test.c +++ b/src/tests/wayland-fullscreen-test.c @@ -110,8 +110,8 @@ toplevel_fullscreen (void) wait_for_first_frame (test_window); meta_window_get_frame_rect (test_window, &rect); - g_assert_cmpint (rect.width, ==, 100); - g_assert_cmpint (rect.height, ==, 100); + g_assert_cmpint (rect.width, ==, 640); + g_assert_cmpint (rect.height, ==, 480); g_assert_cmpint (rect.x, ==, 0); g_assert_cmpint (rect.y, ==, 0); assert_wayland_surface_size (test_window, 10, 10); @@ -154,8 +154,8 @@ toplevel_fullscreen_ref_test (void) g_main_context_iteration (NULL, FALSE); meta_window_get_frame_rect (test_window, &rect); - g_assert_cmpint (rect.width, ==, 100); - g_assert_cmpint (rect.height, ==, 100); + g_assert_cmpint (rect.width, ==, 640); + g_assert_cmpint (rect.height, ==, 480); g_assert_cmpint (rect.x, ==, 0); g_assert_cmpint (rect.y, ==, 0); assert_wayland_surface_size (test_window, 10, 10); @@ -173,7 +173,8 @@ on_before_tests (void) test_driver = meta_wayland_test_driver_new (compositor); - virtual_monitor = meta_create_test_monitor (test_context, 100, 100, 10.0); + virtual_monitor = meta_create_test_monitor (test_context, + 640, 480, 60.0); wayland_test_client = meta_wayland_test_client_new (test_context, "fullscreen"); diff --git a/src/tests/wayland-unit-tests.c b/src/tests/wayland-unit-tests.c index 921c986d2..3fe2de5da 100644 --- a/src/tests/wayland-unit-tests.c +++ b/src/tests/wayland-unit-tests.c @@ -774,8 +774,8 @@ toplevel_bounds_monitors (void) clutter_virtual_input_device_notify_absolute_motion (virtual_pointer, CLUTTER_CURRENT_TIME, - 550.0, 100.0); - wait_for_cursor_position (550.0, 100.0); + 700.0, 100.0); + wait_for_cursor_position (700.0, 100.0); wayland_test_client = meta_wayland_test_client_new (test_context, "xdg-toplevel-bounds"); @@ -837,8 +837,9 @@ on_before_tests (void) meta_context_get_wayland_compositor (test_context); test_driver = meta_wayland_test_driver_new (compositor); + virtual_monitor = meta_create_test_monitor (test_context, - 400, 400, 60.0); + 640, 480, 60.0); } static void