brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conform: Clean up test names

Browse Source 
Drop the 'test-' prefix: it's the conformance test suite, we know it's
full of tests.
This commit is contained in:
Emmanuele Bassi 2012-02-27 12:54:23 +00:00
parent e4c948b150
commit d16f2ac3b5
19 changed files with 149 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tests/conform/Makefile.am
View File

@ -16,13 +16,13 @@ units_sources =
# animation tests # animation tests
units_sources += \ units_sources += \
test-animator.c \ test-animator.c \
test-behaviours.c \ test-behaviours.c \
test-score.c \ test-score.c \
test-state.c \ test-state.c \
test-timeline.c \ test-timeline.c \
test-timeline-interpolate.c \ test-timeline-interpolate.c \
test-timeline-rewind.c \ test-timeline-rewind.c \
$(NULL) $(NULL)
# cogl tests # cogl tests
@ -48,39 +48,39 @@ units_sources += \
# actors tests # actors tests
units_sources += \ units_sources += \
test-actor-graph.c \ test-actor-graph.c \
test-actor-destroy.c \ test-actor-destroy.c \
test-actor-invariants.c \ test-actor-invariants.c \
test-actor-iter.c \ test-actor-iter.c \
test-actor-layout.c \ test-actor-layout.c \
test-actor-size.c \ test-actor-size.c \
test-anchors.c \ test-anchors.c \
test-binding-pool.c \ test-binding-pool.c \
test-clutter-cairo-texture.c \ test-cairo-texture.c \
test-clutter-rectangle.c \ test-group.c \
test-clutter-text.c \ test-offscreen-redirect.c \
test-clutter-texture.c \ test-path.c \
test-group.c \ test-paint-opacity.c \
test-offscreen-redirect.c \ test-pick.c \
test-path.c \ test-shader-effect.c \
test-paint-opacity.c \ test-rectangle.c \
test-pick.c \ test-texture-fbo.c \
test-texture-fbo.c \ test-texture.c \
test-text-cache.c \ test-text-cache.c \
test-shader-effect.c \ test-text.c \
$(NULL) $(NULL)
# objects tests # objects tests
units_sources += \ units_sources += \
test-clutter-units.c \ test-color.c \
test-color.c \ test-model.c \
test-model.c \ test-script-parser.c \
test-script-parser.c \ test-units.c \
$(NULL) $(NULL)
# cally tests # cally tests
units_sources += \ units_sources += \
test-cally-text.c \ test-cally-text.c \
$(NULL) $(NULL)
test_conformance_SOURCES = $(common_sources) $(units_sources) test_conformance_SOURCES = $(common_sources) $(units_sources)

10
tests/conform/test-animator.c
View File

