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

2.0: Prune conformance test suite

Browse Source
This commit is contained in:
Emmanuele Bassi 2012-10-07 19:50:42 +01:00
parent 8d181c46d9
commit 1ff3011cb7
11 changed files with 59 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/conform/Makefile.am
View File

@ -16,66 +16,27 @@ units_sources =
# animation tests
units_sources += \
animator.c \
behaviours.c \
score.c \
state.c \
timeline.c \
timeline-interpolate.c \
timeline-progress.c \
timeline-rewind.c \
$(NULL)
# cogl tests
units_sources += \
test-cogl-fixed.c \
test-cogl-materials.c \
test-cogl-viewport.c \
test-cogl-multitexture.c \
test-cogl-npot-texture.c \
test-cogl-object.c \
test-cogl-premult.c \
test-cogl-readpixels.c \
test-cogl-texture-get-set-data.c \
test-cogl-texture-mipmaps.c \
test-cogl-texture-pixmap-x11.c \
test-cogl-texture-rectangle.c \
test-cogl-atlas-migration.c \
test-cogl-vertex-buffer-contiguous.c \
test-cogl-vertex-buffer-interleved.c \
test-cogl-vertex-buffer-mutability.c \
$(NULL)
# actors tests
units_sources += \
actor-anchors.c \
actor-graph.c \
actor-destroy.c \
actor-invariants.c \
actor-iter.c \
actor-layout.c \
actor-offscreen-redirect.c \
actor-paint-opacity.c \
actor-pick.c \
actor-shader-effect.c \
actor-size.c \
binding-pool.c \
cairo-texture.c \
group.c \
interval.c \
path.c \
rectangle.c \
texture-fbo.c \
texture.c \
text-cache.c \
text.c \
$(NULL)
# objects tests
units_sources += \
color.c \
model.c \
script-parser.c \
units.c \
$(NULL)

8
tests/conform/actor-graph.c
View File

@ -220,8 +220,6 @@ actor_raise_child (TestConformSimpleFixture *fixture,
==,
"bar");
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (iter));
g_object_get (iter, "show-on-set-parent", &show_on_set_parent, NULL);
g_assert (!show_on_set_parent);
iter = clutter_actor_get_child_at_index (actor, 0);
clutter_actor_set_child_above_sibling (actor, iter, NULL);
@ -236,8 +234,6 @@ actor_raise_child (TestConformSimpleFixture *fixture,
==,
"foo");
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (iter));
g_object_get (iter, "show-on-set-parent", &show_on_set_parent, NULL);
g_assert (!show_on_set_parent);
clutter_actor_destroy (actor);
g_object_unref (actor);
@ -284,8 +280,6 @@ actor_lower_child (TestConformSimpleFixture *fixture,
==,
"baz");
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (iter));
g_object_get (iter, "show-on-set-parent", &show_on_set_parent, NULL);
g_assert (!show_on_set_parent);
iter = clutter_actor_get_child_at_index (actor, 2);
clutter_actor_set_child_below_sibling (actor, iter, NULL);
@ -300,8 +294,6 @@ actor_lower_child (TestConformSimpleFixture *fixture,
==,
"foo");
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (iter));
g_object_get (iter, "show-on-set-parent", &show_on_set_parent, NULL);
g_assert (!show_on_set_parent);
clutter_actor_destroy (actor);
g_object_unref (actor);

106
tests/conform/actor-invariants.c
View File

