sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

tests/backend: Make test device removal function name consistent

Browse source 
The add function is add_test_device(), but the remove one was
remove_device(). Lets add a test_ to the former to make them consistent.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3812>
This commit is contained in:
Jonas Ådahl 2024-06-18 17:09:48 +02:00 • committed by Marge Bot
parent 465af4b2d3
commit b41d1437a7
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/tests/meta-backend-test.c
View file

@ -112,8 +112,8 @@ meta_backend_test_add_test_device (MetaBackendTest *backend_test,
}
void
meta_backend_test_remove_device (MetaBackendTest *backend_test,
ClutterVirtualInputDevice *virtual_device)
meta_backend_test_remove_test_device (MetaBackendTest *backend_test,
ClutterVirtualInputDevice *virtual_device)
{
MetaBackend *backend = META_BACKEND (backend_test);
ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);

4
src/tests/meta-backend-test.h
View file

@ -39,5 +39,5 @@ ClutterVirtualInputDevice * meta_backend_test_add_test_device (MetaBackendTest
int n_buttons);
META_EXPORT_TEST
void meta_backend_test_remove_device (MetaBackendTest *backend,
ClutterVirtualInputDevice *device);
void meta_backend_test_remove_test_device (MetaBackendTest *backend,
ClutterVirtualInputDevice *device);

15
src/tests/monitor-unit-tests.c
View file

@ -4154,7 +4154,8 @@ input_device_test_remove (ClutterAutoRemoveInputDevice *virtual_device)
{
MetaBackend *backend = meta_context_get_backend (test_context);
meta_backend_test_remove_device (META_BACKEND_TEST (backend), virtual_device);
meta_backend_test_remove_test_device (META_BACKEND_TEST (backend),
virtual_device);
g_object_unref (virtual_device);
}
G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClutterAutoRemoveInputDevice,
@ -4338,7 +4339,8 @@ meta_test_monitor_orientation_is_managed (void)
g_assert_true (
meta_monitor_manager_get_panel_orientation_managed (monitor_manager));
meta_backend_test_remove_device (META_BACKEND_TEST (backend), touch_device);
meta_backend_test_remove_test_device (META_BACKEND_TEST (backend),
touch_device);
g_clear_object (&touch_device);
g_assert_false (clutter_seat_get_touch_mode (seat));
@ -4716,7 +4718,8 @@ meta_test_monitor_orientation_initial_stored_rotated (void)
/* When no touch device is available, the orientation change is ignored */
g_test_message ("Removing touch device");
meta_backend_test_remove_device (META_BACKEND_TEST (backend), touch_device);
meta_backend_test_remove_test_device (META_BACKEND_TEST (backend),
touch_device);
g_clear_object (&touch_device);
g_test_message ("Rotating to right-up");
@ -5025,7 +5028,8 @@ meta_test_monitor_orientation_changes (void)
/* When no touch device is available, the orientation changes are ignored */
g_test_message ("Removing touch device");
meta_backend_test_remove_device (META_BACKEND_TEST (backend), touch_device);
meta_backend_test_remove_test_device (META_BACKEND_TEST (backend),
touch_device);
g_clear_object (&touch_device);
for (i = META_N_ORIENTATIONS - 1; i > META_ORIENTATION_UNDEFINED; i--)
@ -5225,7 +5229,8 @@ meta_test_monitor_orientation_changes_for_transformed_panel (void)
/* When no touch device is available, the orientation changes are ignored */
g_test_message ("Removing touch device");
meta_backend_test_remove_device (META_BACKEND_TEST (backend), touch_device);
meta_backend_test_remove_test_device (META_BACKEND_TEST (backend),
touch_device);
g_clear_object (&touch_device);
for (i = META_N_ORIENTATIONS - 1; i > META_ORIENTATION_UNDEFINED; i--)