aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-03-27 13:51:13 -0400
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-05 11:10:26 +0200
commit624925fe6e9c72c639d47135d5ea70d4110ac1fe (patch)
treeb57c12a611bf3b4b492327a7fcb5722cd39dad5b
parenttests: remove duplicated eina mempool test (diff)
downloadefl-624925fe6e9c72c639d47135d5ea70d4110ac1fe.tar.gz
tests: move to using checked fixtures for all test suites
individual tests should not need to explicitly call init/shutdown functions in most cases, and many did not properly do this anyway see followup commit which resolves some issues with eina tests ref https://phab.enlightenment.org/T6813 ref https://phab.enlightenment.org/T6811 Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
-rw-r--r--src/tests/ecore/ecore_suite.c13
-rw-r--r--src/tests/ecore/ecore_test_animator.c8
-rw-r--r--src/tests/ecore/ecore_test_args.c6
-rw-r--r--src/tests/ecore/ecore_test_ecore.c93
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c8
-rw-r--r--src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c33
-rw-r--r--src/tests/ecore/ecore_test_job.c4
-rw-r--r--src/tests/ecore/ecore_test_promise.c63
-rw-r--r--src/tests/ecore/ecore_test_promise2.c14
-rw-r--r--src/tests/ecore/ecore_test_timer.c15
-rw-r--r--src/tests/ecore/efl_app_suite.c2
-rw-r--r--src/tests/ecore_con/ecore_con_suite.c13
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con.c44
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con_eet.c8
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con_url.c16
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c62
-rw-r--r--src/tests/ector/suite/ector_suite.c13
-rw-r--r--src/tests/ector/suite/ector_test_init.c2
-rw-r--r--src/tests/edje/edje_suite.c13
-rw-r--r--src/tests/edje/edje_test_edje.c7
-rw-r--r--src/tests/eet/eet_suite.c13
-rw-r--r--src/tests/eet/eet_test_cache.c2
-rw-r--r--src/tests/eet/eet_test_cipher.c4
-rw-r--r--src/tests/eet/eet_test_connection.c4
-rw-r--r--src/tests/eet/eet_test_data.c34
-rw-r--r--src/tests/eet/eet_test_file.c12
-rw-r--r--src/tests/eet/eet_test_identity.c12
-rw-r--r--src/tests/eet/eet_test_image.c6
-rw-r--r--src/tests/eet/eet_test_init.c7
-rw-r--r--src/tests/eeze/eeze_suite.c13
-rw-r--r--src/tests/eeze/eeze_test_init.c7
-rw-r--r--src/tests/eeze/eeze_test_net.c21
-rw-r--r--src/tests/eeze/eeze_test_sensor.c24
-rw-r--r--src/tests/eeze/eeze_test_udev.c21
-rw-r--r--src/tests/efl/efl_suite.c14
-rw-r--r--src/tests/efl/efl_test_model_composite.c10
-rw-r--r--src/tests/efl/efl_test_model_container.c5
-rw-r--r--src/tests/efl_check.h9
-rw-r--r--src/tests/efreet/efreet_suite.c13
-rw-r--r--src/tests/efreet/efreet_test_efreet.c7
-rw-r--r--src/tests/efreet/efreet_test_efreet_cache.c8
-rw-r--r--src/tests/eina/eina_suite.c34
-rw-r--r--src/tests/eina/eina_test_abi.c7
-rw-r--r--src/tests/eina/eina_test_accessor.c5
-rw-r--r--src/tests/eina/eina_test_array.c9
-rw-r--r--src/tests/eina/eina_test_barrier.c4
-rw-r--r--src/tests/eina/eina_test_bezier.c16
-rw-r--r--src/tests/eina/eina_test_binbuf.c22
-rw-r--r--src/tests/eina/eina_test_binshare.c16
-rw-r--r--src/tests/eina/eina_test_convert.c3
-rw-r--r--src/tests/eina/eina_test_counter.c6
-rw-r--r--src/tests/eina/eina_test_error.c15
-rw-r--r--src/tests/eina/eina_test_file.c32
-rw-r--r--src/tests/eina/eina_test_fp.c12
-rw-r--r--src/tests/eina/eina_test_freeq.c11
-rw-r--r--src/tests/eina/eina_test_hash.c28
-rw-r--r--src/tests/eina/eina_test_inarray.c21
-rw-r--r--src/tests/eina/eina_test_inlist.c9
-rw-r--r--src/tests/eina/eina_test_iterator.c12
-rw-r--r--src/tests/eina/eina_test_list.c14
-rw-r--r--src/tests/eina/eina_test_lock.c6
-rw-r--r--src/tests/eina/eina_test_log.c16
-rw-r--r--src/tests/eina/eina_test_magic.c2
-rw-r--r--src/tests/eina/eina_test_main.c11
-rw-r--r--src/tests/eina/eina_test_matrix.c14
-rw-r--r--src/tests/eina/eina_test_matrixsparse.c6
-rw-r--r--src/tests/eina/eina_test_module.c8
-rw-r--r--src/tests/eina/eina_test_quad.c2
-rw-r--r--src/tests/eina/eina_test_quadtree.c2
-rw-r--r--src/tests/eina/eina_test_quaternion.c33
-rw-r--r--src/tests/eina/eina_test_rbtree.c4
-rw-r--r--src/tests/eina/eina_test_rectangle.c6
-rw-r--r--src/tests/eina/eina_test_safepointer.c6
-rw-r--r--src/tests/eina/eina_test_sched.c2
-rw-r--r--src/tests/eina/eina_test_simple_xml_parser.c8
-rw-r--r--src/tests/eina/eina_test_slice.c2
-rw-r--r--src/tests/eina/eina_test_slstr.c16
-rw-r--r--src/tests/eina/eina_test_str.c14
-rw-r--r--src/tests/eina/eina_test_strbuf.c26
-rw-r--r--src/tests/eina/eina_test_tiler.c10
-rw-r--r--src/tests/eina/eina_test_tmpstr.c10
-rw-r--r--src/tests/eina/eina_test_trash.c2
-rw-r--r--src/tests/eina/eina_test_ustr.c20
-rw-r--r--src/tests/eina/eina_test_ustringshare.c6
-rw-r--r--src/tests/eina/eina_test_value.c54
-rw-r--r--src/tests/eina/eina_test_vector.c4
-rw-r--r--src/tests/eina/eina_test_vpath.c11
-rw-r--r--src/tests/eina/eina_test_xattr.c6
-rw-r--r--src/tests/eio/eio_suite.c14
-rw-r--r--src/tests/eldbus/eldbus_suite.c14
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_init.c45
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_message.c20
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c26
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_connection.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_object.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_proxy.c2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c3
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_object.c20
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c21
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_data.c19
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_proxy.c19
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_signal_handler.c22
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c4
-rw-r--r--src/tests/elementary/efl_ui_suite.c12
-rw-r--r--src/tests/elementary/elm_suite.c16
-rw-r--r--src/tests/elementary/elm_test_actionslider.c6
-rw-r--r--src/tests/elementary/elm_test_atspi.c55
-rw-r--r--src/tests/elementary/elm_test_bg.c5
-rw-r--r--src/tests/elementary/elm_test_box.c6
-rw-r--r--src/tests/elementary/elm_test_bubble.c6
-rw-r--r--src/tests/elementary/elm_test_button.c9
-rw-r--r--src/tests/elementary/elm_test_calendar.c6
-rw-r--r--src/tests/elementary/elm_test_check.c12
-rw-r--r--src/tests/elementary/elm_test_clock.c6
-rw-r--r--src/tests/elementary/elm_test_colorselector.c9
-rw-r--r--src/tests/elementary/elm_test_config.c12
-rw-r--r--src/tests/elementary/elm_test_conformant.c6
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c6
-rw-r--r--src/tests/elementary/elm_test_datetime.c6
-rw-r--r--src/tests/elementary/elm_test_dayselector.c6
-rw-r--r--src/tests/elementary/elm_test_diskselector.c6
-rw-r--r--src/tests/elementary/elm_test_entry.c36
-rw-r--r--src/tests/elementary/elm_test_fileselector.c10
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c6
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c6
-rw-r--r--src/tests/elementary/elm_test_flip.c6
-rw-r--r--src/tests/elementary/elm_test_flipselector.c6
-rw-r--r--src/tests/elementary/elm_test_focus.c96
-rw-r--r--src/tests/elementary/elm_test_focus_sub.c12
-rw-r--r--src/tests/elementary/elm_test_frame.c6
-rw-r--r--src/tests/elementary/elm_test_gengrid.c9
-rw-r--r--src/tests/elementary/elm_test_genlist.c14
-rw-r--r--src/tests/elementary/elm_test_glview.c6
-rw-r--r--src/tests/elementary/elm_test_grid.c6
-rw-r--r--src/tests/elementary/elm_test_hover.c6
-rw-r--r--src/tests/elementary/elm_test_hoversel.c6
-rw-r--r--src/tests/elementary/elm_test_icon.c6
-rw-r--r--src/tests/elementary/elm_test_image.c15
-rw-r--r--src/tests/elementary/elm_test_index.c6
-rw-r--r--src/tests/elementary/elm_test_init.c5
-rw-r--r--src/tests/elementary/elm_test_inwin.c6
-rw-r--r--src/tests/elementary/elm_test_label.c6
-rw-r--r--src/tests/elementary/elm_test_layout.c12
-rw-r--r--src/tests/elementary/elm_test_list.c38
-rw-r--r--src/tests/elementary/elm_test_map.c6
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c6
-rw-r--r--src/tests/elementary/elm_test_menu.c6
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c6
-rw-r--r--src/tests/elementary/elm_test_naviframe.c6
-rw-r--r--src/tests/elementary/elm_test_notify.c6
-rw-r--r--src/tests/elementary/elm_test_panel.c6
-rw-r--r--src/tests/elementary/elm_test_panes.c6
-rw-r--r--src/tests/elementary/elm_test_photo.c6
-rw-r--r--src/tests/elementary/elm_test_photocam.c9
-rw-r--r--src/tests/elementary/elm_test_player.c6
-rw-r--r--src/tests/elementary/elm_test_plug.c6
-rw-r--r--src/tests/elementary/elm_test_popup.c6
-rw-r--r--src/tests/elementary/elm_test_prefs.c6
-rw-r--r--src/tests/elementary/elm_test_progressbar.c6
-rw-r--r--src/tests/elementary/elm_test_radio.c6
-rw-r--r--src/tests/elementary/elm_test_scroller.c6
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c6
-rw-r--r--src/tests/elementary/elm_test_separator.c6
-rw-r--r--src/tests/elementary/elm_test_slider.c6
-rw-r--r--src/tests/elementary/elm_test_slideshow.c6
-rw-r--r--src/tests/elementary/elm_test_spinner.c6
-rw-r--r--src/tests/elementary/elm_test_table.c6
-rw-r--r--src/tests/elementary/elm_test_thumb.c6
-rw-r--r--src/tests/elementary/elm_test_toolbar.c6
-rw-r--r--src/tests/elementary/elm_test_video.c6
-rw-r--r--src/tests/elementary/elm_test_web.c6
-rw-r--r--src/tests/elementary/elm_test_win.c26
-rw-r--r--src/tests/elput/elput_suite.c13
-rw-r--r--src/tests/elput/elput_test_elput.c7
-rw-r--r--src/tests/elua/elua_lib.c4
-rw-r--r--src/tests/elua/elua_suite.c13
-rw-r--r--src/tests/emile/emile_suite.c13
-rw-r--r--src/tests/emile/emile_test_base.c2
-rw-r--r--src/tests/eo/suite/eo_suite.c13
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c8
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c4
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c12
-rw-r--r--src/tests/eo/suite/eo_test_event.c6
-rw-r--r--src/tests/eo/suite/eo_test_general.c50
-rw-r--r--src/tests/eo/suite/eo_test_init.c4
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c2
-rw-r--r--src/tests/eo/suite/eo_test_value.c2
-rw-r--r--src/tests/eolian/eolian_parsing.c44
-rw-r--r--src/tests/eolian/eolian_suite.c13
-rw-r--r--src/tests/evas/evas_suite.c18
-rw-r--r--src/tests/evas/evas_test_callbacks.c1
-rw-r--r--src/tests/evas/evas_test_evasgl.c2
-rw-r--r--src/tests/evas/evas_test_filters.c2
-rw-r--r--src/tests/evas/evas_test_image.c10
-rw-r--r--src/tests/evas/evas_test_mask.c3
-rw-r--r--src/tests/evas/evas_test_mesh.c1
-rw-r--r--src/tests/evas/evas_test_object.c2
-rw-r--r--src/tests/evas/evas_test_object_smart.c1
-rw-r--r--src/tests/evas/evas_test_text.c1
-rw-r--r--src/tests/evas/evas_test_textblock.c1
-rw-r--r--src/tests/evas/evas_tests_helpers.h2
-rw-r--r--src/tests/evil/evil_suite.c14
-rw-r--r--src/tests/evil/evil_test_dlfcn.c4
-rw-r--r--src/tests/evil/evil_test_main.c2
-rw-r--r--src/tests/evil/evil_test_unistd.c6
206 files changed, 289 insertions, 2200 deletions
diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c
index eb81132366..4d619f141e 100644
--- a/src/tests/ecore/ecore_suite.c
+++ b/src/tests/ecore/ecore_suite.c
@@ -4,6 +4,7 @@
#include "ecore_suite.h"
#include "../efl_check.h"
+#include <Ecore.h>
static const Efl_Test_Case etc[] = {
{ "Ecore", ecore_test_ecore },
@@ -33,6 +34,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(ecore)
+{
+ ck_assert_int_eq(ecore_init(), 1);
+}
+
+SUITE_SHUTDOWN(ecore)
+{
+ ck_assert_int_eq(ecore_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -46,7 +57,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Ecore", etc);
+ "Ecore", etc, SUITE_INIT_FN(ecore), SUITE_SHUTDOWN_FN(ecore));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index 1ec956a2ff..cbd790ea9a 100644
--- a/src/tests/ecore/ecore_test_animator.c
+++ b/src/tests/ecore/ecore_test_animator.c
@@ -27,8 +27,6 @@ EFL_START_TEST(ecore_test_animators)
double interval1 = 0.02;
double interval2 = 0.01;
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-
ecore_animator_frametime_set(interval1);
animator = ecore_animator_timeline_add(1, _anim_cb, &interval1);
@@ -43,8 +41,6 @@ EFL_START_TEST(ecore_test_animators)
ecore_main_loop_begin();
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -132,8 +128,6 @@ EFL_START_TEST(ecore_test_begin_end_tick)
Eina_Bool is_begin_cb_called = EINA_FALSE;
Eina_Bool is_end_cb_called = EINA_FALSE;
- ecore_init();
-
ecore_animator_custom_source_tick_begin_callback_set(_animator_called_cb, &is_begin_cb_called);
ecore_animator_custom_source_tick_end_callback_set(_animator_called_cb, &is_end_cb_called);
@@ -153,8 +147,6 @@ EFL_START_TEST(ecore_test_begin_end_tick)
fail_if(!is_begin_cb_called);
fail_if(!is_end_cb_called);
fail_if(!is_animator_cb_called);
-
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index 75a9b7dc28..44fc033b8c 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -26,12 +26,10 @@ _cb_args1(void *data EINA_UNUSED, const Efl_Event *event)
EFL_START_TEST(ecore_test_args1)
{
- ecore_init();
efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args1, NULL);
ecore_loop_arguments_send(8, args);
ecore_main_loop_begin();
- ecore_shutdown();
}
EFL_END_TEST
@@ -51,12 +49,10 @@ EFL_START_TEST(ecore_test_args2)
"hello world"
};
- ecore_init();
efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args2, NULL);
ecore_loop_arguments_send(1, simple_args);
ecore_main_loop_begin();
- ecore_shutdown();
}
EFL_END_TEST
@@ -71,12 +67,10 @@ _cb_args3(void *data EINA_UNUSED, const Efl_Event *event)
EFL_START_TEST(ecore_test_args3)
{
- ecore_init();
efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
_cb_args3, NULL);
ecore_loop_arguments_send(0, NULL);
ecore_main_loop_begin();
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index acce1cc3d4..a09b09452c 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -33,13 +33,6 @@ _dummy_cb(void *data)
EFL_START_TEST(ecore_test_ecore_init)
{
- int ret;
-
- ret = ecore_init();
- fail_if(ret < 1);
-
- ret = ecore_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
@@ -47,10 +40,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop)
{
Eina_Bool did = EINA_FALSE;
Ecore_Timer *timer;
- int ret;
-
- ret = ecore_init();
- fail_if(ret < 1);
timer = ecore_timer_add(0.0, _quit_cb, &did);
fail_if(timer == NULL);
@@ -58,8 +47,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop)
ecore_main_loop_begin();
fail_if(did == EINA_FALSE);
-
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -67,10 +54,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idler)
{
Eina_Bool did = EINA_FALSE;
Ecore_Idler *idler;
- int ret;
-
- ret = ecore_init();
- fail_if(ret < 1);
idler = ecore_idler_add(_quit_cb, &did);
fail_if(idler == NULL);
@@ -78,8 +61,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idler)
ecore_main_loop_begin();
fail_if(did == EINA_FALSE);
-
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -87,10 +68,7 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_enterer)
{
Eina_Bool did = EINA_FALSE;
Ecore_Idle_Enterer *idle_enterer;
- int ret;
- ret = ecore_init();
- fail_if(ret < 1);
idle_enterer = ecore_idle_enterer_add(_quit_cb, &did);
fail_if(idle_enterer == NULL);
@@ -99,7 +77,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_enterer)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -107,10 +84,7 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_before_enterer)
{
Eina_Bool did = EINA_FALSE;
Ecore_Idle_Enterer *idle_enterer;
- int ret;
- ret = ecore_init();
- fail_if(ret < 1);
idle_enterer = ecore_idle_enterer_before_add(_quit_cb, &did);
fail_if(idle_enterer == NULL);
@@ -119,7 +93,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_before_enterer)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -128,10 +101,7 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_exiter)
Eina_Bool did = EINA_FALSE;
Ecore_Timer *timer;
Ecore_Idle_Exiter *idle_exiter;
- int ret;
- ret = ecore_init();
- fail_if(ret < 1);
/* make system exit idle */
timer = ecore_timer_add(0.0, _dummy_cb, (void *)(long)0);
@@ -144,7 +114,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_idle_exiter)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -153,10 +122,7 @@ EFL_START_TEST(ecore_test_ecore_main_loop_timer)
Eina_Bool did = EINA_FALSE;
Ecore_Timer *timer;
double start, end, elapsed;
- int ret;
- ret = ecore_init();
- fail_if(ret < 1);
timer = ecore_timer_add(2.0, _quit_cb, &did);
fail_if(timer == NULL);
@@ -170,7 +136,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_timer)
fail_if(elapsed < 2.0);
fail_if(elapsed > 3.0); /* 1 second "error margin" */
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -207,12 +172,8 @@ static Eina_Bool _timer1(void *data)
EFL_START_TEST(ecore_test_ecore_main_loop_timer_inner)
{
Ecore_Timer *timer;
- int ret;
int times = 0;
- ret = ecore_init();
- fail_if(ret < 1);
-
timer = ecore_timer_add(1.0, _timer1, &times);
fail_if(timer == NULL);
@@ -221,8 +182,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_timer_inner)
/*END: outer mainloop */
fail_if(times != 1);
-
- ecore_shutdown();
}
EFL_END_TEST
#endif
@@ -245,9 +204,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler)
int comm[2];
int ret;
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = pipe(comm);
fail_if(ret != 0);
@@ -265,7 +221,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -275,9 +230,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_valid_flags)
int comm[2];
int ret;
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = pipe(comm);
fail_if(ret != 0);
@@ -290,8 +242,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_valid_flags)
close(comm[0]);
close(comm[1]);
-
- ecore_shutdown();
}
EFL_END_TEST
@@ -311,9 +261,6 @@ EFL_START_TEST(ecore_test_efl_loop_fd)
int comm[2];
int ret;
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = pipe(comm);
fail_if(ret != 0);
@@ -332,7 +279,6 @@ EFL_START_TEST(ecore_test_efl_loop_fd)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -354,9 +300,6 @@ EFL_START_TEST(ecore_test_efl_loop_fd_lifecycle)
efl_object_init();
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = pipe(comm);
fail_if(ret != 0);
@@ -378,7 +321,8 @@ EFL_START_TEST(ecore_test_efl_loop_fd_lifecycle)
fail_if(did == EINA_FALSE);
fail_if(dead == EINA_TRUE);
- ret = ecore_shutdown();
+ ecore_shutdown();
+ ecore_init();
efl_del(fd);
fail_if(dead == EINA_FALSE);
@@ -394,9 +338,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_activate_modify)
int comm[2];
int ret;
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = pipe(comm);
fail_if(ret != 0);
@@ -416,7 +357,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_activate_modify)
fail_if(did != EINA_TRUE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -532,15 +472,11 @@ EFL_START_TEST(ecore_test_ecore_main_loop_event)
Ecore_Event_Filter *filter_handler;
Ecore_Event *event;
Ecore_Event *event2;
- int res_counter;
int type, type2;
int *ev = NULL;
int did = 0;
int filter = 0;
- res_counter = ecore_init();
- fail_if(res_counter < 1);
-
/* Create 2 new event types */
type = ecore_event_type_new();
fail_if(type < 1);
@@ -627,8 +563,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_event)
/* Filter counter shouldn't change */
fail_if(filter != 0); // 0
-
- res_counter = ecore_shutdown();
}
EFL_END_TEST
@@ -678,14 +612,10 @@ EFL_START_TEST(ecore_test_ecore_main_loop_event_recursive)
*/
Ecore_Event *e;
int type;
- int ret;
_log_dom = eina_log_domain_register("test", EINA_COLOR_CYAN);
INF("main: begin");
- ret = ecore_init();
- fail_if(ret < 1);
-
type = ecore_event_type_new();
ecore_event_handler_add(type, _event_recursive_cb, NULL);
@@ -696,24 +626,18 @@ EFL_START_TEST(ecore_test_ecore_main_loop_event_recursive)
INF(" main loop end");
INF("main: end");
- ecore_shutdown();
}
EFL_END_TEST
#endif
EFL_START_TEST(ecore_test_ecore_app)
{
- int ret;
-
int argc_in = 2;
const char *argv_in[] = {"arg_str_1", "arg_str2"};
int argc_out = 0;
char **argv_out = NULL;
- ret = ecore_init();
- fail_if(ret < 1);
-
ecore_app_args_set(argc_in, argv_in);
ecore_app_args_get(&argc_out, &argv_out);
@@ -724,7 +648,6 @@ EFL_START_TEST(ecore_test_ecore_app)
fail_if( 0 != strcmp(argv_in[i], argv_out[i]) );
}
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -737,8 +660,6 @@ Eina_Bool _poller_cb(void *data)
EFL_START_TEST(ecore_test_ecore_main_loop_poller)
{
- int ret;
-
Ecore_Poller *poll1_ptr = NULL;
int poll1_interval = 1;
int poll1_counter = 0;
@@ -753,9 +674,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_poller)
Eina_Bool did = EINA_FALSE;
- ret = ecore_init();
- fail_if(ret < 1);
-
/* Check ECORE_POLLER_CORE poll interval */
double interval = 1.0;
ecore_poller_poll_interval_set(ECORE_POLLER_CORE, interval);
@@ -789,7 +707,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_poller)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
@@ -828,13 +745,10 @@ Eina_Bool _poller_loop(void *data)
EFL_START_TEST(ecore_test_ecore_main_loop_poller_add_del)
{
- int ret, count_res = 0;
+ int count_res = 0;
Eina_Bool did = EINA_FALSE;
- ret = ecore_init();
- fail_if(ret < 1);
-
/* Create renewable main poller */
Ecore_Poller *poll_ptr = ecore_poller_add(ECORE_POLLER_CORE, 1, _poller_loop, &count_res);
@@ -853,7 +767,6 @@ EFL_START_TEST(ecore_test_ecore_main_loop_poller_add_del)
fail_if(did == EINA_FALSE);
- ret = ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 6447e91431..69bbaf66ed 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -601,12 +601,6 @@ void setup(void)
{
int ret;
- ret = eina_init();
- ck_assert_int_eq(ret, 1);
-
- ret = ecore_init();
- fail_if(ret < 1);
-
ret = ecore_audio_init();
ck_assert_int_eq(ret, 1);
}
@@ -614,8 +608,6 @@ void setup(void)
void teardown(void)
{
ecore_audio_shutdown();
- ecore_shutdown();
- eina_shutdown();
}
void
diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
index a787b97465..13120e4f49 100644
--- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
+++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
@@ -73,9 +73,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t1)
{
int val = 99;
- eina_init();
- ecore_init();
-
thq1 = eina_thread_queue_new();
if (!thq1) fail();
thq2 = eina_thread_queue_new();
@@ -101,8 +98,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t1)
if (val == 1000) break;
}
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -144,9 +139,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t2)
int i, mcount;
Ecore_Thread *th;
- eina_init();
- ecore_init();
-
thq1 = eina_thread_queue_new();
if (!thq1) fail();
th = ecore_thread_feedback_run(thspeed2_do, NULL, NULL, NULL, NULL, EINA_TRUE);
@@ -166,8 +158,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t2)
}
printf("%i messages sent\n", i);
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -221,9 +211,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t3)
int val1 = 99, val2 = 99, cnt = 0;
Eina_Thread_Queue *parent;
- eina_init();
- ecore_init();
-
thq1 = eina_thread_queue_new();
if (!thq1) fail();
thq2 = eina_thread_queue_new();
@@ -282,8 +269,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t3)
}
printf("enough msgs\n");
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -335,9 +320,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t4)
{
int cnt = 0;
int val1 = 99, val2 = 9999;
-
- eina_init();
- ecore_init();
thq1 = eina_thread_queue_new();
if (!thq1) fail();
ecore_thread_feedback_run(th41_do, NULL, NULL, NULL, NULL, EINA_TRUE);
@@ -372,8 +354,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t4)
}
printf("msgs ok\n");
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -439,7 +419,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t5)
{
int val = 99;
- ecore_init();
eina_semaphore_new(&th4_sem, 0);
thq1 = eina_thread_queue_new();
@@ -481,8 +460,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t5)
eina_semaphore_free(&th4_sem);
eina_thread_queue_free(thq1);
eina_thread_queue_free(thq2);
-
- ecore_shutdown();
}
EFL_END_TEST
@@ -588,9 +565,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)
if (DEBUG) setbuf(stdout, NULL);
- eina_init();
- ecore_init();
-
eina_semaphore_new(&th6_sem, 0);
eina_spinlock_new(&msgnum_lock);
thq1 = eina_thread_queue_new();
@@ -628,8 +602,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)
eina_thread_queue_free(thq1);
eina_spinlock_free(&msgnum_lock);
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -662,9 +634,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7)
void *ref;
int msgcnt = 0, ret;
- eina_init();
- ecore_init();
-
thq1 = eina_thread_queue_new();
if (!thq1) fail();
if (pipe(p) != 0)
@@ -694,8 +663,6 @@ EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7)
}
printf("msg fd ok\n");
- ecore_shutdown();
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_job.c b/src/tests/ecore/ecore_test_job.c
index 496b4493a7..5a2d6f3f75 100644
--- a/src/tests/ecore/ecore_test_job.c
+++ b/src/tests/ecore/ecore_test_job.c
@@ -19,16 +19,12 @@ EFL_START_TEST(ecore_test_job)
Eina_Bool bob = EINA_FALSE;
Ecore_Job *job;
- ecore_init();
-
job = ecore_job_add(&_ecore_quit, &bob);
fail_if(!job);
ecore_main_loop_begin();
fail_if(bob != EINA_TRUE);
-
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_promise.c b/src/tests/ecore/ecore_test_promise.c
index 90b96f396c..83c34b632b 100644
--- a/src/tests/ecore/ecore_test_promise.c
+++ b/src/tests/ecore/ecore_test_promise.c
@@ -64,8 +64,6 @@ EFL_START_TEST(efl_test_promise_future_success)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -91,7 +89,6 @@ EFL_START_TEST(efl_test_promise_future_success)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -104,8 +101,6 @@ EFL_START_TEST(efl_test_promise_future_success_before_get)
Eina_Bool deadf = EINA_FALSE, deadp = EINA_FALSE;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -131,7 +126,6 @@ EFL_START_TEST(efl_test_promise_future_success_before_get)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -144,8 +138,6 @@ EFL_START_TEST(efl_test_promise_future_cancel)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -175,7 +167,6 @@ EFL_START_TEST(efl_test_promise_future_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -189,8 +180,6 @@ EFL_START_TEST(efl_test_promise_before_future_success)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -214,7 +203,6 @@ EFL_START_TEST(efl_test_promise_before_future_success)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -227,8 +215,6 @@ EFL_START_TEST(efl_test_promise_before_future_cancel)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -257,7 +243,6 @@ EFL_START_TEST(efl_test_promise_before_future_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -308,8 +293,6 @@ EFL_START_TEST(efl_test_promise_future_chain_success)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -341,7 +324,6 @@ EFL_START_TEST(efl_test_promise_future_chain_success)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -355,8 +337,6 @@ EFL_START_TEST(efl_test_promise_future_chain_cancel)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -392,7 +372,6 @@ EFL_START_TEST(efl_test_promise_future_chain_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -407,8 +386,6 @@ EFL_START_TEST(efl_test_promise_future_multi_success)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -438,7 +415,6 @@ EFL_START_TEST(efl_test_promise_future_multi_success)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -452,8 +428,6 @@ EFL_START_TEST(efl_test_promise_future_multi_success_noref)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -481,7 +455,6 @@ EFL_START_TEST(efl_test_promise_future_multi_success_noref)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -495,8 +468,6 @@ EFL_START_TEST(efl_test_promise_future_multi_cancel)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -528,7 +499,6 @@ EFL_START_TEST(efl_test_promise_future_multi_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -543,8 +513,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_success)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -572,7 +540,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_success)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -586,8 +553,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_success_noref)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -613,7 +578,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_success_noref)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -628,8 +592,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_cancel)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -665,7 +627,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -680,8 +641,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_cancel_noref)
int progress = 7;
int value = 42;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -717,7 +676,6 @@ EFL_START_TEST(efl_test_promise_before_future_multi_cancel_noref)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -740,8 +698,6 @@ EFL_START_TEST(efl_test_promise_future_optional_success)
cleanup = EINA_FALSE;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -766,7 +722,6 @@ EFL_START_TEST(efl_test_promise_future_optional_success)
fail_if(!deadp || !cleanup);
- ecore_shutdown();
}
EFL_END_TEST
@@ -780,8 +735,6 @@ EFL_START_TEST(efl_test_promise_future_optional_cancel)
cleanup = EINA_FALSE;
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
fail_if(!p);
@@ -810,7 +763,6 @@ EFL_START_TEST(efl_test_promise_future_optional_cancel)
fail_if(!deadp);
- ecore_shutdown();
}
EFL_END_TEST
@@ -841,8 +793,6 @@ EFL_START_TEST(efl_test_promise_all)
Future_Ok donea = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
Future_Ok donep1 = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
- ecore_init();
-
p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
@@ -881,7 +831,6 @@ EFL_START_TEST(efl_test_promise_all)
efl_del(p2);
efl_del(p3);
- ecore_shutdown();
}
EFL_END_TEST
@@ -891,8 +840,6 @@ EFL_START_TEST(efl_test_promise_all_after_value_set)
Efl_Future *all = NULL, *f1, *f2, *f3;
Future_Ok donea = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
- ecore_init();
-
p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
@@ -925,7 +872,6 @@ EFL_START_TEST(efl_test_promise_all_after_value_set)
efl_del(p2);
efl_del(p3);
- ecore_shutdown();
}
EFL_END_TEST
@@ -949,8 +895,6 @@ EFL_START_TEST(efl_test_promise_race)
Future_Ok donea = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
Future_Ok donep1 = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
- ecore_init();
-
p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p3 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
@@ -977,7 +921,6 @@ EFL_START_TEST(efl_test_promise_race)
efl_del(p2);
efl_del(p3);
- ecore_shutdown();
}
EFL_END_TEST
@@ -987,8 +930,6 @@ EFL_START_TEST(efl_test_future_link)
Efl_Future *f;
Eo *o;
- ecore_init();
-
o = efl_add(EFL_LOOP_TIMER_CLASS, efl_main_loop_get(),
efl_loop_timer_interval_set(efl_added, 0.0));
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
@@ -1007,7 +948,6 @@ EFL_START_TEST(efl_test_future_link)
efl_del(o);
efl_del(p);
- ecore_shutdown();
}
EFL_END_TEST
@@ -1024,8 +964,6 @@ EFL_START_TEST(efl_test_recursive_mess)
Efl_Promise *p;
Future_Ok done = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
- ecore_init();
-
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
efl_future_use(&recursive_future, efl_promise_future_get(p));
efl_future_then(recursive_future, _then_cleanup, _cancel, NULL, &done);
@@ -1036,7 +974,6 @@ EFL_START_TEST(efl_test_recursive_mess)
efl_del(p);
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/ecore_test_promise2.c b/src/tests/ecore/ecore_test_promise2.c
index 5cc28aed50..d93a3e2551 100644
--- a/src/tests/ecore/ecore_test_promise2.c
+++ b/src/tests/ecore/ecore_test_promise2.c
@@ -1316,9 +1316,23 @@ EFL_END_TEST
#endif
+static void
+promise_init(void)
+{
+ /* enable ecore init count manipulation for these tests */
+ ecore_shutdown();
+}
+
+static void
+promise_shutdown(void)
+{
+ /* enable ecore init count manipulation for these tests */
+ ecore_init();
+}
void ecore_test_ecore_promise2(TCase *tc)
{
+ tcase_add_checked_fixture(tc, promise_init, promise_shutdown);
tcase_add_test(tc, efl_test_timeout);
tcase_add_test(tc, efl_test_job);
tcase_add_test(tc, efl_test_idle);
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 760a287230..0004c0f420 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -162,8 +162,6 @@ EFL_START_TEST(ecore_test_timers)
.precision = {0.01, 0.02, 0.03}
};
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-
timer.timer1 = ecore_timer_add(TIMEOUT_1, _timer1_cb, &timer);
timer.timer2 = ecore_timer_add(TIMEOUT_2, _timer2_cb, &timer);
timer.add_timer2++;
@@ -185,9 +183,6 @@ EFL_START_TEST(ecore_test_timers)
ecore_timer_del(timer.timer4);
if (timer.timer5)
ecore_timer_del(timer.timer5);
-
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -216,17 +211,12 @@ EFL_START_TEST(ecore_test_timer_inside_call)
{
Test_Inside_Call c;
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-
c.start = ecore_time_get();
c.t = ecore_timer_add(0.01, _timeri_cb, &c);
fail_if(!c.t, "Error add timer\n");
ecore_main_loop_begin();
-
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -262,7 +252,6 @@ EFL_START_TEST(ecore_test_timer_lifecycle)
Eo *et;
efl_object_init();
- ecore_init();
t = ecore_timer_add(1.0, _test_time_cb, &rl);
efl_event_callback_add((Eo*) t, EFL_EVENT_DEL, _test_death_cb, &dl);
@@ -273,8 +262,6 @@ EFL_START_TEST(ecore_test_timer_lifecycle)
efl_loop_timer_interval_set(efl_added, 1.0));
efl_ref(et);
- ecore_shutdown();
-
fail_if(re == EINA_TRUE && rl == EINA_TRUE);
fail_if(dl == EINA_FALSE);
fail_if(de == EINA_TRUE);
@@ -289,10 +276,8 @@ EFL_END_TEST
EFL_START_TEST(ecore_test_timer_valid_callbackfunc)
{
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
Ecore_Timer *t = NULL;
fail_if((t = ecore_timer_add(0.5, NULL, NULL)), "ERROR: Invalid callback func!\n");
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore/efl_app_suite.c b/src/tests/ecore/efl_app_suite.c
index 7523bdafb0..93c972323f 100644
--- a/src/tests/ecore/efl_app_suite.c
+++ b/src/tests/ecore/efl_app_suite.c
@@ -97,7 +97,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Efl_App", etc);
+ "Efl_App", etc, NULL, NULL);
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/ecore_con/ecore_con_suite.c b/src/tests/ecore_con/ecore_con_suite.c
index 1ef8b84d50..7f96297672 100644
--- a/src/tests/ecore_con/ecore_con_suite.c
+++ b/src/tests/ecore_con/ecore_con_suite.c
@@ -4,6 +4,7 @@
#include "ecore_con_suite.h"
#include "../efl_check.h"
+#include <Ecore_Con.h>
static const Efl_Test_Case etc[] = {
{ "Ecore_Con", ecore_con_test_ecore_con },
@@ -13,6 +14,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(ecore_con)
+{
+ ck_assert_int_eq(ecore_con_init(), 1);
+}
+
+SUITE_SHUTDOWN(ecore_con)
+{
+ ck_assert_int_eq(ecore_con_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -26,7 +37,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Ecore_Con", etc);
+ "Ecore_Con", etc, SUITE_INIT_FN(ecore_con), SUITE_SHUTDOWN_FN(ecore_con));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index df481bc6ce..86323a4bd5 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -200,11 +200,6 @@ void _ecore_con_server_client_tests(Ecore_Con_Type compl_type, const char *name,
void *del_ret;
const char *server_name;
- ret = eina_init();
- fail_if(ret != 1);
- ret = ecore_con_init();
- fail_if(ret != 1);
-
handlers[0] = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_ADD,
_add, (void *) 1);
fail_if(handlers[0] == NULL);
@@ -316,10 +311,6 @@ void _ecore_con_server_client_tests(Ecore_Con_Type compl_type, const char *name,
fail_if (del_ret != (void *) 2);
del_ret = ecore_event_handler_del (handlers[5]);
fail_if (del_ret != (void *) 2);
-
- ret = ecore_con_shutdown();
- fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_START_TEST(ecore_test_ecore_con_local_user)
@@ -470,30 +461,12 @@ EFL_START_TEST(ecore_test_ecore_con_ssl_available)
}
EFL_END_TEST
-EFL_START_TEST(ecore_test_ecore_con_init)
-{
- int ret;
-
- ret = ecore_con_init();
- fail_if(ret != 1);
-
- ret = ecore_con_shutdown();
- fail_if(ret != 0);
-}
-EFL_END_TEST
-
EFL_START_TEST(ecore_test_ecore_con_dns)
{
Ecore_Con_Server *client;
Ecore_Event_Handler *e_err;
Ecore_Event_Handler *e_add;
Eina_Bool err_check = EINA_FALSE;
- int ret;
-
- ret = eina_init();
- fail_if(ret != 1);
- ret = ecore_con_init();
- fail_if(ret != 1);
e_add = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _dns_add_del, (void *) &err_check);
e_err = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ERROR, _dns_err, (void *) &err_check);
@@ -509,27 +482,16 @@ EFL_START_TEST(ecore_test_ecore_con_dns)
fail_if (err_check == EINA_FALSE);
fail_if (ecore_event_handler_del(e_err) != (void *) &err_check);
fail_if (ecore_event_handler_del(e_add) != (void *) &err_check);
-
- ret = ecore_con_shutdown();
- fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(ecore_test_ecore_con_shutdown_bef_init)
{
- int ret;
-
- eina_init();
- ret = ecore_con_shutdown();
+ int ret = ecore_con_shutdown();
fail_if(ret != 0);
- ret = ecore_con_init();
- fail_if(ret != 1);
-
ret = ecore_con_shutdown();
fail_if(ret != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -549,19 +511,15 @@ _lookup_done_cb(const char *canonname, const char *ip, struct sockaddr *addr, in
EFL_START_TEST(ecore_test_ecore_con_dns_lookup)
{
const char link[] = "www.google.com";
- ecore_con_init();
fail_unless(ecore_con_lookup(link, _lookup_done_cb, link));
ecore_main_loop_begin();
-
- ecore_con_shutdown();
}
EFL_END_TEST
void ecore_con_test_ecore_con(TCase *tc)
{
- tcase_add_test(tc, ecore_test_ecore_con_init);
tcase_add_test(tc, ecore_test_ecore_con_local_user);
tcase_add_test(tc, ecore_test_ecore_con_local_user_home);
tcase_add_test(tc, ecore_test_ecore_con_local_user_tmp);
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
index bc27f52b77..8cedac0d1e 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
@@ -118,9 +118,7 @@ EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_cl)
int *cb_data = (int *) malloc(sizeof(int));
*cb_data = 1;
- eina_init();
eet_init();
- ecore_con_init();
_ece_test_descriptor_init();
svr = ecore_con_server_add(ECORE_CON_REMOTE_TCP, "127.0.0.1",
@@ -165,9 +163,7 @@ EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_cl)
free(cb_data);
_ece_test_descriptor_shutdown();
ecore_con_server_del(svr);
- ecore_con_shutdown();
eet_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -200,9 +196,7 @@ EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_del)
int *cb_data = (int *) malloc(sizeof(int));
*cb_data = 0;
- eina_init();
eet_init();
- ecore_con_init();
_ece_test_descriptor_init();
svr = ecore_con_server_add(ECORE_CON_REMOTE_TCP, "127.0.0.1",
@@ -235,9 +229,7 @@ EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_del)
free(cb_data);
_ece_test_descriptor_shutdown();
- ecore_con_shutdown();
eet_shutdown();
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
index c1da064352..bdf26f07c3 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
@@ -172,8 +172,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_ftp_upload)
char link[] = ECORE_CON_FTP_TEST_URL;
char url[4096], *username, *password, *file = NULL, *dir = NULL;
- ret = eina_init();
- fail_if(ret != 1);
ret = ecore_con_url_init();
fail_if(ret != 1);
@@ -196,7 +194,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_ftp_upload)
ret = ecore_con_url_shutdown();
fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_END_TEST
#endif
@@ -212,8 +209,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_post)
char *username = NULL, *password = NULL;
char url[4096];
- ret = eina_init();
- fail_if(ret != 1);
ret = ecore_con_url_init();
fail_if(ret != 1);
@@ -240,7 +235,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_post)
ret = ecore_con_url_shutdown();
fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_END_TEST
#endif
@@ -257,8 +251,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_download)
#endif
char url_data[] = "test";
- ret = eina_init();
- fail_if(ret != 1);
ret = ecore_con_url_init();
fail_if(ret != 1);
@@ -290,7 +282,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_download)
ret = ecore_con_url_shutdown();
fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_END_TEST
@@ -299,8 +290,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_create)
Ecore_Con_Url *url;
int ret;
- ret = eina_init();
- fail_if(ret != 1);
ret = ecore_con_url_init();
fail_if(ret != 1);
@@ -311,7 +300,6 @@ EFL_START_TEST(ecore_con_test_ecore_con_url_create)
ret = ecore_con_url_shutdown();
fail_if(ret != 0);
- ret = eina_shutdown();
}
EFL_END_TEST
@@ -359,8 +347,6 @@ _ecore_con_url_cookies_test_init()
const char link[] = DEFAULT_LINK;
#endif
- eina_init();
- ecore_con_init();
ecore_con_url_init();
ec_url = ecore_con_url_new(link);
@@ -385,8 +371,6 @@ _ecore_con_url_cookies_test_shutdown(Ecore_Con_Url *ec_url, int tmpfd, Eina_Tmps
eina_tmpstr_del(*path);
ecore_con_url_free(ec_url);
ecore_con_url_shutdown();
- ecore_con_shutdown();
- eina_shutdown();
}
EFL_START_TEST(ecore_con_test_ecore_con_url_cookies_clear)
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 477b242198..a32f6ee6a6 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -303,8 +303,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
@@ -330,8 +328,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
efl_del(o);
-
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -345,8 +341,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get());
ck_assert_ptr_eq(o, NULL);
@@ -418,8 +412,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
TRAP_ERRORS_FINISH(1);
efl_del(o);
-
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -431,8 +423,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
Eina_Slice slice = { .mem = &addr.sin_addr, .len = sizeof(addr.sin_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
@@ -457,7 +447,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
_ipv4_check(o, &addr);
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -467,8 +456,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address.len != 4 && address.len != 16 is true");
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
1234,
@@ -476,7 +463,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -487,8 +473,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
};
Eo *o;
- ecore_con_init();
-
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
@@ -503,7 +487,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
_ipv4_check(o, &addr);
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -514,8 +497,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
};
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: sockaddr == NULL");
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, NULL);
ck_assert_ptr_eq(o, NULL);
@@ -526,7 +507,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -534,8 +514,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
{
Eo *o;
- ecore_con_init();
-
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "127.0.0.1:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "127.0.0.1:12345");
@@ -556,7 +534,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
ck_assert_str_eq(efl_net_ip_address_string_get(o), "192.168.0.123:80");
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -564,8 +541,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
{
Eo *o;
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: numeric_address == NULL");
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, NULL);
ck_assert_ptr_eq(o, NULL);
@@ -594,7 +569,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(0); /* no error messages! */
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -602,8 +576,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
_resolve(&ctx, "localhost:http", 0, 0);
_assert_found(&ctx, "127.0.0.1:80", EINA_TRUE, 0);
_resolve_cleanup(&ctx);
@@ -632,7 +604,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
_assert_found(&ctx, "[::1]:80", EINA_FALSE, 0);
_resolve_cleanup(&ctx);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -640,8 +611,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: address == NULL");
ctx.future = efl_net_ip_address_resolve(EFL_NET_IP_ADDRESS_CLASS,
NULL, 0, 0);
@@ -662,7 +631,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
_assert_found(&ctx, "[::1]:http", EINA_FALSE, EFL_NET_ERROR_COULDNT_RESOLVE_HOST);
_resolve_cleanup(&ctx);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -691,8 +659,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
#undef TEST
};
- ecore_con_init();
-
for (itr = tests; itr < tests + sizeof(tests)/sizeof(tests[0]); itr++)
{
struct sockaddr_in a = {
@@ -719,7 +685,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
efl_unref(o);
}
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -769,8 +734,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
@@ -789,7 +752,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
_ipv6_check(o, &addr);
efl_del(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -803,8 +765,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
/* generic errors checked at ecore_test_efl_net_ip_address_ipv4_manual_fail */
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
@@ -849,7 +809,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
efl_del(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -861,8 +820,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
Eina_Slice slice = { .mem = &addr.sin6_addr, .len = sizeof(addr.sin6_addr) };
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12365);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
o = efl_net_ip_address_create(EFL_NET_IP_ADDRESS_CLASS,
@@ -887,7 +844,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
_ipv6_check(o, &addr);
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -898,8 +854,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
};
Eo *o;
- ecore_con_init();
-
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
o = efl_net_ip_address_create_sockaddr(EFL_NET_IP_ADDRESS_CLASS, &addr);
@@ -914,7 +868,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
_ipv6_check(o, &addr);
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -922,8 +875,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
{
Eo *o;
- ecore_con_init();
-
o = efl_net_ip_address_parse(EFL_NET_IP_ADDRESS_CLASS, "[::1]:12345");
ck_assert_ptr_ne(o, NULL);
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[::1]:12345");
@@ -1008,7 +959,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
ck_assert_str_eq(efl_net_ip_address_string_get(o), "[fc00::1]");
efl_unref(o);
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -1016,8 +966,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
{
Eo *o;
- ecore_con_init();
-
/* generic error (null ptr) checked in ipv4_parse_fail */
/* incomplete numbers */
@@ -1037,7 +985,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(0); /* no error messages! */
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -1136,8 +1083,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
char buf[4096];
const char *localhost_str;
- ecore_con_init();
-
localhost_str = _ipv6_localhost_check();
if (localhost_str)
@@ -1183,7 +1128,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
_resolve_cleanup(&ctx);
}
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -1191,8 +1135,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
{
struct resolve_ctx ctx = { };
- ecore_con_init();
-
/* generic checks at ipv4_resolve_fail */
#if defined(AI_V4MAPPED) && (AI_V4MAPPED > 0)
@@ -1201,7 +1143,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
_resolve_cleanup(&ctx);
#endif
- ecore_con_shutdown();
}
EFL_END_TEST
@@ -1221,8 +1162,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
#undef TEST
};
- ecore_con_init();
-
for (itr = tests; itr < tests + sizeof(tests)/sizeof(tests[0]); itr++)
{
struct sockaddr_in6 a = {
@@ -1256,7 +1195,6 @@ EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
efl_unref(o);
}
- ecore_con_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/ector/suite/ector_suite.c b/src/tests/ector/suite/ector_suite.c
index 9f04a644b9..d2d3d9207c 100644
--- a/src/tests/ector/suite/ector_suite.c
+++ b/src/tests/ector/suite/ector_suite.c
@@ -22,12 +22,23 @@
#include "ector_suite.h"
#include "../efl_check.h"
+#include <Ector.h>
static const Efl_Test_Case etc[] = {
{ "init", ector_test_init },
{ NULL, NULL }
};
+SUITE_INIT(ector)
+{
+ ck_assert_int_eq(ector_init(), 1);
+}
+
+SUITE_SHUTDOWN(ector)
+{
+ ck_assert_int_eq(ector_shutdown(), 0);
+}
+
int
main(int argc, char *argv[])
{
@@ -41,7 +52,7 @@ main(int argc, char *argv[])
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Ector", etc);
+ "Ector", etc, SUITE_INIT_FN(ector), SUITE_SHUTDOWN_FN(ector));
return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/src/tests/ector/suite/ector_test_init.c b/src/tests/ector/suite/ector_test_init.c
index fd19c3d645..6a1dddff64 100644
--- a/src/tests/ector/suite/ector_test_init.c
+++ b/src/tests/ector/suite/ector_test_init.c
@@ -26,8 +26,6 @@
EFL_START_TEST(ector_init_simple)
{
- fail_if(ector_init() != 1);
- fail_if(ector_shutdown() != 0);
}
EFL_END_TEST
diff --git a/src/tests/edje/edje_suite.c b/src/tests/edje/edje_suite.c
index 0ec7d5c95a..80cb84a8f6 100644
--- a/src/tests/edje/edje_suite.c
+++ b/src/tests/edje/edje_suite.c
@@ -4,12 +4,23 @@
#include "edje_suite.h"
#include "../efl_check.h"
+#include <Edje.h>
static const Efl_Test_Case etc[] = {
{ "Edje", edje_test_edje },
{ NULL, NULL }
};
+SUITE_INIT(edje)
+{
+ ck_assert_int_eq(edje_init(), 1);
+}
+
+SUITE_SHUTDOWN(edje)
+{
+ ck_assert_int_eq(edje_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -23,7 +34,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Edje", etc);
+ "Edje", etc, SUITE_INIT_FN(edje), SUITE_SHUTDOWN_FN(edje));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 2a366741f1..6ad1be75ee 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -18,13 +18,6 @@
EFL_START_TEST(edje_test_edje_init)
{
- int ret;
-
- ret = edje_init();
- fail_if(ret != 1);
-
- ret = edje_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_suite.c b/src/tests/eet/eet_suite.c
index a1d7840327..60cc8ce3e8 100644
--- a/src/tests/eet/eet_suite.c
+++ b/src/tests/eet/eet_suite.c
@@ -6,6 +6,7 @@
#include "eet_suite.h"
#include "../efl_check.h"
+#include <Eet.h>
char argv0[PATH_MAX];
@@ -25,6 +26,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(eet)
+{
+ ck_assert_int_eq(eet_init(), 1);
+}
+
+SUITE_SHUTDOWN(eet)
+{
+ ck_assert_int_eq(eet_shutdown(), 0);
+}
+
int
main(int argc, char *argv[])
{
@@ -40,7 +51,7 @@ main(int argc, char *argv[])
memcpy(argv0, argv[0], strlen(argv[0]) + 1);
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eet", etc);
+ "Eet", etc, SUITE_INIT_FN(eet), SUITE_SHUTDOWN_FN(eet));
return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/src/tests/eet/eet_test_cache.c b/src/tests/eet/eet_test_cache.c
index 02a51ed852..6dee39142c 100644
--- a/src/tests/eet/eet_test_cache.c
+++ b/src/tests/eet/eet_test_cache.c
@@ -57,7 +57,6 @@ EFL_START_TEST(eet_test_cache_concurrency)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
eina_threads_init();
eina_lock_new(&open_worker_mutex);
@@ -95,7 +94,6 @@ EFL_START_TEST(eet_test_cache_concurrency)
fail_if(unlink(file) != 0);
eina_threads_shutdown();
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_cipher.c b/src/tests/eet/eet_test_cipher.c
index eacc8e0f3a..c06c505b4c 100644
--- a/src/tests/eet/eet_test_cipher.c
+++ b/src/tests/eet/eet_test_cipher.c
@@ -23,8 +23,6 @@ EFL_START_TEST(eet_test_cipher_decipher_simple)
int size;
int tmpfd;
- eet_init();
-
fail_if(-1 == (tmpfd = mkstemp(file)));
fail_if(!!close(tmpfd));
@@ -61,8 +59,6 @@ EFL_START_TEST(eet_test_cipher_decipher_simple)
eet_close(ef);
fail_if(unlink(file) != 0);
-
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_connection.c b/src/tests/eet/eet_test_connection.c
index a839f51883..173fa5a37c 100644
--- a/src/tests/eet/eet_test_connection.c
+++ b/src/tests/eet/eet_test_connection.c
@@ -95,8 +95,6 @@ EFL_START_TEST(eet_test_connection_check)
Eet_Test_Ex_Type etbt;
Eina_Bool on_going;
- eet_init();
-
eet_test_ex_set(&etbt, 0);
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
@@ -139,8 +137,6 @@ EFL_START_TEST(eet_test_connection_check)
fail_if(!eet_connection_close(ecd.conn, &on_going));
fail_if(on_going);
-
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_data.c b/src/tests/eet/eet_test_data.c
index f65720114a..ae5d013fcc 100644
--- a/src/tests/eet/eet_test_data.c
+++ b/src/tests/eet/eet_test_data.c
@@ -288,8 +288,6 @@ EFL_START_TEST(eet_test_data_basic_type_encoding_decoding)
void *transfert;
int size;
- eet_init();
-
eet_test_basic_set(&etbt, 0);
eet_test_setup_eddc(&eddc);
@@ -313,8 +311,6 @@ EFL_START_TEST(eet_test_data_basic_type_encoding_decoding)
free(result);
eet_data_descriptor_free(edd);
-
- eet_shutdown();
}
EFL_END_TEST
@@ -328,8 +324,6 @@ EFL_START_TEST(eet_test_data_type_encoding_decoding)
int size;
int test;
- eet_init();
-
eet_test_ex_set(&etbt, 0);
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
etbt.hash = eina_hash_string_superfast_new(NULL);
@@ -379,8 +373,6 @@ EFL_START_TEST(eet_test_data_type_encoding_decoding)
eina_hash_foreach(result->ihash, func7, &test);
fail_if(test != 0);
-
- eet_shutdown();
}
EFL_END_TEST
@@ -398,8 +390,6 @@ EFL_START_TEST(eet_test_data_type_dump_undump)
int size2;
int test;
- eet_init();
-
eet_test_ex_set(&etbt, 0);
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
@@ -470,7 +460,6 @@ EFL_START_TEST(eet_test_data_type_dump_undump)
fail_if(test != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -488,8 +477,6 @@ EFL_START_TEST(eet_test_data_type_escape_dump_undump)
" value \"\\\\My\\\\NewLine\\\\\" string: \"\\n\";\n"
"}\n";
- eet_init();
-
blob = eet_data_text_undump(inputstr, strlen(inputstr), &blob_len);
fail_if(!blob);
@@ -504,7 +491,6 @@ EFL_START_TEST(eet_test_data_type_escape_dump_undump)
eina_strbuf_free(strbuf);
free(blob);
- eet_shutdown();
}
EFL_END_TEST
@@ -519,8 +505,6 @@ EFL_START_TEST(eet_test_data_fp)
void *blob;
int size;
- eet_init();
-
EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_5FP);
edd_5FP = eet_data_descriptor_stream_new(&eddc);
@@ -566,7 +550,6 @@ EFL_START_TEST(eet_test_data_fp)
fail_if(convert->f1 != 1);
fail_if(convert->f0 != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -582,9 +565,6 @@ EFL_START_TEST(eet_test_data_union)
int size;
int i;
- eina_init();
- eet_init();
-
EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_Union_Test);
edd = eet_data_descriptor_stream_new(&eddc);
@@ -642,9 +622,6 @@ EFL_START_TEST(eet_test_data_union)
EUT_CMP(2);
EUT_CMP(3);
}
-
- eet_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -663,9 +640,6 @@ EFL_START_TEST(eet_test_data_variant)
int size;
int i;
- eina_init();
- eet_init();
-
EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_Variant_Test);
edd = eet_data_descriptor_stream_new(&eddc);
@@ -753,8 +727,6 @@ EFL_START_TEST(eet_test_data_variant)
EVT_CMP(3);
}
- eet_shutdown();
- eina_shutdown();
} /* EFL_START_TEST */
EFL_END_TEST
@@ -770,9 +742,6 @@ EFL_START_TEST(eet_test_data_hash_value)
double d;
char *s;
- eina_init();
- eet_init();
-
EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_Hash);
edd = eet_data_descriptor_stream_new(&eddc);
@@ -810,9 +779,6 @@ EFL_START_TEST(eet_test_data_hash_value)
val = (Eina_Value *)eina_hash_find(h->hash, "val/string");
eina_value_get(val, &s);
fail_if((!val) || strcmp(s, EET_TEST_STRING));
-
- eet_shutdown();
- eina_shutdown();
} /* EFL_START_TEST */
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_file.c b/src/tests/eet/eet_test_file.c
index c5e386f895..6d77a7d817 100644
--- a/src/tests/eet/eet_test_file.c
+++ b/src/tests/eet/eet_test_file.c
@@ -26,8 +26,6 @@ EFL_START_TEST(eet_test_file_simple_write)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
fail_if(-1 == (tmpfd = mkstemp(file)));
fail_if(!!close(tmpfd));
@@ -120,7 +118,6 @@ EFL_START_TEST(eet_test_file_simple_write)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -140,8 +137,6 @@ EFL_START_TEST(eet_test_file_data)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
eet_test_ex_set(&etbt, 0);
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
@@ -280,7 +275,6 @@ EFL_START_TEST(eet_test_file_data)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -298,8 +292,6 @@ EFL_START_TEST(eet_test_file_data_dump)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
eet_test_ex_set(&etbt, 0);
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
etbt.list = eina_list_prepend(etbt.list, eet_test_ex_set(NULL, 1));
@@ -382,7 +374,6 @@ EFL_START_TEST(eet_test_file_data_dump)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -400,8 +391,6 @@ EFL_START_TEST(eet_test_file_fp)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Eet_5FP);
edd_5FP = eet_data_descriptor_file_new(&eddc);
@@ -456,7 +445,6 @@ EFL_START_TEST(eet_test_file_fp)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_identity.c b/src/tests/eet/eet_test_identity.c
index 19ffa9219c..641a53fa78 100644
--- a/src/tests/eet/eet_test_identity.c
+++ b/src/tests/eet/eet_test_identity.c
@@ -66,8 +66,6 @@ EFL_START_TEST(eet_test_identity_simple)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
fail_if(-1 == (fd = mkstemp(file)));
fail_if(!!close(fd));
fail_if(!(noread = fopen("/dev/null", "wb")));
@@ -129,7 +127,6 @@ EFL_START_TEST(eet_test_identity_simple)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -137,15 +134,12 @@ EFL_START_TEST(eet_test_identity_open_simple)
{
Eet_Key *k = NULL;
- eet_init();
-
k = eet_identity_open(_cert_pem, _key_pem, NULL);
fail_if(!k);
if (k)
eet_identity_close(k);
- eet_shutdown();
}
EFL_END_TEST
@@ -153,15 +147,12 @@ EFL_START_TEST(eet_test_identity_open_pkcs8)
{
Eet_Key *k = NULL;
- eet_init();
-
k = eet_identity_open(_cert_pem, _key_enc_none_pem, NULL);
fail_if(!k);
if (k)
eet_identity_close(k);
- eet_shutdown();
}
EFL_END_TEST
@@ -169,8 +160,6 @@ EFL_START_TEST(eet_test_identity_open_pkcs8_enc)
{
Eet_Key *k = NULL;
- eet_init();
-
k = eet_identity_open(_cert_pem, _key_enc_pem, NULL);
fail_if(k);
@@ -189,7 +178,6 @@ EFL_START_TEST(eet_test_identity_open_pkcs8_enc)
if (k)
eet_identity_close(k);
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_image.c b/src/tests/eet/eet_test_image.c
index 9214c2b8ab..5e35e67e54 100644
--- a/src/tests/eet/eet_test_image.c
+++ b/src/tests/eet/eet_test_image.c
@@ -85,8 +85,6 @@ EFL_START_TEST(eet_test_image_normal)
file = strdup("/tmp/eet_suite_testXXXXXX");
- eet_init();
-
fail_if(-1 == (tmpfd = mkstemp(file)));
fail_if(!!close(tmpfd));
@@ -428,7 +426,6 @@ EFL_START_TEST(eet_test_image_normal)
fail_if(unlink(file) != 0);
- eet_shutdown();
}
EFL_END_TEST
@@ -454,8 +451,6 @@ EFL_START_TEST(eet_test_image_small)
image[2] = IM2;
image[3] = IM3;
- eet_init();
-
fail_if(-1 == (tmpfd = mkstemp(file)));
fail_if(!!close(tmpfd));
@@ -491,7 +486,6 @@ EFL_START_TEST(eet_test_image_small)
free(data);
- eet_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eet/eet_test_init.c b/src/tests/eet/eet_test_init.c
index f9a9cd993a..bce13cb60c 100644
--- a/src/tests/eet/eet_test_init.c
+++ b/src/tests/eet/eet_test_init.c
@@ -8,13 +8,6 @@
EFL_START_TEST(_eet_test_init)
{
- int ret;
-
- ret = eet_init();
- fail_if(ret != 1);
-
- ret = eet_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/eeze/eeze_suite.c b/src/tests/eeze/eeze_suite.c
index d96ab9138d..3b34930f9a 100644
--- a/src/tests/eeze/eeze_suite.c
+++ b/src/tests/eeze/eeze_suite.c
@@ -4,6 +4,7 @@
#include "eeze_suite.h"
#include "../efl_check.h"
+#include <Eeze.h>
static const Efl_Test_Case etc[] = {
{ "Init", eeze_test_init },
@@ -13,6 +14,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(eeze)
+{
+ ck_assert_int_eq(eeze_init(), 1);
+}
+
+SUITE_SHUTDOWN(eeze)
+{
+ ck_assert_int_eq(eeze_shutdown(), 0);
+}
+
int
main(int argc, char *argv[])
{
@@ -26,7 +37,7 @@ main(int argc, char *argv[])
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eeze", etc);
+ "Eeze", etc, SUITE_INIT_FN(eeze), SUITE_SHUTDOWN_FN(eeze));
return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/src/tests/eeze/eeze_test_init.c b/src/tests/eeze/eeze_test_init.c
index 3ffdc2c2c3..0bdbe890b3 100644
--- a/src/tests/eeze/eeze_test_init.c
+++ b/src/tests/eeze/eeze_test_init.c
@@ -8,13 +8,6 @@
EFL_START_TEST(eeze_test_eeze_init)
{
- int ret;
-
- ret = eeze_init();
- fail_if(ret != 1);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/eeze/eeze_test_net.c b/src/tests/eeze/eeze_test_net.c
index f95a8896d0..a3eca6a408 100644
--- a/src/tests/eeze/eeze_test_net.c
+++ b/src/tests/eeze/eeze_test_net.c
@@ -9,30 +9,19 @@
EFL_START_TEST(eeze_test_net_list)
{
- int ret;
Eina_List *list = NULL;
- ret = eeze_init();
- fail_if(ret != 1);
-
list = eeze_net_list();
fail_if(list == NULL);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
EFL_START_TEST(eeze_test_net_attr)
{
- int ret;
int idx = 0;
Eeze_Net *net = NULL;
const char *tmp = NULL;
- ret = eeze_init();
- fail_if(ret != 1);
-
net = eeze_net_new("lo");
fail_if(net == NULL);
@@ -65,9 +54,6 @@ EFL_START_TEST(eeze_test_net_attr)
fail_if(tmp == NULL);
eeze_net_free(net);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
@@ -75,13 +61,9 @@ EFL_END_TEST
#ifdef HAVE_IPV6
EFL_START_TEST(eeze_test_net_attr_ipv6)
{
- int ret;
Eeze_Net *net = NULL;
const char *tmp = NULL;
- ret = eeze_init();
- fail_if(ret != 1);
-
net = eeze_net_new("lo");
fail_if(net == NULL);
@@ -104,9 +86,6 @@ EFL_START_TEST(eeze_test_net_attr_ipv6)
cleanup:
eeze_net_free(net);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
#endif
diff --git a/src/tests/eeze/eeze_test_sensor.c b/src/tests/eeze/eeze_test_sensor.c
index 920aeb5965..0677eb185c 100644
--- a/src/tests/eeze/eeze_test_sensor.c
+++ b/src/tests/eeze/eeze_test_sensor.c
@@ -36,16 +36,11 @@ event_cb(void *data EINA_UNUSED, int ev_type EINA_UNUSED, void *event)
EFL_START_TEST(eeze_test_sensor_read)
{
Eeze_Sensor_Obj *sens = NULL;
- int ret = 0;
float x, y, z;
int acc;
double timestamp;
Eina_Bool rc = EINA_FALSE;
- ecore_init();
- ret = eeze_init();
- fail_if(ret != 1);
-
sens = eeze_sensor_new(EEZE_SENSOR_TYPE_ACCELEROMETER);
fail_if(sens == NULL);
rc = eeze_sensor_read(sens);
@@ -162,9 +157,6 @@ EFL_START_TEST(eeze_test_sensor_read)
/* Try free on NULL */
eeze_sensor_free(NULL);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
@@ -173,13 +165,8 @@ EFL_START_TEST(eeze_test_sensor_async_read)
Ecore_Event_Handler *handler;
Eeze_Sensor_Obj *sens = NULL;
- int ret = 0;
Eina_Bool rc = EINA_FALSE;
- ecore_init();
- ret = eeze_init();
- fail_if(ret != 1);
-
handler = ecore_event_handler_add(EEZE_SENSOR_EVENT_ACCELEROMETER, event_cb, NULL);
fail_if(handler == NULL);
sens = eeze_sensor_new(EEZE_SENSOR_TYPE_ACCELEROMETER);
@@ -238,20 +225,12 @@ EFL_START_TEST(eeze_test_sensor_async_read)
fail_if(rc != EINA_FALSE);
ecore_main_loop_begin();
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
EFL_START_TEST(eeze_test_sensor_obj_get)
{
Eeze_Sensor_Obj *obj = NULL, *obj_tmp = NULL;
- int ret = 0;
-
- ecore_init();
- ret = eeze_init();
- fail_if(ret != 1);
obj = calloc(1, sizeof(Eeze_Sensor_Obj));
fail_if(obj == NULL);
@@ -266,9 +245,6 @@ EFL_START_TEST(eeze_test_sensor_obj_get)
/* Try to get non existing obj */
obj_tmp = eeze_sensor_obj_get(EEZE_SENSOR_TYPE_LAST + 1);
fail_if(obj_tmp != NULL);
-
- ret = eeze_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/eeze/eeze_test_udev.c b/src/tests/eeze/eeze_test_udev.c
index d225bad68d..713d3d81fb 100644
--- a/src/tests/eeze/eeze_test_udev.c
+++ b/src/tests/eeze/eeze_test_udev.c
@@ -20,8 +20,6 @@ EFL_START_TEST(eeze_test_udev_types)
{
Eina_List *type;
- eeze_init();
-
type = eeze_udev_find_by_type(EEZE_UDEV_TYPE_NONE, NULL);
type = eeze_udev_find_unlisted_similar(type);
type = eeze_udev_find_by_type(EEZE_UDEV_TYPE_KEYBOARD, NULL);
@@ -54,7 +52,6 @@ EFL_START_TEST(eeze_test_udev_types)
type = eeze_udev_find_by_type(0, NULL);
type = eeze_udev_find_unlisted_similar(type);
- eeze_shutdown();
}
EFL_END_TEST
#endif
@@ -63,9 +60,6 @@ EFL_START_TEST(eeze_test_udev_watch)
{
Eeze_Udev_Watch *watch;
- ecore_init();
- eeze_init();
-
/* watch never gets triggered as this is run without user interaction */
watch = eeze_udev_watch_add(EEZE_UDEV_TYPE_KEYBOARD, (EEZE_UDEV_EVENT_ADD | EEZE_UDEV_EVENT_REMOVE), catch_events, NULL);
watch = eeze_udev_watch_add(EEZE_UDEV_TYPE_DRIVE_INTERNAL, (EEZE_UDEV_EVENT_ADD | EEZE_UDEV_EVENT_REMOVE), catch_events, NULL);
@@ -77,9 +71,6 @@ EFL_START_TEST(eeze_test_udev_watch)
watch = eeze_udev_watch_add(EEZE_UDEV_TYPE_GPIO, (EEZE_UDEV_EVENT_ADD | EEZE_UDEV_EVENT_REMOVE), catch_events, NULL);
watch = eeze_udev_watch_add(EEZE_UDEV_TYPE_NONE, (EEZE_UDEV_EVENT_ADD | EEZE_UDEV_EVENT_REMOVE), catch_events, NULL);
eeze_udev_watch_del(watch);
-
- eeze_shutdown();
- ecore_shutdown();
}
EFL_END_TEST
@@ -89,8 +80,6 @@ EFL_START_TEST(eeze_test_udev_syspath)
const char *name;
Eina_Bool r;
- eeze_init();
-
type = eeze_udev_find_by_type(EEZE_UDEV_TYPE_KEYBOARD, NULL);
type = eeze_udev_find_unlisted_similar(type);
EINA_LIST_FOREACH(type, l, name)
@@ -147,8 +136,6 @@ EFL_START_TEST(eeze_test_udev_syspath)
}
eeze_udev_devpath_get_syspath("/dev/null");
-
- eeze_shutdown();
}
EFL_END_TEST
@@ -157,8 +144,6 @@ EFL_START_TEST(eeze_test_udev_attr)
Eina_List *type;
const char *name, *check, *check2;
- eeze_init();
-
type = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_INTERNAL, NULL);
type = eeze_udev_find_unlisted_similar(type);
eeze_udev_find_by_filter("backlight", NULL, NULL);
@@ -203,8 +188,6 @@ EFL_START_TEST(eeze_test_udev_attr)
}
eina_stringshare_del(name);
}
-
- eeze_shutdown();
}
EFL_END_TEST
@@ -215,8 +198,6 @@ EFL_START_TEST(eeze_test_udev_device)
_udev_device *device, *device2;
const char *name;
- eeze_init();
-
type = eeze_udev_find_by_type(EEZE_UDEV_TYPE_DRIVE_INTERNAL, NULL);
fail_if(type == NULL);
type = eeze_udev_find_unlisted_similar(type);
@@ -236,8 +217,6 @@ EFL_START_TEST(eeze_test_udev_device)
device2 = _copy_device(device);
fail_if(device2 != NULL);
-
- eeze_shutdown();
}
EFL_END_TEST
*/
diff --git a/src/tests/efl/efl_suite.c b/src/tests/efl/efl_suite.c
index 82cc6dfb32..d8aea76759 100644
--- a/src/tests/efl/efl_suite.c
+++ b/src/tests/efl/efl_suite.c
@@ -20,7 +20,7 @@
# include "config.h"
#endif
-#include <Eina.h>
+#include <Ecore.h>
#include "efl_suite.h"
#include "../efl_check.h"
@@ -31,6 +31,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(efl)
+{
+ ck_assert_int_eq(ecore_init(), 1);
+}
+
+SUITE_SHUTDOWN(efl)
+{
+ ck_assert_int_eq(ecore_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -44,7 +54,7 @@ main(int argc, char **argv)
eina_init();
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Efl", etc);
+ "Efl", etc, SUITE_INIT_FN(efl), SUITE_SHUTDOWN_FN(efl));
eina_shutdown();
diff --git a/src/tests/efl/efl_test_model_composite.c b/src/tests/efl/efl_test_model_composite.c
index f4c23f3de4..6d958162b8 100644
--- a/src/tests/efl/efl_test_model_composite.c
+++ b/src/tests/efl/efl_test_model_composite.c
@@ -178,9 +178,6 @@ EFL_START_TEST(efl_test_model_composite_boolean)
Test_Data *tdata;
Efl_Future *future;
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
- fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
-
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
@@ -207,8 +204,6 @@ EFL_START_TEST(efl_test_model_composite_boolean)
while (!tdata->success_flag) ecore_main_loop_iterate();
ck_assert(tdata->success_flag);
-
- ecore_shutdown();
}
EFL_END_TEST
@@ -221,9 +216,6 @@ EFL_START_TEST(efl_test_model_composite_selection)
Test_Data *tdata;
Efl_Future *future;
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
- fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
-
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
@@ -249,8 +241,6 @@ EFL_START_TEST(efl_test_model_composite_selection)
while (!tdata->success_flag) ecore_main_loop_iterate();
ck_assert(tdata->success_flag);
-
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/efl/efl_test_model_container.c b/src/tests/efl/efl_test_model_container.c
index cad5281999..aee7dab078 100644
--- a/src/tests/efl/efl_test_model_container.c
+++ b/src/tests/efl/efl_test_model_container.c
@@ -118,9 +118,6 @@ EFL_START_TEST(efl_test_model_container_values)
const char **cmp_str;
int i;
- fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
- fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
-
cmp_int = calloc(8, sizeof(int*));
cmp_str = calloc(8, sizeof(const char*));
for (i = 0; i < 7; ++i)
@@ -158,8 +155,6 @@ EFL_START_TEST(efl_test_model_container_values)
ck_assert(!!test_data.pass_flag);
ck_assert(!test_data.fail_flag);
-
- ecore_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/efl_check.h b/src/tests/efl_check.h
index 60d4e7809c..a643d6f10f 100644
--- a/src/tests/efl_check.h
+++ b/src/tests/efl_check.h
@@ -192,7 +192,7 @@ _timing_end(void)
#endif
EINA_UNUSED static int
-_efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, const Efl_Test_Case *etc)
+_efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, const Efl_Test_Case *etc, SFun init, SFun shutdown)
{
Suite *s;
SRunner *sr;
@@ -214,6 +214,8 @@ _efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, co
continue;
tc = tcase_create(etc[i].test_case);
+ if (init || shutdown)
+ tcase_add_checked_fixture(tc, init, shutdown);
if (_efl_test_fork_has(sr))
tcase_set_timeout(tc, 0);
@@ -233,4 +235,9 @@ _efl_suite_build_and_run(int argc, const char **argv, const char *suite_name, co
return failed_count;
}
+#define SUITE_INIT(NAME) static void _##NAME##_suite_init(void)
+#define SUITE_INIT_FN(NAME) _##NAME##_suite_init
+#define SUITE_SHUTDOWN(NAME) static void _##NAME##_suite_shutdown(void)
+#define SUITE_SHUTDOWN_FN(NAME) _##NAME##_suite_shutdown
+
#endif
diff --git a/src/tests/efreet/efreet_suite.c b/src/tests/efreet/efreet_suite.c
index 463215354e..ea1161e8f7 100644
--- a/src/tests/efreet/efreet_suite.c
+++ b/src/tests/efreet/efreet_suite.c
@@ -4,6 +4,7 @@
#include "efreet_suite.h"
#include "../efl_check.h"
+#include <Efreet.h>
static const Efl_Test_Case etc[] = {
{ "Efreet", efreet_test_efreet },
@@ -11,6 +12,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(efreet)
+{
+ ck_assert_int_eq(efreet_init(), 1);
+}
+
+SUITE_SHUTDOWN(efreet)
+{
+ ck_assert_int_eq(efreet_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -24,7 +35,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Efreet", etc);
+ "Efreet", etc, SUITE_INIT_FN(efreet), SUITE_SHUTDOWN_FN(efreet));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/efreet/efreet_test_efreet.c b/src/tests/efreet/efreet_test_efreet.c
index 2a74309d93..eec3b7f6a8 100644
--- a/src/tests/efreet/efreet_test_efreet.c
+++ b/src/tests/efreet/efreet_test_efreet.c
@@ -9,13 +9,6 @@
EFL_START_TEST(efreet_test_efreet_init)
{
- int ret;
-
- ret = efreet_init();
- fail_if(ret != 1);
-
- ret = efreet_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/efreet/efreet_test_efreet_cache.c b/src/tests/efreet/efreet_test_efreet_cache.c
index afb1549d3a..83f882d1cc 100644
--- a/src/tests/efreet/efreet_test_efreet_cache.c
+++ b/src/tests/efreet/efreet_test_efreet_cache.c
@@ -9,13 +9,7 @@
EFL_START_TEST(efreet_test_efreet_cache_init)
{
- int ret;
-
- ret = efreet_init();
- fail_if(ret != 1);
-
- ret = efreet_shutdown();
- fail_if(ret != 0);
+ /* FIXME: this should maybe do something? */
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_suite.c b/src/tests/eina/eina_suite.c
index 207f34988c..9abb336e51 100644
--- a/src/tests/eina/eina_suite.c
+++ b/src/tests/eina/eina_suite.c
@@ -91,35 +91,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
-/* FIXME this is a copy from eina_test_mempool
- * we should remove the duplication
- */
static Eina_Array *_modules;
-static void _mempool_init(void)
+
+SUITE_INIT(eina)
{
- eina_init();
- /* force modules to be loaded in case they are not installed */
- _modules = eina_module_list_get(NULL,
- PACKAGE_BUILD_DIR "/src/modules/eina",
- EINA_TRUE,
- NULL,
- NULL);
- eina_module_list_load(_modules);
+ ck_assert_int_eq(eina_init(), 1);
}
-static void _mempool_shutdown(void)
+SUITE_SHUTDOWN(eina)
{
- unsigned int i;
- Eina_Array_Iterator it;
- Eina_Module *module;
- eina_module_list_free(_modules);
- if (_modules)
- {
- EINA_ARRAY_ITER_NEXT(_modules, i, module, it)
- free(module);
- eina_array_free(_modules);
- }
- eina_shutdown();
+ ck_assert_int_eq(eina_shutdown(), 0);
}
int
@@ -134,12 +115,9 @@ main(int argc, char **argv)
putenv("EFL_RUN_IN_TREE=1");
#endif
- _mempool_init();
-
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eina", etc);
+ "Eina", etc, SUITE_INIT_FN(eina), SUITE_SHUTDOWN_FN(eina));
- _mempool_shutdown();
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/eina/eina_test_abi.c b/src/tests/eina/eina_test_abi.c
index 7e1d2bc96e..67435ecb60 100644
--- a/src/tests/eina/eina_test_abi.c
+++ b/src/tests/eina/eina_test_abi.c
@@ -43,7 +43,6 @@ EFL_START_TEST(eina_unicode_utf8)
{
int ind;
unsigned char ch;
- eina_init();
/* Valid utf-8 cases */
/* First possible sequence of a certain length */
@@ -240,19 +239,13 @@ EFL_START_TEST(eina_unicode_utf8)
fail_if((eina_unicode_utf8_get_next("\xFC\x83\xBF\xBF\xBF\xBF", &ind) != 0xDCFC) ||
(ind != 1));
/* Add some more error cases here */
-
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_alignof)
{
- eina_init();
-
fail_if(eina_mempool_alignof(6) != 8);
fail_if((eina_mempool_alignof(10) & 0x7) != 0);
-
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_accessor.c b/src/tests/eina/eina_test_accessor.c
index 08d0119713..7a75de6bb6 100644
--- a/src/tests/eina/eina_test_accessor.c
+++ b/src/tests/eina/eina_test_accessor.c
@@ -43,8 +43,6 @@ EFL_START_TEST(eina_accessor_array_simple)
int *tmp;
int i;
- eina_init();
-
ea = eina_array_new(11);
fail_if(!ea);
@@ -74,7 +72,6 @@ EFL_START_TEST(eina_accessor_array_simple)
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
@@ -192,8 +189,6 @@ EFL_START_TEST(eina_accessor_list_simple)
int *j;
int i = 0;
- eina_init();
-
list = eina_list_append(list, &data[0]);
fail_if(list == NULL);
diff --git a/src/tests/eina/eina_test_array.c b/src/tests/eina/eina_test_array.c
index 178b982af6..c8c9764a5f 100644
--- a/src/tests/eina/eina_test_array.c
+++ b/src/tests/eina/eina_test_array.c
@@ -33,8 +33,6 @@ EFL_START_TEST(eina_array_simple)
Eina_Array_Iterator it;
unsigned int i;
- eina_init();
-
ea = eina_array_new(11);
fail_if(!ea);
@@ -66,7 +64,6 @@ EFL_START_TEST(eina_array_simple)
eina_array_flush(ea);
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
@@ -77,8 +74,6 @@ EFL_START_TEST(eina_array_static)
Eina_Array_Iterator it;
unsigned int i;
- eina_init();
-
eina_array_step_set(&sea, sizeof(sea), 10);
for (i = 0; i < 200; ++i)
@@ -104,7 +99,6 @@ EFL_START_TEST(eina_array_static)
eina_array_clean(&sea);
eina_array_flush(&sea);
- eina_shutdown();
}
EFL_END_TEST
@@ -129,8 +123,6 @@ EFL_START_TEST(eina_array_remove_stuff)
Eina_Array_Iterator it;
unsigned int i;
- eina_init();
-
ea = eina_array_new(64);
fail_if(!ea);
@@ -179,7 +171,6 @@ EFL_START_TEST(eina_array_remove_stuff)
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_barrier.c b/src/tests/eina/eina_test_barrier.c
index 2105dc9724..d3234f43a7 100644
--- a/src/tests/eina/eina_test_barrier.c
+++ b/src/tests/eina/eina_test_barrier.c
@@ -65,9 +65,6 @@ EFL_START_TEST(eina_barrier_test_simple)
Eina_Bool r;
int i;
- i = eina_init();
- _ck_assert_int(i, >=, 1);
-
i = eina_threads_init();
_ck_assert_int(i, >=, 1);
@@ -104,7 +101,6 @@ EFL_START_TEST(eina_barrier_test_simple)
eina_barrier_free(&barrier);
eina_threads_shutdown();
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_bezier.c b/src/tests/eina/eina_test_bezier.c
index 6b88f72086..36de00dc13 100644
--- a/src/tests/eina/eina_test_bezier.c
+++ b/src/tests/eina/eina_test_bezier.c
@@ -32,7 +32,6 @@ EFL_START_TEST(eina_bezier_test_values)
Eina_Bezier b;
double sx, sy, cx1, cy1, cx2, cy2, ex, ey;
- eina_init();
eina_bezier_values_set(&b,
1, 2,
3, 4,
@@ -51,7 +50,6 @@ EFL_START_TEST(eina_bezier_test_values)
cy2 != 6 ||
ex != 7 ||
ey != 8);
- eina_shutdown();
}
EFL_END_TEST
@@ -60,7 +58,6 @@ EFL_START_TEST(eina_bezier_test_angle)
Eina_Bezier b;
double angle;
- eina_init();
eina_bezier_values_set(&b,
1, 1,
3, 1,
@@ -78,7 +75,6 @@ EFL_START_TEST(eina_bezier_test_angle)
angle = eina_bezier_angle_at(&b, 0.5);
fail_if(floor(angle) != 90);
- eina_shutdown();
}
EFL_END_TEST
@@ -87,7 +83,6 @@ EFL_START_TEST(eina_bezier_test_length)
Eina_Bezier b;
double length;
- eina_init();
eina_bezier_values_set(&b,
1, 1,
3, 1,
@@ -104,7 +99,6 @@ EFL_START_TEST(eina_bezier_test_length)
length = eina_bezier_length_get(&b);
fail_if(length != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -113,7 +107,6 @@ EFL_START_TEST(eina_bezier_test_t_at)
Eina_Bezier b;
double length, t;
- eina_init();
eina_bezier_values_set(&b,
1, 1,
3, 1,
@@ -126,7 +119,6 @@ EFL_START_TEST(eina_bezier_test_t_at)
t = eina_bezier_t_at(&b, length);
fail_if(t != 1);
- eina_shutdown();
}
EFL_END_TEST
@@ -135,7 +127,6 @@ EFL_START_TEST(eina_bezier_test_point_at)
Eina_Bezier b;
double x, y;
- eina_init();
eina_bezier_values_set(&b,
1, 2,
3, 4,
@@ -150,7 +141,6 @@ EFL_START_TEST(eina_bezier_test_point_at)
fail_if(x != 7 ||
y != 8);
- eina_shutdown();
}
EFL_END_TEST
@@ -159,7 +149,6 @@ EFL_START_TEST(eina_bezier_test_split_at_length)
Eina_Bezier b, l , r;
double len, len1, len2;
- eina_init();
eina_bezier_values_set(&b,
1, 2,
3, 4,
@@ -172,7 +161,6 @@ EFL_START_TEST(eina_bezier_test_split_at_length)
fail_if(len != (len1 + len2));
- eina_shutdown();
}
EFL_END_TEST
@@ -181,7 +169,6 @@ EFL_START_TEST(eina_bezier_test_bounds_get)
Eina_Bezier b;
double x, y, w, h;
- eina_init();
eina_bezier_values_set(&b,
0, 0,
100, 0,
@@ -192,7 +179,6 @@ EFL_START_TEST(eina_bezier_test_bounds_get)
fail_if(x !=0 || y!=0 || w !=100 || h !=100 );
- eina_shutdown();
}
EFL_END_TEST
@@ -201,7 +187,6 @@ EFL_START_TEST(eina_bezier_test_on_interval)
Eina_Bezier b, res;
double px1, px2, py1, py2;
- eina_init();
eina_bezier_values_set(&b,
0, 0,
10, 20,
@@ -213,7 +198,6 @@ EFL_START_TEST(eina_bezier_test_on_interval)
fail_if(px1 != px2 || py1 != py2);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_binbuf.c b/src/tests/eina/eina_test_binbuf.c
index fa9ed02564..1f8fce805f 100644
--- a/src/tests/eina/eina_test_binbuf.c
+++ b/src/tests/eina/eina_test_binbuf.c
@@ -34,8 +34,6 @@ EFL_START_TEST(binbuf_simple)
Eina_Slice ro_slice;
Eina_Rw_Slice rw_slice;
- eina_init();
-
buf = eina_binbuf_new();
fail_if(!buf);
@@ -80,7 +78,6 @@ EFL_START_TEST(binbuf_simple)
eina_binbuf_free(buf);
- eina_shutdown();
#undef TEXT
}
EFL_END_TEST
@@ -91,8 +88,6 @@ EFL_START_TEST(binbuf_remove)
const unsigned char cbuf[] = "12\0 456 78\0 abcthis is some more random junk here!";
size_t size = sizeof(cbuf) - 1; /* We don't care about the real NULL */
- eina_init();
-
buf = eina_binbuf_new();
fail_if(!buf);
@@ -112,8 +107,6 @@ EFL_START_TEST(binbuf_remove)
fail_if(0 != eina_binbuf_length_get(buf));
eina_binbuf_free(buf);
-
- eina_shutdown();
}
EFL_END_TEST
@@ -130,8 +123,6 @@ EFL_START_TEST(binbuf_manage_simple)
unsigned char *alloc_buf = malloc(size);
memcpy(alloc_buf, cbuf, size);
- eina_init();
-
buf = eina_binbuf_manage_new_length(alloc_buf, size);
fail_if(!buf);
@@ -144,7 +135,6 @@ EFL_START_TEST(binbuf_manage_simple)
eina_binbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -155,8 +145,6 @@ EFL_START_TEST(binbuf_manage_read_only_simple)
const unsigned char *cbuf = (const unsigned char *) _cbuf;
size_t size = sizeof(cbuf) - 1; /* We don't care about the real NULL */
- eina_init();
-
buf = eina_binbuf_manage_read_only_new_length(cbuf, size);
fail_if(!buf);
@@ -174,7 +162,6 @@ EFL_START_TEST(binbuf_manage_read_only_simple)
eina_binbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
#pragma GCC diagnostic pop
@@ -184,8 +171,6 @@ EFL_START_TEST(binbuf_insert)
#if 0
Eina_Binbuf *buf;
- eina_init();
-
buf = eina_binbuf_new();
fail_if(!buf);
@@ -227,7 +212,6 @@ EFL_START_TEST(binbuf_insert)
eina_binbuf_free(buf);
- eina_shutdown();
#endif
}
EFL_END_TEST
@@ -248,8 +232,6 @@ EFL_START_TEST(binbuf_realloc)
}
pattern[i] = '\0';
- eina_init();
-
buf = eina_binbuf_new();
fail_if(!buf);
@@ -302,7 +284,6 @@ EFL_START_TEST(binbuf_realloc)
eina_binbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -316,8 +297,6 @@ EFL_START_TEST(binbuf_expand)
size_t i;
Eina_Bool r;
- eina_init();
-
buf = eina_binbuf_new();
fail_if(!buf);
@@ -369,7 +348,6 @@ EFL_START_TEST(binbuf_expand)
eina_binbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_binshare.c b/src/tests/eina/eina_test_binshare.c
index e8911f6b11..d86b477b83 100644
--- a/src/tests/eina/eina_test_binshare.c
+++ b/src/tests/eina/eina_test_binshare.c
@@ -39,8 +39,6 @@ EFL_START_TEST(eina_binshare_simple)
const char *t0;
const char *t1;
- eina_init();
-
t0 = eina_binshare_add_length(TEST0, TEST0_SIZE);
t1 = eina_binshare_add_length(TEST1, TEST1_SIZE);
@@ -57,7 +55,6 @@ EFL_START_TEST(eina_binshare_simple)
eina_binshare_del(t0);
eina_binshare_del(t1);
- eina_shutdown();
}
EFL_END_TEST
@@ -66,8 +63,6 @@ EFL_START_TEST(eina_binshare_small)
char buf[4];
int i;
- eina_init();
-
for (i = 1; i < 3; i++)
{
const char *t0, *t1;
@@ -91,7 +86,6 @@ EFL_START_TEST(eina_binshare_small)
eina_binshare_del(t0);
eina_binshare_del(t1);
}
- eina_shutdown();
}
EFL_END_TEST
@@ -101,8 +95,6 @@ EFL_START_TEST(eina_binshare_test_share)
const char *t0;
const char *t1;
- eina_init();
-
t0 = eina_binshare_add_length(TEST0, TEST0_SIZE);
t1 = eina_binshare_add_length(TEST0, TEST0_SIZE);
@@ -115,7 +107,6 @@ EFL_START_TEST(eina_binshare_test_share)
eina_binshare_del(t0);
eina_binshare_del(t1);
- eina_shutdown();
}
EFL_END_TEST
@@ -124,8 +115,6 @@ EFL_START_TEST(eina_binshare_putstuff)
const char *tmp;
int i;
- eina_init();
-
for (i = 10000; i > 0; --i)
{
char build[64] = "string_";
@@ -135,7 +124,6 @@ EFL_START_TEST(eina_binshare_putstuff)
fail_if(tmp != eina_binshare_add_length(build, strlen(build)));
fail_if((int)strlen(build) != eina_binshare_length(tmp));
}
- eina_shutdown();
}
EFL_END_TEST
@@ -147,8 +135,6 @@ EFL_START_TEST(eina_binshare_collision)
srand(time(NULL));
- eina_init();
-
ea = eina_array_new(256);
fail_if(!ea);
@@ -183,8 +169,6 @@ EFL_START_TEST(eina_binshare_collision)
for (i = 0; i < 1000; ++i)
eina_binshare_del(eina_array_pop(ea));
- eina_shutdown();
-
eina_array_free(ea);
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_convert.c b/src/tests/eina/eina_test_convert.c
index 71c998d293..1b08a00a19 100644
--- a/src/tests/eina/eina_test_convert.c
+++ b/src/tests/eina/eina_test_convert.c
@@ -90,8 +90,6 @@ _eina_convert_check(double test, int length)
long long int m = 0;
long e = 0;
- eina_init();
-
_eina_convert_check(EET_TEST_DOUBLE0, 20);
_eina_convert_check(-EET_TEST_DOUBLE0, 21);
_eina_convert_check(EET_TEST_DOUBLE1, 6);
@@ -103,7 +101,6 @@ _eina_convert_check(double test, int length)
fail_if(eina_convert_atod("0xjo", 8, &m, &e) != EINA_FALSE);
fail_if(eina_convert_atod("0xp", 8, &m, &e) != EINA_FALSE);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_counter.c b/src/tests/eina/eina_test_counter.c
index 5e0d2ef1a7..2f813e93e1 100644
--- a/src/tests/eina/eina_test_counter.c
+++ b/src/tests/eina/eina_test_counter.c
@@ -71,8 +71,6 @@ EFL_START_TEST(eina_counter_simple)
char *dump;
int i;
- eina_init();
-
cnt = eina_counter_new("eina_test");
fail_if(!cnt);
@@ -106,7 +104,6 @@ EFL_START_TEST(eina_counter_simple)
eina_counter_free(cnt);
- eina_shutdown();
}
EFL_END_TEST
@@ -114,8 +111,6 @@ EFL_START_TEST(eina_counter_break)
{
Eina_Counter *cnt;
- eina_init();
-
cnt = eina_counter_new("eina_test");
fail_if(!cnt);
@@ -182,7 +177,6 @@ EFL_START_TEST(eina_counter_break)
}
#endif
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_error.c b/src/tests/eina/eina_test_error.c
index a47a06915c..572c6b02b7 100644
--- a/src/tests/eina/eina_test_error.c
+++ b/src/tests/eina/eina_test_error.c
@@ -75,8 +75,6 @@ EFL_START_TEST(eina_error_errno)
setenv("EINA_ERROR_LEVEL", "1", 0);
- eina_init();
-
test = eina_error_msg_register(TEST_TEXT);
fail_if(!eina_error_msg_get(test));
fail_if(strcmp(eina_error_msg_get(test), TEST_TEXT) != 0);
@@ -88,7 +86,6 @@ EFL_START_TEST(eina_error_errno)
ck_assert_int_eq(eina_error_get(), EBADF);
ck_assert_str_eq(eina_error_msg_get(EBADF), strerror(EBADF));
- eina_shutdown();
}
EFL_END_TEST
@@ -97,8 +94,6 @@ EFL_START_TEST(eina_error_test_find)
int test, r;
const char *str;
- eina_init();
-
/* Make sure the value isn't already there. */
r = eina_error_find(TEST_TEXT TEST_TEXT);
ck_assert_int_eq(r, 0);
@@ -116,7 +111,6 @@ EFL_START_TEST(eina_error_test_find)
r = eina_error_find(TEST_TEXT TEST_TEXT);
ck_assert_int_eq(r, test);
- eina_shutdown();
}
EFL_END_TEST
@@ -125,8 +119,6 @@ EFL_START_TEST(eina_error_test_modify)
int test, r;
const char *str, smsg[] = "Do not copy this string";
- eina_init();
-
test = eina_error_msg_register("Some Test Error");
ck_assert_int_ne(test, 0);
@@ -153,7 +145,6 @@ EFL_START_TEST(eina_error_test_modify)
r = eina_error_find("Change that!");
ck_assert_int_eq(r, test);
- eina_shutdown();
}
EFL_END_TEST
@@ -163,8 +154,6 @@ EFL_START_TEST(eina_error_test_lots)
int codes[512];
unsigned int i;
- eina_init();
-
for (i = 0; i < sizeof(codes)/sizeof(codes[0]); i++)
{
snprintf(buf, sizeof(buf), "myerr-%u", i);
@@ -182,7 +171,6 @@ EFL_START_TEST(eina_error_test_lots)
ck_assert_int_eq(codes[i], found);
}
- eina_shutdown();
}
EFL_END_TEST
@@ -192,8 +180,6 @@ EFL_START_TEST(eina_error_test_failures)
struct log_ctx ctx;
Eina_Error local_error;
- eina_init();
-
eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx);
#define TEST_MAGIC_SAFETY(fn, _msg) \
@@ -249,7 +235,6 @@ EFL_START_TEST(eina_error_test_failures)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- eina_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index 1f0d3e9ad1..2a53573684 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -92,8 +92,6 @@ EFL_START_TEST(eina_file_split_simple)
{
Eina_Array *ea;
- eina_init();
-
#ifdef EINA_SAFETY_CHECKS
#ifdef SHOW_LOG
fprintf(stderr, "you should have a safety check failure below:\n");
@@ -151,7 +149,6 @@ EFL_START_TEST(eina_file_split_simple)
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
@@ -180,8 +177,6 @@ get_eina_test_file_tmp_dir()
EFL_START_TEST(eina_file_direct_ls_simple)
{
- eina_init();
-
/*
* Windows: naming conventions
* https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
@@ -238,14 +233,11 @@ EFL_START_TEST(eina_file_direct_ls_simple)
}
fail_if(rmdir(test_dirname) != 0);
eina_tmpstr_del(test_dirname);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_file_ls_simple)
{
- eina_init();
-
/*
* Windows: naming conventions
* https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx
@@ -300,7 +292,6 @@ EFL_START_TEST(eina_file_ls_simple)
}
fail_if(rmdir(test_dirname) != 0);
eina_tmpstr_del(test_dirname);
- eina_shutdown();
}
EFL_END_TEST
@@ -327,8 +318,6 @@ EFL_START_TEST(eina_file_map_new_test)
int test_dirname_size;
int start_point_final, last_chunk_size;
- eina_init();
-
Eina_Tmpstr *test_dirname = get_eina_test_file_tmp_dir();
fail_if(test_dirname == NULL);
test_dirname_size = strlen((char *)test_dirname);
@@ -440,7 +429,6 @@ EFL_START_TEST(eina_file_map_new_test)
free(test_file2_path);
eina_tmpstr_del(test_dirname);
- eina_shutdown();
}
EFL_END_TEST
@@ -461,8 +449,6 @@ EFL_START_TEST(eina_test_file_virtualize)
void *map;
unsigned int i = 0;
- eina_init();
-
f = eina_file_virtualize("gloubi", virtual_file_data, strlen(virtual_file_data), EINA_FALSE);
fail_if(!f);
@@ -494,7 +480,6 @@ EFL_START_TEST(eina_test_file_virtualize)
eina_file_close(f);
- eina_shutdown();
}
EFL_END_TEST
@@ -519,15 +504,12 @@ EFL_START_TEST(eina_test_file_thread)
Eina_Thread th[4];
unsigned int i;
- fail_if(!eina_init());
-
for (i = 0; i < 4; i++)
fail_if(!(eina_thread_create(&th[i], EINA_THREAD_NORMAL, -1, _eina_test_file_thread, NULL)));
for (i = 0; i < 4; i++)
fail_if(eina_thread_join(th[i]) != NULL);
- eina_shutdown();
}
EFL_END_TEST
@@ -543,15 +525,12 @@ EFL_START_TEST(eina_test_file_path)
unsigned int i;
char *path;
- fail_if(!eina_init());
-
for (i = 0; i < sizeof (sanitize) / sizeof (sanitize[0]); i++)
{
path = eina_file_path_sanitize(sanitize[i].test);
fail_if(strcmp(path, sanitize[i].result));
}
- eina_shutdown();
}
EFL_END_TEST
@@ -580,7 +559,6 @@ EFL_START_TEST(eina_test_file_xattr)
int fd, count=0;
Eina_Xattr *xattr;
- eina_init();
test_file_path = get_full_path(XATTR_TEST_DIR, filename);
fd = open(test_file_path, O_RDONLY | O_BINARY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -627,7 +605,6 @@ EFL_START_TEST(eina_test_file_xattr)
unlink(test_file_path);
eina_tmpstr_del(test_file_path);
eina_file_close(ef);
- eina_shutdown();
}
EFL_END_TEST
#endif
@@ -644,8 +621,6 @@ EFL_START_TEST(eina_test_file_copy)
Eina_Bool ret;
void *content1, *content2;
- eina_init();
-
fd1 = eina_file_mkstemp(test_file1_name, &test_file1_path);
fail_if(fd1 <= 0);
@@ -694,7 +669,6 @@ EFL_START_TEST(eina_test_file_copy)
eina_tmpstr_del(test_file1_path);
eina_tmpstr_del(test_file2_path);
- eina_shutdown();
}
EFL_END_TEST
@@ -708,8 +682,6 @@ EFL_START_TEST(eina_test_file_statat)
int template_size = strlen(template);
int fd, ret;
- eina_init();
-
Eina_Tmpstr *test_dirname = get_eina_test_file_tmp_dir();
fail_if(test_dirname == NULL);
@@ -743,7 +715,6 @@ EFL_START_TEST(eina_test_file_statat)
eina_tmpstr_del(test_file2_path);
eina_tmpstr_del(test_dirname);
- eina_shutdown();
}
EFL_END_TEST
@@ -868,8 +839,6 @@ EFL_START_TEST(eina_test_file_unlink)
Eina_Tmpstr *test_file_path;
const char *tmpfile = "eina_file_test_XXXXXX";
- eina_init();
-
/*If file was not opened as 'eina'*/
fd = create_file_not_empty(tmpfile, &test_file_path, EINA_TRUE);
fail_if(fd != 0);
@@ -881,7 +850,6 @@ EFL_START_TEST(eina_test_file_unlink)
fail_if(!eina_file_open(test_file_path, EINA_FALSE));
fail_if(!eina_file_unlink(test_file_path));
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_fp.c b/src/tests/eina/eina_test_fp.c
index 24c864a16a..786423ca04 100644
--- a/src/tests/eina/eina_test_fp.c
+++ b/src/tests/eina/eina_test_fp.c
@@ -37,8 +37,6 @@ EFL_START_TEST(eina_fp_cos)
double dresult;
double delta;
- fail_if(!eina_init());
-
fl = eina_f32p32_scale(EINA_F32P32_PI, 4);
step = eina_f32p32_div(fl, eina_f32p32_int_from(2048));
@@ -52,7 +50,6 @@ EFL_START_TEST(eina_fp_cos)
fail_if(delta > 0.005);
}
- eina_shutdown();
}
EFL_END_TEST
@@ -66,8 +63,6 @@ EFL_START_TEST(eina_fp_sin)
double dresult;
double delta;
- fail_if(!eina_init());
-
fl = eina_f32p32_scale(EINA_F32P32_PI, 4);
step = eina_f32p32_div(fl, eina_f32p32_int_from(2048));
@@ -82,7 +77,6 @@ EFL_START_TEST(eina_fp_sin)
}
- eina_shutdown();
}
EFL_END_TEST
@@ -98,8 +92,6 @@ EFL_START_TEST(eina_fp_mul)
double maxdelta = 0;
double maxdelta_per = 0;
- fail_if(!eina_init());
-
dl1 = 10;
step1 = 0.001;
dl2 = 1000;
@@ -135,7 +127,6 @@ EFL_START_TEST(eina_fp_mul)
}
printf("Max delta(multiplication): %f (%f%%)\n", maxdelta, maxdelta_per*100);
- eina_shutdown();
}
EFL_END_TEST
@@ -151,8 +142,6 @@ EFL_START_TEST(eina_fp_div)
double maxdelta = 0;
double maxdelta_per = 0;
- fail_if(!eina_init());
-
dl1 = 10;
step1 = 0.001;
dl2 = 1000;
@@ -187,7 +176,6 @@ EFL_START_TEST(eina_fp_div)
}
printf("Max delta(division): %f (%f%%)\n", maxdelta, maxdelta_per*100);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_freeq.c b/src/tests/eina/eina_test_freeq.c
index ea4db52dbf..07fec1134f 100644
--- a/src/tests/eina/eina_test_freeq.c
+++ b/src/tests/eina/eina_test_freeq.c
@@ -11,8 +11,6 @@ EFL_START_TEST(freeq_simple)
Eina_FreeQ *fq;
int *p;
- eina_init();
-
fq = eina_freeq_main_get();
fail_if(fq == NULL);
fail_if(eina_freeq_type_get(fq) != EINA_FREEQ_DEFAULT);
@@ -28,7 +26,6 @@ EFL_START_TEST(freeq_simple)
eina_freeq_free(fq);
- eina_shutdown();
}
EFL_END_TEST
@@ -44,8 +41,6 @@ EFL_START_TEST(freeq_tune)
{
void *p;
- eina_init();
-
eina_freeq_count_max_set(eina_freeq_main_get(), 3);
fail_if(eina_freeq_count_max_get(eina_freeq_main_get()) != 3);
@@ -72,7 +67,6 @@ EFL_START_TEST(freeq_tune)
fail_if(eina_freeq_ptr_pending(eina_freeq_main_get()) == EINA_TRUE);
- eina_shutdown();
}
EFL_END_TEST
@@ -80,8 +74,6 @@ EFL_START_TEST(freeq_reduce)
{
void *p;
- eina_init();
-
_n++;
p = malloc(9);
eina_freeq_ptr_main_add(p, freefn, 9);
@@ -112,7 +104,6 @@ EFL_START_TEST(freeq_reduce)
fail_if(_n > 0);
fail_if(eina_freeq_ptr_pending(eina_freeq_main_get()) == EINA_TRUE);
- eina_shutdown();
}
EFL_END_TEST
@@ -142,7 +133,6 @@ EFL_START_TEST(freeq_postponed)
unsigned int *values[20];
size_t k;
- eina_init();
_n = 0;
fq = eina_freeq_new(EINA_FREEQ_POSTPONED);
@@ -192,7 +182,6 @@ EFL_START_TEST(freeq_postponed)
eina_freeq_free(fq);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_hash.c b/src/tests/eina/eina_test_hash.c
index 69db4f5ae5..d5b006c37f 100644
--- a/src/tests/eina/eina_test_hash.c
+++ b/src/tests/eina/eina_test_hash.c
@@ -76,8 +76,6 @@ EFL_START_TEST(eina_hash_simple)
int array[] = { 1, 42, 4, 5, 6 };
/* As mempool is already initialized and it use hash, we should have 2 init. */
- fail_if(eina_init() != 2);
-
hash = eina_hash_string_superfast_new(NULL);
fail_if(hash == NULL);
@@ -122,8 +120,6 @@ EFL_START_TEST(eina_hash_simple)
eina_hash_free(hash);
- /* Same comment as eina_init */
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
@@ -133,8 +129,6 @@ EFL_START_TEST(eina_test_hash_crc)
int *test;
int array[] = { 1, 42, 4, 5, 6 };
- fail_if(eina_init() != 2);
-
hash = eina_hash_new(EINA_KEY_LENGTH(_eina_string_key_length),
EINA_KEY_CMP(_eina_string_key_cmp),
EINA_KEY_HASH(eina_hash_crc),
@@ -183,8 +177,6 @@ EFL_START_TEST(eina_test_hash_crc)
eina_hash_free(hash);
- /* Same comment as eina_init */
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
@@ -193,8 +185,6 @@ EFL_START_TEST(eina_hash_extended)
Eina_Hash *hash = NULL;
int i;
- fail_if(eina_init() != 2);
-
hash = eina_hash_string_djb2_new(NULL);
fail_if(hash == NULL);
@@ -212,7 +202,6 @@ EFL_START_TEST(eina_hash_extended)
eina_hash_free(hash);
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
@@ -222,8 +211,6 @@ EFL_START_TEST(eina_hash_double_item)
int i[] = { 7, 7 };
int *test;
- fail_if(eina_init() != 2);
-
hash = eina_hash_string_superfast_new(NULL);
fail_if(hash == NULL);
@@ -236,7 +223,6 @@ EFL_START_TEST(eina_hash_double_item)
eina_hash_free(hash);
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
@@ -249,8 +235,6 @@ EFL_START_TEST(eina_hash_all_int)
int *test;
int it;
- fail_if(eina_init() != 2);
-
hash = eina_hash_int32_new(NULL);
fail_if(hash == NULL);
@@ -278,7 +262,6 @@ EFL_START_TEST(eina_hash_all_int)
eina_hash_free(hash);
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
@@ -291,8 +274,6 @@ EFL_START_TEST(eina_hash_int32_fuzze)
unsigned int j;
unsigned int seed;
- eina_init();
-
seed = time(NULL);
srand(seed);
@@ -341,7 +322,6 @@ EFL_START_TEST(eina_hash_int32_fuzze)
eina_hash_free(hash);
- eina_shutdown();
}
EFL_END_TEST
@@ -354,8 +334,6 @@ EFL_START_TEST(eina_hash_string_fuzze)
unsigned int j;
unsigned int seed;
- eina_init();
-
seed = time(NULL);
srand(seed);
@@ -405,17 +383,13 @@ EFL_START_TEST(eina_hash_string_fuzze)
eina_hash_free(hash);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_hash_seed)
{
- eina_init();
-
fail_if(eina_seed == 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -425,8 +399,6 @@ EFL_START_TEST(eina_hash_add_del_by_hash)
int array[] = { 1, 42, 4, 5, 6 };
int key_len, key_hash;
- fail_if(eina_init() != 2);
-
hash = eina_hash_new(EINA_KEY_LENGTH(_eina_string_key_length),
EINA_KEY_CMP(_eina_string_key_cmp),
EINA_KEY_HASH(eina_hash_crc),
diff --git a/src/tests/eina/eina_test_inarray.c b/src/tests/eina/eina_test_inarray.c
index eee2485e4c..74581f2685 100644
--- a/src/tests/eina/eina_test_inarray.c
+++ b/src/tests/eina/eina_test_inarray.c
@@ -40,8 +40,6 @@ EFL_START_TEST(eina_inarray_test_simple)
{-1, -1}
};
- eina_init();
-
array = eina_inarray_new(sizeof(int), 2);
fail_unless(array != NULL);
@@ -84,7 +82,6 @@ EFL_START_TEST(eina_inarray_test_simple)
}
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -95,8 +92,6 @@ EFL_START_TEST(eina_inarray_test_alloc_at)
int *member;
int i;
- eina_init();
-
array = eina_inarray_new(sizeof(int), 2);
fail_unless(array != NULL);
@@ -124,7 +119,6 @@ EFL_START_TEST(eina_inarray_test_alloc_at)
fail_unless(member[i] == i);
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -174,8 +168,6 @@ EFL_START_TEST(eina_inarray_test_insert_sort)
Eina_Inarray *array;
int i, pos;
- eina_init();
-
array = eina_inarray_new(sizeof(short), 1);
fail_unless(array != NULL);
@@ -235,7 +227,6 @@ EFL_START_TEST(eina_inarray_test_insert_sort)
eina_inarray_flush(array);
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -244,8 +235,6 @@ EFL_START_TEST(eina_inarray_test_sort)
Eina_Inarray *array;
int i;
- eina_init();
-
array = eina_inarray_new(sizeof(short), 1);
fail_unless(array != NULL);
@@ -257,7 +246,6 @@ EFL_START_TEST(eina_inarray_test_sort)
eina_inarray_sort(array, short_cmp);
fail_unless(check_short_sorted(array));
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -266,8 +254,6 @@ EFL_START_TEST(eina_inarray_test_reverse)
Eina_Inarray *array;
int i;
- eina_init();
-
array = eina_inarray_new(sizeof(short), 1);
fail_unless(array != NULL);
@@ -285,7 +271,6 @@ EFL_START_TEST(eina_inarray_test_reverse)
}
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -319,8 +304,6 @@ EFL_START_TEST(eina_inarray_test_itr)
short *member;
int i;
- eina_init();
-
array = eina_inarray_new(sizeof(short), 1);
fail_unless(array != NULL);
@@ -386,7 +369,6 @@ EFL_START_TEST(eina_inarray_test_itr)
eina_accessor_free(ac);
eina_inarray_free(array);
- eina_shutdown();
}
EFL_END_TEST
@@ -423,8 +405,6 @@ EFL_START_TEST(eina_inarray_test_search)
unsigned int curr_len;
Eina_Bool rval;
- eina_init();
-
iarr = eina_inarray_new(sizeof(int), 0);
//search in empty array
@@ -490,7 +470,6 @@ EFL_START_TEST(eina_inarray_test_search)
fail_if(iarr->len != curr_len-3);
eina_inarray_free(iarr);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_inlist.c b/src/tests/eina/eina_test_inlist.c
index 3d0277aaf0..649c4dc140 100644
--- a/src/tests/eina/eina_test_inlist.c
+++ b/src/tests/eina/eina_test_inlist.c
@@ -96,8 +96,6 @@ EFL_START_TEST(eina_inlist_simple)
struct log_ctx ctx;
#endif
- fail_if(!eina_init());
-
tmp = _eina_test_inlist_build(42);
lst = eina_inlist_append(lst, EINA_INLIST_GET(tmp));
fail_if(!lst);
@@ -296,7 +294,6 @@ EFL_START_TEST(eina_inlist_simple)
while (lst)
lst = eina_inlist_remove(lst, lst);
- eina_shutdown();
}
EFL_END_TEST
@@ -337,8 +334,6 @@ EFL_START_TEST(eina_inlist_sorted)
Eina_Inlist *sorted = NULL;
int i;
- fail_if(!eina_init());
-
srand(time(NULL));
for (i = 0; i < 2000; ++i)
@@ -371,7 +366,6 @@ EFL_START_TEST(eina_inlist_sorted)
_eina_test_inlist_check(sorted);
- eina_shutdown();
}
EFL_END_TEST
@@ -382,8 +376,6 @@ EFL_START_TEST(eina_inlist_sorted_state)
Eina_Inlist *list = NULL;
int i;
- fail_if(!eina_init());
-
state = eina_inlist_sorted_state_new();
fail_if(!state);
@@ -402,7 +394,6 @@ EFL_START_TEST(eina_inlist_sorted_state)
eina_inlist_sorted_state_free(state);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c
index 70c34d0565..d71d7ec18e 100644
--- a/src/tests/eina/eina_test_iterator.c
+++ b/src/tests/eina/eina_test_iterator.c
@@ -44,8 +44,6 @@ EFL_START_TEST(eina_iterator_filter_simple)
Eina_Iterator *it, *filtered;
Eina_Array *ea;
- eina_init();
-
ea = eina_array_new(11);
fail_if(!ea);
@@ -85,7 +83,6 @@ EFL_START_TEST(eina_iterator_filter_simple)
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
@@ -111,7 +108,6 @@ EFL_START_TEST(eina_iterator_filter_free)
Eina_Iterator *it, *filtered;
Eina_Array *ea;
struct Free_test *data;
- eina_init();
data = calloc(1, sizeof(struct Free_test));
ea = eina_array_new(11);
@@ -127,7 +123,6 @@ EFL_START_TEST(eina_iterator_filter_free)
free(data);
- eina_shutdown();
}
EFL_END_TEST
static Eina_Bool
@@ -147,8 +142,6 @@ EFL_START_TEST(eina_iterator_array_simple)
int *tmp;
int i;
- eina_init();
-
ea = eina_array_new(11);
fail_if(!ea);
@@ -175,7 +168,6 @@ EFL_START_TEST(eina_iterator_array_simple)
eina_array_free(ea);
- eina_shutdown();
}
EFL_END_TEST
@@ -216,7 +208,6 @@ EFL_START_TEST(eina_iterator_hash_simple)
Eina_Hash *hash;
int array[] = { 1, 42, 7, 8, 6 };
- eina_init();
hash = eina_hash_string_superfast_new(NULL);
fail_if(hash == NULL);
@@ -241,7 +232,6 @@ EFL_START_TEST(eina_iterator_hash_simple)
eina_hash_free(hash);
- eina_shutdown();
}
EFL_END_TEST
@@ -361,7 +351,6 @@ EFL_START_TEST(eina_iterator_list_simple)
int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 };
int i = 0;
- eina_init();
list = eina_list_append(list, &data[0]);
fail_if(list == NULL);
@@ -426,7 +415,6 @@ EFL_START_TEST(eina_reverse_iterator_list_simple)
int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 };
int i = 0;
- eina_init();
list = eina_list_append(list, &data[0]);
fail_if(list == NULL);
diff --git a/src/tests/eina/eina_test_list.c b/src/tests/eina/eina_test_list.c
index 5bac650850..411cd49bf8 100644
--- a/src/tests/eina/eina_test_list.c
+++ b/src/tests/eina/eina_test_list.c
@@ -67,7 +67,6 @@ EFL_START_TEST(eina_test_simple)
int result[] = { 81, 9, 9, 7, 1 };
int i;
- eina_init();
list = eina_list_append(list, &data[0]);
fail_if(list == NULL);
@@ -215,7 +214,6 @@ EFL_START_TEST(eina_test_simple)
list = eina_list_free(list);
fail_if(list != NULL);
- eina_shutdown();
}
EFL_END_TEST
@@ -229,7 +227,6 @@ EFL_START_TEST(eina_test_merge)
int data[] = { 6, 9, 42, 1, 7, 9, 81, 1664, 1337, 3, 21, 10, 0, 5, 2008 };
int i;
- eina_init();
l1 = eina_list_append(NULL, &data[0]);
l1 = eina_list_append(l1, &data[1]);
@@ -300,7 +297,6 @@ EFL_START_TEST(eina_test_merge)
fail_if(!eina_list_sorted_check(l1));
- eina_shutdown();
}
EFL_END_TEST
@@ -313,7 +309,6 @@ EFL_START_TEST(eina_test_sorted_insert)
void *d;
int *res, val = 2009;
- eina_init();
count = sizeof(data) / sizeof(data[0]);
@@ -356,7 +351,6 @@ EFL_START_TEST(eina_test_sorted_insert)
fail_if(!eina_list_sorted_check(l1));
eina_list_free(l1);
- eina_shutdown();
}
EFL_END_TEST
@@ -366,7 +360,6 @@ EFL_START_TEST(eina_test_list_split)
Eina_List *list = NULL;
unsigned int i;
- eina_init();
list = eina_list_append(list, "tigh");
list = eina_list_append(list, "adar");
@@ -393,7 +386,6 @@ EFL_START_TEST(eina_test_list_split)
list = eina_list_append(list, "roslin");
}
- eina_shutdown();
}
EFL_END_TEST
@@ -420,7 +412,6 @@ EFL_START_TEST(eina_test_shuffle)
Eina_List *list = NULL;
Eina_List *item = NULL;
- eina_init();
for(i = 0; i < SHUFFLE_SZ; i++)
{
@@ -453,7 +444,6 @@ EFL_START_TEST(eina_test_shuffle)
fail_if(rand_count[i]*d < 0.80f);
}
- eina_shutdown();
}
EFL_END_TEST
@@ -467,7 +457,6 @@ EFL_START_TEST(eina_test_clone)
Eina_List *clist = NULL;
Eina_List *rclist = NULL;
- eina_init();
for(i = 0; i < DATA_SIZE; i++)
{
@@ -502,7 +491,6 @@ EFL_START_TEST(eina_test_clone)
rclist = eina_list_free(rclist);
fail_if(rclist != NULL);
- eina_shutdown();
}
EFL_END_TEST
@@ -514,7 +502,6 @@ EFL_START_TEST(eina_test_move)
int data2[] = {6, 7, 8, 9, 10};
int i, *list_data;
- eina_init();
for (i = 0; i < 5; i++)
{
@@ -542,7 +529,6 @@ EFL_START_TEST(eina_test_move)
eina_list_free(list1);
eina_list_free(list2);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_lock.c b/src/tests/eina/eina_test_lock.c
index fa3e855177..f0442c57b1 100644
--- a/src/tests/eina/eina_test_lock.c
+++ b/src/tests/eina/eina_test_lock.c
@@ -85,7 +85,6 @@ EFL_START_TEST(eina_test_spinlock)
{
unsigned int i;
- fail_if(!eina_init());
counter = 0;
fail_if(!eina_spinlock_new(&spin));
@@ -108,7 +107,6 @@ EFL_START_TEST(eina_test_spinlock)
eina_spinlock_free(&spin);
- eina_shutdown();
}
EFL_END_TEST
@@ -150,7 +148,6 @@ _eina_test_tls_thread(void *data EINA_UNUSED, Eina_Thread t EINA_UNUSED)
EFL_START_TEST(eina_test_tls)
{
- fail_if(!eina_init());
fail_if(!eina_tls_cb_new(&key, _eina_test_tls_free));
@@ -167,7 +164,6 @@ EFL_START_TEST(eina_test_tls)
eina_tls_free(key);
- eina_shutdown();
}
EFL_END_TEST
@@ -202,7 +198,6 @@ EFL_START_TEST(eina_test_rwlock)
struct timespec ts, ts2;
long delay;
- fail_if(!eina_init());
fail_if(!eina_rwlock_new(&mutex));
fail_if(!eina_lock_new(&mtcond));
@@ -251,7 +246,6 @@ EFL_START_TEST(eina_test_rwlock)
eina_lock_free(&mtcond);
eina_rwlock_free(&mutex);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_log.c b/src/tests/eina/eina_test_log.c
index a856f09a7b..043cecf8cb 100644
--- a/src/tests/eina/eina_test_log.c
+++ b/src/tests/eina/eina_test_log.c
@@ -105,7 +105,6 @@ EFL_START_TEST(eina_log_macro)
int oldlevel;
int maxlevel;
- fail_if(!eina_init());
oldlevel = eina_log_level_get();
eina_log_level_set(EINA_LOG_LEVEL_DBG);
@@ -164,7 +163,6 @@ EFL_START_TEST(eina_log_macro)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
eina_log_level_set(oldlevel);
- eina_shutdown();
}
EFL_END_TEST
@@ -174,7 +172,6 @@ EFL_START_TEST(eina_log_domains_macros)
int oldlevel;
int maxlevel;
- fail_if(!eina_init());
/* make global log level blocker */
oldlevel = eina_log_level_get();
@@ -241,13 +238,11 @@ EFL_START_TEST(eina_log_domains_macros)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
eina_log_level_set(oldlevel);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_log_domains_registry)
{
- fail_if(!eina_init());
int i;
int d[50];
@@ -261,13 +256,11 @@ EFL_START_TEST(eina_log_domains_registry)
for (i = 0; i < 50; i++)
eina_log_domain_unregister(d[i]);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_log_domains_slot_reuse)
{
- fail_if(!eina_init());
fail_if(!eina_threads_init());
// Create 9 domains
@@ -298,7 +291,6 @@ EFL_START_TEST(eina_log_domains_slot_reuse)
fail_if(new != removed);
eina_threads_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -307,8 +299,6 @@ EFL_START_TEST(eina_log_level_indexes)
struct log_ctx ctx;
int maxlevel;
- fail_if(!eina_init());
- fail_if(!eina_threads_init());
fail_if(!eina_threads_init());
int d = eina_log_domain_register("Levels", EINA_COLOR_GREEN);
@@ -369,8 +359,6 @@ EFL_START_TEST(eina_log_level_indexes)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
eina_threads_shutdown();
- eina_threads_shutdown();
- eina_shutdown();
}
EFL_END_TEST
@@ -382,7 +370,6 @@ EFL_START_TEST(eina_log_customize)
/* please don't define EINA_LOG_LEVELS for it */
#define TEST_DOM "_Test_Log_Dom"
- fail_if(!eina_init());
#define test_set_get(func, val) \
eina_log_ ## func ## _set(val); \
@@ -444,7 +431,6 @@ EFL_START_TEST(eina_log_customize)
#undef test_set_get_bool
#undef test_set_get
- eina_shutdown();
}
EFL_END_TEST
@@ -452,7 +438,6 @@ EFL_START_TEST(eina_log_level_name)
{
char name[4];
- fail_if(!eina_init());
#define tst(level, str) \
eina_log_level_name_get(level, name); \
@@ -471,7 +456,6 @@ EFL_START_TEST(eina_log_level_name)
#undef tst
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_magic.c b/src/tests/eina/eina_test_magic.c
index 5dd4fad9d5..3404afb0fa 100644
--- a/src/tests/eina/eina_test_magic.c
+++ b/src/tests/eina/eina_test_magic.c
@@ -109,7 +109,6 @@ EFL_START_TEST(eina_magic_simple)
Eina_Magic_Struct *ems = NULL;
struct log_ctx ctx;
- eina_init();
eina_log_print_cb_set(_eina_test_safety_print_cb, &ctx);
@@ -189,7 +188,6 @@ EFL_START_TEST(eina_magic_simple)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_main.c b/src/tests/eina/eina_test_main.c
index ec46a55aec..e70cdd038f 100644
--- a/src/tests/eina/eina_test_main.c
+++ b/src/tests/eina/eina_test_main.c
@@ -26,32 +26,23 @@
#include "eina_suite.h"
- EFL_START_TEST(eina_simple)
+EFL_START_TEST(eina_simple)
{
- fail_if(eina_init() != 2); /* one init by test suite */
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
EFL_START_TEST(eina_cpu)
{
- fail_if(eina_init() != 2); /* one init by test suite */
-
fail_if(eina_cpu_count() <= 0);
eina_cpu_features_get();
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
EFL_START_TEST(eina_hamster)
{
- fail_if(eina_init() != 2); /* one init by test suite */
-
fail_if(eina_hamster_count() <= 0);
-
- fail_if(eina_shutdown() != 1);
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_matrix.c b/src/tests/eina/eina_test_matrix.c
index 3f3ea59145..1d54f21e3f 100644
--- a/src/tests/eina/eina_test_matrix.c
+++ b/src/tests/eina/eina_test_matrix.c
@@ -35,7 +35,6 @@ EFL_START_TEST(eina_matrix2)
Eina_Matrix2 n;
double xx, xy, yx, yy;
- eina_init();
eina_matrix2_values_set(&m,
1, 0,
@@ -54,7 +53,6 @@ EFL_START_TEST(eina_matrix2)
fail_if(!EINA_DBL_EQ(xy, yx) ||
!EINA_DBL_EQ(xy, 0));
- eina_shutdown();
}
EFL_END_TEST
@@ -130,7 +128,6 @@ EFL_START_TEST(eina_matrix4)
zx, zy, zz, zw,
wx, wy, wz, ww;
- eina_init();
eina_matrix4_values_set(&m,
1, 0, 0, 0,
@@ -192,7 +189,6 @@ EFL_START_TEST(eina_matrix4)
!EINA_DBL_EQ(n.wz, 12) ||
!EINA_DBL_EQ(n.ww, 16));
- eina_shutdown();
}
EFL_END_TEST
@@ -323,7 +319,6 @@ EFL_START_TEST(eina_matrix4_2_3)
Eina_Matrix4 m4;
Eina_Matrix3 m3, m3b;
- eina_init();
eina_matrix3_values_set(&m3,
1, 3, 2,
@@ -335,7 +330,6 @@ EFL_START_TEST(eina_matrix4_2_3)
fail_if(memcmp(&m3, &m3b, sizeof (Eina_Matrix3)) != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -347,7 +341,6 @@ EFL_START_TEST(eina_matrix3)
yx, yy, yz,
zx, zy, zz;
- eina_init();
eina_matrix3_values_set(&m,
1, 0, 0,
@@ -385,7 +378,6 @@ EFL_START_TEST(eina_matrix3)
ret = eina_matrix3_equal(&m1, &m2);
fail_if(ret != EINA_FALSE);
- eina_shutdown();
}
EFL_END_TEST
@@ -664,7 +656,6 @@ EFL_START_TEST(eina_matrix3_f16p16)
zx, zy, zz;
Eina_Matrix3_F16p16 m3;
- eina_init();
eina_matrix3_values_set(&m2,
1, 0, 0,
@@ -715,7 +706,6 @@ EFL_START_TEST(eina_matrix3_f16p16)
m3.zy != m3.zz ||
m3.zz != 196608);
- eina_shutdown();
}
EFL_END_TEST
@@ -727,7 +717,6 @@ EFL_START_TEST(eina_matrix3_map_transform)
Eina_Quad q;
Eina_Bool ret;
- eina_init();
eina_matrix3_values_set(&m,
0, 1, 0,
@@ -779,7 +768,6 @@ EFL_START_TEST(eina_matrix3_map_transform)
!EINA_DBL_EQ(q.x3, 0) ||
!EINA_DBL_EQ(q.y3, 3));
- eina_shutdown();
}
EFL_END_TEST
@@ -791,7 +779,6 @@ EFL_START_TEST(eina_normal3_test)
yx, yy, yz,
zx, zy, zz;
- eina_init();
eina_matrix4_values_set(&m,
1, 0, 0, 0,
0, 1, 0, 0,
@@ -826,7 +813,6 @@ EFL_START_TEST(eina_normal3_test)
(fabs(yz)) > DBL_EPSILON ||
(fabs(zy)) > DBL_EPSILON
);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_matrixsparse.c b/src/tests/eina/eina_test_matrixsparse.c
index d64720b0f9..c1aba54f9d 100644
--- a/src/tests/eina/eina_test_matrixsparse.c
+++ b/src/tests/eina/eina_test_matrixsparse.c
@@ -105,7 +105,6 @@ EFL_START_TEST(eina_test_simple)
value3 = -3;
value4 = -4;
- eina_init();
matrix = eina_matrixsparse_new(MAX_ROWS, MAX_COLS,
eina_matrixsparse_free_cell_cb, data);
@@ -266,7 +265,6 @@ EFL_START_TEST(eina_test_simple)
matrixsparse_check(matrix, data, MAX_ROWS, MAX_COLS);
eina_matrixsparse_free(matrix);
- eina_shutdown();
}
EFL_END_TEST
@@ -283,7 +281,6 @@ EFL_START_TEST(eina_test_resize)
for (j = 0; j < MAX_COLS; j++)
data[i][j] = 0;
- eina_init();
matrix = eina_matrixsparse_new(MAX_ROWS, MAX_COLS,
eina_matrixsparse_free_cell_cb, data);
@@ -378,7 +375,6 @@ EFL_START_TEST(eina_test_resize)
eina_matrixsparse_free(matrix);
- eina_shutdown();
}
EFL_END_TEST
@@ -405,7 +401,6 @@ EFL_START_TEST(eina_test_iterators)
printf("\n");
}
- eina_init();
matrix = eina_matrixsparse_new(MAX_ROWS, MAX_COLS,
eina_matrixsparse_free_cell_cb, data);
@@ -477,7 +472,6 @@ EFL_START_TEST(eina_test_iterators)
eina_matrixsparse_free(matrix);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_module.c b/src/tests/eina/eina_test_module.c
index e08a17d584..68ad598899 100644
--- a/src/tests/eina/eina_test_module.c
+++ b/src/tests/eina/eina_test_module.c
@@ -52,9 +52,8 @@ EFL_START_TEST(eina_module_load_unload)
Eina_Array_Iterator it;
Eina_Module *module;
- eina_init();
_modules = eina_module_list_get(NULL,
- PACKAGE_BUILD_DIR "/src/tests/",
+ PACKAGE_BUILD_DIR "/src/tests/eina",
EINA_TRUE,
&list_cb,
NULL);
@@ -65,7 +64,6 @@ EFL_START_TEST(eina_module_load_unload)
EINA_ARRAY_ITER_NEXT(_modules, i, module, it)
free(module);
eina_array_free(_modules);
- eina_shutdown();
}
EFL_END_TEST
@@ -73,15 +71,13 @@ EFL_START_TEST(eina_module_find_test)
{
Eina_Array *_modules;
- eina_init();
_modules = eina_module_list_get(NULL,
- PACKAGE_BUILD_DIR "/src/tests/",
+ PACKAGE_BUILD_DIR "/src/tests/eina",
EINA_TRUE,
&list_cb,
NULL);
fail_if(!_modules);
fail_if(eina_module_find(_modules, NULL) != NULL);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_quad.c b/src/tests/eina/eina_test_quad.c
index 815245c256..d8a3cf206a 100644
--- a/src/tests/eina/eina_test_quad.c
+++ b/src/tests/eina/eina_test_quad.c
@@ -16,7 +16,6 @@ EFL_START_TEST(eina_quad_simple)
double x0, x1, x2, x3;
double y0, y1, y2, y3;
- fail_if(!eina_init());
eina_quad_coords_set(&r2,
0.0, 5.0,
@@ -66,7 +65,6 @@ EFL_START_TEST(eina_quad_simple)
!EINA_FLT_EQ(r2.x3, 5.0) ||
!EINA_FLT_EQ(r2.y3, 40.0));
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_quadtree.c b/src/tests/eina/eina_test_quadtree.c
index 1b344b9c0a..175154de23 100644
--- a/src/tests/eina/eina_test_quadtree.c
+++ b/src/tests/eina/eina_test_quadtree.c
@@ -94,7 +94,6 @@ EFL_START_TEST(eina_quadtree_collision)
int count;
int i;
- fail_if(!eina_init());
q = eina_quadtree_new(640, 480,
_eina_quadtree_rectangle_vert,
@@ -185,7 +184,6 @@ EFL_START_TEST(eina_quadtree_collision)
eina_quadtree_free(q);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_quaternion.c b/src/tests/eina/eina_test_quaternion.c
index 9bb32e0e1c..fc1ec16bef 100644
--- a/src/tests/eina/eina_test_quaternion.c
+++ b/src/tests/eina/eina_test_quaternion.c
@@ -97,11 +97,9 @@ EFL_START_TEST(eina_test_quaternion_norm)
static const Eina_Quaternion q = { 1, 3, 4, 5 };
double result = eina_quaternion_norm(&q);
- eina_init();
fail_if(!EINA_FLT_EQ(result, sqrt(51)));
- eina_shutdown();
}
EFL_END_TEST
@@ -111,7 +109,6 @@ EFL_START_TEST(eina_test_quaternion_conjugate)
static const Eina_Quaternion r1 = { -1, 1, 1, 3 }, r2 = { -1, -3, -4, 3 };
Eina_Quaternion t1, t2;
- eina_init();
eina_quaternion_conjugate(&t1, &q1);
eina_quaternion_conjugate(&t2, &q2);
@@ -119,7 +116,6 @@ EFL_START_TEST(eina_test_quaternion_conjugate)
fail_if(!eina_quaternion_cmp(&t1, &r1));
fail_if(!eina_quaternion_cmp(&t2, &r2));
- eina_shutdown();
}
EFL_END_TEST
@@ -135,7 +131,6 @@ EFL_START_TEST(eina_test_quaternion_matrix)
};
Eina_Matrix3 tm;
- eina_init();
eina_quaternion_rotation_matrix3_get(&tm, &q);
fail_if(!eina_matrix3_cmp(&tm, &m));
@@ -143,7 +138,6 @@ EFL_START_TEST(eina_test_quaternion_matrix)
eina_matrix3_quaternion_get(&tq, &m);
fail_if(!eina_quaternion_cmp(&tq, &q) && !eina_quaternion_cmp(&tq, &q1));
- eina_shutdown();
}
EFL_END_TEST
@@ -153,14 +147,12 @@ EFL_START_TEST(eina_test_quaternion_op)
Eina_Quaternion z = { 0, 0, 0, 0 };
Eina_Quaternion neg, r;
- eina_init();
eina_quaternion_negative(&neg, &q);
eina_quaternion_add(&r, &q, &neg);
fail_if(!eina_quaternion_cmp(&z, &r));
- eina_shutdown();
}
EFL_END_TEST
@@ -173,7 +165,6 @@ EFL_START_TEST(eina_test_quaternion_f16p16)
Eina_Quaternion_F16p16 t, s, r = {65536, 65536, 65536, 65536};
- eina_init();
eina_quaternion_f16p16_set(&p, x, y, z, w);
fail_if(!eina_quaternion_cmp(&p, &q));
@@ -227,12 +218,10 @@ EFL_START_TEST(eina_test_quaternion_dot)
Eina_Quaternion r = {7, 9, 5, 1};
double res;
- eina_init();
res = eina_quaternion_dot(&q, &r);
fail_if(res != 59);
- eina_shutdown();
}
EFL_END_TEST
@@ -242,12 +231,10 @@ EFL_START_TEST(eina_test_quaternion_scale)
double scale = 2;
Eina_Quaternion r, res = {2, 6, 8, 10};
- eina_init();
eina_quaternion_scale(&r, &q, scale);
fail_if(!eina_quaternion_cmp(&r, &res));
- eina_shutdown();
}
EFL_END_TEST
@@ -255,13 +242,11 @@ EFL_START_TEST(eina_test_quaternion_set)
{
Eina_Quaternion q, r = {1, 3, 4, 5};
- eina_init();
eina_quaternion_set(&q, 1, 3, 4, 5);
fail_if(!eina_quaternion_cmp(&q, &r));
- eina_shutdown();
}
EFL_END_TEST
@@ -271,12 +256,10 @@ EFL_START_TEST(eina_test_quaternion_mul)
Eina_Quaternion q = {7, 9, 5, 1};
Eina_Quaternion r, res = {15, 71, 17, -49};
- eina_init();
eina_quaternion_mul(&r, &p, &q);
fail_if(!eina_quaternion_cmp(&r, &res));
- eina_shutdown();
}
EFL_END_TEST
@@ -289,7 +272,6 @@ EFL_START_TEST(eina_test_matrix_recompose)
const Eina_Quaternion rotation = { 0, 0, 0, 1 };
Eina_Matrix4 m4;
- eina_init();
eina_quaternion_matrix4_to(&m4,
&rotation,
@@ -300,7 +282,6 @@ EFL_START_TEST(eina_test_matrix_recompose)
fail_if(eina_matrix4_type_get(&m4) != EINA_MATRIX_TYPE_IDENTITY);
- eina_shutdown();
}
EFL_END_TEST
@@ -309,12 +290,10 @@ EFL_START_TEST(eina_test_quaternion_normalized)
Eina_Quaternion p = {1, 1, 1, 1};
Eina_Quaternion res, q = {0.5, 0.5, 0.5, 0.5};
- eina_init();
eina_quaternion_normalized(&res, &p);
fail_if(!eina_quaternion_cmp(&q, &res));
- eina_shutdown();
}
EFL_END_TEST
@@ -330,7 +309,6 @@ EFL_START_TEST(eina_test_matrix_quaternion)
Eina_Matrix4 m4, m4r;
Eina_Point_3D translation, scale, skew;
- eina_init();
eina_matrix3_identity(&m3);
eina_matrix3_rotate(&m3, 3.14159265);
@@ -362,7 +340,6 @@ EFL_START_TEST(eina_test_matrix_quaternion)
// Disable this test for the moment as it seems a rounding issue
// fail_if(!eina_matrix3_cmp(&m3r, &m3));
- eina_shutdown();
}
EFL_END_TEST
#endif
@@ -374,7 +351,6 @@ EFL_START_TEST(eina_test_quaternion_f16p16_lerp)
Eina_Quaternion_F16p16 res1 = {65536, 65536, 65536, 0};
Eina_Quaternion_F16p16 res2 = {0, 0, 0, 0};
- eina_init();
eina_quaternion_f16p16_lerp(&r, &p, &q, 65536);
fail_if(!eina_quaternion_f16p16_cmp(&r, &res1));
@@ -391,7 +367,6 @@ EFL_START_TEST(eina_test_quaternion_f16p16_lerp)
eina_quaternion_f16p16_nlerp(&r, &p, &q, 65536);
fail_if(!eina_quaternion_f16p16_cmp(&r, &res1));
- eina_shutdown();
}
EFL_END_TEST
@@ -401,7 +376,6 @@ EFL_START_TEST(eina_test_quaternion_lerp)
Eina_Quaternion rq = {1, 0, 0, 0};
Eina_Quaternion rr, res = {0.5, 0.0, 0.5, 0.0};
- eina_init();
eina_quaternion_lerp(&rr, &rp, &rq, 0.5);
fail_if(!eina_quaternion_cmp(&rr, &res));
@@ -427,7 +401,6 @@ EFL_START_TEST(eina_test_quaternion_lerp)
eina_quaternion_nlerp(&rr, &rp, &rq, 1.0);
fail_if(!eina_quaternion_cmp(&rr, &res));
- eina_shutdown();
}
EFL_END_TEST
@@ -440,7 +413,6 @@ EFL_START_TEST(eina_test_quaternion_f16p16_rotate_matrix)
131072, -262144, 131072,
131072, 131072, -262144 };
- eina_init();
eina_quaternion_f16p16_rotate(&r, &c, &q);
fail_if(r.x != res.x ||
@@ -450,7 +422,6 @@ EFL_START_TEST(eina_test_quaternion_f16p16_rotate_matrix)
eina_quaternion_f16p16_rotation_matrix3_get(&m, &q);
fail_if(!eina_matrix3_f16p16_cmp(&m, &mres));
- eina_shutdown();
}
EFL_END_TEST
@@ -461,7 +432,6 @@ EFL_START_TEST(eina_test_quaternion_rotate)
Eina_Point_3D res1 = {3.0, 3.0, -9.0};
Eina_Quaternion q = {1, 1, 1, 0};
- eina_init();
eina_quaternion_rotate(&r, &c, &q);
fail_if(!eina_point_3d_cmp(&r, &res));
@@ -470,7 +440,6 @@ EFL_START_TEST(eina_test_quaternion_rotate)
eina_quaternion_rotate(&r, &c, &q);
fail_if(!eina_point_3d_cmp(&r, &res1));
- eina_shutdown();
}
EFL_END_TEST
@@ -482,7 +451,6 @@ EFL_START_TEST(eina_test_quaternion_operations)
const double v[] = {0, 1, 2, 3};
double angle;
Eina_Matrix4 m;
- eina_init();
eina_quaternion_inverse(&out, &in);
fail_if((out.x + 0.2 > DBL_EPSILON) || (out.y + 0.2 > DBL_EPSILON) ||
@@ -535,7 +503,6 @@ EFL_START_TEST(eina_test_quaternion_operations)
(fabs(out.z) - 1.0) > DBL_EPSILON ||
(fabs(out.w) - 1.0) > DBL_EPSILON
);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_rbtree.c b/src/tests/eina/eina_test_rbtree.c
index b767c78885..2ec9cf461e 100644
--- a/src/tests/eina/eina_test_rbtree.c
+++ b/src/tests/eina/eina_test_rbtree.c
@@ -368,7 +368,6 @@ EFL_START_TEST(eina_rbtree_remove)
Eina_Array_Iterator it;
unsigned int i;
- eina_init();
ea = eina_array_new(11);
fail_if(!ea);
@@ -403,7 +402,6 @@ EFL_START_TEST(eina_rbtree_remove)
fail_if(root != NULL);
- eina_shutdown();
}
EFL_END_TEST
@@ -622,7 +620,6 @@ EFL_START_TEST(eina_rbtree_fuzzy)
unsigned int i;
unsigned int j;
- eina_init();
for (i = 0; i < 10000; i++)
@@ -672,7 +669,6 @@ EFL_START_TEST(eina_rbtree_fuzzy)
}
}
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_rectangle.c b/src/tests/eina/eina_test_rectangle.c
index 46348759bf..b38cc75639 100644
--- a/src/tests/eina/eina_test_rectangle.c
+++ b/src/tests/eina/eina_test_rectangle.c
@@ -35,7 +35,6 @@ EFL_START_TEST(eina_rectangle_pool)
int w;
int h;
- fail_if(!eina_init());
pool = eina_rectangle_pool_new(256, 256);
fail_if(pool == NULL);
@@ -69,7 +68,6 @@ EFL_START_TEST(eina_rectangle_pool)
eina_rectangle_pool_free(pool);
- eina_shutdown();
}
EFL_END_TEST
@@ -82,7 +80,6 @@ EFL_START_TEST(eina_rectangle_pool_skyline)
int w;
int h;
- fail_if(!eina_init());
pool = eina_rectangle_pool_new(256, 256);
fail_if(pool == NULL);
@@ -116,7 +113,6 @@ EFL_START_TEST(eina_rectangle_pool_skyline)
eina_rectangle_pool_free(pool);
- eina_shutdown();
}
EFL_END_TEST
@@ -124,7 +120,6 @@ EFL_START_TEST(eina_rectangle_union_intersect)
{
Eina_Rectangle r1, r2, r3, r4, r5, r6, r7, r8, rd;
- fail_if(!eina_init());
EINA_RECTANGLE_SET(&r1, 10, 10, 50, 50);
EINA_RECTANGLE_SET(&r2, 20, 20, 20, 20);
@@ -192,7 +187,6 @@ EFL_START_TEST(eina_rectangle_union_intersect)
|| rd.w != 20
|| rd.h != 20);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_safepointer.c b/src/tests/eina/eina_test_safepointer.c
index 0bc6a7d42b..c65ab7e2f1 100644
--- a/src/tests/eina/eina_test_safepointer.c
+++ b/src/tests/eina/eina_test_safepointer.c
@@ -34,7 +34,6 @@ EFL_START_TEST(eina_test_reusable)
{
unsigned int i;
- eina_init();
for (i = 0; i < sizeof (test_array) / sizeof (test_array[0]); i++)
{
@@ -68,7 +67,6 @@ EFL_START_TEST(eina_test_reusable)
}
}
- eina_shutdown();
}
EFL_END_TEST
@@ -116,7 +114,6 @@ EFL_START_TEST(eina_test_threading)
Eina_Thread t1, t2;
unsigned int i;
- eina_init();
// We need a barrier so that both thread are more likely
// to start running in parallel
@@ -147,7 +144,6 @@ EFL_START_TEST(eina_test_threading)
}
}
- eina_shutdown();
}
EFL_END_TEST
@@ -155,7 +151,6 @@ EFL_START_TEST(eina_test_lowestbit)
{
unsigned int i;
- eina_init();
for (i = 0; i < sizeof (test_array) / sizeof (test_array[0]); i++)
{
@@ -175,7 +170,6 @@ EFL_START_TEST(eina_test_lowestbit)
fail_if(eina_safepointer_get(pointers[i]) != NULL);
}
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_sched.c b/src/tests/eina/eina_test_sched.c
index 1096161e2f..c054236e70 100644
--- a/src/tests/eina/eina_test_sched.c
+++ b/src/tests/eina/eina_test_sched.c
@@ -59,7 +59,6 @@ EFL_START_TEST(eina_test_sched_prio_drop)
Eina_Thread tid;
Eina_Bool r;
- eina_init();
r = eina_thread_create(&tid, EINA_THREAD_NORMAL, -1, _thread_run, NULL);
fail_unless(r);
@@ -72,7 +71,6 @@ EFL_START_TEST(eina_test_sched_prio_drop)
/* niceness of main thread should not have changed */
ck_assert_int_eq(niceval2, niceval);
- eina_shutdown();
}
EFL_END_TEST
#else
diff --git a/src/tests/eina/eina_test_simple_xml_parser.c b/src/tests/eina/eina_test_simple_xml_parser.c
index da75342164..34c8d69002 100644
--- a/src/tests/eina/eina_test_simple_xml_parser.c
+++ b/src/tests/eina/eina_test_simple_xml_parser.c
@@ -53,7 +53,6 @@ EFL_START_TEST(eina_simple_xml_parser_node_dump)
{
FILE *f;
- eina_init();
f = fopen(get_file_full_path("sample.gpx"), "rb");
if (f)
{
@@ -86,24 +85,20 @@ EFL_START_TEST(eina_simple_xml_parser_node_dump)
fclose(f);
}
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_simple_xml_parser_null_node_dump)
{
- eina_init();
char *out = eina_simple_xml_node_dump(NULL, " ");
fail_if(out != NULL);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_simple_xml_parser_childs_count)
{
- eina_init();
const char *buf = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\" ?>\n"
"<test version=\"0.1\"><child>I'm a child.</child><child><![CDATA[I'm a 2-nd child.]]></child><!-- Some comment --></test>";
@@ -114,7 +109,6 @@ EFL_START_TEST(eina_simple_xml_parser_childs_count)
fail_if(eina_inlist_count(root->children) != 2);
eina_simple_xml_node_root_free(root);
- eina_shutdown();
}
EFL_END_TEST
@@ -225,7 +219,6 @@ EFL_START_TEST(eina_simple_xml_parser_parse_with_custom_callback)
{
FILE *f;
- eina_init();
f = fopen(get_file_full_path("sample.gpx"), "rb");
if (f)
@@ -261,7 +254,6 @@ EFL_START_TEST(eina_simple_xml_parser_parse_with_custom_callback)
fclose(f);
}
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_slice.c b/src/tests/eina/eina_test_slice.c
index 004675d523..1c16054d06 100644
--- a/src/tests/eina/eina_test_slice.c
+++ b/src/tests/eina/eina_test_slice.c
@@ -34,7 +34,6 @@ EFL_START_TEST(eina_test_slice_init)
Eina_Rw_Slice c = EINA_SLICE_STR("hi there");
EINA_RW_SLICE_DECLARE(d, 512);
- eina_init();
fail_unless(a.len == sizeof("hello world") - 1);
fail_unless(strcmp(a.mem, "hello world") == 0);
@@ -46,7 +45,6 @@ EFL_START_TEST(eina_test_slice_init)
fail_unless(d.len == 512);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_slstr.c b/src/tests/eina/eina_test_slstr.c
index 47c8410729..42fd845b32 100644
--- a/src/tests/eina/eina_test_slstr.c
+++ b/src/tests/eina/eina_test_slstr.c
@@ -19,12 +19,10 @@ EFL_START_TEST(slstr_copy)
{
Eina_Slstr *str;
- eina_init();
str = _slstr_copy();
ck_assert_str_eq(str, "Hello world 1");
- eina_shutdown();
}
EFL_END_TEST
@@ -40,12 +38,10 @@ EFL_START_TEST(slstr_steal)
{
Eina_Slstr *str;
- eina_init();
str = _slstr_steal();
ck_assert_str_eq(str, "Hello world 2");
- eina_shutdown();
}
EFL_END_TEST
@@ -62,13 +58,11 @@ EFL_START_TEST(slstr_stringshare)
Eina_Stringshare *ss;
Eina_Slstr *str;
- eina_init();
str = _slstr_stringshare();
ss = eina_stringshare_add("Hello world 3");
fail_if(ss != str);
- eina_shutdown();
}
EFL_END_TEST
@@ -84,12 +78,10 @@ EFL_START_TEST(slstr_tmpstr)
{
Eina_Slstr *str;
- eina_init();
str = _slstr_tmpstr();
ck_assert_str_eq(str, "Hello world 4");
- eina_shutdown();
}
EFL_END_TEST
@@ -109,12 +101,10 @@ EFL_START_TEST(slstr_strbuf)
{
Eina_Slstr *str;
- eina_init();
str = _slstr_strbuf();
ck_assert_str_eq(str, "Hello world 5");
- eina_shutdown();
}
EFL_END_TEST
@@ -128,12 +118,10 @@ EFL_START_TEST(slstr_slstr_printf)
{
Eina_Slstr *str;
- eina_init();
str = _slstr_printf(6);
ck_assert_str_eq(str, "Hello world 6");
- eina_shutdown();
}
EFL_END_TEST
@@ -156,13 +144,11 @@ _many_do(void)
EFL_START_TEST(slstr_many)
{
- eina_init();
_many_do();
eina_slstr_local_clear();
- eina_shutdown();
}
EFL_END_TEST
@@ -180,7 +166,6 @@ EFL_START_TEST(slstr_thread)
Eina_Thread th[threads];
int k;
- eina_init();
for (k = 0; k < threads; k++)
fail_if(!eina_thread_create(&th[k], EINA_THREAD_NORMAL, -1, _thread_cb, NULL));
@@ -190,7 +175,6 @@ EFL_START_TEST(slstr_thread)
eina_slstr_local_clear();
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c
index 1d1a7db0c5..f92c1f260a 100644
--- a/src/tests/eina/eina_test_str.c
+++ b/src/tests/eina/eina_test_str.c
@@ -32,7 +32,6 @@ EFL_START_TEST(str_simple)
char *str, *ret;
const char *escape_ret = "\\ a\\\\x\\'";
- eina_init();
fail_if(!eina_str_has_prefix("", ""));
@@ -115,7 +114,6 @@ EFL_START_TEST(str_simple)
free(str);
free(ret);
- eina_shutdown();
}
EFL_END_TEST
@@ -125,7 +123,6 @@ EFL_START_TEST(str_split)
unsigned int elements;
char *str;
- eina_init();
result = eina_str_split_full(NULL, ":", 1, &elements);
fail_if(result != NULL);
@@ -248,7 +245,6 @@ EFL_START_TEST(str_split)
free(result[0]);
free(result);
- eina_shutdown();
}
EFL_END_TEST
@@ -258,7 +254,6 @@ EFL_START_TEST(str_lcat_lcpy)
size_t ret;
size_t ds = (sizeof(dst) / sizeof(char));
- eina_init();
dst[0] = '\0';
@@ -290,7 +285,6 @@ EFL_START_TEST(str_lcat_lcpy)
fail_if(ret != 10);
fail_if(strcmp(dst, "copy2cop") != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -300,7 +294,6 @@ EFL_START_TEST(str_join_len)
size_t ret;
size_t ds = (sizeof(dst) / sizeof(char));
- eina_init();
dst[0] = '\0';
@@ -320,7 +313,6 @@ EFL_START_TEST(str_join_len)
fail_if(ret != 9);
fail_if(strcmp(dst, "abcd#efg") != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -334,7 +326,6 @@ EFL_START_TEST(str_memdup)
unsigned char buf[7];
unsigned char *temp_buf;
- eina_init();
t1.i = 1234;
t1.s = "hello";
@@ -351,7 +342,6 @@ EFL_START_TEST(str_memdup)
fail_if(strcmp((char *) temp_buf, "aaabbb") != 0);
free(temp_buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -360,7 +350,6 @@ EFL_START_TEST(str_strftime)
time_t curr_time;
struct tm *info;
char *buf;
- eina_init();
curr_time = time(NULL);
info = localtime(&curr_time);
@@ -369,7 +358,6 @@ EFL_START_TEST(str_strftime)
fail_if(buf == NULL);
free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -382,7 +370,6 @@ EFL_START_TEST(str_convert)
size_t ret_sz;
int i;
- eina_init();
ret = eina_str_convert("UTF-8", "UTF-16LE", utf8);
fail_if(ret == NULL);
@@ -398,7 +385,6 @@ EFL_START_TEST(str_convert)
fail_if(ret[i] != utf16[i]);
free(ret);
- eina_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/eina/eina_test_strbuf.c b/src/tests/eina/eina_test_strbuf.c
index 9f1be3f49c..7df11463e2 100644
--- a/src/tests/eina/eina_test_strbuf.c
+++ b/src/tests/eina/eina_test_strbuf.c
@@ -35,7 +35,6 @@ EFL_START_TEST(strbuf_simple)
#define TEST_TEXT \
"This test should be so long that it is longer than the initial size of strbuf"
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -74,7 +73,6 @@ EFL_START_TEST(strbuf_simple)
eina_strbuf_free(buf);
- eina_shutdown();
#undef TEST_TEXT
}
EFL_END_TEST
@@ -86,7 +84,6 @@ EFL_START_TEST(strbuf_manage_simple)
#define TEST_TEXT \
"This test should be so long that it is longer than the initial size of strbuf"
- eina_init();
txt = strdup(TEST_TEXT);
@@ -126,7 +123,6 @@ EFL_START_TEST(strbuf_manage_simple)
fail_if(strcmp(txt, TEST_TEXT TEST_TEXT));
free(txt);
- eina_shutdown();
#undef TEST_TEXT
}
EFL_END_TEST
@@ -135,7 +131,6 @@ EFL_START_TEST(strbuf_remove)
{
Eina_Strbuf *buf;
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -171,7 +166,6 @@ EFL_START_TEST(strbuf_remove)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -182,7 +176,6 @@ EFL_START_TEST(strbuf_append)
ro_slice.len -= strlen("ELSE");
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -224,7 +217,6 @@ EFL_START_TEST(strbuf_append)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -235,7 +227,6 @@ EFL_START_TEST(strbuf_insert)
ro_slice.len = 2;
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -278,7 +269,6 @@ EFL_START_TEST(strbuf_insert)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -286,7 +276,6 @@ EFL_START_TEST(strbuf_replace)
{
Eina_Strbuf *buf;
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -326,7 +315,6 @@ EFL_START_TEST(strbuf_replace)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -341,7 +329,6 @@ EFL_START_TEST(strbuf_realloc)
pattern[i] = 'a' + (i % 26);
pattern[i] = '\0';
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -393,7 +380,6 @@ EFL_START_TEST(strbuf_realloc)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -405,7 +391,6 @@ EFL_START_TEST(strbuf_append_realloc)
const char *str;
size_t i, target_pattern_size;
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -428,7 +413,6 @@ EFL_START_TEST(strbuf_append_realloc)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -440,7 +424,6 @@ EFL_START_TEST(strbuf_prepend_realloc)
const char *str;
size_t i, target_pattern_size;
- eina_init();
buf = eina_strbuf_new();
fail_if(!buf);
@@ -463,7 +446,6 @@ EFL_START_TEST(strbuf_prepend_realloc)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -472,7 +454,6 @@ EFL_START_TEST(strbuf_trim)
Eina_Strbuf* buf;
const char *str;
- eina_init();
buf = eina_strbuf_new();
fail_unless(buf != NULL);
@@ -510,7 +491,6 @@ EFL_START_TEST(strbuf_trim)
eina_strbuf_reset(buf);
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -519,7 +499,6 @@ EFL_START_TEST(strbuf_tolower)
Eina_Strbuf* buf;
const char *str;
- eina_init();
buf = eina_strbuf_new();
fail_unless(buf != NULL);
@@ -538,7 +517,6 @@ EFL_START_TEST(strbuf_tolower)
fail_unless(str || strcmp(str, "upper1@ "));
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -547,7 +525,6 @@ EFL_START_TEST(strbuf_substr_get)
Eina_Strbuf* buf, *substr;
const char *str;
- eina_init();
buf = eina_strbuf_new();
fail_unless(buf != NULL);
@@ -583,7 +560,6 @@ EFL_START_TEST(strbuf_substr_get)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
@@ -615,7 +591,6 @@ EFL_START_TEST(strbuf_prepend_print)
Eina_Strbuf* buf;
const char *str;
- eina_init();
buf = eina_strbuf_new();
fail_unless(buf != NULL);
@@ -640,7 +615,6 @@ EFL_START_TEST(strbuf_prepend_print)
eina_strbuf_free(buf);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_tiler.c b/src/tests/eina/eina_test_tiler.c
index 67393f378c..46d1b024a7 100644
--- a/src/tests/eina/eina_test_tiler.c
+++ b/src/tests/eina/eina_test_tiler.c
@@ -87,7 +87,6 @@ EFL_START_TEST(eina_test_tile_grid_slicer_iterator)
{1, 2, 0, 0, 128, 1, 0},
{2, 2, 0, 0, 1, 1, 0}};
- eina_init();
cur_test = test1;
it = eina_tile_grid_slicer_iterator_new(200, 210, 10, 15, 128, 128);
@@ -124,7 +123,6 @@ EFL_START_TEST(eina_test_tile_grid_slicer_iterator)
check_iterator(it, cur_test);
eina_iterator_free(it);
- eina_shutdown();
}
EFL_END_TEST
@@ -137,7 +135,6 @@ EFL_START_TEST(eina_test_tiler_all)
int i = 0;
int width, height;
- eina_init();
tl = eina_tiler_new(1, 1);
@@ -183,7 +180,6 @@ EFL_START_TEST(eina_test_tiler_all)
eina_tiler_free(tl);
- eina_shutdown();
}
EFL_END_TEST
@@ -195,7 +191,6 @@ EFL_START_TEST(eina_test_tiler_stable)
Eina_Rectangle r;
int i = 0;
- eina_init();
tl = eina_tiler_new(640, 480);
fail_if(!tl);
@@ -233,7 +228,6 @@ EFL_START_TEST(eina_test_tiler_stable)
eina_tiler_free(tl);
- eina_shutdown();
}
EFL_END_TEST
@@ -244,7 +238,6 @@ EFL_START_TEST(eina_test_tiler_calculation)
Eina_Rectangle r1, r2, r3, *rp;
int i = 0;
- eina_init();
t1 = eina_tiler_new(500, 500);
fail_if(!t1);
@@ -349,7 +342,6 @@ EFL_START_TEST(eina_test_tiler_calculation)
eina_tiler_free(t1);
eina_tiler_free(t2);
- eina_shutdown();
}
EFL_END_TEST
@@ -360,7 +352,6 @@ EFL_START_TEST(eina_test_tiler_size)
Eina_Tiler *t;
Eina_Bool rects = EINA_FALSE;
- eina_init();
t = eina_tiler_new(131070, 131070);
fail_if(!t);
@@ -379,7 +370,6 @@ EFL_START_TEST(eina_test_tiler_size)
fail_if(!rects);
eina_iterator_free(it);
eina_tiler_free(t);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_tmpstr.c b/src/tests/eina/eina_test_tmpstr.c
index 25558e79ad..33e7db709f 100644
--- a/src/tests/eina/eina_test_tmpstr.c
+++ b/src/tests/eina/eina_test_tmpstr.c
@@ -27,7 +27,6 @@
EFL_START_TEST(tmpstr_simple)
{
- eina_init();
const int cnt_tmp_strings = 10;
const int max_str_len = 255;
@@ -57,13 +56,11 @@ EFL_START_TEST(tmpstr_simple)
// Delete non tmp string (should do nothing)
eina_tmpstr_del("Some non tmp string");
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(tmpstr_simple_len)
{
- eina_init();
const int cnt_tmp_strings = 10;
const int max_str_len = 255;
@@ -93,13 +90,11 @@ EFL_START_TEST(tmpstr_simple_len)
// Delete non tmp string (should do nothing)
eina_tmpstr_del("Some non tmp string");
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(tmpstr_manage)
{
- eina_init();
char *buf = malloc(7);
strcpy(buf, "tmpstr");
@@ -107,13 +102,11 @@ EFL_START_TEST(tmpstr_manage)
fail_if(strcmp(buf, tstr1));
eina_tmpstr_del(tstr1);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(tmpstr_manage_len)
{
- eina_init();
char *buf = malloc(10);
strcpy(buf, "tmpstr");
@@ -121,13 +114,11 @@ EFL_START_TEST(tmpstr_manage_len)
fail_if(strcmp(buf, tstr1));
eina_tmpstr_del(tstr1);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(tmpstr_len)
{
- eina_init();
const char *str1 = "12345";
const char *str2 = "123456789";
@@ -143,7 +134,6 @@ EFL_START_TEST(tmpstr_len)
eina_tmpstr_del(tstr1);
eina_tmpstr_del(tstr2);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_trash.c b/src/tests/eina/eina_test_trash.c
index e3a3ebf1df..ce736e2976 100644
--- a/src/tests/eina/eina_test_trash.c
+++ b/src/tests/eina/eina_test_trash.c
@@ -32,7 +32,6 @@ EFL_START_TEST(trash_simple)
int inp_char = inp_int + '0';
void *data;
- eina_init();
trash = calloc(1, sizeof(Eina_Trash));
fail_if(trash == NULL);
@@ -68,7 +67,6 @@ EFL_START_TEST(trash_simple)
fail_if(i != 98);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_ustr.c b/src/tests/eina/eina_test_ustr.c
index 96a05b8dd5..6c8edcf258 100644
--- a/src/tests/eina/eina_test_ustr.c
+++ b/src/tests/eina/eina_test_ustr.c
@@ -74,7 +74,6 @@ static const Eina_Unicode EMPTYSTR[] = {0};
EFL_START_TEST(eina_unicode_strcmp_test)
{
- eina_init();
/* 1 & 2 */
fail_if(eina_unicode_strcmp(STR1,STR2) == 0);
@@ -97,7 +96,6 @@ EFL_START_TEST(eina_unicode_strcmp_test)
fail_if(eina_unicode_strcmp(STR4, STR4) != 0);
fail_if(eina_unicode_strcmp(EMPTYSTR, EMPTYSTR) != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -106,7 +104,6 @@ EFL_START_TEST(eina_unicode_strcpy_test)
Eina_Unicode buf[10] = { 0 };
Eina_Unicode *rv;
- eina_init();
rv = eina_unicode_strcpy(buf,STR1);
fail_if(rv != buf);
@@ -133,7 +130,6 @@ EFL_START_TEST(eina_unicode_strcpy_test)
fail_if(buf[0] != 0);
fail_if(buf[1] != '7');
- eina_shutdown();
}
EFL_END_TEST
@@ -142,7 +138,6 @@ EFL_START_TEST(eina_unicode_strncpy_test)
Eina_Unicode buf[10] = { 0 };
Eina_Unicode *rv;
- eina_init();
rv = eina_unicode_strncpy(buf,STR1,9);
fail_if(rv != buf);
@@ -201,7 +196,6 @@ EFL_START_TEST(eina_unicode_strncpy_test)
}
#endif
- eina_shutdown();
}
EFL_END_TEST
@@ -210,7 +204,6 @@ EFL_END_TEST
EFL_START_TEST(eina_ustr_strlen_test)
{
- eina_init();
fail_if(eina_unicode_strlen(STR1) != 8);
fail_if(eina_unicode_strlen(STR2) != 9);
@@ -242,13 +235,11 @@ EFL_START_TEST(eina_ustr_strlen_test)
}
#endif
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_unicode_strnlen_test)
{
- eina_init();
/* Strlen style tests*/
fail_if(eina_unicode_strnlen(STR1,10) != 8);
@@ -287,7 +278,6 @@ EFL_START_TEST(eina_unicode_strnlen_test)
}
#endif
- eina_shutdown();
}
EFL_END_TEST
@@ -295,7 +285,6 @@ EFL_START_TEST(eina_unicode_strdup_test)
{
Eina_Unicode *buf;
- eina_init();
buf = eina_unicode_strdup(STR1);
fail_if(!buf);
@@ -307,7 +296,6 @@ EFL_START_TEST(eina_unicode_strdup_test)
fail_if(!buf);
fail_if(buf[0] != 0);
- eina_shutdown();
}
EFL_END_TEST
@@ -316,7 +304,6 @@ EFL_START_TEST(eina_unicode_strstr_test)
Eina_Unicode *buf;
Eina_Unicode on[] = { 'O', 'n', 0 };
- eina_init();
buf = eina_unicode_strstr(STR1,on);
fail_if(!buf);
@@ -333,7 +320,6 @@ EFL_START_TEST(eina_unicode_strstr_test)
fail_if(!buf);
fail_if(buf != STR1);
- eina_shutdown();
}
EFL_END_TEST
@@ -348,7 +334,6 @@ EFL_START_TEST(eina_unicode_escape_test)
Eina_Unicode *buf;
size_t i;
- eina_init();
for (i = 0; i < sizeof(str)/sizeof(str[0]); ++i)
{
@@ -359,7 +344,6 @@ EFL_START_TEST(eina_unicode_escape_test)
free(buf);
}
- eina_shutdown();
}
EFL_END_TEST
@@ -367,7 +351,6 @@ EFL_START_TEST(eina_unicode_utf8)
{
int ind;
unsigned char ch;
- eina_init();
/* Valid utf-8 cases */
/* First possible sequence of a certain length */
@@ -574,7 +557,6 @@ EFL_START_TEST(eina_unicode_utf8)
fail_if((eina_unicode_utf8_get_prev("\xED\x9F\xBF", &ind) != 0x00) ||
(ind != 0));
- eina_shutdown();
}
EFL_END_TEST
@@ -592,7 +574,6 @@ EFL_START_TEST(eina_unicode_utf8_conversion)
char *c_sub_out;
int len;
- eina_init();
uni_out = eina_unicode_utf8_to_unicode(c_in, &len);
fail_if((len != 9) || eina_unicode_strcmp(uni_in, uni_out));
@@ -615,7 +596,6 @@ EFL_START_TEST(eina_unicode_utf8_conversion)
ck_assert_int_eq(len, 0);
ck_assert_str_eq("", c_sub_out);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_ustringshare.c b/src/tests/eina/eina_test_ustringshare.c
index 120850218c..2e1a63045e 100644
--- a/src/tests/eina/eina_test_ustringshare.c
+++ b/src/tests/eina/eina_test_ustringshare.c
@@ -37,7 +37,6 @@ EFL_START_TEST(eina_ustringshare_simple)
const Eina_Unicode *t0;
const Eina_Unicode *t1;
- eina_init();
t0 = eina_ustringshare_add(TEST0);
t1 = eina_ustringshare_add(TEST1);
@@ -57,7 +56,6 @@ EFL_START_TEST(eina_ustringshare_simple)
eina_ustringshare_del(t0);
eina_ustringshare_del(t1);
- eina_shutdown();
}
EFL_END_TEST
@@ -67,7 +65,6 @@ EFL_START_TEST(eina_ustringshare_test_share)
const Eina_Unicode *t0;
const Eina_Unicode *t1;
- eina_init();
t0 = eina_ustringshare_add(TEST0);
t1 = eina_ustringshare_add(TEST0);
@@ -83,7 +80,6 @@ EFL_START_TEST(eina_ustringshare_test_share)
eina_ustringshare_del(t0);
eina_ustringshare_del(t1);
- eina_shutdown();
}
EFL_END_TEST
@@ -92,7 +88,6 @@ EFL_START_TEST(eina_ustringshare_putstuff)
const Eina_Unicode *tmp;
int i;
- eina_init();
for (i = 10000; i > 0; --i)
{
@@ -107,7 +102,6 @@ EFL_START_TEST(eina_ustringshare_putstuff)
fail_if((int)eina_unicode_strlen(build) != eina_ustringshare_strlen(tmp));
}
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_value.c b/src/tests/eina/eina_test_value.c
index 76b9a0b4c1..caa47b7cee 100644
--- a/src/tests/eina/eina_test_value.c
+++ b/src/tests/eina/eina_test_value.c
@@ -47,7 +47,6 @@ EFL_START_TEST(eina_value_test_simple)
float f;
double d;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -126,7 +125,6 @@ EFL_START_TEST(eina_value_test_simple)
eina_value_flush(value);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -134,7 +132,6 @@ EFL_START_TEST(eina_value_test_compare)
{
Eina_Value *a, *b;
- eina_init();
a = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(a != NULL);
@@ -430,7 +427,6 @@ EFL_START_TEST(eina_value_test_compare)
eina_value_free(a);
eina_value_free(b);
- eina_shutdown();
}
EFL_END_TEST
@@ -439,7 +435,6 @@ EFL_START_TEST(eina_value_test_string)
Eina_Value *value;
const char *s;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_STRING);
fail_unless(value != NULL);
@@ -459,7 +454,6 @@ EFL_START_TEST(eina_value_test_string)
ck_assert_str_eq(s, "profusion");
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -480,7 +474,6 @@ EFL_START_TEST(eina_value_test_pvariant)
double d, in_d;
const char *str, *in_str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -590,7 +583,6 @@ EFL_START_TEST(eina_value_test_pvariant)
ck_assert_str_eq(str, "profusion");
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -613,7 +605,6 @@ EFL_START_TEST(eina_value_test_to_string)
char *out;
char buf[256];
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -795,7 +786,6 @@ EFL_START_TEST(eina_value_test_to_string)
free(out);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -808,7 +798,6 @@ EFL_START_TEST(eina_value_test_to_binbuf)
const char *out;
char buf[256];
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -859,7 +848,6 @@ EFL_START_TEST(eina_value_test_to_binbuf)
eina_binbuf_free(bin);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -880,7 +868,6 @@ EFL_START_TEST(eina_value_test_convert_char)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -990,7 +977,6 @@ EFL_START_TEST(eina_value_test_convert_char)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1011,7 +997,6 @@ EFL_START_TEST(eina_value_test_convert_uchar)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_UCHAR);
fail_unless(value != NULL);
@@ -1105,7 +1090,6 @@ EFL_START_TEST(eina_value_test_convert_uchar)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1124,7 +1108,6 @@ EFL_START_TEST(eina_value_test_convert_short)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_SHORT);
fail_unless(value != NULL);
@@ -1238,7 +1221,6 @@ EFL_START_TEST(eina_value_test_convert_short)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1256,7 +1238,6 @@ EFL_START_TEST(eina_value_test_convert_ushort)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_USHORT);
fail_unless(value != NULL);
@@ -1341,7 +1322,6 @@ EFL_START_TEST(eina_value_test_convert_ushort)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1358,7 +1338,6 @@ EFL_START_TEST(eina_value_test_convert_int)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_INT);
fail_unless(value != NULL);
@@ -1472,7 +1451,6 @@ EFL_START_TEST(eina_value_test_convert_int)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1486,7 +1464,6 @@ EFL_START_TEST(eina_value_test_convert_uint)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_UINT);
fail_unless(value != NULL);
@@ -1559,7 +1536,6 @@ EFL_START_TEST(eina_value_test_convert_uint)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1580,7 +1556,6 @@ EFL_START_TEST(eina_value_test_convert_long)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_LONG);
fail_unless(value != NULL);
@@ -1710,7 +1685,6 @@ EFL_START_TEST(eina_value_test_convert_long)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1731,7 +1705,6 @@ EFL_START_TEST(eina_value_test_convert_ulong)
double d;
const char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_ULONG);
fail_unless(value != NULL);
@@ -1839,7 +1812,6 @@ EFL_START_TEST(eina_value_test_convert_ulong)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -1863,7 +1835,6 @@ EFL_START_TEST(eina_value_test_convert_float)
float max_float_value = FLT_MAX;
float min_float_value = FLT_MIN;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_FLOAT);
fail_unless(value != NULL);
@@ -2013,7 +1984,6 @@ EFL_START_TEST(eina_value_test_convert_float)
eina_value_flush(&conv);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2027,7 +1997,6 @@ EFL_START_TEST(eina_value_test_array)
char buf[1024];
char *str;
- eina_init();
value = eina_value_array_new(EINA_VALUE_TYPE_CHAR, 0);
fail_unless(value != NULL);
@@ -2126,7 +2095,6 @@ EFL_START_TEST(eina_value_test_array)
fail_unless(c == 31);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2139,7 +2107,6 @@ EFL_START_TEST(eina_value_test_list)
char *str;
const char *s;
- eina_init();
value = eina_value_list_new(EINA_VALUE_TYPE_CHAR);
fail_unless(value != NULL);
@@ -2236,7 +2203,6 @@ EFL_START_TEST(eina_value_test_list)
ck_assert_str_eq(s, "eina");
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2250,7 +2216,6 @@ EFL_START_TEST(eina_value_test_hash)
char *str;
const char *s;
- eina_init();
value = eina_value_hash_new(EINA_VALUE_TYPE_CHAR, 0);
fail_unless(value != NULL);
@@ -2356,7 +2321,6 @@ EFL_START_TEST(eina_value_test_hash)
ck_assert_str_eq(s, "y");
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2370,7 +2334,6 @@ EFL_START_TEST(eina_value_test_timeval)
char *str;
char buf[64];
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_TIMEVAL);
fail_unless(value != NULL);
@@ -2440,7 +2403,6 @@ EFL_START_TEST(eina_value_test_timeval)
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2453,7 +2415,6 @@ EFL_START_TEST(eina_value_test_blob)
int i = 0x11223344;
char *str;
- eina_init();
value = eina_value_new(EINA_VALUE_TYPE_BLOB);
fail_unless(value != NULL);
@@ -2529,7 +2490,6 @@ EFL_START_TEST(eina_value_test_blob)
eina_value_flush(&other);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2588,7 +2548,6 @@ EFL_START_TEST(eina_value_test_struct)
char c;
char *str;
- eina_init();
value = eina_value_struct_new(&myst_desc);
fail_unless(value != NULL);
@@ -2715,7 +2674,6 @@ EFL_START_TEST(eina_value_test_struct)
eina_value_flush(&other);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2742,7 +2700,6 @@ EFL_START_TEST(eina_value_test_array_of_struct)
char *str;
int i;
- eina_init();
value = eina_value_array_new(EINA_VALUE_TYPE_STRUCT, 0);
fail_unless(value != NULL);
@@ -2792,13 +2749,11 @@ EFL_START_TEST(eina_value_test_array_of_struct)
eina_value_flush(&array_item);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_value_test_optional_int)
{
- eina_init();
/* Eina_Value *value = eina_value_new(EINA_VALUE_TYPE_OPTIONAL); */
/* Eina_Bool is_empty; */
@@ -2832,13 +2787,11 @@ EFL_START_TEST(eina_value_test_optional_int)
/* ck_assert_int_eq(expected_value, actual_value); */
/* eina_value_free(value); */
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_value_test_optional_string)
{
- eina_init();
Eina_Value *value = eina_value_new(EINA_VALUE_TYPE_OPTIONAL);
Eina_Bool is_empty;
@@ -2873,13 +2826,11 @@ EFL_START_TEST(eina_value_test_optional_string)
ck_assert_str_eq(expected_value, actual_value);
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_value_test_optional_struct_members)
{
- eina_init();
struct s {
int64_t a;
@@ -2933,7 +2884,6 @@ EFL_START_TEST(eina_value_test_optional_struct_members)
eina_value_free(value);
- eina_shutdown();
}
EFL_END_TEST
@@ -2944,7 +2894,6 @@ EFL_START_TEST(eina_value_test_value)
int i;
const char *str;
- eina_init();
fail_if(!eina_value_setup(&composed, EINA_VALUE_TYPE_VALUE));
fail_if(!eina_value_setup(&v, EINA_VALUE_TYPE_INT));
@@ -2967,7 +2916,6 @@ EFL_START_TEST(eina_value_test_value)
eina_value_flush(&v);
eina_value_flush(&composed);
- eina_shutdown();
}
EFL_END_TEST
@@ -2976,7 +2924,6 @@ EFL_START_TEST(eina_value_test_value_string)
Eina_Value composed, v, str_v;
const char *msg = "A string", *str;
- eina_init();
fail_if(!eina_value_setup(&composed, EINA_VALUE_TYPE_VALUE));
fail_if(!eina_value_setup(&v, EINA_VALUE_TYPE_STRING));
@@ -3000,7 +2947,6 @@ EFL_START_TEST(eina_value_test_value_string)
eina_value_flush(&str_v);
eina_value_flush(&composed);
eina_value_flush(&v);
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_vector.c b/src/tests/eina/eina_test_vector.c
index 64d5c7ec63..6030dfc528 100644
--- a/src/tests/eina/eina_test_vector.c
+++ b/src/tests/eina/eina_test_vector.c
@@ -40,7 +40,6 @@ EFL_START_TEST(eina_test_vector2_operations)
double res = 0;
const double arr[] = {5, 5};
- eina_init();
eina_vector2_set(&v1, x, y);
fail_if((v1.x != 1) || (v1.y != 2));
@@ -107,7 +106,6 @@ EFL_START_TEST(eina_test_vector2_operations)
eina_vector2_homogeneous_direction_transform(&v3, &m3, &v3);
fail_if((v3.x != 24) || (v3.y != 24));
- eina_shutdown();
}
EFL_END_TEST
@@ -126,7 +124,6 @@ EFL_START_TEST(eina_test_vector3_operations)
Eina_Bool res2 = EINA_FALSE;
const double arr[] = {5, 5, 5};
- eina_init();
eina_vector3_set(&v1, x, y, z);
fail_if((v1.x != 1) || (v1.y != 2) || (v1.z != 3));
@@ -238,7 +235,6 @@ EFL_START_TEST(eina_test_vector3_operations)
eina_vector3_homogeneous_direction_transform(&v3, &m4, &v3);
fail_if((v3.x != 72) || (v3.y != 72) || (v3.z != 72));
- eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_vpath.c b/src/tests/eina/eina_test_vpath.c
index ffb12a57a0..b67925ed4a 100644
--- a/src/tests/eina/eina_test_vpath.c
+++ b/src/tests/eina/eina_test_vpath.c
@@ -8,12 +8,8 @@
EFL_START_TEST(eina_test_vpath_valid)
{
- int ret;
char test[PATH_MAX];
- ret = eina_init();
- ck_assert_int_ne(ret, 0);
-
ck_assert_str_eq(eina_vpath_resolve("/"), "/");
ck_assert_str_eq(eina_vpath_resolve("./"), "./");
ck_assert_str_eq(eina_vpath_resolve("..bla"), "..bla");
@@ -25,24 +21,17 @@ EFL_START_TEST(eina_test_vpath_valid)
snprintf(test, sizeof(test), "%s/bla", eina_environment_home_get());
ck_assert_str_eq(eina_vpath_resolve("(:home:)/bla"), test);
- ret = eina_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eina_test_vpath_invalid)
{
- int ret;
-
- ret = eina_init();
- ck_assert_int_ne(ret, 0);
-
ck_assert_ptr_eq(eina_vpath_resolve("(:asdfasdfafasdf"), NULL);
ck_assert_ptr_eq(eina_vpath_resolve("(:missing_slash:)"), NULL);
ck_assert_ptr_eq(eina_vpath_resolve("(:"), NULL);
ck_assert_ptr_eq(eina_vpath_resolve("(:home:)"), NULL);
ck_assert_ptr_eq(eina_vpath_resolve("(:wrong_meta_key:)/"), NULL);
- ret = eina_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eina/eina_test_xattr.c b/src/tests/eina/eina_test_xattr.c
index 6f7b52edab..c3f8aff842 100644
--- a/src/tests/eina/eina_test_xattr.c
+++ b/src/tests/eina/eina_test_xattr.c
@@ -50,7 +50,6 @@ EFL_START_TEST(eina_test_xattr_set)
Eina_Bool ret;
Eina_Tmpstr *test_file_path;
- eina_init();
test_file_path = get_file_path(XATTR_TEST_DIR, filename);
fd = open(test_file_path, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -93,7 +92,6 @@ EFL_START_TEST(eina_test_xattr_set)
unlink(test_file_path);
eina_tmpstr_del(test_file_path);
- eina_shutdown();
}
EFL_END_TEST
@@ -121,7 +119,6 @@ EFL_START_TEST(eina_test_xattr_list)
Eina_Iterator *it;
Eina_Xattr *xattr;
- eina_init();
test_file_path = get_file_path(XATTR_TEST_DIR, filename);
cp_file_path = get_file_path(XATTR_TEST_DIR, filename_cp);
@@ -243,7 +240,6 @@ EFL_START_TEST(eina_test_xattr_list)
unlink(cp_file_path);
eina_tmpstr_del(test_file_path);
eina_tmpstr_del(cp_file_path);
- eina_shutdown();
}
EFL_END_TEST
@@ -260,7 +256,6 @@ EFL_START_TEST(eina_test_xattr_types)
Eina_Bool ret;
Eina_Tmpstr *test_file_path;
- eina_init();
test_file_path = get_file_path(XATTR_TEST_DIR, filename);
fd = open(test_file_path, O_WRONLY | O_CREAT | O_TRUNC, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -289,7 +284,6 @@ EFL_START_TEST(eina_test_xattr_types)
unlink(test_file_path);
eina_tmpstr_del(test_file_path);
- eina_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/eio/eio_suite.c b/src/tests/eio/eio_suite.c
index b5b63d1ff2..810bef70ed 100644
--- a/src/tests/eio/eio_suite.c
+++ b/src/tests/eio/eio_suite.c
@@ -6,6 +6,7 @@
#include "eio_suite.h"
#include "../efl_check.h"
+#include <Eio.h>
static const Efl_Test_Case etc[] = {
{"Eio_Monitor", eio_test_monitor},
@@ -23,6 +24,17 @@ static const Efl_Test_Case etc[] = {
{NULL, NULL}
};
+SUITE_INIT(eio)
+{
+ //T6813
+ //ck_assert_int_eq(eio_init(), 1);
+}
+
+SUITE_SHUTDOWN(eio)
+{
+ //ck_assert_int_eq(eio_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -38,7 +50,7 @@ main(int argc, char **argv)
eina_init();
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eio", etc);
+ "Eio", etc, SUITE_INIT_FN(eio), SUITE_SHUTDOWN_FN(eio));
eina_shutdown();
diff --git a/src/tests/eldbus/eldbus_suite.c b/src/tests/eldbus/eldbus_suite.c
index 6b76759577..560deaf21f 100644
--- a/src/tests/eldbus/eldbus_suite.c
+++ b/src/tests/eldbus/eldbus_suite.c
@@ -4,6 +4,7 @@
#include "eldbus_suite.h"
#include "../efl_check.h"
+#include <Eldbus.h>
static const Efl_Test_Case etc[] = {
{ "eldbus_init", eldbus_test_eldbus_init },
@@ -22,6 +23,17 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(eldbus)
+{
+ ck_assert_int_eq(eldbus_init(), 1);
+}
+
+SUITE_SHUTDOWN(eldbus)
+{
+ //T6814
+ ck_assert_int_eq(eldbus_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -35,7 +47,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eldbus", etc);
+ "Eldbus", etc, SUITE_INIT_FN(eldbus), SUITE_SHUTDOWN_FN(eldbus));
return (failed_count == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_init.c b/src/tests/eldbus/eldbus_test_eldbus_init.c
index e26b30239e..b2449d0b9f 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_init.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_init.c
@@ -20,36 +20,17 @@ _quit_cb(void *data EINA_UNUSED)
EFL_START_TEST(eldbus_test_eldbus)
{
- int ret;
-
- ecore_init();
- ret = eldbus_init();
- fail_if(ret < 1);
-
- ret = eldbus_shutdown();
-
- ecore_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eldbus_test_eldbus_main_loop)
{
Ecore_Timer *timer;
- int ret;
-
- ecore_init();
- ret = eldbus_init();
- fail_if(ret < 1);
timer = ecore_timer_add(0.1, _quit_cb, NULL);
fail_if(timer == NULL);
ecore_main_loop_begin();
-
- ret = eldbus_shutdown();
-
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -63,12 +44,6 @@ EFL_END_TEST
EFL_START_TEST(eldbus_test_eldbus_conn)
{
Eldbus_Connection *conn;
- int ret;
-
- ecore_init();
-
- ret = eldbus_init();
- fail_if(ret < 1);
/*
* let's use connection type == system, so it works without a session,
@@ -79,11 +54,6 @@ EFL_START_TEST(eldbus_test_eldbus_conn)
fail_if(conn == NULL);
eldbus_connection_unref(conn);
-
- ret = eldbus_shutdown();
-
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -91,12 +61,6 @@ EFL_START_TEST(eldbus_test_eldbus_conn_object)
{
Eldbus_Connection *conn;
Eldbus_Object *obj;
- int ret;
-
- ecore_init();
-
- ret = eldbus_init();
- fail_if(ret < 1);
/*
* let's use connection type == system, so it works without a D-Bus session.
@@ -113,10 +77,6 @@ EFL_START_TEST(eldbus_test_eldbus_conn_object)
eldbus_connection_unref(conn);
- ret = eldbus_shutdown();
-
- ecore_shutdown();
-
}
EFL_END_TEST
@@ -131,9 +91,6 @@ EFL_START_TEST(eldbus_test_eldbus_name_owner_changed)
Eldbus_Connection *conn;
const char *id = NULL;
- ecore_init();
- eldbus_init();
-
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
fail_if(conn == NULL);
@@ -147,8 +104,6 @@ EFL_START_TEST(eldbus_test_eldbus_name_owner_changed)
eldbus_connection_unref(conn);
- eldbus_shutdown();
- ecore_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/eldbus/eldbus_test_eldbus_message.c b/src/tests/eldbus/eldbus_test_eldbus_message.c
index cdcc527843..6f8eb23a23 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_message.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_message.c
@@ -46,26 +46,9 @@ static Eldbus_Message_Iter *iter_value_swap = NULL;
*
*
* @precondition
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- ecore_shutdown();
- int ret = eldbus_shutdown();
- ck_assert_int_eq(ret, 0);
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -1621,7 +1604,6 @@ EFL_END_TEST
void eldbus_test_eldbus_message(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_message_iterator_activatable_list_p);
tcase_add_test(tc, utc_eldbus_message_info_data_get_p);
tcase_add_test(tc, utc_eldbus_message_signal_new_p);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model.c b/src/tests/eldbus/eldbus_test_eldbus_model.c
index 468c63f37b..642b501b0c 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model.c
@@ -135,22 +135,6 @@ efl_model_first_child_get(Efl_Model *efl_model)
}
void
-check_init(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-void
-check_shutdown(void)
-{
- ecore_shutdown();
- int ret = eldbus_shutdown();
- ck_assert_int_eq(ret, 0);
-}
-
-void
check_property(Eo *object, const char *property_name, const char *expected_value)
{
Efl_Future *future;
@@ -279,31 +263,22 @@ check_efl_model_children_slice_get(Efl_Model *efl_model)
EFL_START_TEST(smoke)
{
- check_init();
-
Eo *connection = create_connection();
efl_unref(connection);
-
- check_shutdown();
}
EFL_END_TEST
EFL_START_TEST(object)
{
- check_init();
-
Eo *root = create_object();
efl_unref(root);
- check_shutdown();
}
EFL_END_TEST
EFL_START_TEST(proxy)
{
- check_init();
-
Eo *root = create_object();
Eina_Accessor *accessor = NULL;
@@ -326,7 +301,6 @@ EFL_START_TEST(proxy)
efl_unref(root);
- check_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
index b1117c5d61..254a600bd6 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_connection.c
@@ -18,7 +18,6 @@ static Eo *connection = NULL;
static void
_setup(void)
{
- check_init();
connection = create_connection();
}
@@ -26,7 +25,6 @@ static void
_teardown(void)
{
efl_unref(connection);
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_method.c b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
index 6299baaa30..073aee82dd 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_method.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_method.c
@@ -25,8 +25,6 @@ static Eo *method = NULL;
static void
_setup(void)
{
- check_init();
-
fake_server = fake_server_start(&fake_server_data);
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
@@ -45,8 +43,6 @@ _teardown(void)
efl_unref(fake_server_object);
fake_server_stop(fake_server);
-
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_object.c b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
index 011bb80915..caddcf4b18 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_object.c
@@ -18,7 +18,6 @@ static Eo *object = NULL;
static void
_setup(void)
{
- check_init();
object = create_object();
}
@@ -26,7 +25,6 @@ static void
_teardown(void)
{
efl_unref(object);
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
index 76ffc55ade..2e677d52be 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_proxy.c
@@ -17,7 +17,6 @@ static Eo *dbus_proxy = NULL;
static void
_setup(void)
{
- check_init();
dbus_object1 = create_object();
dbus_proxy = eldbus_model_proxy_from_object_get(dbus_object1, ELDBUS_FDO_INTERFACE);
@@ -28,7 +27,6 @@ static void
_teardown(void)
{
efl_unref(dbus_object1);
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
index 32fd3c6453..f9800be5d4 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_model_signal.c
@@ -23,8 +23,6 @@ static Eo *pong_signal = NULL;
static void
_setup(void)
{
- check_init();
-
fake_server = fake_server_start(&fake_server_data);
fake_server_object = efl_add(ELDBUS_MODEL_OBJECT_CLASS, efl_main_loop_get(), eldbus_model_object_custom_constructor(efl_added, ELDBUS_CONNECTION_TYPE_SESSION, NULL, EINA_FALSE, FAKE_SERVER_BUS, FAKE_SERVER_PATH));
@@ -44,7 +42,6 @@ _teardown(void)
fake_server_stop(fake_server);
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/eldbus/eldbus_test_eldbus_object.c b/src/tests/eldbus/eldbus_test_eldbus_object.c
index a9dc8e71a5..a183330388 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_object.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_object.c
@@ -27,26 +27,9 @@ static int cb_data = 5;
* @defgroup eldbus_object
*
* @precondition
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- ecore_shutdown();
- int ret = eldbus_shutdown();
- ck_assert_int_eq(ret, 0);
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -402,7 +385,6 @@ EFL_END_TEST
void
eldbus_test_eldbus_object(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_object_send_info_get_p);
tcase_add_test(tc, utc_eldbus_introspect_p);
tcase_add_test(tc, utc_eldbus_object_peer_p);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c b/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
index d5d7055d43..6834279009 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c
@@ -30,25 +30,9 @@ const char *member = "GetId";
* @li eldbus_pending_path_get()
*
* @precondition
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- eldbus_shutdown();
- ecore_shutdown();
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -203,6 +187,5 @@ EFL_END_TEST
void
eldbus_test_eldbus_pending_cancel(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_pending_info_get_cancel_p);
-} \ No newline at end of file
+}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_pending_data.c b/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
index 80285280db..18d485134c 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_pending_data.c
@@ -27,25 +27,9 @@ static Eldbus_Message *message = NULL;
* @li eldbus_pending_data_del()
*
* @precondition
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- eldbus_shutdown();
- ecore_shutdown();
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -156,6 +140,5 @@ EFL_END_TEST
void
eldbus_test_eldbus_pending_data(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_pending_data_p);
}
diff --git a/src/tests/eldbus/eldbus_test_eldbus_proxy.c b/src/tests/eldbus/eldbus_test_eldbus_proxy.c
index 51a5911709..4c70d898b2 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_proxy.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_proxy.c
@@ -29,25 +29,9 @@ static int proxy_data_stored = 5;
* @defgroup eldbus_proxy
*
* @preconditio
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- eldbus_shutdown();
- ecore_shutdown();
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -409,7 +393,6 @@ EFL_END_TEST
void
eldbus_test_eldbus_proxy(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_proxy_info_get_call_p);
tcase_add_test(tc, utc_eldbus_proxy_send_call_p);
tcase_add_test(tc, utc_eldbus_proxy_send_and_block_p);
diff --git a/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c b/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
index f0c986b8e1..2b5a394197 100644
--- a/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
+++ b/src/tests/eldbus/eldbus_test_eldbus_signal_handler.c
@@ -23,26 +23,9 @@ static Ecore_Timer *timeout = NULL;
* @defgroup eldbus_signal_handler
*
* @precondition
-* @step 1 Initialize ecore with ecore_init()
-* @step 2 Initialize eldbus with eldbus_init()
+* @step 1 Initialize eldbus with eldbus_init()
*/
-static void
-_setup(void)
-{
- ecore_init();
- int ret = eldbus_init();
- ck_assert_int_ge(ret, 1);
-}
-
-static void
-_teardown(void)
-{
- ecore_shutdown();
- int ret = eldbus_shutdown();
- ck_assert_int_eq(ret, 0);
-}
-
static Eina_Bool
_ecore_loop_close(void *data EINA_UNUSED)
{
@@ -474,10 +457,9 @@ EFL_END_TEST
void
eldbus_test_eldbus_signal_handler(TCase *tc)
{
- tcase_add_checked_fixture(tc, _setup, _teardown);
tcase_add_test(tc, utc_eldbus_signal_handler_add_p);
tcase_add_test(tc, utc_eldbus_signal_handler_del_p);
tcase_add_test(tc, utc_eldbus_signal_handler_get_p);
tcase_add_test(tc, utc_eldbus_signal_handler_ref_unref_p);
tcase_add_test(tc, utc_eldbus_signal_handler_free_cb_add_del_p);
-} \ No newline at end of file
+}
diff --git a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
index aca18cfe46..47259d4038 100644
--- a/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
+++ b/src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c
@@ -24,8 +24,6 @@ static Fake_Server_Data fake_server_data = {0};
static void
_setup(void)
{
- check_init();
-
fake_server_data = (Fake_Server_Data){
.readonly_property = FAKE_SERVER_READONLY_PROPERTY_VALUE,
.writeonly_property = FAKE_SERVER_WRITEONLY_PROPERTY_VALUE,
@@ -45,8 +43,6 @@ _teardown(void)
efl_del(fake_server_object);
fake_server_stop(fake_server);
-
- check_shutdown();
}
EFL_START_TEST(properties_get)
diff --git a/src/tests/elementary/efl_ui_suite.c b/src/tests/elementary/efl_ui_suite.c
index fbe5f36e5c..54e8ed184b 100644
--- a/src/tests/elementary/efl_ui_suite.c
+++ b/src/tests/elementary/efl_ui_suite.c
@@ -54,6 +54,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(efl_ui)
+{
+ //???
+}
+
+SUITE_SHUTDOWN(efl_ui)
+{
+
+}
+
int
main(int argc, char **argv)
{
@@ -67,7 +77,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Efl_Ui", etc);
+ "Efl_Ui", etc, SUITE_INIT_FN(efl_ui), SUITE_SHUTDOWN_FN(efl_ui));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c
index e57e118675..2cf66ac609 100644
--- a/src/tests/elementary/elm_suite.c
+++ b/src/tests/elementary/elm_suite.c
@@ -88,6 +88,20 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(elm)
+{
+ char *args[] = { "exe" };
+ ck_assert_int_eq(elm_init(1, args), 1);
+}
+
+SUITE_SHUTDOWN(elm)
+{
+ ck_assert_int_eq(elm_shutdown(), 0);
+ /* verify that ecore was de-initialized completely */
+ ck_assert_int_eq(ecore_init(), 1);
+ ck_assert_int_eq(ecore_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -105,7 +119,7 @@ main(int argc, char **argv)
putenv("TESTS_GL_DISABLED=1");
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Elementary", etc);
+ "Elementary", etc, SUITE_INIT_FN(elm), SUITE_SHUTDOWN_FN(elm));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index 91206250f4..38a09e5749 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_actionslider_legacy_type_check)
Evas_Object *win, *actionslider;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
actionslider = elm_actionslider_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_actionslider_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_actionslider"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *actionslider;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
actionslider = elm_actionslider_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index d54de1b1c7..607045bb9a 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -28,9 +28,6 @@ void generate_app(void)
EFL_START_TEST (test_efl_access_app_obj_name_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
ck_assert(root != NULL);
@@ -44,14 +41,11 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
ck_assert_str_eq(ret, "Test name");
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_i18n_name_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
const char *name;
@@ -71,14 +65,11 @@ EFL_START_TEST (test_efl_access_i18n_name_get)
ck_assert(name != NULL);
ck_assert_str_eq(name, "Some\ntext");
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_i18n_name_set)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
const char *name;
@@ -97,15 +88,11 @@ EFL_START_TEST (test_efl_access_i18n_name_set)
ck_assert(name != NULL);
ck_assert_str_eq(name, "Other text");
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_role_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
Efl_Access_Role role;
@@ -115,14 +102,11 @@ EFL_START_TEST (test_efl_access_role_get)
ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_role_set)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
Efl_Access_Role role;
@@ -138,15 +122,11 @@ EFL_START_TEST (test_efl_access_role_set)
if (role != EFL_ACCESS_ROLE_ENTRY)
ck_assert(0);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_role_name_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
@@ -156,15 +136,11 @@ EFL_START_TEST (test_efl_access_role_name_get)
ck_assert(ret != NULL);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_localized_role_name_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
@@ -174,15 +150,11 @@ EFL_START_TEST (test_efl_access_localized_role_name_get)
ck_assert(ret != NULL);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_description_set)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
@@ -205,15 +177,12 @@ EFL_START_TEST (test_efl_access_description_set)
ck_assert(ret == NULL);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
/* Test if initial description value is NULL */
EFL_START_TEST (test_efl_access_description_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
const char *descr;
@@ -221,15 +190,11 @@ EFL_START_TEST (test_efl_access_description_get)
ck_assert(descr == NULL);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_children_and_parent)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
generate_app();
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
@@ -249,15 +214,11 @@ EFL_START_TEST (test_efl_access_children_and_parent)
ck_assert(win == g_win);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_children_and_parent2)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
generate_app();
Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
@@ -279,15 +240,12 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
ck_assert(btn == g_btn);
efl_del(root);
- elm_shutdown();
}
EFL_END_TEST
/* Initial value of translation domain should be NULL */
EFL_START_TEST (test_efl_access_translation_domain_get)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
const char *domain;
@@ -296,14 +254,11 @@ EFL_START_TEST (test_efl_access_translation_domain_get)
ck_assert(domain == NULL);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_translation_domain_set)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
const char *domain;
@@ -319,14 +274,11 @@ EFL_START_TEST (test_efl_access_translation_domain_set)
ck_assert(domain == NULL);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_relationship_append)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
Efl_Access_Relation_Set set;
@@ -383,14 +335,11 @@ EFL_START_TEST (test_efl_access_relationship_append)
efl_access_relation_set_free(set);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (test_efl_access_relationship_remove)
{
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
Efl_Access_Relation_Set set;
@@ -461,7 +410,6 @@ EFL_START_TEST (test_efl_access_relationship_remove)
if (rel_from) ck_assert(eina_list_data_find(rel_from->objects, g_bg) == NULL);
efl_access_relation_set_free(set);
- elm_shutdown();
}
EFL_END_TEST
@@ -471,8 +419,6 @@ EFL_START_TEST (test_efl_access_relationships_clear)
Efl_Access_Relation *rel;
Eina_List *l;
- char *args[] = { "exe" };
- elm_init(1, args);
generate_app();
efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
@@ -492,7 +438,6 @@ EFL_START_TEST (test_efl_access_relationships_clear)
}
efl_access_relation_set_free(set);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_bg.c b/src/tests/elementary/elm_test_bg.c
index 244d02618f..6b4076c728 100644
--- a/src/tests/elementary/elm_test_bg.c
+++ b/src/tests/elementary/elm_test_bg.c
@@ -10,8 +10,6 @@ EFL_START_TEST (elm_bg_legacy_type_check)
Evas_Object *win, *bg;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "bg", ELM_WIN_BASIC);
bg = elm_bg_add(win);
@@ -24,7 +22,6 @@ EFL_START_TEST (elm_bg_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_bg"));
- elm_shutdown();
}
EFL_END_TEST
@@ -33,7 +30,6 @@ EFL_START_TEST (elm_bg_legacy_file_set_get_check)
Evas_Object *win, *bg;
const char *file = NULL, *key = NULL;
- elm_init(1, NULL);
win = elm_win_add(NULL, "bg", ELM_WIN_BASIC);
bg = elm_bg_add(win);
@@ -51,7 +47,6 @@ EFL_START_TEST (elm_bg_legacy_file_set_get_check)
ck_assert(key != NULL);
ck_assert(!strcmp(key, "test_key"));
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index c170498baa..becfb98f7b 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_box_legacy_type_check)
Evas_Object *win, *box;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
box = elm_box_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_box_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_box"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *box;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
box = elm_box_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index 011087c553..485ac91ef9 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_bubble_legacy_type_check)
Evas_Object *win, *bubble;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
bubble = elm_bubble_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_bubble_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_bubble"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *bubble;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
bubble = elm_bubble_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index 0c87f88710..ee49bb98f1 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -13,8 +13,6 @@ EFL_START_TEST (elm_button_legacy_type_check)
Evas_Object *win, *button;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
button = elm_button_add(win);
@@ -27,7 +25,6 @@ EFL_START_TEST (elm_button_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_button"));
- elm_shutdown();
}
EFL_END_TEST
@@ -36,8 +33,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *button;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
button = elm_button_add(win);
@@ -45,7 +40,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
- elm_shutdown();
}
EFL_END_TEST
@@ -53,8 +47,6 @@ EFL_START_TEST (elm_atspi_interfaces_check)
{
Evas_Object *win, *button;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
button = elm_button_add(win);
@@ -63,7 +55,6 @@ EFL_START_TEST (elm_atspi_interfaces_check)
ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN));
ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN));
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 5f2fa9553e..90da2ffac8 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_calendar_legacy_type_check)
Evas_Object *win, *calendar;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
calendar = elm_calendar_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_calendar_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_calendar"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *calendar;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
calendar = elm_calendar_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_CALENDAR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 2d9ee72e73..486475f79b 100644
--- a/src/tests/elementary/elm_test_check.c
+++ b/src/tests/elementary/elm_test_check.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_check_legacy_type_check)
Evas_Object *win, *check;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
check = elm_check_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_check_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_check"));
- elm_shutdown();
}
EFL_END_TEST
@@ -33,8 +30,6 @@ EFL_START_TEST (elm_check_onoff_text)
{
Evas_Object *win, *check;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
check = elm_check_add(win);
@@ -49,7 +44,6 @@ EFL_START_TEST (elm_check_onoff_text)
ck_assert(elm_object_part_text_get(check, "on") == NULL);
ck_assert(elm_object_part_text_get(check, "off") == NULL);
- elm_shutdown();
}
EFL_END_TEST
@@ -58,8 +52,6 @@ EFL_START_TEST (elm_check_state)
Evas_Object *win, *check;
Eina_Bool state = EINA_TRUE;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
check = elm_check_add(win);
@@ -71,7 +63,6 @@ EFL_START_TEST (elm_check_state)
ck_assert(elm_check_state_get(check) == EINA_FALSE);
ck_assert(state == EINA_FALSE);
- elm_shutdown();
}
EFL_END_TEST
@@ -80,8 +71,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *check;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
check = elm_check_add(win);
@@ -89,7 +78,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index 926dd47a93..e1827a9830 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_clock_legacy_type_check)
Evas_Object *win, *clock;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
clock = elm_clock_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_clock_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_clock"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *clk;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
clk = elm_clock_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_TEXT);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index fc89b19ef7..5e4c78151e 100644
--- a/src/tests/elementary/elm_test_colorselector.c
+++ b/src/tests/elementary/elm_test_colorselector.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_colorselector_legacy_type_check)
Evas_Object *win, *colorselector;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
colorselector = elm_colorselector_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_colorselector_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_colorselector"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_colorselector_palette)
Evas_Object *win, *c;
unsigned int palette_cnt;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
c = elm_colorselector_add(win);
@@ -53,7 +48,6 @@ EFL_START_TEST (elm_colorselector_palette)
ck_assert(eina_list_count(elm_colorselector_palette_items_get(c)) == palette_cnt);
evas_object_del(c);
- elm_shutdown();
}
EFL_END_TEST
@@ -62,8 +56,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *c;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
c = elm_colorselector_add(win);
@@ -71,7 +63,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index 12768900f8..c69b53340c 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -11,9 +11,6 @@ typedef unsigned int uint;
EFL_START_TEST (elm_config_eoapi)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
@@ -143,15 +140,11 @@ EFL_START_TEST (elm_config_eoapi)
fail(channels[i].name);
}
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (elm_config_win)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
@@ -163,7 +156,6 @@ EFL_START_TEST (elm_config_win)
fail_if(efl_config_int_get(win, "cache_flush_interval") != 42);
efl_del(win);
- elm_shutdown();
}
EFL_END_TEST
@@ -182,9 +174,6 @@ _eina_list_string_has(const Eina_List *list, const char *str)
EFL_START_TEST (elm_config_profiles)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
// this only tests some of the profile APIs. we're not going to mess with
// the global config during make check :)
@@ -228,7 +217,6 @@ EFL_START_TEST (elm_config_profiles)
elm_config_profile_dir_free(dir);
eina_stringshare_del(str);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c
index aa26d5b339..befb99727e 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_conformant_legacy_type_check)
Evas_Object *win, *conformant;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
conformant = elm_conformant_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_conformant_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_conformant"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *conformant;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
conformant = elm_conformant_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 66f5e0612a..053a5ad2ac 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_ctxpopup_legacy_type_check)
Evas_Object *win, *ctxpopup;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "ctxpopup", ELM_WIN_BASIC);
ctxpopup = elm_ctxpopup_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_ctxpopup_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_ctxpopup"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *ctxpopup;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
ctxpopup = elm_ctxpopup_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index ac40b95a60..3c614c9a59 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_datetime_legacy_type_check)
Evas_Object *win, *datetime;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
datetime = elm_datetime_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_datetime_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_datetime"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *datetime;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
datetime = elm_datetime_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index 04c8d285ab..1c3b480c02 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_dayselector_legacy_type_check)
Evas_Object *win, *dayselector;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
dayselector = elm_dayselector_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_dayselector_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_dayselector"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *dayselector;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
dayselector = elm_dayselector_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PANEL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index 1007b7c406..fcf95ef4b8 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_diskselector_legacy_type_check)
Evas_Object *win, *diskselector;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
diskselector = elm_diskselector_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_diskselector_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_diskselector"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *diskselector;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
diskselector = elm_diskselector_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LIST);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index aef5ccb734..9be9da6686 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -13,8 +13,6 @@ EFL_START_TEST (elm_entry_legacy_type_check)
Evas_Object *win, *entry;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -27,7 +25,6 @@ EFL_START_TEST (elm_entry_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_entry"));
- elm_shutdown();
}
EFL_END_TEST
@@ -35,14 +32,11 @@ EFL_START_TEST (elm_entry_del)
{
Evas_Object *win, *entry;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
elm_object_text_set(entry, "TEST");
- elm_shutdown();
}
EFL_END_TEST
@@ -58,8 +52,6 @@ EFL_START_TEST (elm_entry_signal_callback)
void *data;
int k;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -90,7 +82,6 @@ EFL_START_TEST (elm_entry_signal_callback)
data = elm_layout_signal_callback_del(entry, "sig", "src", _dummy_cb);
fail_if(data);
- elm_shutdown();
}
EFL_END_TEST
@@ -103,8 +94,6 @@ EFL_START_TEST (elm_entry_atspi_text_char_get)
const char *txt = "ĄA11Y Ł TEST";
const char *mtxt = "<b>ĄA11Y</b> <title>Ł</> TEST";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -131,7 +120,6 @@ EFL_START_TEST (elm_entry_atspi_text_char_get)
ck_assert(val == 0);
free(expected);
- elm_shutdown();
}
EFL_END_TEST
@@ -142,8 +130,6 @@ EFL_START_TEST (elm_entry_atspi_text_char_count)
const char *mtxt = "<b>AĄ11Y</b> <title>Ł</> TEST";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -152,7 +138,6 @@ EFL_START_TEST (elm_entry_atspi_text_char_count)
val = efl_access_text_character_count_get(entry);
ck_assert(val == 12);
- elm_shutdown();
}
EFL_END_TEST
@@ -164,8 +149,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_char)
const char *txt = "Lorem ipśum dolor sit amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -198,7 +181,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_char)
ck_assert(end == -1);
ck_assert(val == NULL);
- elm_shutdown();
}
EFL_END_TEST
@@ -210,8 +192,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_word)
const char *txt = "Lorem ipśum dolor sit amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -245,7 +225,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_word)
ck_assert(val == NULL);
if (val) free(val);
- elm_shutdown();
}
EFL_END_TEST
@@ -257,8 +236,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_paragraph)
const char *txt = "Lorem ipśum<br> dolor sit<br> amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -292,7 +269,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_paragraph)
ck_assert(val == NULL);
if (val) free(val);
- elm_shutdown();
}
EFL_END_TEST
@@ -304,8 +280,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_line)
const char *txt = "Lorem ipśum<br> dolor sit amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -328,7 +302,6 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_line)
ck_assert(end == 29);
if (val) free(val);
- elm_shutdown();
}
EFL_END_TEST
@@ -338,8 +311,6 @@ EFL_START_TEST (elm_entry_atspi_text_text_get)
char *val;
const char *txt = "Lorem Xpśum dolor sit amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -360,7 +331,6 @@ EFL_START_TEST (elm_entry_atspi_text_text_get)
ck_assert_str_eq(val, "Xpśum dolor");
if (val) free(val);
- elm_shutdown();
}
EFL_END_TEST
@@ -372,8 +342,6 @@ EFL_START_TEST (elm_entry_atspi_text_selections)
Eina_Bool ret;
const char *txt = "Lorem ipśum<br> dolor sit\n amęt";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -407,7 +375,6 @@ EFL_START_TEST (elm_entry_atspi_text_selections)
str = elm_entry_selection_get(entry);
ck_assert(str == NULL);
- elm_shutdown();
}
EFL_END_TEST
@@ -416,8 +383,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *entry;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
entry = elm_entry_add(win);
@@ -425,7 +390,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_ENTRY);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index 1c648b078c..096cf368d7 100644
--- a/src/tests/elementary/elm_test_fileselector.c
+++ b/src/tests/elementary/elm_test_fileselector.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_fileselector_legacy_type_check)
Evas_Object *win, *fileselector;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
fileselector = elm_fileselector_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_fileselector_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_fileselector"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *fileselector;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
fileselector = elm_fileselector_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER);
- elm_shutdown();
}
EFL_END_TEST
@@ -63,9 +57,6 @@ EFL_START_TEST (elm_fileselector_selected)
char *path;
Eina_Bool open, selected;
- char *args[] = { "exe" };
- elm_init(1, args);
-
if (!eina_file_mkdtemp("elm_test-XXXXXX", &tmp_path))
{
/* can not test */
@@ -105,7 +96,6 @@ EFL_START_TEST (elm_fileselector_selected)
eina_stringshare_del(no_exist);
free(path);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 0d27f4c371..9079860569 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_fileselector_button_legacy_type_check)
Evas_Object *win, *fs_button;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
fs_button = elm_fileselector_button_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_fileselector_button_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_fileselector_button"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *fs_button;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
fs_button = elm_fileselector_button_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index c1973be7ca..42af79700b 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_fileselector_entry_legacy_type_check)
Evas_Object *win, *fileselector_entry;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselector_entry", ELM_WIN_BASIC);
fileselector_entry = elm_fileselector_entry_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_fileselector_entry_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_fileselector_entry"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *fs_entry;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
fs_entry = elm_fileselector_entry_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_GROUPING);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 698d046c4c..4d87dfa00d 100644
--- a/src/tests/elementary/elm_test_flip.c
+++ b/src/tests/elementary/elm_test_flip.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_flip_legacy_type_check)
Evas_Object *win, *flip;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
flip = elm_flip_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_flip_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_flip"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *flip;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
flip = elm_flip_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index 8c637f9dc8..40523b73bc 100644
--- a/src/tests/elementary/elm_test_flipselector.c
+++ b/src/tests/elementary/elm_test_flipselector.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_flipselector_legacy_type_check)
Evas_Object *win, *flipselector;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
flipselector = elm_flipselector_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_flipselector_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_flipselector"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *flipselector;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
flipselector = elm_flipselector_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LIST);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_focus.c b/src/tests/elementary/elm_test_focus.c
index bf10de4383..c8459ec92d 100644
--- a/src/tests/elementary/elm_test_focus.c
+++ b/src/tests/elementary/elm_test_focus.c
@@ -2,8 +2,6 @@
EFL_START_TEST(focus_unregister_twice)
{
- char *args[] = { "exe" };
- elm_init(1, args);
Efl_Ui_Focus_Object *r1 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get());
Efl_Ui_Focus_Object *r2 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get());
@@ -21,15 +19,11 @@ EFL_START_TEST(focus_unregister_twice)
efl_del(r1);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST(focus_register_twice)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Efl_Ui_Focus_Object *r1 = elm_focus_test_object_new("r1", 0, 0, 10, 10);
Efl_Ui_Focus_Object *r2 = elm_focus_test_object_new("r2", 0, 10, 10, 10);
@@ -43,7 +37,6 @@ EFL_START_TEST(focus_register_twice)
efl_del(r1);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -52,9 +45,6 @@ EFL_START_TEST(pos_check)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *middle, *east, *west, *north, *south, *root;
- char *args[] = { "exe" };
- elm_init(1, args);
-
elm_focus_test_setup_cross(&middle, &south, &north, &east, &west);
m = elm_focus_test_manager_new(&root);
@@ -88,7 +78,6 @@ EFL_START_TEST(pos_check)
efl_del(west);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -124,9 +113,6 @@ EFL_START_TEST(pos_check2)
Efl_Ui_Focus_Relations *rel;
Efl_Ui_Focus_Object *root, *middle, *north_east, *north_west, *south_east, *south_west;
- char *args[] = { "exe" };
- elm_init(1, args);
-
middle = elm_focus_test_object_new("middle", 40, 40, 5, 5);
north_east = elm_focus_test_object_new("north_east", 60, 20, 5, 5);
@@ -162,14 +148,10 @@ EFL_START_TEST(pos_check2)
efl_del(south_east);
efl_del(south_west);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST(redirect)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 0, 20, 20);
TEST_OBJ_NEW(root2, 0, 0, 20, 20);
TEST_OBJ_NEW(one, 0, 0, 20, 20);
@@ -193,8 +175,6 @@ EFL_START_TEST(redirect)
efl_del(m);
efl_del(m2);
-
- elm_shutdown();
}
EFL_END_TEST
@@ -206,9 +186,6 @@ EFL_START_TEST(border_check)
Eina_Iterator *iter;
Efl_Ui_Focus_Object *obj;
- char *args[] = { "exe" };
- elm_init(1, args);
-
elm_focus_test_setup_cross(&middle, &south, &north, &east, &west);
m = elm_focus_test_manager_new(&root);
@@ -234,7 +211,6 @@ EFL_START_TEST(border_check)
ck_assert(eina_list_data_find(list, middle) == NULL);
ck_assert(eina_list_count(list) == 4);
- elm_shutdown();
}
EFL_END_TEST
@@ -244,9 +220,6 @@ EFL_START_TEST(logical_chain)
Efl_Ui_Focus_Object *lroot;
int i = 0;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 0, 20, 20);
m = elm_focus_test_manager_new(&lroot);
@@ -301,7 +274,6 @@ EFL_START_TEST(logical_chain)
{
ck_assert_ptr_eq(logical_chain[i], efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_PREVIOUS));
}
- elm_shutdown();
}
EFL_END_TEST
@@ -309,14 +281,10 @@ EFL_START_TEST(finalize_check)
{
Efl_Ui_Focus_Manager *m;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get());
fail_if(m);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -324,9 +292,6 @@ EFL_START_TEST(redirect_param)
{
Efl_Ui_Focus_Manager *m, *m2;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
@@ -346,7 +311,6 @@ EFL_START_TEST(redirect_param)
efl_del(m);
efl_del(m2);
- elm_shutdown();
}
EFL_END_TEST
@@ -354,9 +318,6 @@ EFL_START_TEST(invalid_args_check)
{
Efl_Ui_Focus_Manager *m;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
TEST_OBJ_NEW(child2, 0, 20, 20, 20);
@@ -380,7 +341,6 @@ EFL_START_TEST(invalid_args_check)
ck_assert_int_eq(efl_ui_focus_manager_calc_update_parent(m, child, child2), 1);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -389,9 +349,6 @@ EFL_START_TEST(order_check)
Efl_Ui_Focus_Manager *m;
Eina_List *order = NULL;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(child1, 0, 20, 20, 20);
TEST_OBJ_NEW(child2, 0, 20, 20, 20);
@@ -420,7 +377,6 @@ EFL_START_TEST(order_check)
ck_assert_int_eq(efl_ui_focus_manager_calc_update_children(m, root, order), 0);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -428,9 +384,6 @@ EFL_START_TEST(logical_shift)
{
Efl_Ui_Focus_Manager *m;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 0, 10, 10);
TEST_OBJ_NEW(child, 0, 0, 10, 10);
TEST_OBJ_NEW(sub, 0, 0, 10, 10);
@@ -456,7 +409,6 @@ EFL_START_TEST(logical_shift)
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), sub_child);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -464,9 +416,6 @@ EFL_START_TEST(root_redirect_chain)
{
Efl_Ui_Focus_Manager *m, *m2;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
@@ -489,7 +438,6 @@ EFL_START_TEST(root_redirect_chain)
efl_del(m);
efl_del(m2);
- elm_shutdown();
}
EFL_END_TEST
@@ -497,9 +445,6 @@ EFL_START_TEST(root_redirect_chain_unset)
{
Efl_Ui_Focus_Manager *m, *m2, *m3, *m4;
- char *args[] = { "exe" };
- elm_init(1, args);
-
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
@@ -539,7 +484,6 @@ EFL_START_TEST(root_redirect_chain_unset)
efl_del(m2);
efl_del(m3);
efl_del(m4);
- elm_shutdown();
}
EFL_END_TEST
@@ -620,9 +564,6 @@ EFL_START_TEST(first_touch_check)
Efl_Ui_Focus_Object *most_left, *most_right;
Eina_List *managers = NULL;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = _recursive_triangle_manager(0, &most_right, &most_left, &managers);
efl_ui_focus_manager_setup_on_first_touch(m, EFL_UI_FOCUS_DIRECTION_NEXT, efl_ui_focus_manager_root_get(m));
@@ -639,7 +580,6 @@ EFL_START_TEST(first_touch_check)
EINA_LIST_FREE(managers, m)
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -648,15 +588,11 @@ EFL_START_TEST(test_request_subchild_empty)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, root), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -665,9 +601,6 @@ EFL_START_TEST(test_request_subchild_one_element)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
efl_ui_focus_manager_calc_register(m, c1, root, NULL);
@@ -676,7 +609,6 @@ EFL_START_TEST(test_request_subchild_one_element)
ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c1), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -685,9 +617,6 @@ EFL_START_TEST(test_request_subchild_child_alongside)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -699,7 +628,6 @@ EFL_START_TEST(test_request_subchild_child_alongside)
ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -708,9 +636,6 @@ EFL_START_TEST(test_request_subchild_child_logical_regular)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -722,7 +647,6 @@ EFL_START_TEST(test_request_subchild_child_logical_regular)
ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -731,9 +655,6 @@ EFL_START_TEST(test_request_subchild_child_regular_regular)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -745,7 +666,6 @@ EFL_START_TEST(test_request_subchild_child_regular_regular)
ck_assert_ptr_eq(efl_ui_focus_manager_request_subchild(m, c2), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -754,9 +674,6 @@ EFL_START_TEST(test_unregister_last_focused_no_history)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2, *c3;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -772,7 +689,6 @@ EFL_START_TEST(test_unregister_last_focused_no_history)
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c1);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -781,9 +697,6 @@ EFL_START_TEST(test_unregister_last_focused)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2, *c3;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -801,7 +714,6 @@ EFL_START_TEST(test_unregister_last_focused)
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), c2);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -810,9 +722,6 @@ EFL_START_TEST(test_unregister_last_focused_no_child)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
efl_ui_focus_manager_calc_register(m, c1, root, NULL);
@@ -823,7 +732,6 @@ EFL_START_TEST(test_unregister_last_focused_no_child)
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), NULL);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
@@ -832,9 +740,6 @@ EFL_START_TEST(test_pop_history_element)
Efl_Ui_Focus_Manager *m;
Efl_Ui_Focus_Object *root, *c1, *c2, *c3;
- char *args[] = { "exe" };
- elm_init(1, args);
-
m = elm_focus_test_manager_new(&root);
c1 = elm_focus_test_object_new("child1", 0, 0, 20, 20);
c2 = elm_focus_test_object_new("child2", 0, 0, 20, 20);
@@ -861,7 +766,6 @@ EFL_START_TEST(test_pop_history_element)
ck_assert_int_eq(efl_ui_focus_object_focus_get(c1), EINA_TRUE);
efl_del(m);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_focus_sub.c b/src/tests/elementary/elm_test_focus_sub.c
index 94359abe4f..56a0e7913a 100644
--- a/src/tests/elementary/elm_test_focus_sub.c
+++ b/src/tests/elementary/elm_test_focus_sub.c
@@ -110,9 +110,6 @@ EFL_START_TEST(correct_register)
Eina_List *set1 = NULL;
Efl_Ui_Focus_Object *root;
Efl_Ui_Focus_Manager *manager, *sub;
- char *args[] = { "exe" };
- elm_init(1, args);
-
_setup(&manager, &sub, &root);
TEST_OBJ_NEW(child1, 0, 0, 10, 10);
@@ -142,7 +139,6 @@ EFL_START_TEST(correct_register)
efl_del(child3);
efl_del(sub);
efl_del(manager);
- elm_shutdown();
}
EFL_END_TEST
@@ -151,9 +147,6 @@ EFL_START_TEST(correct_unregister)
Eina_List *set = NULL;
Efl_Ui_Focus_Object *root;
Efl_Ui_Focus_Manager *manager, *sub;
- char *args[] = { "exe" };
- elm_init(1, args);
-
_setup(&manager, &sub, &root);
TEST_OBJ_NEW(child1, 0, 0, 10, 10);
@@ -186,7 +179,6 @@ EFL_START_TEST(correct_unregister)
efl_del(child1);
efl_del(child2);
efl_del(child3);
- elm_shutdown();
}
EFL_END_TEST
@@ -195,9 +187,6 @@ EFL_START_TEST(correct_un_register)
Eina_List *set_add = NULL, *set_del = NULL;
Efl_Ui_Focus_Object *root;
Efl_Ui_Focus_Manager *manager, *sub;
- char *args[] = { "exe" };
- elm_init(1, args);
-
_setup(&manager, &sub, &root);
TEST_OBJ_NEW(child1, 0, 0, 10, 10);
@@ -228,7 +217,6 @@ EFL_START_TEST(correct_un_register)
efl_del(child1);
efl_del(child2);
efl_del(child3);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c
index ad6f2baaa8..d6ca3fedf9 100644
--- a/src/tests/elementary/elm_test_frame.c
+++ b/src/tests/elementary/elm_test_frame.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_frame_legacy_type_check)
Evas_Object *win, *frame;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
frame = elm_frame_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_frame_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_frame"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *frame;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
frame = elm_frame_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FRAME);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 15c142a138..85fe9af940 100644
--- a/src/tests/elementary/elm_test_gengrid.c
+++ b/src/tests/elementary/elm_test_gengrid.c
@@ -12,8 +12,6 @@ EFL_START_TEST (elm_gengrid_legacy_type_check)
Evas_Object *win, *gengrid;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
gengrid = elm_gengrid_add(win);
@@ -26,7 +24,6 @@ EFL_START_TEST (elm_gengrid_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_gengrid"));
- elm_shutdown();
}
EFL_END_TEST
@@ -35,8 +32,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *gengrid;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
gengrid = elm_gengrid_add(win);
@@ -44,7 +39,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE);
- elm_shutdown();
}
EFL_END_TEST
@@ -67,8 +61,6 @@ gl_content_get(void *data EINA_UNUSED, Evas_Object *obj, const char *part EINA_U
*/
EFL_START_TEST(elm_atspi_children_parent)
{
- char *args[] = { "exe" };
- elm_init(1, args);
elm_config_atspi_mode_set(EINA_TRUE);
static Elm_Gengrid_Item_Class itc;
@@ -93,7 +85,6 @@ EFL_START_TEST(elm_atspi_children_parent)
parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_MIXIN);
ck_assert(it == parent);
- elm_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 5bc703f530..455ac762ba 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -59,8 +59,6 @@ EFL_START_TEST (elm_genlist_group)
Elm_Object_Item *git;
int i;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
genlist = elm_genlist_add(win);
@@ -71,7 +69,6 @@ EFL_START_TEST (elm_genlist_group)
verify_group_api(git);
- elm_shutdown();
}
EFL_END_TEST
@@ -79,8 +76,6 @@ EFL_START_TEST (elm_genlist_legacy_type_check)
{
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
genlist = elm_genlist_add(win);
@@ -93,14 +88,11 @@ EFL_START_TEST (elm_genlist_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_genlist"));
- elm_shutdown();
}
EFL_END_TEST
void test_init(void)
{
- char *args[] = { "exe" };
- elm_init(1, args);
elm_config_atspi_mode_set(EINA_TRUE);
win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
genlist = elm_genlist_add(win);
@@ -116,7 +108,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LIST);
- elm_shutdown();
}
EFL_END_TEST
@@ -141,7 +132,6 @@ EFL_START_TEST(elm_atspi_children_get1)
eina_list_free(children);
- elm_shutdown();
}
EFL_END_TEST
@@ -160,7 +150,6 @@ EFL_START_TEST(elm_atspi_children_get2)
ck_assert(eina_list_nth(children, 0) == it[1]);
ck_assert(eina_list_nth(children, 2) == it[2]);
- elm_shutdown();
}
EFL_END_TEST
@@ -204,7 +193,6 @@ EFL_START_TEST(elm_atspi_children_events_add)
ck_assert(ev_data.is_added == EINA_TRUE);
ck_assert(ev_data.child == it[2]);
- elm_shutdown();
}
EFL_END_TEST
@@ -235,7 +223,6 @@ EFL_START_TEST(elm_atspi_children_events_del1)
ck_assert(ev_data.is_added == EINA_FALSE);
ck_assert(ev_data.child == it[2]);
- elm_shutdown();
}
EFL_END_TEST
@@ -257,7 +244,6 @@ EFL_START_TEST(elm_atspi_children_events_del2)
ck_assert(ev_data.is_added == EINA_FALSE);
ck_assert(ev_data.child == it);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index d61d8a2cf7..4d8525c234 100644
--- a/src/tests/elementary/elm_test_glview.c
+++ b/src/tests/elementary/elm_test_glview.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_glview_legacy_type_check)
Evas_Object *win, *glview;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
glview = elm_glview_add(win);
@@ -28,7 +26,6 @@ EFL_START_TEST (elm_glview_legacy_type_check)
ck_assert(!strcmp(type, "elm_glview"));
}
- elm_shutdown();
}
EFL_END_TEST
@@ -37,8 +34,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *glview;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
glview = elm_glview_add(win);
@@ -50,7 +45,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
}
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index 37db2acac3..ec08a3659b 100644
--- a/src/tests/elementary/elm_test_grid.c
+++ b/src/tests/elementary/elm_test_grid.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_grid_legacy_type_check)
Evas_Object *win, *grid;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
grid = elm_grid_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_grid_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_grid"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *grid;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
grid = elm_grid_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index addfdcce1c..b3660ff5b8 100644
--- a/src/tests/elementary/elm_test_hover.c
+++ b/src/tests/elementary/elm_test_hover.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_hover_legacy_type_check)
Evas_Object *win, *hover;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
hover = elm_hover_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_hover_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_hover"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *hover;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
hover = elm_hover_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index 6f66b4f41f..1e22955d53 100644
--- a/src/tests/elementary/elm_test_hoversel.c
+++ b/src/tests/elementary/elm_test_hoversel.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_hoversel_legacy_type_check)
Evas_Object *win, *hoversel;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
hoversel = elm_hoversel_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_hoversel_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_hoversel"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *hoversel;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
hoversel = elm_hoversel_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 483d345f28..afd747a9aa 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_icon_legacy_type_check)
Evas_Object *win, *icon;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
icon = elm_icon_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_icon_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_icon"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *icon;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
icon = elm_icon_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_ICON);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 2882f8dc77..8e4c791ba3 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -22,8 +22,6 @@ EFL_START_TEST (elm_image_legacy_type_check)
Evas_Object *win, *image;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
image = elm_image_add(win);
@@ -36,7 +34,6 @@ EFL_START_TEST (elm_image_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_image"));
- elm_shutdown();
}
EFL_END_TEST
@@ -45,8 +42,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *image;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
image = elm_image_add(win);
@@ -54,7 +49,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
- elm_shutdown();
}
EFL_END_TEST
@@ -139,8 +133,6 @@ EFL_START_TEST (elm_image_async_path)
Eina_Bool ok;
Test_Data td;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
td.success = 0;
@@ -160,7 +152,6 @@ EFL_START_TEST (elm_image_async_path)
elm_run();
ck_assert(td.success == 3);
- elm_shutdown();
}
EFL_END_TEST
@@ -172,8 +163,6 @@ EFL_START_TEST (elm_image_async_mmap)
Eina_File *f;
char path[PATH_MAX];
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
td.success = 1; // skip "error" case
@@ -199,7 +188,6 @@ EFL_START_TEST (elm_image_async_mmap)
eina_file_close(f);
- elm_shutdown();
}
EFL_END_TEST
@@ -209,8 +197,6 @@ EFL_START_TEST (efl_ui_image_icon)
Eina_Bool ok;
const char *icon_name;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
image = efl_add(EFL_UI_IMAGE_CLASS, win);
@@ -226,7 +212,6 @@ EFL_START_TEST (efl_ui_image_icon)
icon_name = efl_ui_image_icon_get(image);
ck_assert(icon_name == NULL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index dd107c5e9e..e8ea3ecff1 100644
--- a/src/tests/elementary/elm_test_index.c
+++ b/src/tests/elementary/elm_test_index.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_index_legacy_type_check)
Evas_Object *win, *index;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
index = elm_index_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_index_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_index"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *idx;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
idx = elm_index_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_init.c b/src/tests/elementary/elm_test_init.c
index fa7d7f5d39..da3a584cab 100644
--- a/src/tests/elementary/elm_test_init.c
+++ b/src/tests/elementary/elm_test_init.c
@@ -7,11 +7,6 @@
EFL_START_TEST (elm_main)
{
- char *args[] = { "exe" };
- ck_assert(elm_init(1, args) == 1);
- ck_assert(elm_shutdown() == 0);
- ck_assert(ecore_init() == 1);
- ck_assert(ecore_shutdown() == 0);
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index b356a81745..33141b4f6a 100644
--- a/src/tests/elementary/elm_test_inwin.c
+++ b/src/tests/elementary/elm_test_inwin.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_inwin_legacy_type_check)
Evas_Object *win, *inwin;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
inwin = elm_win_inwin_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_inwin_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_inwin"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *inwin;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
inwin = elm_win_inwin_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index e6e898cd95..e580ec4c4c 100644
--- a/src/tests/elementary/elm_test_label.c
+++ b/src/tests/elementary/elm_test_label.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_label_legacy_type_check)
Evas_Object *win, *label;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
label = elm_label_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_label_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_label"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *label;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
label = elm_label_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LABEL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 8e5809be01..cf7badeb91 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_layout_legacy_type_check)
Evas_Object *win, *layout;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
layout = elm_layout_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_layout_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_layout"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST(elm_atspi_role_get)
Evas_Object *win, *layout;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
layout = elm_layout_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST(elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
@@ -52,8 +46,6 @@ EFL_START_TEST(elm_layout_swallows)
char buf[PATH_MAX];
Evas_Object *win, *ly, *bt, *bt2;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
ly = efl_add(EFL_UI_LAYOUT_CLASS, win);
@@ -75,7 +67,6 @@ EFL_START_TEST(elm_layout_swallows)
fail_if(!efl_content_set(efl_part(ly, "element1"), bt2));
ck_assert_ptr_eq(efl_parent_get(bt2), ly);
- elm_shutdown();
}
EFL_END_TEST
@@ -88,8 +79,6 @@ EFL_START_TEST(elm_layout_model_connect)
const char *part_text;
const char text_value[] = "A random string for elm_layout_model_connect test";
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
ly = efl_add(EFL_UI_LAYOUT_CLASS, win);
@@ -111,7 +100,6 @@ EFL_START_TEST(elm_layout_model_connect)
ck_assert_str_eq(part_text, text_value);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index e366f52fd4..e5e27e6888 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -13,8 +13,6 @@ EFL_START_TEST (elm_list_legacy_type_check)
Evas_Object *win, *list;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -27,7 +25,6 @@ EFL_START_TEST (elm_list_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_list"));
- elm_shutdown();
}
EFL_END_TEST
@@ -41,8 +38,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_children_count_get)
Elm_Object_Item *item;
int val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -59,7 +55,6 @@ EFL_START_TEST (elm_list_atspi_selection_selected_children_count_get)
val = elm_interface_atspi_selection_selected_children_count_get(list);
ck_assert(val == 0);
- elm_shutdown();
}
EFL_END_TEST
@@ -69,8 +64,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_select)
Elm_Object_Item *item;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -80,7 +74,6 @@ EFL_START_TEST (elm_list_atspi_selection_child_select)
ck_assert(val == EINA_TRUE);
ck_assert(EINA_TRUE == elm_list_item_selected_get(item));
- elm_shutdown();
}
EFL_END_TEST
@@ -90,8 +83,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_child_deselect)
Elm_Object_Item *item;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -104,7 +96,6 @@ EFL_START_TEST (elm_list_atspi_selection_selected_child_deselect)
ck_assert(val == EINA_TRUE);
ck_assert(EINA_FALSE == elm_list_item_selected_get(item));
- elm_shutdown();
}
EFL_END_TEST
@@ -114,8 +105,7 @@ EFL_START_TEST (elm_list_atspi_selection_is_child_selected)
Elm_Object_Item *item;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -128,7 +118,6 @@ EFL_START_TEST (elm_list_atspi_selection_is_child_selected)
val = elm_interface_atspi_selection_is_child_selected(list, 0);
ck_assert(val == EINA_TRUE);
- elm_shutdown();
}
EFL_END_TEST
@@ -138,8 +127,7 @@ EFL_START_TEST (elm_list_atspi_selection_all_children_select)
Elm_Object_Item *item1, *item2;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -156,7 +144,6 @@ EFL_START_TEST (elm_list_atspi_selection_all_children_select)
ck_assert(EINA_TRUE == elm_list_item_selected_get(item1));
ck_assert(EINA_TRUE == elm_list_item_selected_get(item2));
- elm_shutdown();
}
EFL_END_TEST
@@ -167,8 +154,7 @@ EFL_START_TEST (elm_list_atspi_selection_clear)
Elm_Object_Item *item1, *item2;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -184,7 +170,6 @@ EFL_START_TEST (elm_list_atspi_selection_clear)
ck_assert(EINA_FALSE == elm_list_item_selected_get(item1));
ck_assert(EINA_FALSE == elm_list_item_selected_get(item2));
- elm_shutdown();
}
EFL_END_TEST
@@ -194,8 +179,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_deselect)
Elm_Object_Item *item;
Eina_Bool val;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -208,7 +192,6 @@ EFL_START_TEST (elm_list_atspi_selection_child_deselect)
ck_assert(val == EINA_TRUE);
ck_assert(EINA_FALSE == elm_list_item_selected_get(item));
- elm_shutdown();
}
EFL_END_TEST
@@ -219,8 +202,7 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *list;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
+
win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
list = elm_list_add(win);
@@ -228,7 +210,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LIST);
- elm_shutdown();
}
EFL_END_TEST
@@ -242,8 +223,6 @@ EFL_START_TEST(elm_atspi_children_parent)
Efl_Access *parent;
Elm_Object_Item *it;
- char *args[] = { "exe" };
- elm_init(1, args);
Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
Evas_Object *icon = elm_icon_add(win);
@@ -260,7 +239,6 @@ EFL_START_TEST(elm_atspi_children_parent)
parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_MIXIN);
ck_assert(it == parent);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index d07bea00e9..b127027057 100644
--- a/src/tests/elementary/elm_test_map.c
+++ b/src/tests/elementary/elm_test_map.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_map_legacy_type_check)
Evas_Object *win, *map;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
map = elm_map_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_map_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_map"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *map;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
map = elm_map_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index 85f9b5fdb8..7f86c901be 100644
--- a/src/tests/elementary/elm_test_mapbuf.c
+++ b/src/tests/elementary/elm_test_mapbuf.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_mapbuf_legacy_type_check)
Evas_Object *win, *mapbuf;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
mapbuf = elm_mapbuf_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_mapbuf_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_mapbuf"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *mapbuf;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
mapbuf = elm_mapbuf_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 3027eb514d..3477a6044b 100644
--- a/src/tests/elementary/elm_test_menu.c
+++ b/src/tests/elementary/elm_test_menu.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_menu_legacy_type_check)
Evas_Object *win, *menu;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
menu = elm_menu_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_menu_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_menu"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *menu;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
menu = elm_menu_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_MENU);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index f652e46c22..8d988a5fc5 100644
--- a/src/tests/elementary/elm_test_multibuttonentry.c
+++ b/src/tests/elementary/elm_test_multibuttonentry.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_multibuttonentry_legacy_type_check)
Evas_Object *win, *multibuttonentry;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
multibuttonentry = elm_multibuttonentry_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_multibuttonentry_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_multibuttonentry"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *multibuttonentry;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
multibuttonentry = elm_multibuttonentry_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index 22a169c53f..fcabc194e0 100644
--- a/src/tests/elementary/elm_test_naviframe.c
+++ b/src/tests/elementary/elm_test_naviframe.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_naviframe_legacy_type_check)
Evas_Object *win, *naviframe;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
naviframe = elm_naviframe_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_naviframe_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_naviframe"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *naviframe;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
naviframe = elm_naviframe_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index e87dc0561a..41156306ab 100644
--- a/src/tests/elementary/elm_test_notify.c
+++ b/src/tests/elementary/elm_test_notify.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_notify_legacy_type_check)
Evas_Object *win, *notify;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
notify = elm_notify_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_notify_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_notify"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *notify;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
notify = elm_notify_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index 99c2b7fc49..8a52b75bf0 100644
--- a/src/tests/elementary/elm_test_panel.c
+++ b/src/tests/elementary/elm_test_panel.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_panel_legacy_type_check)
Evas_Object *win, *panel;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
panel = elm_panel_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_panel_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_panel"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *panel;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
panel = elm_panel_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PANEL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index 9e2635ddf5..f6796ee81c 100644
--- a/src/tests/elementary/elm_test_panes.c
+++ b/src/tests/elementary/elm_test_panes.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_panes_legacy_type_check)
Evas_Object *win, *panes;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
panes = elm_panes_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_panes_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_panes"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *panes;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
panes = elm_panes_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 0eff4b4d82..454affc283 100644
--- a/src/tests/elementary/elm_test_photo.c
+++ b/src/tests/elementary/elm_test_photo.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_photo_legacy_type_check)
Evas_Object *win, *photo;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
photo = elm_photo_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_photo_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_photo"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *photo;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
photo = elm_photo_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index c03b0f6f02..3de90e75d3 100644
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_photocam_legacy_type_check)
Evas_Object *win, *photocam;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
photocam = elm_photocam_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_photocam_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_photocam"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *photocam;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
photocam = elm_photocam_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
- elm_shutdown();
}
EFL_END_TEST
@@ -53,8 +47,6 @@ EFL_START_TEST (efl_ui_image_zoomable_icon)
Eina_Bool ok;
const char *icon_name;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
@@ -70,7 +62,6 @@ EFL_START_TEST (efl_ui_image_zoomable_icon)
icon_name = efl_ui_image_icon_get(img_zoomable);
ck_assert(icon_name == NULL);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index c331709e54..332895c445 100644
--- a/src/tests/elementary/elm_test_player.c
+++ b/src/tests/elementary/elm_test_player.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_player_legacy_type_check)
Evas_Object *win, *player;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
player = elm_player_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_player_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_player"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *player;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
player = elm_player_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index c4c3a143c9..3912df07b6 100644
--- a/src/tests/elementary/elm_test_plug.c
+++ b/src/tests/elementary/elm_test_plug.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_plug_legacy_type_check)
Evas_Object *win, *plug;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
plug = elm_plug_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_plug_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_plug"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *plug;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
plug = elm_plug_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 55a3158165..3283499758 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_popup_legacy_type_check)
Evas_Object *win, *popup;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
popup = elm_popup_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_popup_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_popup"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *popup;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
popup = elm_popup_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_DIALOG);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index 9baed622b9..5efca7b9b1 100644
--- a/src/tests/elementary/elm_test_prefs.c
+++ b/src/tests/elementary/elm_test_prefs.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_prefs_legacy_type_check)
Evas_Object *win, *prefs;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
prefs = elm_prefs_add(win);
@@ -28,7 +26,6 @@ EFL_START_TEST (elm_prefs_legacy_type_check)
ck_assert(!strcmp(type, "elm_prefs"));
}
- elm_shutdown();
}
EFL_END_TEST
@@ -38,8 +35,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *prefs;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
prefs = elm_prefs_add(win);
@@ -47,7 +42,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT);
- elm_shutdown();
#endif
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index 9a5467d378..ad3fbec976 100644
--- a/src/tests/elementary/elm_test_progressbar.c
+++ b/src/tests/elementary/elm_test_progressbar.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_progressbar_legacy_type_check)
Evas_Object *win, *progressbar;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
progressbar = elm_progressbar_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_progressbar_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_progressbar"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *progressbar;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
progressbar = elm_progressbar_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index b2a5a12af8..954c3d8e18 100644
--- a/src/tests/elementary/elm_test_radio.c
+++ b/src/tests/elementary/elm_test_radio.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_radio_legacy_type_check)
Evas_Object *win, *radio;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
radio = elm_radio_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_radio_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_radio"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *radio;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
radio = elm_radio_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index 0ab4b6a7ac..a21949dbcd 100644
--- a/src/tests/elementary/elm_test_scroller.c
+++ b/src/tests/elementary/elm_test_scroller.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_scroller_legacy_type_check)
Evas_Object *win, *scroller;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
scroller = elm_scroller_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_scroller_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_scroller"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *scroller;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
scroller = elm_scroller_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index 9b0820e50b..baca5d3704 100644
--- a/src/tests/elementary/elm_test_segmentcontrol.c
+++ b/src/tests/elementary/elm_test_segmentcontrol.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_segment_control_legacy_type_check)
Evas_Object *win, *segment_control;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC);
segment_control = elm_segment_control_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_segment_control_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_segment_control"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *segmentcontrol;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
segmentcontrol = elm_segment_control_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_LIST);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index 1a51efda9d..3e85e42b33 100644
--- a/src/tests/elementary/elm_test_separator.c
+++ b/src/tests/elementary/elm_test_separator.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_separator_legacy_type_check)
Evas_Object *win, *separator;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "separator", ELM_WIN_BASIC);
separator = elm_separator_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_separator_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_separator"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *separator;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
separator = elm_separator_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index 6b98831c29..1cff728e87 100644
--- a/src/tests/elementary/elm_test_slider.c
+++ b/src/tests/elementary/elm_test_slider.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_slider_legacy_type_check)
Evas_Object *win, *slider;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
slider = elm_slider_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_slider_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_slider"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *slider;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
slider = elm_slider_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index 161f8a1d27..fd618ec44b 100644
--- a/src/tests/elementary/elm_test_slideshow.c
+++ b/src/tests/elementary/elm_test_slideshow.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_slideshow_legacy_type_check)
Evas_Object *win, *slideshow;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
slideshow = elm_slideshow_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_slideshow_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_slideshow"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *slideshow;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
slideshow = elm_slideshow_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index 9168843eeb..fc3bd4edcc 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_spinner_legacy_type_check)
Evas_Object *win, *spinner;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
spinner = elm_spinner_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_spinner_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_spinner"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *spinner;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
spinner = elm_spinner_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index dda8fe26c7..57b8b383df 100644
--- a/src/tests/elementary/elm_test_table.c
+++ b/src/tests/elementary/elm_test_table.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_table_legacy_type_check)
Evas_Object *win, *table;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
table = elm_table_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_table_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_table"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *table;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
table = elm_table_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_FILLER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index 0393c995b9..9b82f750a2 100644
--- a/src/tests/elementary/elm_test_thumb.c
+++ b/src/tests/elementary/elm_test_thumb.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_thumb_legacy_type_check)
Evas_Object *win, *thumb;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
thumb = elm_thumb_add(win);
@@ -26,7 +24,6 @@ EFL_START_TEST (elm_thumb_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "Elm_Thumb"));
- elm_shutdown();
}
EFL_END_TEST
@@ -35,8 +32,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *thumb;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
thumb = elm_thumb_add(win);
@@ -44,7 +39,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index 7bfbeb9357..e4d759c524 100644
--- a/src/tests/elementary/elm_test_toolbar.c
+++ b/src/tests/elementary/elm_test_toolbar.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_toolbar_legacy_type_check)
Evas_Object *win, *toolbar;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
toolbar = elm_toolbar_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_toolbar_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_toolbar"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *toolbar;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
toolbar = elm_toolbar_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index 5a828edbe6..9e8d709d7f 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_video_legacy_type_check)
Evas_Object *win, *video;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
video = elm_video_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_video_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_video"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *video;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
video = elm_video_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index 58761b7da8..2ae4a2517b 100644
--- a/src/tests/elementary/elm_test_web.c
+++ b/src/tests/elementary/elm_test_web.c
@@ -11,8 +11,6 @@ EFL_START_TEST (elm_web_legacy_type_check)
Evas_Object *win, *web;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
web = elm_web_add(win);
@@ -25,7 +23,6 @@ EFL_START_TEST (elm_web_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_web"));
- elm_shutdown();
}
EFL_END_TEST
@@ -34,8 +31,6 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win, *web;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
web = elm_web_add(win);
@@ -43,7 +38,6 @@ EFL_START_TEST (elm_atspi_role_get)
ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 741781a33f..942927ab66 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -68,8 +68,6 @@ EFL_START_TEST (elm_win_legacy_type_check)
Evas_Object *win;
const char *type;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
type = elm_object_widget_type_get(win);
@@ -80,7 +78,6 @@ EFL_START_TEST (elm_win_legacy_type_check)
ck_assert(type != NULL);
ck_assert(!strcmp(type, "elm_win"));
- elm_shutdown();
}
EFL_END_TEST
@@ -89,15 +86,12 @@ EFL_START_TEST (elm_atspi_role_get)
Evas_Object *win;
Efl_Access_Role role;
- char *args[] = { "exe" };
- elm_init(1, args);
win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
role = efl_access_role_get(win);
ck_assert(role == EFL_ACCESS_ROLE_WINDOW);
- elm_shutdown();
}
EFL_END_TEST
@@ -106,9 +100,6 @@ EFL_START_TEST (elm_atspi_component_screen_position)
Eina_Bool ret;
int x, y;
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
ret = efl_access_component_screen_position_set(win, 45, 45);
@@ -120,15 +111,11 @@ EFL_START_TEST (elm_atspi_component_screen_position)
ck_assert((x == 45) && (y == 45));
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (elm_win_autohide)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
if (elm_win_xwindow_get(win))
{
@@ -145,15 +132,11 @@ EFL_START_TEST (elm_win_autohide)
visible = efl_gfx_visible_get(win);
ck_assert(visible == EINA_FALSE);
}
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
@@ -172,15 +155,11 @@ EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
ck_assert(efl_ref_count(win) >= 1);
ck_assert(visible == EINA_FALSE);
- elm_shutdown();
}
EFL_END_TEST
EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
{
- char *args[] = { "exe" };
- elm_init(1, args);
-
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
@@ -202,7 +181,6 @@ EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
ck_assert(efl_ref_count(win) >= 1);
ck_assert(visible == EINA_FALSE);
}
- elm_shutdown();
}
EFL_END_TEST
@@ -383,9 +361,6 @@ EFL_START_TEST (efl_ui_win_multi_touch_inputs)
* pointer x: down, move, move, ...
*/
- char *args[] = { "exe" };
- elm_init(1, args);
-
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
@@ -402,7 +377,6 @@ EFL_START_TEST (efl_ui_win_multi_touch_inputs)
fail_if(fail_flag != EINA_FALSE);
- elm_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elput/elput_suite.c b/src/tests/elput/elput_suite.c
index 35132162aa..8df9302f06 100644
--- a/src/tests/elput/elput_suite.c
+++ b/src/tests/elput/elput_suite.c
@@ -4,6 +4,7 @@
#include "elput_suite.h"
#include "../efl_check.h"
+#include <Elput.h>
static const Efl_Test_Case etc[] =
{
@@ -13,6 +14,16 @@ static const Efl_Test_Case etc[] =
{ NULL, NULL }
};
+SUITE_INIT(elput)
+{
+ ck_assert_int_eq(elput_init(), 1);
+}
+
+SUITE_SHUTDOWN(elput)
+{
+ ck_assert_int_eq(elput_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -25,7 +36,7 @@ main(int argc, char **argv)
#endif
count =
- _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, "Elput", etc);
+ _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, "Elput", etc, SUITE_INIT_FN(elput), SUITE_SHUTDOWN_FN(elput));
return (count == 0) ? 0 : 255;
}
diff --git a/src/tests/elput/elput_test_elput.c b/src/tests/elput/elput_test_elput.c
index 7d74d2d898..2d3202d810 100644
--- a/src/tests/elput/elput_test_elput.c
+++ b/src/tests/elput/elput_test_elput.c
@@ -13,13 +13,6 @@
EFL_START_TEST(elput_test_elput_init)
{
- int ret;
-
- ret = elput_init();
- fail_if(ret < 1);
-
- ret = elput_shutdown();
- fail_if(ret != 0);
}
EFL_END_TEST
diff --git a/src/tests/elua/elua_lib.c b/src/tests/elua/elua_lib.c
index b14323c431..4f53e7d869 100644
--- a/src/tests/elua/elua_lib.c
+++ b/src/tests/elua/elua_lib.c
@@ -25,8 +25,6 @@ EFL_START_TEST(elua_api)
cargv[1] = arg2;
char *spath = NULL;
- fail_if(!elua_init());
-
st = elua_state_new("test");
fail_if(!st);
@@ -127,8 +125,6 @@ EFL_START_TEST(elua_api)
fail_if(remove(buf));
elua_state_free(st);
-
- elua_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/elua/elua_suite.c b/src/tests/elua/elua_suite.c
index 1ad5ac164b..0ed47f87b5 100644
--- a/src/tests/elua/elua_suite.c
+++ b/src/tests/elua/elua_suite.c
@@ -4,12 +4,23 @@
#include "elua_suite.h"
#include "../efl_check.h"
+#include <Elua.h>
static const Efl_Test_Case etc[] = {
{ "Elua Library", elua_lib_test},
{ NULL, NULL }
};
+SUITE_INIT(elua)
+{
+ ck_assert_int_eq(elua_init(), 1);
+}
+
+SUITE_SHUTDOWN(elua)
+{
+ ck_assert_int_eq(elua_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -25,7 +36,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Elua", etc);
+ "Elua", etc, SUITE_INIT_FN(elua), SUITE_SHUTDOWN_FN(elua));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/emile/emile_suite.c b/src/tests/emile/emile_suite.c
index 7fc70631e5..edfbf26a4a 100644
--- a/src/tests/emile/emile_suite.c
+++ b/src/tests/emile/emile_suite.c
@@ -4,6 +4,7 @@
#include "emile_suite.h"
#include "../efl_check.h"
+#include <Emile.h>
static const Efl_Test_Case etc[] = {
{ "Emile_Base", emile_test_base },
@@ -11,6 +12,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(emile)
+{
+ ck_assert_int_eq(emile_init(), 1);
+}
+
+SUITE_SHUTDOWN(emile)
+{
+ ck_assert_int_eq(emile_shutdown(), 0);
+}
+
int
main(int argc, char *argv[])
{
@@ -24,7 +35,7 @@ main(int argc, char *argv[])
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Emile", etc);
+ "Emile", etc, SUITE_INIT_FN(emile), SUITE_SHUTDOWN_FN(emile));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/emile/emile_test_base.c b/src/tests/emile/emile_test_base.c
index c76d7ab87a..0108edbe54 100644
--- a/src/tests/emile/emile_test_base.c
+++ b/src/tests/emile/emile_test_base.c
@@ -9,8 +9,6 @@
EFL_START_TEST(emile_test_init)
{
- fail_if(emile_init() <= 0);
- fail_if(emile_shutdown() != 0);
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c
index a9e6cc7444..58b01ac706 100644
--- a/src/tests/eo/suite/eo_suite.c
+++ b/src/tests/eo/suite/eo_suite.c
@@ -4,6 +4,7 @@
#include "eo_suite.h"
#include "../../efl_check.h"
+#include <Eo.h>
static const Efl_Test_Case etc[] = {
{ "Eo init", eo_test_init },
@@ -17,6 +18,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(efl_object)
+{
+ ck_assert_int_eq(efl_object_init(), 1);
+}
+
+SUITE_SHUTDOWN(efl_object)
+{
+ ck_assert_int_eq(efl_object_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -30,7 +41,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eo", etc);
+ "Eo", etc, SUITE_INIT_FN(efl_object), SUITE_SHUTDOWN_FN(efl_object));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index 83d6eaac2b..5a737a415d 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -14,7 +14,6 @@ static struct log_ctx ctx;
EFL_START_TEST(eo_pure_virtual_fct_call)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -26,13 +25,11 @@ EFL_START_TEST(eo_pure_virtual_fct_call)
efl_unref(obj);
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_api_not_implemented_call)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -44,13 +41,11 @@ EFL_START_TEST(eo_api_not_implemented_call)
efl_unref(obj);
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_op_not_found_in_super)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -62,7 +57,6 @@ EFL_START_TEST(eo_op_not_found_in_super)
efl_unref(obj);
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -112,7 +106,6 @@ EFL_DEFINE_CLASS(simple_errorcase_class_get, &errorcase_class_desc, EO_CLASS, NU
EFL_START_TEST(eo_fallbackcall_execute)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -124,7 +117,6 @@ EFL_START_TEST(eo_fallbackcall_execute)
simple_error_test(obj);
ck_assert_int_eq(fallback_called, 1);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index 22591cb578..df370a1cd4 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -34,7 +34,6 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
EFL_START_TEST(efl_destructor_unref)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
static Efl_Class_Description class_desc = {
@@ -58,13 +57,11 @@ EFL_START_TEST(efl_destructor_unref)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_destructor_double_del)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
static Efl_Class_Description class_desc = {
@@ -90,7 +87,6 @@ EFL_START_TEST(efl_destructor_double_del)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index e4d9e77954..a5052196c7 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -14,7 +14,6 @@ static struct log_ctx ctx;
EFL_START_TEST(eo_inherit_errors)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
const Efl_Class *klass;
@@ -72,13 +71,11 @@ EFL_START_TEST(eo_inherit_errors)
(void) klass;
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_inconsistent_mro)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
const Efl_Class *klass;
@@ -148,7 +145,6 @@ EFL_START_TEST(eo_inconsistent_mro)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -156,7 +152,6 @@ static void _stub_class_constructor(Efl_Class *klass EINA_UNUSED) {}
EFL_START_TEST(eo_bad_interface)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_safety_print_cb, &ctx);
const Efl_Class *klass;
@@ -195,7 +190,6 @@ EFL_START_TEST(eo_bad_interface)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -214,7 +208,6 @@ _null_class_initializer(Efl_Class *klass)
EFL_START_TEST(eo_null_api)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
const Efl_Class *klass;
@@ -236,7 +229,6 @@ EFL_START_TEST(eo_null_api)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -253,7 +245,6 @@ _redefined_class_initializer(Efl_Class *klass)
EFL_START_TEST(eo_api_redefined)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
const Efl_Class *klass;
@@ -275,7 +266,6 @@ EFL_START_TEST(eo_api_redefined)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -292,7 +282,6 @@ _dich_func_class_initializer(Efl_Class *klass)
EFL_START_TEST(eo_dich_func_override)
{
- efl_object_init();
eina_log_print_cb_set(eo_test_print_cb, &ctx);
const Efl_Class *klass;
@@ -314,7 +303,6 @@ EFL_START_TEST(eo_dich_func_override)
eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_event.c b/src/tests/eo/suite/eo_test_event.c
index 7adc7fd29e..9694ba3a76 100644
--- a/src/tests/eo/suite/eo_test_event.c
+++ b/src/tests/eo/suite/eo_test_event.c
@@ -60,7 +60,6 @@ _cb1(void *data, const Efl_Event *event)
EFL_START_TEST(eo_event)
{
Test_Data data;
- efl_object_init();
Eo *obj;
obj = efl_add_ref(efl_test_event_class_get(), NULL);
@@ -79,7 +78,6 @@ EFL_START_TEST(eo_event)
ck_assert_int_ne(data.event2, 0);
ck_assert_int_ne(data.event3, 0);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -120,7 +118,6 @@ _cb_rec_1(void *data, const Efl_Event *event)
EFL_START_TEST(eo_event_call_in_call)
{
Test_Data data;
- efl_object_init();
Eo *obj;
obj = efl_add_ref(efl_test_event_class_get(), NULL);
@@ -132,7 +129,6 @@ EFL_START_TEST(eo_event_call_in_call)
ck_assert_int_ne(data.event2, 0);
ck_assert_int_ne(data.event3, 0);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -164,7 +160,6 @@ _generation_clamp_step1(void *data EINA_UNUSED, const Efl_Event *e)
EFL_START_TEST(eo_event_generation_bug)
{
- efl_object_init();
/*
* The idea is:
@@ -187,7 +182,6 @@ EFL_START_TEST(eo_event_generation_bug)
ck_assert_int_ne(emitted, 0);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index a52935a9aa..e142704ad1 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -21,7 +21,6 @@
EFL_START_TEST(eo_simple)
{
- efl_object_init();
Eo *obj = efl_add_ref(EO_CLASS, NULL);
fail_if(obj);
@@ -31,13 +30,11 @@ EFL_START_TEST(eo_simple)
efl_destructor(obj);
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_singleton)
{
- efl_object_init();
Eo *obj = efl_add_ref(SINGLETON_CLASS, NULL);
fail_if(!obj);
@@ -50,7 +47,6 @@ EFL_START_TEST(eo_singleton)
efl_unref(obj);
efl_unref(obj2);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -70,7 +66,6 @@ _simple_obj_override_a_double_set(Eo *obj, void *class_data EINA_UNUSED, int a)
EFL_START_TEST(efl_object_override_tests)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
fail_if(!obj);
@@ -133,7 +128,6 @@ EFL_START_TEST(efl_object_override_tests)
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -199,7 +193,6 @@ EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
EFL_START_TEST(eo_signals)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
Eina_Bool r;
@@ -280,13 +273,11 @@ EFL_START_TEST(eo_signals)
}
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_data_fetch)
{
- efl_object_init();
/* Usually should be const, not const only for the test... */
static Efl_Class_Description class_desc = {
@@ -319,13 +310,11 @@ EFL_START_TEST(efl_data_fetch)
fail_if(!efl_data_scope_get(obj, EFL_OBJECT_CLASS));
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_data_safe_fetch)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE2_CLASS, NULL);
fail_if(!obj || !efl_data_scope_safe_get(obj, SIMPLE2_CLASS));
@@ -343,13 +332,11 @@ EFL_START_TEST(efl_data_safe_fetch)
efl_unref(obj);
fail_if(efl_data_scope_safe_get(obj, SIMPLE3_CLASS) != NULL);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_isa_tests)
{
- efl_object_init();
const Efl_Class *klass, *iface, *mixin;
@@ -419,14 +406,12 @@ EFL_START_TEST(efl_isa_tests)
fail_if(!efl_isa(obj, EO_CLASS));
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_composite_tests)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
fail_if(!obj);
@@ -452,7 +437,6 @@ EFL_START_TEST(efl_composite_tests)
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -489,7 +473,6 @@ _class_initializer(Efl_Class *klass)
EFL_START_TEST(eo_man_free)
{
- efl_object_init();
/* Usually should be const, not const only for the test... */
static Efl_Class_Description class_desc = {
@@ -564,13 +547,11 @@ EFL_START_TEST(eo_man_free)
efl_unref(obj);
fail_if(!efl_manual_free(obj));
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_refs)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj2 = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj3 = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -697,13 +678,11 @@ EFL_START_TEST(efl_refs)
efl_del(obj2);
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(efl_weak_reference)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj2 = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -768,13 +747,11 @@ EFL_START_TEST(efl_weak_reference)
efl_unref(obj2);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_generic_data)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj2 = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj3 = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -941,7 +918,6 @@ EFL_START_TEST(eo_generic_data)
efl_unref(obj2);
efl_unref(obj3);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -950,7 +926,6 @@ EFL_START_TEST(eo_magic_checks)
{
char _buf[sizeof(long)]; /* Just enough to hold eina magic + a bit more. */
char *buf = _buf;
- efl_object_init();
memset(_buf, 1, sizeof(_buf));
@@ -1033,7 +1008,6 @@ EFL_START_TEST(eo_magic_checks)
buf = NULL;
}
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1061,7 +1035,6 @@ _multi_class_initializer(Efl_Class *klass)
EFL_START_TEST(efl_func_resolve)
{
- efl_object_init();
/* Usually should be const, not const only for the test... */
static Efl_Class_Description class_desc = {
@@ -1093,7 +1066,6 @@ EFL_START_TEST(efl_func_resolve)
fail_if(!efl_destructed_is(obj));
efl_manual_free(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1101,7 +1073,6 @@ EFL_START_TEST(efl_add_do_and_custom)
{
Simple_Public_Data *pd = NULL;
Eo *obj = NULL;
- efl_object_init();
obj = efl_add_ref(SIMPLE_CLASS, NULL, efl_constructor(efl_added));
fail_if(!obj);
@@ -1127,14 +1098,12 @@ EFL_START_TEST(efl_add_do_and_custom)
fail_if(!finalized);
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_pointers_indirection)
{
#ifdef HAVE_EO_ID
- efl_object_init();
static const Efl_Class_Description class_desc = {
EO_VERSION,
@@ -1213,7 +1182,6 @@ EFL_START_TEST(eo_pointers_indirection)
efl_unref(objs[0]);
free(objs);
- efl_object_shutdown();
#endif
}
EFL_END_TEST
@@ -1237,7 +1205,6 @@ _add_failures_class_initializer(Efl_Class *klass)
EFL_START_TEST(efl_add_failures)
{
- efl_object_init();
static const Efl_Class_Description class_desc = {
EO_VERSION,
@@ -1255,7 +1222,6 @@ EFL_START_TEST(efl_add_failures)
fail_if(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1280,7 +1246,6 @@ _del_intercept_reuse(Eo *obj)
EFL_START_TEST(efl_del_intercept)
{
#ifdef HAVE_EO_ID
- efl_object_init();
static const Efl_Class_Description class_desc = {
EO_VERSION,
@@ -1330,14 +1295,12 @@ EFL_START_TEST(efl_del_intercept)
ck_assert_int_eq(efl_ref_count(obj), 1);
efl_unref(obj);
- efl_object_shutdown();
#endif
}
EFL_END_TEST
EFL_START_TEST(efl_name)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj2 = efl_add_ref(SIMPLE_CLASS, NULL);
Eo *obj3 = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -1388,13 +1351,11 @@ EFL_START_TEST(efl_name)
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_comment)
{
- efl_object_init();
Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
const char *comment;
@@ -1418,13 +1379,11 @@ EFL_START_TEST(eo_comment)
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
EFL_START_TEST(eo_rec_interface)
{
- efl_object_init();
Eo *s = efl_add_ref(SEARCHABLE_CLASS, NULL);
Eo *obj = efl_add(SIMPLE_CLASS, s);
Eo *obj2 = efl_add(SIMPLE_CLASS, obj);
@@ -1435,7 +1394,6 @@ EFL_START_TEST(eo_rec_interface)
efl_del(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1535,7 +1493,6 @@ EFL_START_TEST(eo_domain)
Eo *obj, *objs;
printf("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
- efl_object_init();
#ifndef _WIN32
signal(SIGALRM, _timeout);
@@ -1613,7 +1570,6 @@ EFL_START_TEST(eo_domain)
efl_unref(obj);
efl_unref(objs);
- efl_object_shutdown();
printf("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n");
#ifndef _WIN32
@@ -1654,7 +1610,6 @@ _cast_inherit_class_initializer_2(Efl_Class *klass)
EFL_START_TEST(efl_cast_test)
{
- efl_object_init();
static const Efl_Class_Description class_desc_1 = {
EO_VERSION,
@@ -1715,7 +1670,6 @@ EFL_START_TEST(efl_cast_test)
ck_assert_int_eq(inherit_value(efl_cast(obj, SIMPLE_CLASS)), 0);
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1742,7 +1696,6 @@ EFL_START_TEST(efl_object_destruct_test)
int var = 0;
Eo *obj;
- efl_object_init();
obj = efl_add_ref(SIMPLE_CLASS, NULL);
fail_if(efl_ref_count(obj) != 1);
@@ -1753,7 +1706,6 @@ EFL_START_TEST(efl_object_destruct_test)
// var should be 2 if del then destruct, 0 otherwise
ck_assert_int_eq(var, 2);
- efl_object_shutdown();
}
EFL_END_TEST
@@ -1768,7 +1720,6 @@ EFL_START_TEST(efl_object_auto_unref_test)
int _auto_unref_del;
Eo *obj, *parent;
- efl_object_init();
// Test unref after valid call
_auto_unref_del = 0;
@@ -1806,7 +1757,6 @@ EFL_START_TEST(efl_object_auto_unref_test)
fail_if(!_auto_unref_del);
efl_unref(parent);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index 31e16d2099..cee49211e1 100644
--- a/src/tests/eo/suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c
@@ -10,9 +10,7 @@
EFL_START_TEST(eo_test_simple)
{
fail_if(!efl_object_init()); /* one init by test suite */
- fail_if(!efl_object_init());
fail_if(!efl_object_shutdown());
- fail_if(efl_object_shutdown());
}
EFL_END_TEST
@@ -20,7 +18,6 @@ EFL_START_TEST(eo_test_init_shutdown)
{
Eo *obj;
- fail_if(!efl_object_init());
ck_assert_str_eq("Efl.Object", efl_class_name_get(EFL_OBJECT_CLASS));
/* XXX-1: Essential for the next test to assign the wrong op. */
@@ -38,7 +35,6 @@ EFL_START_TEST(eo_test_init_shutdown)
/* XXX-1: Verify that the op was not cached. */
ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS));
- fail_if(efl_object_shutdown());
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index 92d023c6dd..411eb4536f 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -115,7 +115,6 @@ EFL_START_TEST(eo_threaded_calls_test)
{
Eina_Thread threads[2];
- efl_object_init();
fail_if(!eina_spinlock_new(&locks[0]));
fail_if(!eina_spinlock_new(&locks[1]));
@@ -133,7 +132,6 @@ EFL_START_TEST(eo_threaded_calls_test)
eina_barrier_free(&barrier);
eina_barrier_free(&barrier0);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index 36709a9043..515ae79d8e 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -11,7 +11,6 @@
EFL_START_TEST(eo_value)
{
- efl_object_init();
char *str, *str2;
Eina_Value val2, eo_val;
@@ -45,7 +44,6 @@ EFL_START_TEST(eo_value)
efl_dbg_info_free(eo_dbg_info);
efl_unref(obj);
- efl_object_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index c5ff1c967c..f61a8f4215 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -22,7 +22,6 @@ EFL_START_TEST(eolian_namespaces)
const Eolian_Unit *unit;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -91,7 +90,6 @@ EFL_START_TEST(eolian_namespaces)
eina_iterator_free(iter);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -105,7 +103,6 @@ EFL_START_TEST(eolian_events)
const Eolian_Unit *unit;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -167,7 +164,6 @@ EFL_START_TEST(eolian_events)
fail_if(eolian_class_event_by_name_get(class, "clicked,triple"));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -180,7 +176,6 @@ EFL_START_TEST(eolian_override)
const Eolian_Implement *impl;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -227,7 +222,6 @@ EFL_START_TEST(eolian_override)
eina_iterator_free(iter);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -237,7 +231,6 @@ EFL_START_TEST(eolian_consts)
const Eolian_Class *class;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -249,7 +242,6 @@ EFL_START_TEST(eolian_consts)
fail_if(EINA_FALSE == eolian_function_object_is_const(fid));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -264,7 +256,6 @@ EFL_START_TEST(eolian_ctor_dtor)
const Eolian_Unit *unit;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -319,7 +310,6 @@ EFL_START_TEST(eolian_ctor_dtor)
eina_iterator_free(iter);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -333,7 +323,6 @@ EFL_START_TEST(eolian_typedef)
const Eolian_Unit *unit;
const char *file;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -403,7 +392,6 @@ EFL_START_TEST(eolian_typedef)
fail_if(eina_iterator_next(iter, (void**)&tdl));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -418,7 +406,6 @@ EFL_START_TEST(eolian_complex_type)
const Eolian_Unit *unit;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -492,7 +479,6 @@ EFL_START_TEST(eolian_complex_type)
eina_stringshare_del(type_name);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -502,7 +488,6 @@ EFL_START_TEST(eolian_scope)
const Eolian_Class *class;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -528,7 +513,6 @@ EFL_START_TEST(eolian_scope)
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -545,7 +529,6 @@ EFL_START_TEST(eolian_simple_parsing)
Eolian_Value v;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -667,7 +650,6 @@ EFL_START_TEST(eolian_simple_parsing)
fail_if(!eolian_type_is_ptr(eolian_function_return_type_get(fid, EOLIAN_METHOD)));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -682,7 +664,6 @@ EFL_START_TEST(eolian_struct)
const char *type_name;
const char *file;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -740,7 +721,6 @@ EFL_START_TEST(eolian_struct)
fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -750,7 +730,6 @@ EFL_START_TEST(eolian_extern)
const Eolian_Class *class;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -778,7 +757,6 @@ EFL_START_TEST(eolian_extern)
fail_if(!eolian_typedecl_is_extern(tdl));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -792,7 +770,6 @@ EFL_START_TEST(eolian_var)
Eolian_Value v;
const char *name;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -846,7 +823,6 @@ EFL_START_TEST(eolian_var)
fail_if(eolian_variable_value_get(var));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -863,7 +839,6 @@ EFL_START_TEST(eolian_enum)
const char *name;
Eolian_Value v;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -950,7 +925,6 @@ EFL_START_TEST(eolian_enum)
fail_if(v.value.i != 5);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -960,7 +934,6 @@ EFL_START_TEST(eolian_class_funcs)
const Eolian_Class *class;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -989,7 +962,6 @@ EFL_START_TEST(eolian_class_funcs)
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1000,7 +972,6 @@ EFL_START_TEST(eolian_free_func)
const Eolian_Type *type;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -1038,7 +1009,6 @@ EFL_START_TEST(eolian_free_func)
fail_if(strcmp(eolian_type_free_func_get(type), "ptr_free"));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1050,7 +1020,6 @@ EFL_START_TEST(eolian_null)
const Eolian_Unit *unit;
Eina_Iterator *iter;
- eolian_init();
Eolian_State *eos = eolian_state_new();
/* Parsing */
@@ -1090,7 +1059,6 @@ EFL_START_TEST(eolian_null)
eina_iterator_free(iter);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1100,7 +1068,6 @@ EFL_START_TEST(eolian_import)
const Eolian_Typedecl *tdl;
const Eolian_Unit *unit;
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1115,7 +1082,6 @@ EFL_START_TEST(eolian_import)
fail_if(strcmp(eolian_object_file_get((const Eolian_Object *)tdl), "import_types.eot"));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1127,7 +1093,6 @@ EFL_START_TEST(eolian_decl)
const Eolian_Unit *unit;
Eina_Iterator *itr;
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1177,7 +1142,6 @@ EFL_START_TEST(eolian_decl)
fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_TYPEDECL);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1195,7 +1159,6 @@ EFL_START_TEST(eolian_docs)
const Eolian_Unit *unit;
Eina_Iterator *itr;
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1423,7 +1386,6 @@ EFL_START_TEST(eolian_docs)
fail_if(eolian_documentation_description_get(doc));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1439,7 +1401,6 @@ EFL_START_TEST(eolian_function_types)
const char* type_name = NULL;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1551,7 +1512,6 @@ EFL_START_TEST(eolian_function_types)
fail_if(eina_iterator_next(iter, &dummy));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1567,7 +1527,6 @@ EFL_START_TEST(eolian_function_as_arguments)
const char *type_name = NULL;
void *dummy;
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1593,7 +1552,6 @@ EFL_START_TEST(eolian_function_as_arguments)
fail_if(eina_iterator_next(iter, &dummy));
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
@@ -1609,7 +1567,6 @@ EFL_START_TEST(eolian_parts)
"Override", "Base", "Parts"
};
- eolian_init();
Eolian_State *eos = eolian_state_new();
fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data"));
@@ -1640,7 +1597,6 @@ EFL_START_TEST(eolian_parts)
eina_iterator_free(iter);
eolian_state_free(eos);
- eolian_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/eolian/eolian_suite.c b/src/tests/eolian/eolian_suite.c
index 1704b7f81b..491013950e 100644
--- a/src/tests/eolian/eolian_suite.c
+++ b/src/tests/eolian/eolian_suite.c
@@ -8,6 +8,7 @@
#include "eolian_suite.h"
#include "../efl_check.h"
+#include <Eolian.h>
static const Efl_Test_Case etc[] = {
{ "Eolian Parsing", eolian_parsing_test},
@@ -15,6 +16,16 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(eolian)
+{
+ ck_assert_int_eq(eolian_init(), 1);
+}
+
+SUITE_SHUTDOWN(eolian)
+{
+ ck_assert_int_eq(eolian_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -30,7 +41,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Eolian", etc);
+ "Eolian", etc, SUITE_INIT_FN(eolian), SUITE_SHUTDOWN_FN(eolian));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/evas/evas_suite.c b/src/tests/evas/evas_suite.c
index 78fe314c9a..52ba05e596 100644
--- a/src/tests/evas/evas_suite.c
+++ b/src/tests/evas/evas_suite.c
@@ -25,6 +25,18 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+SUITE_INIT(evas)
+{
+ ck_assert_int_eq(evas_init(), 1);
+ ck_assert_int_eq(ecore_evas_init(), 1);
+}
+
+SUITE_SHUTDOWN(evas)
+{
+ ck_assert_int_eq(ecore_evas_shutdown(), 0);
+ ck_assert_int_eq(evas_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -37,12 +49,8 @@ main(int argc, char **argv)
putenv("EFL_RUN_IN_TREE=1");
#endif
- ecore_evas_init();
-
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Evas", etc);
-
- ecore_evas_shutdown();
+ "Evas", etc, SUITE_INIT_FN(evas), SUITE_SHUTDOWN_FN(evas));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/evas/evas_test_callbacks.c b/src/tests/evas/evas_test_callbacks.c
index dc0bf31aa1..0b61ca55a2 100644
--- a/src/tests/evas/evas_test_callbacks.c
+++ b/src/tests/evas/evas_test_callbacks.c
@@ -25,7 +25,6 @@ do \
{ \
evas_object_del(rect); \
evas_free(evas); \
- ecore_evas_shutdown(); \
} \
while (0)
diff --git a/src/tests/evas/evas_test_evasgl.c b/src/tests/evas/evas_test_evasgl.c
index b3e8305cc0..603ed874f1 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -42,7 +42,6 @@ _detect_osmesa(void)
Ecore_Evas *ee; Evas *evas; Evas_Object *im = NULL; \
if (!strcmp(engine, "buffer") && !_detect_osmesa()) return; \
putenv("EVAS_GL_API_DEBUG=1"); \
- ecore_evas_init(); \
if (!options || !strcmp(engine, "buffer")) ee = ecore_evas_new(engine, 0, 0, 1, 1, NULL); \
else ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, options); \
if (!ee) { printf("Could not create ecore evas. Skipping Evas GL tests.\n"); \
@@ -60,7 +59,6 @@ _detect_osmesa(void)
init_failed: \
evas_object_del(im); \
ecore_evas_free(ee); \
- ecore_evas_shutdown(); \
do {} while (0)
static void
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index a72da3bb33..f3c5fa8426 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -25,7 +25,6 @@
Ecore_Evas *ee; Evas *evas; \
Evas_Object *to; \
setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1); \
- ecore_evas_init(); \
ee = ecore_evas_buffer_new(1, 1); \
ecore_evas_show(ee); \
ecore_evas_manual_render_set(ee, EINA_TRUE); \
@@ -41,7 +40,6 @@
#define END_FILTER_TEST() \
evas_object_del(to); \
ecore_evas_free(ee); \
- ecore_evas_shutdown(); \
do {} while (0)
#ifdef LITTLE_ENDIAN
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index cdd7bff03d..35d736b26c 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -87,7 +87,6 @@ EFL_START_TEST(evas_object_image_loader)
evas_object_del(o);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -282,7 +281,6 @@ EFL_START_TEST(evas_object_image_loader_orientation)
evas_object_del(rot);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -332,7 +330,6 @@ EFL_START_TEST(evas_object_image_orient)
evas_object_del(orig);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -390,7 +387,6 @@ EFL_START_TEST(evas_object_image_tgv_loader_data)
eina_strbuf_free(str);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
#endif
@@ -460,7 +456,6 @@ EFL_START_TEST(evas_object_image_all_loader_data)
eina_strbuf_free(str);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -521,7 +516,6 @@ EFL_START_TEST(evas_object_image_buggy)
eina_strbuf_free(str);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -632,7 +626,6 @@ EFL_START_TEST(evas_object_image_partially_load_orientation)
evas_object_del(orig);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -659,7 +652,6 @@ EFL_START_TEST(evas_object_image_defaults)
efl_del(o);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -823,7 +815,6 @@ EFL_START_TEST(evas_object_image_map_unmap)
// TODO: test more color conversions
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
@@ -875,7 +866,6 @@ EFL_START_TEST(evas_object_image_jp2k_loader_data)
eina_strbuf_free(str);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
#endif
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index 850c4c86ae..bdb3b627dd 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -15,7 +15,6 @@
#define START_MASK_TEST(w, h) \
Ecore_Evas *ee; Evas *e; \
- ecore_evas_init(); \
ee = ecore_evas_buffer_new(w, h); \
ecore_evas_show(ee); \
ecore_evas_manual_render_set(ee, EINA_TRUE); \
@@ -27,7 +26,6 @@
Evas_Object *o; \
EINA_LIST_FREE(tofree, o) { evas_object_del(o); } \
ecore_evas_free(ee); \
- ecore_evas_shutdown(); \
} while (0)
#define AUTODEL(o) do { tofree = eina_list_prepend(tofree, o); } while (0)
@@ -99,7 +97,6 @@ EFL_START_TEST(evas_mask_test_setget)
evas_object_del(obj);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index 24ca961bd2..e06a392a9a 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -153,7 +153,6 @@ EFL_START_TEST(evas_object_mesh_loader_saver)
unlink(tmp);
evas_free(e);
- ecore_evas_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/evas/evas_test_object.c b/src/tests/evas/evas_test_object.c
index 076bf69b74..20c199803b 100644
--- a/src/tests/evas/evas_test_object.c
+++ b/src/tests/evas/evas_test_object.c
@@ -26,8 +26,6 @@ EFL_START_TEST(evas_object_various)
/* Twice because EVAS_TEST_INIT_EVAS inits it twice. */
- ecore_evas_shutdown();
- ecore_evas_shutdown();
}
EFL_END_TEST
diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c
index 080c985368..287c673291 100644
--- a/src/tests/evas/evas_test_object_smart.c
+++ b/src/tests/evas/evas_test_object_smart.c
@@ -43,7 +43,6 @@ do \
{ \
evas_object_del(smart_obj); \
evas_free(evas); \
- ecore_evas_shutdown(); \
} \
while (0)
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index 10368f6fc0..7c66fc96c0 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -33,7 +33,6 @@ do \
{ \
evas_object_del(to); \
evas_free(evas); \
- ecore_evas_shutdown(); \
} \
while (0)
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 451e34f5ac..1aced3de2b 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -58,7 +58,6 @@ do \
evas_object_del(tb); \
evas_textblock_style_free(st); \
evas_free(evas); \
- ecore_evas_shutdown(); \
} \
while (0)
diff --git a/src/tests/evas/evas_tests_helpers.h b/src/tests/evas/evas_tests_helpers.h
index 561502aba3..af970b1a11 100644
--- a/src/tests/evas/evas_tests_helpers.h
+++ b/src/tests/evas/evas_tests_helpers.h
@@ -15,7 +15,6 @@ do \
evas_object_del(tb); \
evas_textblock_style_free(st); \
evas_free(evas); \
- ecore_evas_shutdown(); \
} \
while (0)
@@ -25,7 +24,6 @@ _setup_evas()
Evas *evas;
Evas_Engine_Info *einfo;
- ecore_evas_init();
evas = evas_new();
evas_output_method_set(evas, evas_render_method_lookup("buffer"));
diff --git a/src/tests/evil/evil_suite.c b/src/tests/evil/evil_suite.c
index 36d86ac8e5..3331d287b2 100644
--- a/src/tests/evil/evil_suite.c
+++ b/src/tests/evil/evil_suite.c
@@ -25,6 +25,7 @@
#include "evil_suite.h"
#include "../efl_check.h"
+#include <Evil.h>
static const Efl_Test_Case etc[] = {
{ "Dlfcn", evil_test_dlfcn },
@@ -44,6 +45,17 @@ static const Efl_Test_Case etc[] = {
{ NULL, NULL }
};
+
+SUITE_INIT(evil)
+{
+ ck_assert_int_eq(evil_init(), 1);
+}
+
+SUITE_SHUTDOWN(evil)
+{
+ ck_assert_int_eq(evil_shutdown(), 0);
+}
+
int
main(int argc, char **argv)
{
@@ -57,7 +69,7 @@ main(int argc, char **argv)
#endif
failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
- "Evil", etc);
+ "Evil", etc, SUITE_INIT_FN(evil), SUITE_SHUTDOWN_FN(evil));
return (failed_count == 0) ? 0 : 255;
}
diff --git a/src/tests/evil/evil_test_dlfcn.c b/src/tests/evil/evil_test_dlfcn.c
index e20ece8634..d932e710a8 100644
--- a/src/tests/evil/evil_test_dlfcn.c
+++ b/src/tests/evil/evil_test_dlfcn.c
@@ -64,11 +64,11 @@ EFL_START_TEST(evil_dlfcn_dlsym_success)
sym_init = dlsym(mod, "evil_init");
fail_if(sym_init == NULL);
- fail_if(sym_init() != 1);
+ fail_if(sym_init() != 2);
sym_shutdown = dlsym(mod, "evil_shutdown");
fail_if(sym_shutdown == NULL);
- fail_if(sym_shutdown() != 0);
+ fail_if(sym_shutdown() != 1);
res = dlclose(mod);
fail_if(res != 0);
diff --git a/src/tests/evil/evil_test_main.c b/src/tests/evil/evil_test_main.c
index ccca6ff2eb..bae448219f 100644
--- a/src/tests/evil/evil_test_main.c
+++ b/src/tests/evil/evil_test_main.c
@@ -26,8 +26,6 @@
EFL_START_TEST(evil_main_simple)
{
- fail_if(evil_init() != 1);
- fail_if(evil_shutdown() != 0);
}
EFL_END_TEST
diff --git a/src/tests/evil/evil_test_unistd.c b/src/tests/evil/evil_test_unistd.c
index 8379400ed0..4c003ea3c5 100644
--- a/src/tests/evil/evil_test_unistd.c
+++ b/src/tests/evil/evil_test_unistd.c
@@ -61,14 +61,10 @@ EFL_START_TEST(evil_unistd_pipe)
int sockets[2];
struct timeval t;
fd_set rfds;
- int ret;
data *d;
DWORD thread_id;
HANDLE h;
- ret = evil_init();
- fail_if(ret == 0);
-
FD_ZERO(&rfds);
t.tv_sec = 5;
t.tv_usec = 0;
@@ -109,8 +105,6 @@ EFL_START_TEST(evil_unistd_pipe)
CloseHandle(h);
free(d);
-
- evil_shutdown();
}
EFL_END_TEST