tests: use fixtures for eio tests

Summary:
remove a lot of duplicated code and make this test suite read more like
all the other suites

fix T6813
Depends on D6247

Reviewers: stefan_schmidt, bu5hm4n, ManMower, devilhorns

Reviewed By: bu5hm4n, ManMower

Subscribers: Hermet, bu5hm4n, cedric, #committers

Tags: #efl

Maniphest Tasks: T6813

Differential Revision: https://phab.enlightenment.org/D6248

diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 59318f8..4a7ac7d 100644 (file)
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -166,11 +166,6 @@ EFL_START_TEST(eio_model_test_test_file)
 
    memset(&reqs, 0, sizeof(struct reqs_t));
 
-   fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
-   fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-   fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
-   fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
-
    filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(),
                        eio_model_path_set(efl_added, EFL_MODEL_TEST_FILENAME_PATH));
    fail_if(!filemodel, "ERROR: Cannot init model!\n");
@@ -197,10 +192,6 @@ EFL_START_TEST(eio_model_test_test_file)
    ecore_main_loop_begin();
 
    efl_del(filemodel);
-
-   eio_shutdown();
-   ecore_shutdown();
-   eina_shutdown();
 }
 EFL_END_TEST
 

diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index bdb6b07..392aa31 100644 (file)
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -99,11 +99,6 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
    Eo *filemodel = NULL;
    Eina_Future* future;
 
-   fail_if(!eina_init(), "ERROR: Cannot init Eina!\n");
-   fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
-   fail_if(!efl_object_init(), "ERROR: Cannot init EO!\n");
-   fail_if(!eio_init(), "ERROR: Cannot init EIO!\n");
-
    tmpdir = eina_environment_tmp_get();
 
    filemodel = efl_add(EIO_MODEL_CLASS,
@@ -122,10 +117,6 @@ EFL_START_TEST(eio_model_test_test_monitor_add)
 
    efl_del(filemodel);
 
-   eio_shutdown();
-   ecore_shutdown();
-   eina_shutdown();
-
    fail_if(!children_deleted);
 }
 EFL_END_TEST

diff --git a/src/tests/eio/eio_suite.c b/src/tests/eio/eio_suite.c
index 810bef7..f83afd6 100644 (file)
--- a/src/tests/eio/eio_suite.c
+++ b/src/tests/eio/eio_suite.c
@@ -8,7 +8,17 @@
 #include "../efl_check.h"
 #include <Eio.h>
 