@ -3,8 +3,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_animator_multi_properties (TestConformSimpleFixture *fixture, animator_multi_properties (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *animator = NULL, *foo = NULL; GObject *animator = NULL, *foo = NULL;
@ -106,7 +106,7 @@ test_animator_multi_properties (TestConformSimpleFixture *fixture,
} }
void void
test_animator_properties (TestConformSimpleFixture *fixture, animator_properties (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
@ -169,8 +169,8 @@ test_animator_properties (TestConformSimpleFixture *fixture,
} }
void void
test_animator_base (TestConformSimpleFixture *fixture, animator_base (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *animator = NULL; GObject *animator = NULL;

2
tests/conform/test-behaviours.c
View File

@ -64,7 +64,7 @@ static const struct
static const gint n_behaviour_tests = G_N_ELEMENTS (behaviour_tests); static const gint n_behaviour_tests = G_N_ELEMENTS (behaviour_tests);
void void
test_behaviours (TestConformSimpleFixture *fixture, behaviours_base (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
BehaviourFixture b_fixture; BehaviourFixture b_fixture;

4
tests/conform/test-binding-pool.c
View File

@ -262,8 +262,8 @@ on_activate (KeyGroup *key_group,
} }
void void
test_binding_pool (TestConformSimpleFixture *fixture, binding_pool (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
KeyGroup *key_group = g_object_new (TYPE_KEY_GROUP, NULL); KeyGroup *key_group = g_object_new (TYPE_KEY_GROUP, NULL);

4
tests/conform/test-clutter-cairo-texture.c → tests/conform/test-cairo-texture.c
View File

@ -161,8 +161,8 @@ idle_cb (gpointer data)
} }
void void
test_clutter_cairo_texture (TestConformSimpleFixture *fixture, texture_cairo (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
TestState state; TestState state;
unsigned int idle_source; unsigned int idle_source;

20
tests/conform/test-color.c
View File

@ -4,8 +4,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_color_hls_roundtrip (TestConformSimpleFixture *fixture, color_hls_roundtrip (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterColor color; ClutterColor color;
gfloat hue, luminance, saturation; gfloat hue, luminance, saturation;
@ -73,8 +73,8 @@ test_color_hls_roundtrip (TestConformSimpleFixture *fixture,
} }
void void
test_color_from_string_invalid (TestConformSimpleFixture *fixture, color_from_string_invalid (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterColor color; ClutterColor color;
@ -89,8 +89,8 @@ test_color_from_string_invalid (TestConformSimpleFixture *fixture,
} }
void void
test_color_from_string_valid (TestConformSimpleFixture *fixture, color_from_string_valid (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterColor color; ClutterColor color;
@ -238,8 +238,8 @@ test_color_from_string_valid (TestConformSimpleFixture *fixture,
} }
void void
test_color_to_string (TestConformSimpleFixture *fixture, color_to_string (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterColor color; ClutterColor color;
gchar *str; gchar *str;
@ -256,8 +256,8 @@ test_color_to_string (TestConformSimpleFixture *fixture,
} }
void void
test_color_operators (TestConformSimpleFixture *fixture, color_operators (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterColor op1, op2; ClutterColor op1, op2;
ClutterColor res; ClutterColor res;

91
tests/conform/test-conform-main.c
View File

@ -62,18 +62,19 @@ static TestConformSharedState *shared_state = NULL;
/* this is a macro that conditionally executes a test if CONDITION /* this is a macro that conditionally executes a test if CONDITION
* evaluates to TRUE; otherwise, it will put the test under the * evaluates to TRUE; otherwise, it will put the test under the
* "/skip" namespace and execute a dummy function that will always * "/skipped" namespace and execute a dummy function that will always
* pass. * pass.
*/ */
#define TEST_CONFORM_SKIP(CONDITION, NAMESPACE, FUNC) G_STMT_START { \ #define TEST_CONFORM_SKIP(CONDITION, NAMESPACE, FUNC) G_STMT_START { \
if (CONDITION) { \ if (CONDITION) { TEST_CONFORM_SIMPLE (NAMESPACE, FUNC); } \
else { \
g_test_add ("/skipped" NAMESPACE "/" #FUNC, \ g_test_add ("/skipped" NAMESPACE "/" #FUNC, \
TestConformSimpleFixture, \ TestConformSimpleFixture, \
shared_state, /* data argument for test */ \ shared_state, /* data argument for test */ \
test_conform_simple_fixture_setup, \ test_conform_simple_fixture_setup, \
test_conform_skip_test, \ test_conform_skip_test, \
test_conform_simple_fixture_teardown); \ test_conform_simple_fixture_teardown); \
} else { TEST_CONFORM_SIMPLE (NAMESPACE, FUNC); } } G_STMT_END } } G_STMT_END
#define TEST_CONFORM_TODO(NAMESPACE, FUNC) G_STMT_START { \ #define TEST_CONFORM_TODO(NAMESPACE, FUNC) G_STMT_START { \
extern void FUNC (TestConformSimpleFixture *, gconstpointer); \ extern void FUNC (TestConformSimpleFixture *, gconstpointer); \
@ -106,7 +107,7 @@ clutter_test_init (gint *argc,
g_test_init (argc, argv, NULL); g_test_init (argc, argv, NULL);
g_test_bug_base ("http://bugzilla.openedhand.com/show_bug.cgi?id=%s"); g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=%s");
/* Initialise the state you need to share with everything. /* Initialise the state you need to share with everything.
*/ */
@ -160,9 +161,9 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_contains); TEST_CONFORM_SIMPLE ("/actor/invariants", actor_contains);
TEST_CONFORM_SIMPLE ("/actor/invariants", default_stage); TEST_CONFORM_SIMPLE ("/actor/invariants", default_stage);
TEST_CONFORM_SIMPLE ("/actor/opacity", test_label_opacity); TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_label);
TEST_CONFORM_SIMPLE ("/actor/opacity", test_rectangle_opacity); TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_rectangle);
TEST_CONFORM_SIMPLE ("/actor/opacity", test_paint_opacity); TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_paint);
TEST_CONFORM_SIMPLE ("/text", text_utf8_validation); TEST_CONFORM_SIMPLE ("/text", text_utf8_validation);
TEST_CONFORM_SIMPLE ("/text", text_set_empty); TEST_CONFORM_SIMPLE ("/text", text_set_empty);
@ -177,57 +178,57 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/text", text_get_chars); TEST_CONFORM_SIMPLE ("/text", text_get_chars);
TEST_CONFORM_SIMPLE ("/text", text_cache); TEST_CONFORM_SIMPLE ("/text", text_cache);
TEST_CONFORM_SIMPLE ("/text", text_password_char); TEST_CONFORM_SIMPLE ("/text", text_password_char);
TEST_CONFORM_SIMPLE ("/text", idempotent_use_markup); TEST_CONFORM_SIMPLE ("/text", text_idempotent_use_markup);
TEST_CONFORM_SIMPLE ("/rectangle", test_rect_set_size); TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_size);
TEST_CONFORM_SIMPLE ("/rectangle", test_rect_set_color); TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_color);
TEST_CONFORM_SIMPLE ("/texture", test_texture_pick_with_alpha); TEST_CONFORM_SIMPLE ("/texture", texture_pick_with_alpha);
TEST_CONFORM_SIMPLE ("/texture", test_texture_fbo); TEST_CONFORM_SIMPLE ("/texture", texture_fbo);
TEST_CONFORM_SIMPLE ("/texture/cairo", test_clutter_cairo_texture); TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo);
TEST_CONFORM_SIMPLE ("/path", test_path); TEST_CONFORM_SIMPLE ("/path", test_path);
TEST_CONFORM_SIMPLE ("/binding-pool", test_binding_pool); TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool);
TEST_CONFORM_SIMPLE ("/model", test_list_model_populate); TEST_CONFORM_SIMPLE ("/model", list_model_populate);
TEST_CONFORM_SIMPLE ("/model", test_list_model_iterate); TEST_CONFORM_SIMPLE ("/model", list_model_iterate);
TEST_CONFORM_SIMPLE ("/model", test_list_model_filter); TEST_CONFORM_SIMPLE ("/model", list_model_filter);
TEST_CONFORM_SIMPLE ("/model", test_list_model_from_script); TEST_CONFORM_SIMPLE ("/model", list_model_from_script);
TEST_CONFORM_SIMPLE ("/model", test_list_model_row_changed); TEST_CONFORM_SIMPLE ("/model", list_model_row_changed);
TEST_CONFORM_SIMPLE ("/color", test_color_from_string_valid); TEST_CONFORM_SIMPLE ("/color", color_from_string_valid);
TEST_CONFORM_SIMPLE ("/color", test_color_from_string_invalid); TEST_CONFORM_SIMPLE ("/color", color_from_string_invalid);
TEST_CONFORM_SIMPLE ("/color", test_color_to_string); TEST_CONFORM_SIMPLE ("/color", color_to_string);
TEST_CONFORM_SIMPLE ("/color", test_color_hls_roundtrip); TEST_CONFORM_SIMPLE ("/color", color_hls_roundtrip);
TEST_CONFORM_SIMPLE ("/color", test_color_operators); TEST_CONFORM_SIMPLE ("/color", color_operators);
TEST_CONFORM_SIMPLE ("/units", test_units_constructors); TEST_CONFORM_SIMPLE ("/units", units_constructors);
TEST_CONFORM_SIMPLE ("/units", test_units_string); TEST_CONFORM_SIMPLE ("/units", units_string);
TEST_CONFORM_SIMPLE ("/units", test_units_cache); TEST_CONFORM_SIMPLE ("/units", units_cache);
TEST_CONFORM_SIMPLE ("/group", test_group_depth_sorting); TEST_CONFORM_SIMPLE ("/group", group_depth_sorting);
TEST_CONFORM_SIMPLE ("/script", test_script_single); TEST_CONFORM_SIMPLE ("/script", script_single);
TEST_CONFORM_SIMPLE ("/script", test_script_child); TEST_CONFORM_SIMPLE ("/script", script_child);
TEST_CONFORM_SIMPLE ("/script", test_script_implicit_alpha); TEST_CONFORM_SIMPLE ("/script", script_implicit_alpha);
TEST_CONFORM_SIMPLE ("/script", test_script_object_property); TEST_CONFORM_SIMPLE ("/script", script_object_property);
TEST_CONFORM_SIMPLE ("/script", test_script_animation); TEST_CONFORM_SIMPLE ("/script", script_animation);
TEST_CONFORM_SIMPLE ("/script", test_script_named_object); TEST_CONFORM_SIMPLE ("/script", script_named_object);
TEST_CONFORM_SIMPLE ("/script", test_animator_base); TEST_CONFORM_SIMPLE ("/script", script_layout_property);
TEST_CONFORM_SIMPLE ("/script", test_animator_properties); TEST_CONFORM_SIMPLE ("/script", animator_base);
TEST_CONFORM_SIMPLE ("/script", test_animator_multi_properties); TEST_CONFORM_SIMPLE ("/script", animator_properties);
TEST_CONFORM_SIMPLE ("/script", test_state_base); TEST_CONFORM_SIMPLE ("/script", animator_multi_properties);
TEST_CONFORM_SIMPLE ("/script", test_script_layout_property); TEST_CONFORM_SIMPLE ("/script", state_base);
TEST_CONFORM_SIMPLE ("/timeline", test_timeline); TEST_CONFORM_SIMPLE ("/timeline", timeline_base);
TEST_CONFORM_SIMPLE ("/timeline", markers_from_script); TEST_CONFORM_SIMPLE ("/timeline", timeline_markers_from_script);
TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", timeline_interpolation); TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_interpolation);
TEST_CONFORM_SKIP (!g_test_slow (), "/timeline", timeline_rewind); TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_rewind);
TEST_CONFORM_SIMPLE ("/score", test_score); TEST_CONFORM_SIMPLE ("/score", score_base);
TEST_CONFORM_SIMPLE ("/behaviours", test_behaviours); TEST_CONFORM_SIMPLE ("/behaviours", behaviours_base);
/* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */ /* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */
TEST_CONFORM_TODO ("/cally", cally_text); TEST_CONFORM_TODO ("/cally", cally_text);

4
tests/conform/test-group.c
View File

@ -2,8 +2,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_group_depth_sorting (TestConformSimpleFixture *fixture, group_depth_sorting (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *group; ClutterActor *group;
ClutterActor *child, *test; ClutterActor *child, *test;

24
tests/conform/test-model.c
View File

@ -172,8 +172,8 @@ filter_odd_rows (ClutterModel *model,
} }
void void
test_list_model_filter (TestConformSimpleFixture *fixture, list_model_filter (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ModelData test_data = { NULL, 0 }; ModelData test_data = { NULL, 0 };
ClutterModelIter *iter; ClutterModelIter *iter;
@ -260,8 +260,8 @@ test_list_model_filter (TestConformSimpleFixture *fixture,
} }
void void
test_list_model_iterate (TestConformSimpleFixture *fixture, list_model_iterate (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ModelData test_data = { NULL, 0 }; ModelData test_data = { NULL, 0 };
ClutterModelIter *iter; ClutterModelIter *iter;
@ -335,8 +335,8 @@ test_list_model_iterate (TestConformSimpleFixture *fixture,
} }
void void
test_list_model_populate (TestConformSimpleFixture *fixture, list_model_populate (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ModelData test_data = { NULL, 0 }; ModelData test_data = { NULL, 0 };
gint i; gint i;
@ -366,8 +366,8 @@ test_list_model_populate (TestConformSimpleFixture *fixture,
} }
void void
test_list_model_from_script (TestConformSimpleFixture *fixture, list_model_from_script (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *model; GObject *model;
@ -383,11 +383,7 @@ test_list_model_from_script (TestConformSimpleFixture *fixture,
if (g_test_verbose () && error) if (g_test_verbose () && error)
g_print ("Error: %s", error->message); g_print ("Error: %s", error->message);
#if GLIB_CHECK_VERSION (2, 20, 0)
g_assert_no_error (error); g_assert_no_error (error);
#else
g_assert (error == NULL);
#endif /* GLIB_CHECK_VERSION (2, 20, 0) */
model = clutter_script_get_object (script, "test-model"); model = clutter_script_get_object (script, "test-model");
@ -465,8 +461,8 @@ on_row_changed (ClutterModel *model,
} }
void void
test_list_model_row_changed (TestConformSimpleFixture *fixture, list_model_row_changed (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ChangedData test_data = { NULL, NULL, 0, 0 }; ChangedData test_data = { NULL, NULL, 0, 0 };
GValue value = { 0, }; GValue value = { 0, };

12
tests/conform/test-paint-opacity.c
View File

@ -4,8 +4,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_label_opacity (TestConformSimpleFixture *fixture, opacity_label (TestConformSimpleFixture *fixture,
gpointer dummy) gpointer dummy)
{ {
ClutterActor *stage; ClutterActor *stage;
ClutterActor *label; ClutterActor *label;
@ -43,8 +43,8 @@ test_label_opacity (TestConformSimpleFixture *fixture,
} }
void void
test_rectangle_opacity (TestConformSimpleFixture *fixture, opacity_rectangle (TestConformSimpleFixture *fixture,
gpointer dummy) gpointer dummy)
{ {
ClutterActor *stage; ClutterActor *stage;
ClutterActor *rect; ClutterActor *rect;
@ -77,8 +77,8 @@ test_rectangle_opacity (TestConformSimpleFixture *fixture,
} }
void void
test_paint_opacity (TestConformSimpleFixture *fixture, opacity_paint (TestConformSimpleFixture *fixture,
gpointer dummy) gpointer dummy)
{ {
ClutterActor *stage, *group1, *group2; ClutterActor *stage, *group1, *group2;
ClutterActor *label, *rect; ClutterActor *label, *rect;

4
tests/conform/test-clutter-rectangle.c → tests/conform/test-rectangle.c
View File

@ -9,7 +9,7 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_rect_set_size (TestConformSimpleFixture *fixture, rectangle_set_size (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *rect = clutter_rectangle_new (); ClutterActor *rect = clutter_rectangle_new ();
@ -33,7 +33,7 @@ test_rect_set_size (TestConformSimpleFixture *fixture,
} }
void void
test_rect_set_color (TestConformSimpleFixture *fixture, rectangle_set_color (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterActor *rect = clutter_rectangle_new (); ClutterActor *rect = clutter_rectangle_new ();

2
tests/conform/test-score.c
View File

@ -43,7 +43,7 @@ on_timeline_completed (ClutterScore *score,
} }
void void
test_score (TestConformSimpleFixture *fixture, score_base (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterScore *score; ClutterScore *score;

28
tests/conform/test-script-parser.c
View File

@ -115,8 +115,8 @@ test_group_init (TestGroup *self)
} }
void void
test_script_child (TestConformSimpleFixture *fixture, script_child (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *container, *actor; GObject *container, *actor;
@ -165,8 +165,8 @@ test_script_child (TestConformSimpleFixture *fixture,
} }
void void
test_script_single (TestConformSimpleFixture *fixture, script_single (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
ClutterColor color = { 0, }; ClutterColor color = { 0, };
@ -203,8 +203,8 @@ test_script_single (TestConformSimpleFixture *fixture,
} }
void void
test_script_implicit_alpha (TestConformSimpleFixture *fixture, script_implicit_alpha (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
ClutterTimeline *timeline; ClutterTimeline *timeline;
@ -242,8 +242,8 @@ test_script_implicit_alpha (TestConformSimpleFixture *fixture,
} }
void void
test_script_object_property (TestConformSimpleFixture *fixture, script_object_property (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
ClutterLayoutManager *manager; ClutterLayoutManager *manager;
@ -273,8 +273,8 @@ test_script_object_property (TestConformSimpleFixture *fixture,
} }
void void
test_script_named_object (TestConformSimpleFixture *fixture, script_named_object (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
ClutterLayoutManager *manager; ClutterLayoutManager *manager;
@ -305,8 +305,8 @@ test_script_named_object (TestConformSimpleFixture *fixture,
} }
void void
test_script_animation (TestConformSimpleFixture *fixture, script_animation (TestConformSimpleFixture *fixture,
gconstpointer dummy) gconstpointer dummy)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *animation = NULL; GObject *animation = NULL;
@ -332,8 +332,8 @@ test_script_animation (TestConformSimpleFixture *fixture,
} }
void void
test_script_layout_property (TestConformSimpleFixture *fixture, script_layout_property (TestConformSimpleFixture *fixture,
gconstpointer dummy G_GNUC_UNUSED) gconstpointer dummy G_GNUC_UNUSED)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *manager, *container, *actor1, *actor2; GObject *manager, *container, *actor1, *actor2;

4
tests/conform/test-state.c
View File

@ -3,8 +3,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_state_base (TestConformSimpleFixture *fixture G_GNUC_UNUSED, state_base (TestConformSimpleFixture *fixture G_GNUC_UNUSED,
gconstpointer dummy G_GNUC_UNUSED) gconstpointer dummy G_GNUC_UNUSED)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
GObject *state = NULL; GObject *state = NULL;

2
tests/conform/test-clutter-text.c → tests/conform/test-text.c
View File

@ -450,7 +450,7 @@ validate_markup_attributes (ClutterText *text,
} }
void void
idempotent_use_markup (void) text_idempotent_use_markup (void)
{ {
ClutterText *text; ClutterText *text;
const char *contents = "foo <b>bar</b>"; const char *contents = "foo <b>bar</b>";

4
tests/conform/test-texture-fbo.c
View File

@ -169,8 +169,8 @@ queue_redraw (gpointer stage)
} }
void void
test_texture_fbo (TestConformSimpleFixture *fixture, texture_fbo (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
TestState state; TestState state;
ClutterActor *actor; ClutterActor *actor;

4
tests/conform/test-clutter-texture.c → tests/conform/test-texture.c
View File

@ -29,8 +29,8 @@ make_texture (void)
} }
void void
test_texture_pick_with_alpha (TestConformSimpleFixture *fixture, texture_pick_with_alpha (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterTexture *tex = CLUTTER_TEXTURE (clutter_texture_new ()); ClutterTexture *tex = CLUTTER_TEXTURE (clutter_texture_new ());
ClutterStage *stage = CLUTTER_STAGE (clutter_stage_new ()); ClutterStage *stage = CLUTTER_STAGE (clutter_stage_new ());

6
tests/conform/test-timeline.c
View File

@ -182,7 +182,7 @@ delay_cb (gpointer data)
} }
void void
test_timeline (TestConformSimpleFixture *fixture, timeline_base (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterTimeline *timeline_1; ClutterTimeline *timeline_1;
@ -320,8 +320,8 @@ test_timeline (TestConformSimpleFixture *fixture,
} }
void void
markers_from_script (TestConformSimpleFixture *fixture, timeline_markers_from_script (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterScript *script = clutter_script_new (); ClutterScript *script = clutter_script_new ();
ClutterTimeline *timeline; ClutterTimeline *timeline;

12
tests/conform/test-clutter-units.c → tests/conform/test-units.c
View File

@ -4,8 +4,8 @@
#include "test-conform-common.h" #include "test-conform-common.h"
void void
test_units_cache (TestConformSimpleFixture *fixture, units_cache (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterUnits units; ClutterUnits units;
ClutterSettings *settings; ClutterSettings *settings;
@ -29,8 +29,8 @@ test_units_cache (TestConformSimpleFixture *fixture,
} }
void void
test_units_constructors (TestConformSimpleFixture *fixture, units_constructors (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterUnits units, units_cm; ClutterUnits units, units_cm;
@ -57,8 +57,8 @@ test_units_constructors (TestConformSimpleFixture *fixture,
} }
void void
test_units_string (TestConformSimpleFixture *fixture, units_string (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
{ {
ClutterUnits units; ClutterUnits units;
gchar *string; gchar *string;