From 81438eebefd8200c9137d734452fb7c4b0bd847f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 20 Dec 2016 23:15:45 +0800 Subject: [PATCH] monitor-unit-tests: Test suggested-x/y configuration Test the suggested-x/y output state often set by virtual machines. https://bugzilla.gnome.org/show_bug.cgi?id=777732 --- src/tests/monitor-unit-tests.c | 131 +++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/src/tests/monitor-unit-tests.c b/src/tests/monitor-unit-tests.c index 1c07e3f47..6b74295ac 100644 --- a/src/tests/monitor-unit-tests.c +++ b/src/tests/monitor-unit-tests.c @@ -1057,6 +1057,135 @@ meta_test_monitor_hidpi_linear_config (void) check_monitor_configuration (&test_case); } +static void +meta_test_monitor_suggested_config (void) +{ + MonitorTestCase test_case = { + .setup = { + .modes = { + { + .width = 800, + .height = 600, + .refresh_rate = 60.0 + }, + { + .width = 1024, + .height = 768, + .refresh_rate = 60.0 + } + }, + .n_modes = 2, + .outputs = { + { + .crtc = 0, + .modes = { 0 }, + .n_modes = 1, + .preferred_mode = 0, + .possible_crtcs = { 0 }, + .n_possible_crtcs = 1, + .width_mm = 222, + .height_mm = 125 + }, + { + .crtc = 1, + .modes = { 1 }, + .n_modes = 1, + .preferred_mode = 1, + .possible_crtcs = { 1 }, + .n_possible_crtcs = 1, + .width_mm = 220, + .height_mm = 124 + } + }, + .n_outputs = 2, + .crtcs = { + { + .current_mode = -1 + }, + { + .current_mode = -1 + } + }, + .n_crtcs = 2 + }, + + .expect = { + .monitors = { + { + .outputs = { 0 }, + .n_outputs = 1, + .modes = { + { + .width = 800, + .height = 600, + .crtc_modes = { + { + .output = 0, + .crtc_mode = 0 + } + } + } + }, + .n_modes = 1, + .width_mm = 222, + .height_mm = 125 + }, + { + .outputs = { 1 }, + .n_outputs = 1, + .modes = { + { + .width = 1024, + .height = 768, + .crtc_modes = { + { + .output = 1, + .crtc_mode = 1 + } + } + } + }, + .n_modes = 1, + .width_mm = 220, + .height_mm = 124 + } + }, + .n_monitors = 2, + /* + * Logical monitors expectations altered to correspond to the + * "suggested_x/y" changed further below. + */ + .logical_monitors = { + { + .layout = { .x = 1024, .y = 758, .width = 800, .height = 600 }, + .scale = 1 + }, + { + .layout = { .x = 0, .y = 0, .width = 1024, .height = 768 }, + .scale = 1 + } + }, + .n_logical_monitors = 2, + .n_outputs = 2, + .n_crtcs = 2, + .n_tiled_monitors = 0, + .screen_width = 1024 + 800, + .screen_height = 1358 + } + }; + MetaMonitorTestSetup *test_setup; + + test_setup = create_monitor_test_setup (&test_case); + + test_setup->outputs[0].suggested_x = 1024; + test_setup->outputs[0].suggested_y = 758; + test_setup->outputs[1].suggested_x = 0; + test_setup->outputs[1].suggested_y = 0; + + emulate_hotplug (test_setup); + check_monitor_configuration (&test_case); +} + void init_monitor_tests (void) { @@ -1077,4 +1206,6 @@ init_monitor_tests (void) meta_test_monitor_tiled_linear_config); g_test_add_func ("/backends/monitor/hidpi-linear-config", meta_test_monitor_hidpi_linear_config); + g_test_add_func ("/backends/monitor/suggested-config", + meta_test_monitor_suggested_config); }