From 9fcbb274e01e4fb5df2d08fddfdfd3b91fe63e4e Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 21 May 2010 14:22:56 +0100 Subject: [PATCH] Do not use wildcards in test-state Use named states, like in a real case. --- tests/conform/test-state.c | 6 +++--- tests/data/test-state-1.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/conform/test-state.c b/tests/conform/test-state.c index 8124437..0552ff9 100644 --- a/tests/conform/test-state.c +++ b/tests/conform/test-state.c @@ -36,13 +36,13 @@ test_state_base (TestConformSimpleFixture *fixture G_GNUC_UNUSED, g_assert (g_list_find (states, g_intern_static_string ("clicked"))); g_list_free (states); - duration = clutter_state_get_duration (CLUTTER_STATE (state), "*", "clicked"); + duration = clutter_state_get_duration (CLUTTER_STATE (state), "base", "clicked"); g_assert_cmpint (duration, ==, 250); - duration = clutter_state_get_duration (CLUTTER_STATE (state), "clicked", "*"); + duration = clutter_state_get_duration (CLUTTER_STATE (state), "clicked", "base"); g_assert_cmpint (duration, ==, 150); - keys = clutter_state_get_keys (CLUTTER_STATE (state), "*", "clicked", + keys = clutter_state_get_keys (CLUTTER_STATE (state), "base", "clicked", clutter_script_get_object (script, "rect"), "opacity"); g_assert (keys != NULL); diff --git a/tests/data/test-state-1.json b/tests/data/test-state-1.json index ad4f3fa..78ab5de 100644 --- a/tests/data/test-state-1.json +++ b/tests/data/test-state-1.json @@ -11,7 +11,7 @@ "transitions" : [ { - "source" : "*", + "source" : "base", "target" : "clicked", "duration" : 250, @@ -21,7 +21,7 @@ }, { "source" : "clicked", - "target" : "*", + "target" : "base", "duration" : 150, "keys" : [ -- 2.7.4