isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-unit-tests: Use g_assert_cmp* macros when suitable

Browse Source 
Use the g_assert_cmp(int|uint|...) macros when comparing integers and
unsigned integers. This means that the mismatched numbers are printed
in the test report.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2017-01-12 13:40:31 +08:00
parent 4b33f05eda
commit 1ee0412177
1 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/tests/monitor-unit-tests.c
View File

@ -333,17 +333,29 @@ check_monitor_configuration (MonitorTestCase *test_case)
GList *l; GList *l;
int i; int i;
g_assert (monitor_manager->screen_width == test_case->expect.screen_width); g_assert_cmpint (monitor_manager->screen_width,
g_assert (monitor_manager->screen_height == test_case->expect.screen_height); ==,
g_assert ((int) monitor_manager->n_outputs == test_case->expect.n_outputs); test_case->expect.screen_width);
g_assert ((int) monitor_manager->n_crtcs == test_case->expect.n_crtcs); g_assert_cmpint (monitor_manager->screen_height,
==,
test_case->expect.screen_height);
g_assert_cmpint ((int) monitor_manager->n_outputs,
==,
test_case->expect.n_outputs);
g_assert_cmpint ((int) monitor_manager->n_crtcs,
==,
test_case->expect.n_crtcs);
tiled_monitor_count = tiled_monitor_count =
meta_monitor_manager_test_get_tiled_monitor_count (monitor_manager_test); meta_monitor_manager_test_get_tiled_monitor_count (monitor_manager_test);
g_assert (tiled_monitor_count == test_case->expect.n_tiled_monitors); g_assert_cmpint (tiled_monitor_count,
==,
test_case->expect.n_tiled_monitors);
monitors = meta_monitor_manager_get_monitors (monitor_manager); monitors = meta_monitor_manager_get_monitors (monitor_manager);
g_assert ((int) g_list_length (monitors) == test_case->expect.n_monitors); g_assert_cmpint ((int) g_list_length (monitors),
==,
test_case->expect.n_monitors);
for (l = monitors, i = 0; l; l = l->next, i++) for (l = monitors, i = 0; l; l = l->next, i++)
{ {
MetaMonitor *monitor = l->data; MetaMonitor *monitor = l->data;
@ -359,7 +371,8 @@ check_monitor_configuration (MonitorTestCase *test_case)
outputs = meta_monitor_get_outputs (monitor); outputs = meta_monitor_get_outputs (monitor);
g_assert ((int) g_list_length (outputs) == g_assert_cmpint ((int) g_list_length (outputs),
==,
test_case->expect.monitors[i].n_outputs); test_case->expect.monitors[i].n_outputs);
for (l_output = outputs, j = 0; l_output; l_output = l_output->next, j++) for (l_output = outputs, j = 0; l_output; l_output = l_output->next, j++)
@ -372,8 +385,12 @@ check_monitor_configuration (MonitorTestCase *test_case)
} }
meta_monitor_get_physical_dimensions (monitor, &width_mm, &height_mm); meta_monitor_get_physical_dimensions (monitor, &width_mm, &height_mm);
g_assert (width_mm == test_case->expect.monitors[i].width_mm); g_assert_cmpint (width_mm,
g_assert (height_mm == test_case->expect.monitors[i].height_mm); ==,
test_case->expect.monitors[i].width_mm);
g_assert_cmpint (height_mm,
==,
test_case->expect.monitors[i].height_mm);
modes = meta_monitor_get_modes (monitor); modes = meta_monitor_get_modes (monitor);
for (l_mode = modes, j = 0; l_mode; l_mode = l_mode->next, j++) for (l_mode = modes, j = 0; l_mode; l_mode = l_mode->next, j++)
@ -385,8 +402,12 @@ check_monitor_configuration (MonitorTestCase *test_case)
meta_monitor_mode_get_resolution (mode, &width, &height); meta_monitor_mode_get_resolution (mode, &width, &height);
g_assert (width == test_case->expect.monitors[i].modes[j].width); g_assert_cmpint (width,
g_assert (height == test_case->expect.monitors[i].modes[j].height); ==,
test_case->expect.monitors[i].modes[j].width);
g_assert_cmpint (height,
==,
test_case->expect.monitors[i].modes[j].height);
data = (CheckMonitorModeData) { data = (CheckMonitorModeData) {
.monitor_manager = monitor_manager, .monitor_manager = monitor_manager,
@ -415,7 +436,9 @@ check_monitor_configuration (MonitorTestCase *test_case)
n_logical_monitors = n_logical_monitors =
meta_monitor_manager_get_num_logical_monitors (monitor_manager); meta_monitor_manager_get_num_logical_monitors (monitor_manager);
g_assert (n_logical_monitors == test_case->expect.n_logical_monitors); g_assert_cmpint (n_logical_monitors,
==,
test_case->expect.n_logical_monitors);
logical_monitors = logical_monitors =
meta_monitor_manager_get_logical_monitors (monitor_manager); meta_monitor_manager_get_logical_monitors (monitor_manager);
@ -427,13 +450,21 @@ check_monitor_configuration (MonitorTestCase *test_case)
GList *monitors; GList *monitors;
GList *l_monitor; GList *l_monitor;
g_assert (logical_monitor->rect.x == test_logical_monitor->layout.x); g_assert_cmpint (logical_monitor->rect.x,
g_assert (logical_monitor->rect.y == test_logical_monitor->layout.y); ==,
g_assert (logical_monitor->rect.width == test_logical_monitor->layout.x);
g_assert_cmpint (logical_monitor->rect.y,
==,
test_logical_monitor->layout.y);
g_assert_cmpint (logical_monitor->rect.width,
==,
test_logical_monitor->layout.width); test_logical_monitor->layout.width);
g_assert (logical_monitor->rect.height == g_assert_cmpint (logical_monitor->rect.height,
==,
test_logical_monitor->layout.height); test_logical_monitor->layout.height);
g_assert (logical_monitor->scale == test_logical_monitor->scale); g_assert_cmpint (logical_monitor->scale,
==,
test_logical_monitor->scale);
monitors = meta_logical_monitor_get_monitors (logical_monitor); monitors = meta_logical_monitor_get_monitors (logical_monitor);
for (l_monitor = monitors; l_monitor; l_monitor = l_monitor->next) for (l_monitor = monitors; l_monitor; l_monitor = l_monitor->next)
@ -451,7 +482,7 @@ check_monitor_configuration (MonitorTestCase *test_case)
} }
} }
} }
g_assert (n_logical_monitors == i); g_assert_cmpint (n_logical_monitors, ==, i);
} }
static MetaMonitorTestSetup * static MetaMonitorTestSetup *