From ee8ff34d7bbc1f3ff7b4e66ea53b4bfef4ee1736 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 4 Feb 2016 15:10:11 +0100 Subject: [PATCH] Test rework #19: Eolian_Cxx --- src/Makefile_Eolian_Cxx.am | 3 +- src/tests/eolian_cxx/a.c | 2 - src/tests/eolian_cxx/b.c | 2 - src/tests/eolian_cxx/c.c | 2 - src/tests/eolian_cxx/callback.c | 6 +- src/tests/eolian_cxx/d.c | 2 - src/tests/eolian_cxx/eolian_cxx_suite.cc | 108 +++--------------- src/tests/eolian_cxx/eolian_cxx_suite.h | 14 +++ .../eolian_cxx/eolian_cxx_test_address_of.cc | 3 +- .../eolian_cxx/eolian_cxx_test_binding.cc | 5 +- .../eolian_cxx/eolian_cxx_test_callback.cc | 15 ++- .../eolian_cxx/eolian_cxx_test_generate.cc | 6 +- .../eolian_cxx/eolian_cxx_test_inheritance.cc | 3 +- src/tests/eolian_cxx/eolian_cxx_test_parse.cc | 10 +- .../eolian_cxx/eolian_cxx_test_wrapper.cc | 5 +- src/tests/eolian_cxx/generic.c | 1 - src/tests/eolian_cxx/simple.c | 6 +- 17 files changed, 54 insertions(+), 139 deletions(-) create mode 100644 src/tests/eolian_cxx/eolian_cxx_suite.h diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am index b310bbe479..89111c1681 100644 --- a/src/Makefile_Eolian_Cxx.am +++ b/src/Makefile_Eolian_Cxx.am @@ -74,7 +74,8 @@ tests/eolian_cxx/eolian_cxx_test_wrapper.cc \ tests/eolian_cxx/simple.c \ tests/eolian_cxx/generic.c \ tests/eolian_cxx/eolian_cxx_test_inheritance.cc \ -tests/eolian_cxx/eolian_cxx_test_generate.cc +tests/eolian_cxx/eolian_cxx_test_generate.cc \ +tests/eolian_cxx/eolian_cxx_suite.h tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_wrapper.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_callback.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h diff --git a/src/tests/eolian_cxx/a.c b/src/tests/eolian_cxx/a.c index 885c9ea173..067639f7de 100644 --- a/src/tests/eolian_cxx/a.c +++ b/src/tests/eolian_cxx/a.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -21,4 +20,3 @@ static Eo *_a_eo_base_constructor(Eo *obj EINA_UNUSED, A_Data *pd EINA_UNUSED) } #include "a.eo.c" - diff --git a/src/tests/eolian_cxx/b.c b/src/tests/eolian_cxx/b.c index f32617b38d..4efe49491b 100644 --- a/src/tests/eolian_cxx/b.c +++ b/src/tests/eolian_cxx/b.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -22,4 +21,3 @@ static Eo *_b_eo_base_constructor(Eo *obj EINA_UNUSED, B_Data *pd EINA_UNUSED) } #include "b.eo.c" - diff --git a/src/tests/eolian_cxx/c.c b/src/tests/eolian_cxx/c.c index f113c8f813..c95e2a364c 100644 --- a/src/tests/eolian_cxx/c.c +++ b/src/tests/eolian_cxx/c.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -22,4 +21,3 @@ static Eo *_c_eo_base_constructor(Eo *obj EINA_UNUSED, C_Data *pd EINA_UNUSED) } #include "c.eo.c" - diff --git a/src/tests/eolian_cxx/callback.c b/src/tests/eolian_cxx/callback.c index 62612546d7..4ad49fff52 100644 --- a/src/tests/eolian_cxx/callback.c +++ b/src/tests/eolian_cxx/callback.c @@ -1,13 +1,12 @@ - #ifdef HAVE_CONFIG_H # include #endif +#include + #include #include -#include - #include "callback.eo.h" struct _Callback_Data @@ -57,4 +56,3 @@ static void _callback_test_global_callbacks(Eo *obj EINA_UNUSED, void *pd EINA_U } #include "callback.eo.c" - diff --git a/src/tests/eolian_cxx/d.c b/src/tests/eolian_cxx/d.c index 8ef24d6916..e68a29ecc2 100644 --- a/src/tests/eolian_cxx/d.c +++ b/src/tests/eolian_cxx/d.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -24,4 +23,3 @@ static Eo *_d_eo_base_constructor(Eo *obj EINA_UNUSED, D_Data *pd EINA_UNUSED) } #include "d.eo.c" - diff --git a/src/tests/eolian_cxx/eolian_cxx_suite.cc b/src/tests/eolian_cxx/eolian_cxx_suite.cc index 7f8043914b..f925b09edf 100644 --- a/src/tests/eolian_cxx/eolian_cxx_suite.cc +++ b/src/tests/eolian_cxx/eolian_cxx_suite.cc @@ -1,24 +1,11 @@ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include +#endif -void eolian_cxx_test_parse(TCase* tc); -void eolian_cxx_test_wrapper(TCase* tc); -void eolian_cxx_test_generate(TCase* tc); -void eolian_cxx_test_callback(TCase* tc); -void eolian_cxx_test_address_of(TCase* tc); -void eolian_cxx_test_inheritance(TCase* tc); -void eolian_cxx_test_binding(TCase* tc); +#include "eolian_cxx_suite.h" +#include "../efl_check.h" -typedef struct _Eolian_Cxx_Test_Case Eolian_Cxx_Test_Case; -struct _Eolian_Cxx_Test_Case -{ - const char *test_case; - void (*build)(TCase *tc); -}; - -static const Eolian_Cxx_Test_Case etc[] = { +static const Efl_Test_Case etc[] = { { "Eolian-Cxx Parsing", eolian_cxx_test_parse }, { "Eolian-Cxx Wrapper", eolian_cxx_test_wrapper }, { "Eolian-Cxx Generation", eolian_cxx_test_generate }, @@ -29,87 +16,18 @@ static const Eolian_Cxx_Test_Case etc[] = { { NULL, NULL } }; -static void -_list_tests(void) +int +main(int argc, char* argv[]) { - const Eolian_Cxx_Test_Case *itr; + int failed_count; - itr = etc; - fputs("Available Test Cases:\n", stderr); - for (; itr->test_case; itr++) - fprintf(stderr, "\t%s\n", itr->test_case); -} - -static 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 * -eolian_cxx_build_suite(int argc, const char **argv) -{ - TCase *tc; - Suite *s; - int i; - - s = suite_create("Eolian C++"); - - 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; -} - -int main(int argc, char* argv[]) -{ - Suite *s; - SRunner *sr; - int i, 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(const_cast("EFL_RUN_IN_TREE=1")); - s = eolian_cxx_build_suite(argc - 1, (const char **)argv + 1); - sr = srunner_create(s); - - srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml"); - - 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, + "Eolian C++", etc); return (failed_count == 0) ? 0 : 255; } diff --git a/src/tests/eolian_cxx/eolian_cxx_suite.h b/src/tests/eolian_cxx/eolian_cxx_suite.h new file mode 100644 index 0000000000..73e6dc2169 --- /dev/null +++ b/src/tests/eolian_cxx/eolian_cxx_suite.h @@ -0,0 +1,14 @@ +#ifndef _EOLIAN_CXX_SUITE_H +#define _EOLIAN_CXX_SUITE_H + +#include + +void eolian_cxx_test_parse(TCase* tc); +void eolian_cxx_test_wrapper(TCase* tc); +void eolian_cxx_test_generate(TCase* tc); +void eolian_cxx_test_callback(TCase* tc); +void eolian_cxx_test_address_of(TCase* tc); +void eolian_cxx_test_inheritance(TCase* tc); +void eolian_cxx_test_binding(TCase* tc); + +#endif /* _EOLIAN_CXX_SUITE_H */ diff --git a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc index c76fa5f025..9a1283be6c 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -8,7 +7,7 @@ #include #include -#include +#include "eolian_cxx_suite.h" START_TEST(eolian_cxx_test_addess_of_conversions) { diff --git a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc index a6d8ebb310..4a189bb058 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc @@ -1,13 +1,10 @@ - -// test EFL++ generated bindings - #ifdef HAVE_CONFIG_H # include #endif #include -#include +#include "eolian_cxx_suite.h" START_TEST(eolian_cxx_test_binding_constructor_only_required) { diff --git a/src/tests/eolian_cxx/eolian_cxx_test_callback.cc b/src/tests/eolian_cxx/eolian_cxx_test_callback.cc index 42caa4a34c..6ffaf50590 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_callback.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_callback.cc @@ -1,19 +1,18 @@ - #ifdef HAVE_CONFIG_H # include #endif +#include +#include +#include +#include + #include #include #include -#include - -#include -#include -#include -#include +#include "eolian_cxx_suite.h" void foo(void*) {} @@ -106,7 +105,7 @@ START_TEST(eolian_cxx_test_callback_event_del) )); ++called4; })); - + fail_if(called1 != 2); fail_if(called2 != 2); fail_if(called3 != 2); diff --git a/src/tests/eolian_cxx/eolian_cxx_test_generate.cc b/src/tests/eolian_cxx/eolian_cxx_test_generate.cc index d9770ad710..acb32dd8e2 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_generate.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_generate.cc @@ -1,12 +1,12 @@ - #ifdef HAVE_CONFIG_H # include #endif +#include + #include -#include -#include +#include "eolian_cxx_suite.h" START_TEST(eolian_cxx_test_generate_complex_types) { diff --git a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc index 1337135528..9804a80359 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_inheritance.cc @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif @@ -8,7 +7,7 @@ #include -#include +#include "eolian_cxx_suite.h" struct bar : efl::eo::inherit diff --git a/src/tests/eolian_cxx/eolian_cxx_test_parse.cc b/src/tests/eolian_cxx/eolian_cxx_test_parse.cc index 3fd283fc22..48d414663e 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_parse.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_parse.cc @@ -1,9 +1,13 @@ +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include #include -#include -#include -#include +#include "eolian_cxx_suite.h" START_TEST(eolian_cxx_test_parse_complex_types) { diff --git a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc index a2ab990bfd..bf794a7eb7 100644 --- a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc +++ b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc @@ -1,6 +1,3 @@ - -// Test Eolian-Cxx wrappers - #ifdef HAVE_CONFIG_H # include #endif @@ -10,7 +7,7 @@ #include -#include +#include "eolian_cxx_suite.h" START_TEST(eolian_cxx_test_wrapper_size) { diff --git a/src/tests/eolian_cxx/generic.c b/src/tests/eolian_cxx/generic.c index 97f6b98187..81edb672d0 100644 --- a/src/tests/eolian_cxx/generic.c +++ b/src/tests/eolian_cxx/generic.c @@ -1,4 +1,3 @@ - #ifdef HAVE_CONFIG_H # include #endif diff --git a/src/tests/eolian_cxx/simple.c b/src/tests/eolian_cxx/simple.c index 1009b37831..79d4d80c10 100644 --- a/src/tests/eolian_cxx/simple.c +++ b/src/tests/eolian_cxx/simple.c @@ -1,13 +1,12 @@ - #ifdef HAVE_CONFIG_H # include #endif +#include + #include #include -#include - #include "simple.eo.h" #define MY_CLASS SIMPLE_CLASS @@ -35,4 +34,3 @@ static Eina_Bool _simple_name_get(Eo *obj EINA_UNUSED, void *pd EINA_UNUSED, con } #include "simple.eo.c" -