discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d4bcd7c8eb11781bc0c572320f557121cbb8f35c
commit d4bcd7c8eb11781bc0c572320f557121cbb8f35c Author: Mike Blumenkrantz <[email protected]> Date: Tue Aug 7 12:10:22 2018 -0400 tests/eolian: remove eolian_decl test Summary: <q66> just remove decl.eo and remove the eolian_decl test; it's useless <q66> the reason: it used to be testing some specific API, which got replaced with more generalized API that is now used everywhere in the tests, so that specific test no longer has a purpose resolves some compile errors due to type conflicts Reviewers: q66 Reviewed By: q66 Subscribers: cedric, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6773 --- src/Makefile_Eolian.am | 1 - src/tests/eolian/data/decl.eo | 22 -------------- src/tests/eolian/eolian_parsing.c | 61 --------------------------------------- 3 files changed, 84 deletions(-) diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am index 57c5cda09b..2fe7ad0c95 100644 --- a/src/Makefile_Eolian.am +++ b/src/Makefile_Eolian.am @@ -79,7 +79,6 @@ tests/eolian/data/class_simple.eo \ tests/eolian/data/complex_type.eo \ tests/eolian/data/consts.eo \ tests/eolian/data/ctor_dtor.eo \ -tests/eolian/data/decl.eo \ tests/eolian/data/docs.eo \ tests/eolian/data/enum.eo \ tests/eolian/data/events.eo \ diff --git a/src/tests/eolian/data/decl.eo b/src/tests/eolian/data/decl.eo deleted file mode 100644 index ed036bc2a9..0000000000 --- a/src/tests/eolian/data/decl.eo +++ /dev/null @@ -1,22 +0,0 @@ -struct A { - foo: int; -} - -enum B { - x -} - -type C: A; - -var pants: B = B.x; - -class Decl { - methods { - foo { - params { - idx: int; - } - return: mstring @owned; - } - } -} diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 758ff9840e..8f4d015663 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -1085,66 +1085,6 @@ EFL_START_TEST(eolian_import) } EFL_END_TEST -EFL_START_TEST(eolian_decl) -{ - const Eolian_Object *decl; - const Eolian_Typedecl *tdl; - const Eolian_Variable *var; - const Eolian_Unit *unit; - Eina_Iterator *itr; - - Eolian_State *eos = eolian_state_new(); - - fail_if(!eolian_state_directory_add(eos, TESTS_SRC_DIR"/data")); - - fail_if(!(unit = eolian_state_file_parse(eos, TESTS_SRC_DIR"/data/decl.eo"))); - fail_if(!(eolian_unit_class_by_name_get(unit, "Decl"))); - - fail_if(!(itr = eolian_state_objects_by_file_get(eos, "decl.eo"))); - - fail_if(!eina_iterator_next(itr, (void**)&decl)); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_TYPEDECL); - fail_if(strcmp(eolian_object_name_get(decl), "A")); - tdl = (const Eolian_Typedecl *)decl; - fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_STRUCT); - fail_if(strcmp(eolian_typedecl_short_name_get(tdl), "A")); - - fail_if(!eina_iterator_next(itr, (void**)&decl)); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_TYPEDECL); - fail_if(strcmp(eolian_object_name_get(decl), "B")); - tdl = (const Eolian_Typedecl *)decl; - fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_ENUM); - fail_if(strcmp(eolian_typedecl_short_name_get(tdl), "B")); - - fail_if(!eina_iterator_next(itr, (void**)&decl)); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_TYPEDECL); - fail_if(strcmp(eolian_object_name_get(decl), "C")); - tdl = (const Eolian_Typedecl *)decl; - fail_if(eolian_typedecl_type_get(tdl) != EOLIAN_TYPEDECL_ALIAS); - fail_if(strcmp(eolian_typedecl_short_name_get(tdl), "C")); - - fail_if(!eina_iterator_next(itr, (void**)&decl)); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_VARIABLE); - fail_if(strcmp(eolian_object_name_get(decl), "pants")); - var = (const Eolian_Variable *)decl; - fail_if(strcmp(eolian_variable_short_name_get(var), "pants")); - - fail_if(!eina_iterator_next(itr, (void**)&decl)); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_CLASS); - fail_if(strcmp(eolian_object_name_get(decl), "Decl")); - - fail_if(eina_iterator_next(itr, (void**)&decl)); - - fail_if(!(decl = eolian_unit_object_by_name_get(unit, "pants"))); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_VARIABLE); - - fail_if(!(decl = eolian_unit_object_by_name_get(unit, "A"))); - fail_if(eolian_object_type_get(decl) != EOLIAN_OBJECT_TYPEDECL); - - eolian_state_free(eos); -} -EFL_END_TEST - EFL_START_TEST(eolian_docs) { const Eolian_Typedecl *tdl; @@ -1619,7 +1559,6 @@ void eolian_parsing_test(TCase *tc) tcase_add_test(tc, eolian_free_func); tcase_add_test(tc, eolian_null); tcase_add_test(tc, eolian_import); - tcase_add_test(tc, eolian_decl); tcase_add_test(tc, eolian_docs); tcase_add_test(tc, eolian_function_types); tcase_add_test(tc, eolian_function_as_arguments); --