+EFL_START_TEST(eio_init_test)
+EFL_END_TEST
+
+static void
+eio_test_init(TCase *tc)
+{
+   tcase_add_test(tc, eio_init_test);
+}
+
 static const Efl_Test_Case etc[] = {
+  {"Eio", eio_test_init},
   {"Eio_Monitor", eio_test_monitor},
   {"Eio_Sentry", eio_test_sentry},
   {"Eio Model", eio_model_test_file},
@@ -26,13 +36,12 @@ static const Efl_Test_Case etc[] = {
 
 SUITE_INIT(eio)
 {
-   //T6813
-   //ck_assert_int_eq(eio_init(), 1);
+   ck_assert_int_eq(eio_init(), 1);
 }
 
 SUITE_SHUTDOWN(eio)
 {
-   //ck_assert_int_eq(eio_shutdown(), 0);
+   ck_assert_int_eq(eio_shutdown(), 0);
 }
 
 int

diff --git a/src/tests/eio/eio_test_eet.c b/src/tests/eio/eio_test_eet.c
index bfdddcf..fbd6441 100644 (file)
--- a/src/tests/eio/eio_test_eet.c
+++ b/src/tests/eio/eio_test_eet.c
@@ -73,9 +73,7 @@ EFL_START_TEST(eio_test_eet_cipher_decipher)
    Eio_File *ef;
    Eina_Tmpstr *file;
 
-   ecore_init();
    eet_init();
-   eio_init();
 
    ret = eina_file_mkstemp("eio_eet_example_XXXXXX", &file);
    fail_if(ret == -1);
@@ -107,9 +105,7 @@ EFL_START_TEST(eio_test_eet_cipher_decipher)
    fail_if(!ef);
 
    eina_tmpstr_del(file);
-   eio_shutdown();
    eet_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -167,9 +163,7 @@ EFL_START_TEST(eio_test_eet_data_cipher_decipher)
    Test_Struct *tc;
    Eina_Tmpstr *file;
 
-   ecore_init();
    eet_init();
-   eio_init();
 
    _test_struct_descriptor_init();
    tc = _test_struct_new();
@@ -204,9 +198,7 @@ EFL_START_TEST(eio_test_eet_data_cipher_decipher)
    fail_if(!ef);
 
    eina_tmpstr_del(file);
-   eio_shutdown();
    eet_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 

diff --git a/src/tests/eio/eio_test_file.c b/src/tests/eio/eio_test_file.c
index d6a375a..5028215 100644 (file)
--- a/src/tests/eio/eio_test_file.c
+++ b/src/tests/eio/eio_test_file.c
@@ -117,16 +117,9 @@ _open_done_cb(void *data, Eio_File *handler EINA_UNUSED, Eina_File *file)
 
 EFL_START_TEST(eio_file_test_ls)
 {
-   int number_of_listed_files = 0, ret;
+   int number_of_listed_files = 0;
    const char *new_dir = "new_dir";
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
-
    Eina_Tmpstr *test_dirname = get_eio_test_file_tmp_dir();
    Eina_Tmpstr *nested_dirname = create_test_dirs(test_dirname);
    Eina_Tmpstr *nested_filename = get_full_path(test_dirname, files[3]);
@@ -188,9 +181,6 @@ EFL_START_TEST(eio_file_test_ls)
    eina_tmpstr_del(test_dirname);
    eina_tmpstr_del(nested_filename);
    eina_tmpstr_del(new_dirname);
-   eina_shutdown();
-   eio_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -200,12 +190,6 @@ EFL_START_TEST(eio_file_test_file)
    Eina_Bool is_dir;
    const char * new_file = "new_file";
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
    ret = ecore_file_init();
    fail_if(ret < 1);
 
@@ -303,9 +287,6 @@ EFL_START_TEST(eio_file_test_file)
    eina_tmpstr_del(new_filename);
    eina_tmpstr_del(new_dirname);
    ecore_file_shutdown();
-   eina_shutdown();
-   eio_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -314,12 +295,6 @@ EFL_START_TEST(eio_file_test_open)
    Eina_Bool opened_file;
    int ret;
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
    ret = ecore_file_init();
    fail_if(ret < 1);
 
@@ -340,9 +315,6 @@ EFL_START_TEST(eio_file_test_open)
    eina_tmpstr_del(test_dirname);
    eina_tmpstr_del(nested_filename);
    ecore_file_shutdown();
-   eina_shutdown();
-   eio_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 

diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 7501111..0a849ad 100644 (file)
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -202,12 +202,6 @@ EFL_START_TEST(efl_io_manager_test_stat)
    Eina_Bool is_dir = EINA_TRUE;
    int ret;
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
    ret = ecore_file_init();
    fail_if(ret < 1);
 
@@ -236,9 +230,6 @@ EFL_START_TEST(efl_io_manager_test_stat)
    eina_tmpstr_del(test_dirname);
    eina_tmpstr_del(nested_filename);
    ecore_file_shutdown();
-   eina_shutdown();
-   eio_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -252,12 +243,6 @@ EFL_START_TEST(efl_io_manager_test_ls)
    uint64_t main_files = 0;
    int ret;
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
    ret = ecore_file_init();
    fail_if(ret < 1);
 
@@ -291,9 +276,6 @@ EFL_START_TEST(efl_io_manager_test_ls)
    eina_tmpstr_del(test_dirname);
    eina_tmpstr_del(nested_filename);
    ecore_file_shutdown();
-   eina_shutdown();
-   eio_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -307,14 +289,8 @@ EFL_START_TEST(efl_io_manager_test_open)
    Eina_Bool opened_file = EINA_FALSE;
    int ret;
 
-   ret = ecore_init();
-   fail_if(ret < 1);
-   ret = eina_init();
-   fail_if(ret < 1);
    ret = ecore_file_init();
    fail_if(ret < 1);
-   ret = eio_init();
-   fail_if(ret < 1);
 
    test_dirname = get_eio_test_file_tmp_dir();
    nested_dirname = create_test_dirs(test_dirname);
@@ -335,31 +311,24 @@ EFL_START_TEST(efl_io_manager_test_open)
    eina_tmpstr_del(nested_dirname);
    eina_tmpstr_del(test_dirname);
 
-   eio_shutdown();
    eina_tmpstr_del(nested_filename);
    ecore_file_shutdown();
-   eina_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
-EFL_START_TEST(efl_io_instantiated)
+EFL_START_TEST(efl_io_test_instantiated)
 {
    Efl_Io_Manager *manager;
 
+   ck_assert_int_eq(eio_shutdown(), 0);
    ecore_init();
-
    fail_if(efl_provider_find(efl_main_loop_get(), EFL_IO_MANAGER_CLASS) != NULL);
-
-   eio_init();
+   ecore_shutdown();
+   ck_assert_int_eq(eio_init(), 1);
 
    manager = efl_provider_find(efl_main_loop_get(), EFL_IO_MANAGER_CLASS);
    fail_if(manager == NULL);
    fail_if(!efl_isa(manager, EFL_IO_MANAGER_CLASS));
-
-   eio_shutdown();
-
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -369,5 +338,5 @@ eio_test_job(TCase *tc)
     tcase_add_test(tc, efl_io_manager_test_ls);
     tcase_add_test(tc, efl_io_manager_test_stat);
     tcase_add_test(tc, efl_io_manager_test_open);
-    tcase_add_test(tc, efl_io_instantiated);
+    tcase_add_test(tc, efl_io_test_instantiated);
 }

diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index db8142f..2d88548 100644 (file)
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -127,10 +127,6 @@ EFL_START_TEST(eio_test_job_xattr_set)
    Eo *job;
    Eina_Future **futures = NULL;
 
-   ecore_init();
-   eina_init();
-   eio_init();
-
    job = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
 
    test_file_path = get_full_path(XATTR_TEST_DIR, filename);
@@ -189,9 +185,6 @@ EFL_START_TEST(eio_test_job_xattr_set)
    close(fd);
    unlink(test_file_path);
    eina_tmpstr_del(test_file_path);
-   eio_shutdown();
-   eina_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 

diff --git a/src/tests/eio/eio_test_map.c b/src/tests/eio/eio_test_map.c
index 0c4dc85..abfb80f 100644 (file)
--- a/src/tests/eio/eio_test_map.c
+++ b/src/tests/eio/eio_test_map.c
@@ -61,10 +61,6 @@ EFL_START_TEST(eio_test_map_simple)
    Eio_File *ef;
    Eina_Tmpstr *file_path;
 
-   ecore_init();
-   eina_init();
-   eio_init();
-
    fd = eina_file_mkstemp(file, &file_path);
    fail_if(fd < 0);
    fail_if(write(fd, data, strlen(data)) != (ssize_t)strlen(data));
@@ -89,9 +85,6 @@ EFL_START_TEST(eio_test_map_simple)
    fail_if(!ef);
 
    eina_tmpstr_del(file_path);
-   eio_shutdown();
-   eina_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 

diff --git a/src/tests/eio/eio_test_monitor.c b/src/tests/eio/eio_test_monitor.c
index 0e774df..68f4023 100644 (file)
--- a/src/tests/eio/eio_test_monitor.c
+++ b/src/tests/eio/eio_test_monitor.c
@@ -116,7 +116,6 @@ static Eina_Bool _check_event_path(void *data, void *event)
 static Eina_Tmpstr *_common_init()
 {
    Eina_Tmpstr *dirname;
-   fail_if(eio_init() != 1);
    ecore_file_init();
 
    //test timeout
@@ -130,7 +129,6 @@ static void _common_shutdown(Eina_Tmpstr *dirname)
 {
    _delete_directory((void*)dirname);
    ecore_file_shutdown();
-   fail_if(eio_shutdown() != 0);
    eina_tmpstr_del(dirname);
 }
 

diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index f11d670..5fdcde0 100644 (file)
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -115,7 +115,6 @@ static void _check_event_path(void *data, const Efl_Event *event)
 static Eina_Tmpstr *_common_init()
 {
    Eina_Tmpstr *dirname;
-   fail_if(eio_init() != 1);
    ecore_file_init();
 
    //test timeout
@@ -129,7 +128,6 @@ static void _common_shutdown(Eina_Tmpstr *dirname)
 {
    _delete_directory((void*)dirname);
    ecore_file_shutdown();
-   fail_if(eio_shutdown() != 0);
    eina_tmpstr_del(dirname);
 }
 

diff --git a/src/tests/eio/eio_test_xattr.c b/src/tests/eio/eio_test_xattr.c
index 4eff0b7..62b956a 100644 (file)
--- a/src/tests/eio/eio_test_xattr.c
+++ b/src/tests/eio/eio_test_xattr.c
@@ -138,10 +138,6 @@ EFL_START_TEST(eio_test_xattr_set)
    int num_of_attr = 0, fd;
    unsigned int i;
 
-   ecore_init();
-   eina_init();
-   eio_init();
-
    test_file_path = get_full_path(XATTR_TEST_DIR, filename);
    fd = open(test_file_path,
              O_WRONLY | O_CREAT | O_TRUNC,
@@ -182,9 +178,6 @@ EFL_START_TEST(eio_test_xattr_set)
    close(fd);
    unlink(test_file_path);
    eina_tmpstr_del(test_file_path);
-   eio_shutdown();
-   eina_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 
@@ -196,10 +189,6 @@ EFL_START_TEST(eio_test_xattr_types_set)
    int  fd, num_of_attr=0;
    Eio_File *fp;
 
-   ecore_init();
-   eina_init();
-   eio_init();
-
    test_file_path = get_full_path(XATTR_TEST_DIR, filename);
    fd = open(test_file_path,
              O_WRONLY | O_CREAT | O_TRUNC,
@@ -253,9 +242,6 @@ EFL_START_TEST(eio_test_xattr_types_set)
    close(fd);
    unlink(test_file_path);
    eina_tmpstr_del(test_file_path);
-   eio_shutdown();
-   eina_shutdown();
-   ecore_shutdown();
 }
 EFL_END_TEST
 #endif