@ -11,7 +11,7 @@ actor_initial_state (TestConformSimpleFixture *fixture,
{
ClutterActor *actor;
actor = clutter_rectangle_new ();
actor = clutter_actor_new ();
g_object_ref_sink (actor);
if (g_test_verbose ())
@ -22,7 +22,7 @@ actor_initial_state (TestConformSimpleFixture *fixture,
g_assert (!(CLUTTER_ACTOR_IS_REALIZED (actor)));
g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
clutter_actor_destroy (actor);
g_object_unref (actor);
@ -34,7 +34,7 @@ actor_shown_not_parented (TestConformSimpleFixture *fixture,
{
ClutterActor *actor;
actor = clutter_rectangle_new ();
actor = clutter_actor_new ();
g_object_ref_sink (actor);
clutter_actor_show (actor);
@ -250,79 +250,6 @@ actor_map_recursive (TestConformSimpleFixture *fixture,
clutter_actor_destroy (stage);
}
void
actor_show_on_set_parent (TestConformSimpleFixture *fixture,
gconstpointer data)
{
ClutterActor *actor, *group;
gboolean show_on_set_parent;
ClutterActor *stage;
stage = clutter_stage_new ();
group = clutter_actor_new ();
g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (group)));
clutter_actor_add_child (stage, group);
actor = clutter_actor_new ();
g_object_get (actor,
"show-on-set-parent", &show_on_set_parent,
NULL);
g_assert (!(CLUTTER_ACTOR_IS_VISIBLE (actor)));
g_assert (show_on_set_parent);
clutter_actor_add_child (group, actor);
g_object_get (actor,
"show-on-set-parent", &show_on_set_parent,
NULL);
g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
g_assert (show_on_set_parent);
g_object_ref (actor);
clutter_actor_remove_child (group, actor);
g_object_get (actor,
"show-on-set-parent", &show_on_set_parent,
NULL);
g_assert (!CLUTTER_ACTOR_IS_REALIZED (actor));
g_assert (!CLUTTER_ACTOR_IS_MAPPED (actor));
g_assert (CLUTTER_ACTOR_IS_VISIBLE (actor));
g_assert (show_on_set_parent);
clutter_actor_destroy (actor);
clutter_actor_destroy (group);
actor = clutter_actor_new ();
clutter_actor_add_child (stage, actor);
clutter_actor_hide (actor);
g_object_get (actor,
"show-on-set-parent", &show_on_set_parent,
NULL);
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (actor));
g_assert (!CLUTTER_ACTOR_IS_MAPPED (actor));
g_assert (show_on_set_parent);
clutter_actor_destroy (actor);
actor = clutter_actor_new ();
clutter_actor_hide (actor);
clutter_actor_add_child (stage, actor);
g_object_get (actor,
"show-on-set-parent", &show_on_set_parent,
NULL);
g_assert (!CLUTTER_ACTOR_IS_VISIBLE (actor));
g_assert (!CLUTTER_ACTOR_IS_MAPPED (actor));
g_assert (!show_on_set_parent);
clutter_actor_destroy (actor);
clutter_actor_destroy (stage);
}
void
clone_no_map (TestConformSimpleFixture *fixture,
gconstpointer data)
@ -335,20 +262,20 @@ clone_no_map (TestConformSimpleFixture *fixture,
stage = clutter_stage_new ();
clutter_actor_show (stage);
group = clutter_group_new ();
actor = clutter_rectangle_new ();
group = clutter_actor_new ();
actor = clutter_actor_new ();
clutter_actor_hide (group);
clutter_container_add_actor (CLUTTER_CONTAINER (group), actor);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), group);
clutter_actor_add_child (group, actor);
clutter_actor_add_child (stage, group);
g_assert (!(CLUTTER_ACTOR_IS_MAPPED (group)));
g_assert (!(CLUTTER_ACTOR_IS_MAPPED (actor)));
clone = clutter_clone_new (group);
clutter_container_add_actor (CLUTTER_CONTAINER (stage), clone);
clutter_actor_add_child (stage, clone);
g_assert (CLUTTER_ACTOR_IS_MAPPED (clone));
g_assert (!(CLUTTER_ACTOR_IS_MAPPED (group)));
@ -426,23 +353,6 @@ actor_contains (TestConformSimpleFixture *fixture,
expected_results[x * 10 + y]);
}
void
default_stage (TestConformSimpleFixture *fixture,
gconstpointer data)
{
ClutterActor *stage, *def_stage;
stage = clutter_stage_new ();
def_stage = clutter_stage_get_default ();
if (clutter_feature_available (CLUTTER_FEATURE_STAGE_MULTIPLE))
g_assert (stage != def_stage);
else
g_assert (stage == def_stage);
g_assert (CLUTTER_ACTOR_IS_REALIZED (def_stage));
}
void
actor_pivot_transformation (TestConformSimpleFixture *fixture,
gconstpointer data)

4
tests/conform/actor-layout.c
View File

