diff options
Diffstat (limited to 'tests/at-spi2-atk/atk_test_action.c')
| -rw-r--r-- | tests/at-spi2-atk/atk_test_action.c | 62 |
1 files changed, 28 insertions, 34 deletions
diff --git a/tests/at-spi2-atk/atk_test_action.c b/tests/at-spi2-atk/atk_test_action.c index 18990c64..b079a8e0 100644 --- a/tests/at-spi2-atk/atk_test_action.c +++ b/tests/at-spi2-atk/atk_test_action.c @@ -26,15 +26,9 @@ #define DATA_FILE TESTS_DATA_DIR "/test-action.xml" static void -teardown_action_test (gpointer fixture, gconstpointer user_data) +atk_test_action_sample_get_interface (TestAppFixture *fixture, gconstpointer user_data) { - terminate_app (); -} - -static void -atk_test_action_sample_get_interface (gpointer fixture, gconstpointer user_data) -{ - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; g_assert_cmpstr (atspi_accessible_get_name (obj, NULL), ==, "root_object"); AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *iface = atspi_accessible_get_action_iface (child); @@ -42,54 +36,54 @@ atk_test_action_sample_get_interface (gpointer fixture, gconstpointer user_data) } static void -atk_test_action_get_action_description (gpointer fixture, gconstpointer user_data) +atk_test_action_get_action_description (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert_cmpstr (atspi_action_get_action_description (action, 0, NULL), ==, "action1 description"); } static void -atk_test_action_get_action_name (gpointer fixture, gconstpointer user_data) +atk_test_action_get_action_name (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert_cmpstr (atspi_action_get_action_name (action, 0, NULL), ==, "action1"); } static void -atk_test_action_get_n_actions (gpointer fixture, gconstpointer user_data) +atk_test_action_get_n_actions (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert_cmpint (atspi_action_get_n_actions (action, NULL), ==, 2); } static void -atk_test_action_get_key_binding (gpointer fixture, gconstpointer user_data) +atk_test_action_get_key_binding (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert_cmpstr (atspi_action_get_key_binding (action, 0, NULL), ==, "action1 key binding"); } static void -atk_test_action_get_localized_name (gpointer fixture, gconstpointer user_data) +atk_test_action_get_localized_name (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert_cmpstr (atspi_action_get_localized_name (action, 0, NULL), ==, "action1"); } static void -atk_test_action_do_action (gpointer fixture, gconstpointer user_data) +atk_test_action_do_action (TestAppFixture *fixture, gconstpointer user_data) { - AtspiAccessible *obj = get_root_obj (DATA_FILE); + AtspiAccessible *obj = fixture->root_obj; AtspiAccessible *child = atspi_accessible_get_child_at_index (obj, 1, NULL); AtspiAction *action = atspi_accessible_get_action_iface (child); g_assert (action != NULL); @@ -103,18 +97,18 @@ atk_test_action_do_action (gpointer fixture, gconstpointer user_data) void atk_test_action (void) { - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_sample_get_interface", - 0, NULL, NULL, atk_test_action_sample_get_interface, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_description", - 0, NULL, NULL, atk_test_action_get_action_description, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_action_name", - 0, NULL, NULL, atk_test_action_get_action_name, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_n_actions", - 0, NULL, NULL, atk_test_action_get_n_actions, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_key_binding", - 0, NULL, NULL, atk_test_action_get_key_binding, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_get_localized_name", - 0, NULL, NULL, atk_test_action_get_localized_name, teardown_action_test); - g_test_add_vtable (ATK_TEST_PATH_ACTION "/atk_test_action_do_action", - 0, NULL, NULL, atk_test_action_do_action, teardown_action_test); + g_test_add ("/action/atk_test_action_sample_get_interface", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_sample_get_interface, fixture_teardown); + g_test_add ("/action/atk_test_action_get_action_description", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_action_description, fixture_teardown); + g_test_add ("/action/atk_test_action_get_action_name", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_action_name, fixture_teardown); + g_test_add ("/action/atk_test_action_get_n_actions", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_n_actions, fixture_teardown); + g_test_add ("/action/atk_test_action_get_key_binding", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_key_binding, fixture_teardown); + g_test_add ("/action/atk_test_action_get_localized_name", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_get_localized_name, fixture_teardown); + g_test_add ("/action/atk_test_action_do_action", + TestAppFixture, DATA_FILE, fixture_setup, atk_test_action_do_action, fixture_teardown); } |