Test rework #10: Eina

mainly minor stuff: whitespaces, order of includes, ... Just don't fear the number
of changed files :-)

src/tests/eina/eina_suite.c

@@ -20,19 +20,12 @@
 # include "config.h"
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
-#include <stdio.h>
-#include <string.h>
+#include "../efl_check.h"
 
-typedef struct _Eina_Test_Case Eina_Test_Case;
-struct _Eina_Test_Case
-{
-   const char *test_case;
-   void (*build)(TCase *tc);
-};
-
-static const Eina_Test_Case etc[] = {
+static const Efl_Test_Case etc[] = {
    { "FixedPoint", eina_test_fp },
    { "Inarray", eina_test_inarray },
    { "Array", eina_test_array },
@@ -88,54 +81,6 @@ static const Eina_Test_Case etc[] = {
    { NULL, NULL }
 };
 
-static void
-_list_tests(void)
-{
-   const Eina_Test_Case *itr = etc;
-      fputs("Available Test Cases:\n", stderr);
-   for (; itr->test_case; itr++)
-      fprintf(stderr, "\t%s\n", itr->test_case);
-}
-
-static Eina_Bool
-_use_test(int argc, const char **argv, const char *test_case)
-{
-   if (argc < 1)
-      return 1;
-
-   for (; argc > 0; argc--, argv++)
-      if (strcmp(test_case, *argv) == 0)
-         return 1;
-
-   return 0;
-}
-
-Suite *
-eina_build_suite(int argc, const char **argv)
-{
-   TCase *tc;
-   Suite *s;
-   int i;
-
-   s = suite_create("Eina");
-
-   for (i = 0; etc[i].test_case; ++i)
-     {
-        if (!_use_test(argc, argv, etc[i].test_case))
-           continue;
-
-        tc = tcase_create(etc[i].test_case);
-#ifndef _WIN32
-        tcase_set_timeout(tc, 0);
-#endif
-
-        etc[i].build(tc);
-        suite_add_tcase(s, tc);
-     }
-
-   return s;
-}
-
 /* FIXME this is a copy from eina_test_mempool
  * we should remove the duplication
  */
@@ -156,7 +101,7 @@ static void _mempool_shutdown(void)
 {
    unsigned int i;
    Eina_Array_Iterator it;
-   Eina_Module *module;	
+   Eina_Module *module;
    eina_module_list_free(_modules);
    if (_modules)
      {
@@ -170,38 +115,17 @@ static void _mempool_shutdown(void)
 int
 main(int argc, char **argv)
 {
-   Suite *s;
-   SRunner *sr;
-   int i, failed_count;
+   int failed_count;
 
-   for (i = 1; i < argc; i++)
-      if ((strcmp(argv[i], "-h") == 0) ||
-          (strcmp(argv[i], "--help") == 0))
-        {
-           fprintf(stderr, "Usage:\n\t%s [test_case1 .. [test_caseN]]\n",
-                   argv[0]);
-           _list_tests();
-           return 0;
-        }
-      else if ((strcmp(argv[i], "-l") == 0) ||
-               (strcmp(argv[i], "--list") == 0))
-        {
-           _list_tests();
-           return 0;
-        }
+   if (!_efl_test_option_disp(argc, argv, etc))
+     return 0;
 
    putenv("EFL_RUN_IN_TREE=1");
 
-   s = eina_build_suite(argc - 1, (const char **)argv + 1);
-   sr = srunner_create(s);
-
-   srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml");
-
    _mempool_init();
 
-   srunner_run_all(sr, CK_ENV);
-   failed_count = srunner_ntests_failed(sr);
-   srunner_free(sr);
+   failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
+                                           "Eina", etc);
 
    _mempool_shutdown();
 

src/tests/eina/eina_test_accessor.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Bool
 eina_accessor_check(EINA_UNUSED const Eina_Array *array,

src/tests/eina/eina_test_array.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_array_simple)
 {

src/tests/eina/eina_test_barrier.c

@@ -22,8 +22,9 @@
 
 #include <unistd.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Thread wk1, wk2, wk3, wk4, wk5;
 static Eina_Barrier barrier;

src/tests/eina/eina_test_bezier.c

@@ -20,11 +20,12 @@
 # include "config.h"
 #endif
 
-#include <math.h>
 #include <stdio.h>
+#include <math.h>
+
+#include <Eina.h>
 
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_bezier_test_values)
 {

src/tests/eina/eina_test_binbuf.c

@@ -21,8 +21,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(binbuf_simple)
 {

src/tests/eina/eina_test_binshare.c

@@ -25,8 +25,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define TEST0 "te\0st/0"
 #define TEST0_SIZE 7

src/tests/eina/eina_test_clist.c

@@ -6,7 +6,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "Eina.h"
+#include <Eina.h>
+
 #include "eina_suite.h"
 
 Eina_Clist string_list = EINA_CLIST_INIT(string_list);

src/tests/eina/eina_test_convert.c

@@ -26,8 +26,9 @@
 #include <float.h>
 #include <limits.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_convert_simple)
 {

src/tests/eina/eina_test_counter.c

@@ -23,10 +23,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_safety_checks.h"
 
+#include "eina_suite.h"
+
 #ifdef EINA_SAFETY_CHECKS
 struct log_ctx {
    const char *msg;

src/tests/eina/eina_test_cow.c

@@ -20,8 +20,9 @@
 # include "config.h"
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 typedef struct _Eina_Cow_Test Eina_Cow_Test;
 struct _Eina_Cow_Test

src/tests/eina/eina_test_crc.c

@@ -6,8 +6,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_crc_simple)
 {

src/tests/eina/eina_test_error.c

@@ -28,8 +28,9 @@
 # include <Evil.h>
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define TEST_TEXT "The big test\n"
 

src/tests/eina/eina_test_file.c

@@ -27,11 +27,12 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_safety_checks.h"
 #include "eina_file_common.h"
 
+#include "eina_suite.h"
+
 #ifdef _WIN32
 # define PATH_SEP_C '\\'
 #else

src/tests/eina/eina_test_fp.c

@@ -20,11 +20,12 @@
 # include "config.h"
 #endif
 
-#include <math.h>
 #include <stdio.h>
+#include <math.h>
+
+#include <Eina.h>
 
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_fp_cos)
 {

src/tests/eina/eina_test_hash.c

@@ -24,10 +24,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_hash.h"
 
+#include "eina_suite.h"
+
 #define EINA_HASH_BUCKET_SIZE       8
 
 static unsigned int

src/tests/eina/eina_test_inarray.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_inarray_test_simple)
 {

src/tests/eina/eina_test_inlist.c

@@ -23,10 +23,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_safety_checks.h"
 
+#include "eina_suite.h"
+
 typedef struct _Eina_Test_Inlist Eina_Test_Inlist;
 struct _Eina_Test_Inlist
 {

src/tests/eina/eina_test_iterator.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Bool
 eina_iterator_array_check(EINA_UNUSED const Eina_Array *array,

src/tests/eina/eina_test_lalloc.c

@@ -23,8 +23,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 typedef struct _Eina_Lazy_Allocator_Test Eina_Lazy_Allocator_Test;
 struct _Eina_Lazy_Allocator_Test

src/tests/eina/eina_test_list.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Bool eina_list_sorted_check(const Eina_List *list)
 {

src/tests/eina/eina_test_lock.c

@@ -22,8 +22,9 @@
 
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #ifdef __MACH__
 # include <mach/clock.h>

src/tests/eina/eina_test_log.c

@@ -24,8 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 struct log_ctx {
    int level;

src/tests/eina/eina_test_magic.c

@@ -26,10 +26,11 @@
 
 #define EINA_MAGIC_DEBUG
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_safety_checks.h"
 
+#include "eina_suite.h"
+
 #define EINA_MAGIC_TEST 0x7781fee7
 #define EINA_MAGIC_TEST2 0x42241664
 #define EINA_MAGIC_STRING "Eina Magic Test"

src/tests/eina/eina_test_main.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
    START_TEST(eina_simple)
 {

src/tests/eina/eina_test_matrix.c

@@ -22,11 +22,12 @@
 
 #define DBL_EPSILON 0.0000001
 
-#include <math.h>
 #include <stdio.h>
+#include <math.h>
+
+#include <Eina.h>
 
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_matrix2)
 {

src/tests/eina/eina_test_matrixsparse.c

@@ -4,8 +4,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define MAX_ROWS 10
 #define MAX_COLS 10

src/tests/eina/eina_test_mempool.c

@@ -20,8 +20,9 @@
 # include "config.h"
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Array *_modules;
 
@@ -43,7 +44,7 @@ _mempool_shutdown(void)
 {
    unsigned int i;
    Eina_Array_Iterator it;
-   Eina_Module *module;	
+   Eina_Module *module;
    eina_module_list_free(_modules);
    if (_modules)
      {
@@ -191,5 +192,3 @@ eina_test_mempool(TCase *tc)
    tcase_add_test(tc, eina_mempool_ememoa_unknown);
 #endif
 }
-
-

src/tests/eina/eina_test_model.c

@@ -23,8 +23,9 @@
 #include <stdio.h>
 #include <inttypes.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static void
 _eina_test_model_check_safety_null(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args)

src/tests/eina/eina_test_module.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Bool list_cb(Eina_Module *m, void *data EINA_UNUSED)
 {

src/tests/eina/eina_test_module_dummy.c

@@ -4,7 +4,7 @@
 
 #include <stdio.h>
 
-#include "Eina.h"
+#include <Eina.h>
 
 Eina_Bool dummy_module_init(void)
 {

src/tests/eina/eina_test_quad.c

@@ -2,11 +2,12 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
 #include <stdio.h>
+#include <assert.h>
+
+#include <Eina.h>
 
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_quad_simple)
 {

src/tests/eina/eina_test_quadtree.c

@@ -20,11 +20,12 @@
 # include "config.h"
 #endif
 
-#include <assert.h>
 #include <stdio.h>
+#include <assert.h>
+
+#include <Eina.h>
 
 #include "eina_suite.h"
-#include "Eina.h"
 
 static Eina_Quad_Direction
 _eina_quadtree_rectangle_vert(const void *object, size_t middle)

src/tests/eina/eina_test_quaternion.c

@@ -24,8 +24,9 @@
 #include <float.h>
 #include <limits.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define FLOAT_CMP(a, b) (fabs((float)a - (float)b) <= FLT_MIN)
 

src/tests/eina/eina_test_rbtree.c

@@ -24,8 +24,9 @@
 #include <stdio.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static const unsigned int r1[1000] =
 {

src/tests/eina/eina_test_rectangle.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_rectangle_pool)
 {

src/tests/eina/eina_test_sched.c

@@ -25,8 +25,9 @@
 #include <sys/resource.h>
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #ifdef __linux__
 

src/tests/eina/eina_test_simple_xml_parser.c

@@ -24,8 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static const char *get_file_full_path(const char *filename)
 {

src/tests/eina/eina_test_str.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
    START_TEST(str_simple)
 {

src/tests/eina/eina_test_strbuf.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(strbuf_simple)
 {

src/tests/eina/eina_test_stringshare.c

@@ -25,8 +25,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define TEST0 "test/0"
 #define TEST1 "test/1"

src/tests/eina/eina_test_tiler.c

@@ -22,8 +22,9 @@
 
 #include <stdio.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 struct test_rect
 {

src/tests/eina/eina_test_tmpstr.c

@@ -20,10 +20,11 @@
 # include "config.h"
 #endif
 
-#include "eina_suite.h"
-#include "Eina.h"
+#include <Eina.h>
 #include "eina_tmpstr.h"
 
+#include "eina_suite.h"
+
 START_TEST(tmpstr_simple)
 {
    eina_init();

src/tests/eina/eina_test_trash.c

@@ -19,8 +19,9 @@
 # include "config.h"
 #endif
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(trash_simple)
 {
@@ -30,11 +31,11 @@ START_TEST(trash_simple)
    int inp_int = 9;
    int inp_char = inp_int + '0';
    void *data;
- 
+
    eina_init();
-   
+
    trash = calloc(1, sizeof(Eina_Trash));
-   fail_if(trash == NULL); 	
+   fail_if(trash == NULL);
    eina_trash_init(&trash);
 
    for (i = 1; i < 51; ++i)
@@ -54,9 +55,9 @@ START_TEST(trash_simple)
    fail_if(*((char *)eina_array_data_get(data, 0)) != inp_char);
    data = eina_trash_pop(&trash);
    fail_if(!data);
-   fail_if(*((int *)eina_array_data_get(data, 0)) != inp_int); 
+   fail_if(*((int *)eina_array_data_get(data, 0)) != inp_int);
    free(data);
-  
+
    i = 0;
    EINA_TRASH_CLEAN(&trash, data)
      {
@@ -66,7 +67,7 @@ START_TEST(trash_simple)
      }
 
    fail_if(i != 98);
- 
+
    eina_shutdown();
 }
 END_TEST
@@ -76,4 +77,3 @@ eina_test_trash(TCase *tc)
 {
    tcase_add_test(tc, trash_simple);
 }
-

src/tests/eina/eina_test_ustr.c

@@ -25,8 +25,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #ifdef EINA_SAFETY_CHECKS
 struct log_ctx {
@@ -634,4 +635,3 @@ eina_test_ustr(TCase *tc)
    tcase_add_test(tc,eina_unicode_utf8_conversion);
 
 }
-

src/tests/eina/eina_test_ustringshare.c

@@ -25,8 +25,9 @@
 #include <string.h>
 #include <time.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 static const Eina_Unicode TEST0[] = {'t', 'e', 's', 't', '/', '0', 0};
 static const Eina_Unicode TEST1[] = {'t', 'e', 's', 't', '/', '1', 0};

src/tests/eina/eina_test_value.c

@@ -24,8 +24,9 @@
 #include <inttypes.h>
 #include <float.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 #define FP_ERR (1)
 #define CHECK_FP(a, b) ((a - b) <= FP_ERR)
@@ -1043,7 +1044,7 @@ START_TEST(eina_value_test_convert_uchar)
    eina_shutdown();
 }
 END_TEST
- 
+
 START_TEST(eina_value_test_convert_short)
 {
    Eina_Value *value, conv;
@@ -1797,7 +1798,7 @@ 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);
@@ -1899,7 +1900,7 @@ START_TEST(eina_value_test_convert_float)
    eina_value_flush(&conv);
 
    fail_unless(eina_value_set(value, min_float_value));
-   
+
    fail_unless(eina_value_setup(&conv, EINA_VALUE_TYPE_FLOAT));
    fail_unless(eina_value_convert(value, &conv));
    fail_unless(eina_value_get(&conv, &f));
@@ -1949,7 +1950,7 @@ START_TEST(eina_value_test_convert_float)
 
    eina_value_free(value);
    eina_shutdown();
-                                             
+
 }
 END_TEST
 
@@ -2761,7 +2762,7 @@ START_TEST(eina_value_test_optional_int)
    /* ck_assert(eina_value_optional_pset(value, EINA_VALUE_TYPE_INT, &expected_value)); */
    /* ck_assert(eina_value_optional_empty_is(value, &is_empty)); */
    /* ck_assert(!is_empty); */
-   
+
    /* // gets the actual value */
    /* ck_assert(eina_value_optional_pget(value, &actual_value)); */
    /* ck_assert_int_eq(expected_value, actual_value); */
@@ -2865,7 +2866,7 @@ START_TEST(eina_value_test_optional_struct_members)
 
    eina_value_flush(&actual_value);
    eina_value_flush(&expected_value);
-   
+
    eina_value_free(value);
 
    eina_shutdown();

src/tests/eina/eina_test_vector.c

@@ -24,8 +24,9 @@
 #include <float.h>
 #include <limits.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 START_TEST(eina_test_vector2_operations)
 {

src/tests/eina/eina_test_xattr.c

@@ -25,8 +25,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 
+#include <Eina.h>
+
 #include "eina_suite.h"
-#include "Eina.h"
 
 Eina_Tmpstr*
 get_file_path(const char* tmpdirname, const char* filename)