@ -234,7 +234,7 @@ actor_basic_layout (TestConformSimpleFixture *fixture,
clutter_actor_set_name (flower[2], "Green Flower");
clutter_actor_add_child (vase, flower[2]);
clutter_actor_show_all (stage);
clutter_actor_show (stage);
state = test_state_new ();
test_state_set_stage (state, stage);
@ -282,7 +282,7 @@ actor_margin_layout (TestConformSimpleFixture *fixture,
clutter_actor_set_margin_bottom (flower[2], 6);
clutter_actor_add_child (vase, flower[2]);
clutter_actor_show_all (stage);
clutter_actor_show (stage);
state = test_state_new ();
test_state_set_stage (state, stage);

19
tests/conform/actor-offscreen-redirect.c
View File

@ -281,7 +281,7 @@ timeout_cb (gpointer user_data)
/* Modifying the transformation on the parent should cause a
redraw */
clutter_actor_set_anchor_point (data->parent_container, 0, 1);
clutter_actor_set_pivot_point (data->parent_container, 0, 1);
verify_redraw (data, 1);
/* Redrawing an unrelated actor shouldn't cause a redraw */
@ -303,30 +303,30 @@ actor_offscreen_redirect (TestConformSimpleFixture *fixture,
data.stage = clutter_stage_new ();
data.parent_container = clutter_group_new ();
data.parent_container = clutter_actor_new ();
data.container = g_object_new (foo_group_get_type (), NULL);
data.foo_actor = g_object_new (foo_actor_get_type (), NULL);
clutter_actor_set_size (CLUTTER_ACTOR (data.foo_actor), 100, 100);
clutter_container_add_actor (CLUTTER_CONTAINER (data.container),
clutter_actor_add_child (data.container,
CLUTTER_ACTOR (data.foo_actor));
clutter_container_add_actor (CLUTTER_CONTAINER (data.parent_container),
clutter_actor_add_child (data.parent_container,
data.container);
clutter_container_add_actor (CLUTTER_CONTAINER (data.stage),
clutter_actor_add_child (data.stage,
data.parent_container);
data.child = clutter_rectangle_new ();
data.child = clutter_actor_new ();
clutter_actor_set_size (data.child, 1, 1);
clutter_container_add_actor (CLUTTER_CONTAINER (data.container),
clutter_actor_add_child (data.container,
data.child);
data.unrelated_actor = clutter_rectangle_new ();
data.unrelated_actor = clutter_actor_new ();
clutter_actor_set_size (data.child, 1, 1);
clutter_container_add_actor (CLUTTER_CONTAINER (data.stage),
clutter_actor_add_child (data.stage,
data.unrelated_actor);
clutter_actor_show (data.stage);
@ -345,4 +345,3 @@ actor_offscreen_redirect (TestConformSimpleFixture *fixture,
else if (g_test_verbose ())
g_print ("Skipping\n");
}

40
tests/conform/binding-pool.c
View File

@ -18,20 +18,20 @@ typedef struct _KeyGroupClass KeyGroupClass;
struct _KeyGroup
{
ClutterGroup parent_instance;
ClutterActor parent_instance;
gint selected_index;
};
struct _KeyGroupClass
{
ClutterGroupClass parent_class;
ClutterActorClass parent_class;
void (* activate) (KeyGroup *group,
ClutterActor *child);
};
G_DEFINE_TYPE (KeyGroup, key_group, CLUTTER_TYPE_GROUP);
G_DEFINE_TYPE (KeyGroup, key_group, CLUTTER_TYPE_ACTOR)
enum
{
@ -53,7 +53,7 @@ key_group_action_move_left (KeyGroup *self,
g_assert_cmpstr (action_name, ==, "move-left");
g_assert_cmpint (key_val, ==, CLUTTER_KEY_Left);
n_children = clutter_group_get_n_children (CLUTTER_GROUP (self));
n_children = clutter_actor_get_n_children (CLUTTER_ACTOR (self));
self->selected_index -= 1;
@ -74,7 +74,7 @@ key_group_action_move_right (KeyGroup *self,
g_assert_cmpstr (action_name, ==, "move-right");
g_assert_cmpint (key_val, ==, CLUTTER_KEY_Right);
n_children = clutter_group_get_n_children (CLUTTER_GROUP (self));
n_children = clutter_actor_get_n_children (CLUTTER_ACTOR (self));
self->selected_index += 1;
@ -100,7 +100,7 @@ key_group_action_activate (KeyGroup *self,
if (self->selected_index == -1)
return FALSE;
child = clutter_group_get_nth_child (CLUTTER_GROUP (self),
child = clutter_actor_get_child_at_index (CLUTTER_ACTOR (self),
self->selected_index);
if (child)
@ -138,14 +138,13 @@ static void
key_group_paint (ClutterActor *actor)
{
KeyGroup *self = KEY_GROUP (actor);
GList *children, *l;
ClutterActorIter iter;
ClutterActor *child;
gint i;
children = clutter_container_get_children (CLUTTER_CONTAINER (self));
for (l = children, i = 0; l != NULL; l = l->next, i++)
clutter_actor_iter_init (&iter, actor);
while (clutter_actor_iter_next (&iter, &child))
{
ClutterActor *child = l->data;
/* paint the selection rectangle */
if (i == self->selected_index)
@ -165,8 +164,6 @@ key_group_paint (ClutterActor *actor)
clutter_actor_paint (child);
}
g_list_free (children);
}
static void
@ -267,23 +264,24 @@ binding_pool (TestConformSimpleFixture *fixture,
{
KeyGroup *key_group = g_object_new (TYPE_KEY_GROUP, NULL);
clutter_container_add (CLUTTER_CONTAINER (key_group),
g_object_new (CLUTTER_TYPE_RECTANGLE,
clutter_actor_add_child (CLUTTER_ACTOR (key_group),
g_object_new (CLUTTER_TYPE_ACTOR,
"width", 50.0,
"height", 50.0,
"x", 0.0, "y", 0.0,
NULL),
g_object_new (CLUTTER_TYPE_RECTANGLE,
NULL));
clutter_actor_add_child (CLUTTER_ACTOR (key_group),
g_object_new (CLUTTER_TYPE_ACTOR,
"width", 50.0,
"height", 50.0,
"x", 75.0, "y", 0.0,
NULL),
g_object_new (CLUTTER_TYPE_RECTANGLE,
NULL));
clutter_actor_add_child (CLUTTER_ACTOR (key_group),
g_object_new (CLUTTER_TYPE_ACTOR,
"width", 50.0,
"height", 50.0,
"x", 150.0, "y", 0.0,
NULL),
NULL);
NULL));
g_assert_cmpint (key_group->selected_index, ==, -1);

4
tests/conform/cally-text.c
View File

@ -286,7 +286,7 @@ cally_text (void)
data.label = clutter_text_new_with_text (TEST_FONT, "Lorem ipsum dolor sit amet");
clutter_container_add (CLUTTER_CONTAINER (data.stage), data.label, NULL);
clutter_actor_add_child (data.stage, data.label);
data.offset = 6;
data.extents_x = 64;
data.extents_y = 99;
@ -304,7 +304,7 @@ cally_text (void)
data1.label = clutter_text_new_with_text (TEST_FONT, "");
clutter_text_set_markup (CLUTTER_TEXT(data1.label), "<span fgcolor=\"#FFFF00\" bgcolor=\"#00FF00\"><s>Lorem ipsum dolor sit amet</s></span>");
clutter_container_add (CLUTTER_CONTAINER (data1.stage), data1.label, NULL);
clutter_actor_add_child (data1.stage, data1.label);
data1.offset = 10;
data1.extents_x = 90;
data1.extents_y = 199;

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

@ -137,15 +137,8 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/actor", actor_remove_child);
TEST_CONFORM_SIMPLE ("/actor", actor_remove_all);
TEST_CONFORM_SIMPLE ("/actor", actor_container_signals);
TEST_CONFORM_SIMPLE ("/actor", actor_destruction);
TEST_CONFORM_SIMPLE ("/actor", actor_anchors);
TEST_CONFORM_SIMPLE ("/actor", actor_pick);
TEST_CONFORM_SIMPLE ("/actor", actor_fixed_size);
TEST_CONFORM_SIMPLE ("/actor", actor_preferred_size);
TEST_CONFORM_SIMPLE ("/actor", actor_basic_layout);
TEST_CONFORM_SIMPLE ("/actor", actor_margin_layout);
TEST_CONFORM_SIMPLE ("/actor", actor_offscreen_redirect);
TEST_CONFORM_SIMPLE ("/actor", actor_shader_effect);
TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_children);
TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_remove);
@ -158,16 +151,10 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_realize_not_recursive);
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_map_recursive);
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_mapped);
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_show_on_set_parent);
TEST_CONFORM_SIMPLE ("/actor/invariants", clone_no_map);
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_contains);
TEST_CONFORM_SIMPLE ("/actor/invariants", default_stage);
TEST_CONFORM_SIMPLE ("/actor/invariants", actor_pivot_transformation);
TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_label);
TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_rectangle);
TEST_CONFORM_SIMPLE ("/actor/opacity", opacity_paint);
TEST_CONFORM_SIMPLE ("/text", text_utf8_validation);
TEST_CONFORM_SIMPLE ("/text", text_set_empty);
TEST_CONFORM_SIMPLE ("/text", text_set_text);
@ -179,17 +166,9 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/text", text_cursor);
TEST_CONFORM_SIMPLE ("/text", text_event);
TEST_CONFORM_SIMPLE ("/text", text_get_chars);
TEST_CONFORM_SIMPLE ("/text", text_cache);
TEST_CONFORM_SIMPLE ("/text", text_password_char);
TEST_CONFORM_SIMPLE ("/text", text_idempotent_use_markup);
TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_size);
TEST_CONFORM_SIMPLE ("/rectangle", rectangle_set_color);
TEST_CONFORM_SIMPLE ("/texture", texture_pick_with_alpha);
TEST_CONFORM_SIMPLE ("/texture", texture_fbo);
TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo);
TEST_CONFORM_SIMPLE ("/interval", interval_initial_state);
TEST_CONFORM_SIMPLE ("/interval", interval_transform);
@ -197,12 +176,6 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool);
TEST_CONFORM_SIMPLE ("/model", list_model_populate);
TEST_CONFORM_SIMPLE ("/model", list_model_iterate);
TEST_CONFORM_SIMPLE ("/model", list_model_filter);
TEST_CONFORM_SIMPLE ("/model", list_model_from_script);
TEST_CONFORM_SIMPLE ("/model", list_model_row_changed);
TEST_CONFORM_SIMPLE ("/color", color_from_string_valid);
TEST_CONFORM_SIMPLE ("/color", color_from_string_invalid);
TEST_CONFORM_SIMPLE ("/color", color_to_string);
@ -213,21 +186,6 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/units", units_string);
TEST_CONFORM_SIMPLE ("/units", units_cache);
TEST_CONFORM_SIMPLE ("/group", group_depth_sorting);
TEST_CONFORM_SIMPLE ("/script", script_single);
TEST_CONFORM_SIMPLE ("/script", script_child);
TEST_CONFORM_SIMPLE ("/script", script_implicit_alpha);
TEST_CONFORM_SIMPLE ("/script", script_object_property);
TEST_CONFORM_SIMPLE ("/script", script_animation);
TEST_CONFORM_SIMPLE ("/script", script_named_object);
TEST_CONFORM_SIMPLE ("/script", script_layout_property);
TEST_CONFORM_SIMPLE ("/script", animator_base);
TEST_CONFORM_SIMPLE ("/script", animator_properties);
TEST_CONFORM_SIMPLE ("/script", animator_multi_properties);
TEST_CONFORM_SIMPLE ("/script", state_base);
TEST_CONFORM_SIMPLE ("/script", script_margin);
TEST_CONFORM_SIMPLE ("/timeline", timeline_base);
TEST_CONFORM_SIMPLE ("/timeline", timeline_markers_from_script);
TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_interpolation);
@ -235,10 +193,6 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/timeline", timeline_progress_mode);
TEST_CONFORM_SIMPLE ("/timeline", timeline_progress_step);
TEST_CONFORM_SIMPLE ("/score", score_base);
TEST_CONFORM_SIMPLE ("/behaviours", behaviours_base);
TEST_CONFORM_SIMPLE ("/events", events_touch);
/* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */

2
tests/conform/text-cache.c
View File

@ -271,7 +271,7 @@ text_cache (void)
g_signal_connect (data.stage, "paint", G_CALLBACK (on_paint), &data);
clutter_container_add (CLUTTER_CONTAINER (data.stage), data.label, NULL);
clutter_actor_add_child (data.stage, data.label);
clutter_actor_show (data.stage);

2
tests/conform/timeline-interpolate.c
View File

@ -138,7 +138,7 @@ timeline_interpolation (void)
state.timeline =
clutter_timeline_new (TEST_TIMELINE_DURATION);
clutter_timeline_set_loop (state.timeline, TRUE);
clutter_timeline_set_repeat_count (state.timeline, -1);
g_signal_connect (G_OBJECT(state.timeline),
"new-frame",
G_CALLBACK(new_frame_cb),

4
tests/conform/timeline.c
View File

@ -217,7 +217,7 @@ timeline_base (TestConformSimpleFixture *fixture,
g_strfreev (markers);
timeline_data_init (&data_2, 2);
timeline_2 = clutter_timeline_clone (timeline_1);
timeline_2 = clutter_timeline_new (FRAME_COUNT * 1000 / FPS);
clutter_timeline_add_marker_at_time (timeline_2, "bar", 2 * 1000 / FPS);
markers = clutter_timeline_list_markers (timeline_2, -1, &n_markers);
g_assert (markers != NULL);
@ -226,7 +226,7 @@ timeline_base (TestConformSimpleFixture *fixture,
g_strfreev (markers);
timeline_data_init (&data_3, 3);
timeline_3 = clutter_timeline_clone (timeline_1);
timeline_3 = clutter_timeline_new (FRAME_COUNT * 1000 / FPS);
clutter_timeline_set_direction (timeline_3, CLUTTER_TIMELINE_BACKWARD);
clutter_timeline_add_marker_at_time (timeline_3, "start-marker",
FRAME_COUNT * 1000 / FPS);