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

tests/clutter: Don't test BoxLayout's child properties

Browse source 
They are about to become ex-properties.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1265
This commit is contained in:
Florian Müllner 2020-05-21 13:46:25 +02:00
parent 82d96aebe1
commit a1be7cdbd7
2 changed files with 0 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/tests/clutter/conform/script-parser.c
View file

@ -251,69 +251,6 @@ script_named_object (void)
g_free (test_file);
}
static void
script_layout_property (void)
{
ClutterScript *script = clutter_script_new ();
GObject *manager, *container, *actor1, *actor2;
GError *error = NULL;
gchar *test_file;
gboolean x_fill, expand;
ClutterBoxAlignment y_align;
test_file = g_test_build_filename (G_TEST_DIST, "scripts", "test-script-layout-property.json", NULL);
clutter_script_load_from_file (script, test_file, &error);
if (g_test_verbose () && error)
g_print ("Error: %s", error->message);
g_assert_no_error (error);
manager = container = actor1 = actor2 = NULL;
clutter_script_get_objects (script,
"manager", &manager,
"container", &container,
"actor-1", &actor1,
"actor-2", &actor2,
NULL);
g_assert (CLUTTER_IS_LAYOUT_MANAGER (manager));
g_assert (CLUTTER_IS_CONTAINER (container));
g_assert (CLUTTER_IS_ACTOR (actor1));
g_assert (CLUTTER_IS_ACTOR (actor2));
x_fill = FALSE;
y_align = CLUTTER_BOX_ALIGNMENT_START;
expand = FALSE;
clutter_layout_manager_child_get (CLUTTER_LAYOUT_MANAGER (manager),
CLUTTER_CONTAINER (container),
CLUTTER_ACTOR (actor1),
"x-fill", &x_fill,
"y-align", &y_align,
"expand", &expand,
NULL);
g_assert (x_fill);
g_assert (y_align == CLUTTER_BOX_ALIGNMENT_CENTER);
g_assert (expand);
x_fill = TRUE;
y_align = CLUTTER_BOX_ALIGNMENT_START;
expand = TRUE;
clutter_layout_manager_child_get (CLUTTER_LAYOUT_MANAGER (manager),
CLUTTER_CONTAINER (container),
CLUTTER_ACTOR (actor2),
"x-fill", &x_fill,
"y-align", &y_align,
"expand", &expand,
NULL);
g_assert (x_fill == FALSE);
g_assert (y_align == CLUTTER_BOX_ALIGNMENT_END);
g_assert (expand == FALSE);
g_object_unref (script);
}
static void
script_margin (void)
{
@ -362,6 +299,5 @@ CLUTTER_TEST_SUITE (
CLUTTER_TEST_UNIT ("/script/container-child", script_child)
CLUTTER_TEST_UNIT ("/script/named-object", script_named_object)
CLUTTER_TEST_UNIT ("/script/object-property", script_object_property)
CLUTTER_TEST_UNIT ("/script/layout-property", script_layout_property)
CLUTTER_TEST_UNIT ("/script/actor-margin", script_margin)
)

21
src/tests/clutter/conform/scripts/test-script-layout-property.json
View file

@ -1,21 +0,0 @@
[
{ "id" : "manager", "type" : "ClutterBoxLayout" },
{
"id" : "container", "type" : "ClutterBox",
"layout-manager" : "manager",
"children" : [
{
"id" : "actor-1", "type" : "ClutterRectangle",
"layout::x-fill" : true,
"layout::y-align" : "center",
"layout::expand" : true
}, {
"id" : "actor-2", "type" : "ClutterRectangle",
"layout::x-fill" : false,
"layout::y-align" : "end",
"layout::expand" : false
}
]
}
]