From 420ca31f0becfbfac3c76d19ff3e2ef93311fc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 25 Mar 2020 16:34:38 +0100 Subject: [PATCH] tests/clutter: Port timeline-progress to current test suite https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1289 --- src/tests/clutter/conform/meson.build | 1 + src/tests/clutter/conform/timeline-progress.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build index fbaa46bd3..19fcf1c34 100644 --- a/src/tests/clutter/conform/meson.build +++ b/src/tests/clutter/conform/meson.build @@ -35,6 +35,7 @@ clutter_conform_tests_general_tests = [ 'script-parser', 'timeline', 'timeline-interpolate', + 'timeline-progress', 'units', ] diff --git a/src/tests/clutter/conform/timeline-progress.c b/src/tests/clutter/conform/timeline-progress.c index 938b95648..20a71f2bc 100644 --- a/src/tests/clutter/conform/timeline-progress.c +++ b/src/tests/clutter/conform/timeline-progress.c @@ -1,10 +1,11 @@ +#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #include #include -#include "test-conform-common.h" -void -timeline_progress_step (TestConformSimpleFixture *fixture G_GNUC_UNUSED, - gconstpointer dummy G_GNUC_UNUSED) +#include "tests/clutter-test-utils.h" + +static void +timeline_progress_step (void) { ClutterTimeline *timeline; @@ -86,9 +87,8 @@ timeline_progress_step (TestConformSimpleFixture *fixture G_GNUC_UNUSED, g_object_unref (timeline); } -void -timeline_progress_mode (TestConformSimpleFixture *fixture G_GNUC_UNUSED, - gconstpointer dummy G_GNUC_UNUSED) +static void +timeline_progress_mode (void) { ClutterTimeline *timeline; @@ -108,3 +108,8 @@ timeline_progress_mode (TestConformSimpleFixture *fixture G_GNUC_UNUSED, g_object_unref (timeline); } + +CLUTTER_TEST_SUITE ( + CLUTTER_TEST_UNIT ("/timeline/progress/step", timeline_progress_step); + CLUTTER_TEST_UNIT ("/timeline/progress/mode", timeline_progress_mode) +)