zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ab7c48de757c6497f8083edcb6888a51c832c902
commit ab7c48de757c6497f8083edcb6888a51c832c902 Author: Mike Blumenkrantz <[email protected]> Date: Wed Jun 12 08:54:20 2019 -0400 tests/efl_ui: remove unnecessary shutdown fixture code Summary: this is automatically handled by elm_shutdown at the end of every test Reviewers: YOhoho Reviewed By: YOhoho Subscribers: YOhoho, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9087 --- src/tests/elementary/efl_ui_test_active_view.c | 5 ----- src/tests/elementary/efl_ui_test_box.c | 12 +----------- src/tests/elementary/efl_ui_test_box_flow.c | 12 +----------- src/tests/elementary/efl_ui_test_box_stack.c | 12 +----------- src/tests/elementary/efl_ui_test_grid.c | 17 +---------------- src/tests/elementary/efl_ui_test_relative_layout.c | 12 +----------- src/tests/elementary/efl_ui_test_table.c | 12 +----------- 7 files changed, 6 insertions(+), 76 deletions(-) diff --git a/src/tests/elementary/efl_ui_test_active_view.c b/src/tests/elementary/efl_ui_test_active_view.c index 8643fcb8ed..f1b4c32ebb 100644 --- a/src/tests/elementary/efl_ui_test_active_view.c +++ b/src/tests/elementary/efl_ui_test_active_view.c @@ -550,11 +550,6 @@ active_view_setup() static void active_view_teardown() { - if (win) - { - efl_del(win); - win = NULL; - } memset(&transition_calls, 0, sizeof(transition_calls)); memset(&indicator_calls, 0, sizeof(indicator_calls)); } diff --git a/src/tests/elementary/efl_ui_test_box.c b/src/tests/elementary/efl_ui_test_box.c index 348e8b0fd0..06162f2dc1 100644 --- a/src/tests/elementary/efl_ui_test_box.c +++ b/src/tests/elementary/efl_ui_test_box.c @@ -228,16 +228,6 @@ layout_setup() layout = efl_add(EFL_UI_BOX_CLASS, win); } -static void -layout_teardown() -{ - if (win) - { - efl_del(win); - win = NULL; - } -} - EFL_START_TEST (efl_ui_box_class_check) { const char *class; @@ -565,7 +555,7 @@ EFL_END_TEST void efl_ui_test_box(TCase *tc) { - tcase_add_checked_fixture(tc, layout_setup, layout_teardown); + tcase_add_checked_fixture(tc, layout_setup, NULL); tcase_add_test(tc, efl_ui_box_class_check); tcase_add_test(tc, efl_ui_box_layout_update); tcase_add_test(tc, efl_ui_box_layout_update_pack); diff --git a/src/tests/elementary/efl_ui_test_box_flow.c b/src/tests/elementary/efl_ui_test_box_flow.c index 299acca1fc..121e67324b 100644 --- a/src/tests/elementary/efl_ui_test_box_flow.c +++ b/src/tests/elementary/efl_ui_test_box_flow.c @@ -228,16 +228,6 @@ layout_setup() efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); } -static void -layout_teardown() -{ - if (win) - { - efl_del(win); - win = NULL; - } -} - EFL_START_TEST (efl_ui_box_flow_class_check) { const char *class; @@ -408,7 +398,7 @@ EFL_END_TEST void efl_ui_test_box_flow(TCase *tc) { - tcase_add_checked_fixture(tc, layout_setup, layout_teardown); + tcase_add_checked_fixture(tc, layout_setup, NULL); tcase_add_test(tc, efl_ui_box_flow_class_check); tcase_add_test(tc, efl_ui_box_flow_layout_update); tcase_add_test(tc, efl_ui_box_flow_layout_update_pack); diff --git a/src/tests/elementary/efl_ui_test_box_stack.c b/src/tests/elementary/efl_ui_test_box_stack.c index 5a59bc5efa..d7fbc2b3be 100644 --- a/src/tests/elementary/efl_ui_test_box_stack.c +++ b/src/tests/elementary/efl_ui_test_box_stack.c @@ -137,16 +137,6 @@ layout_setup() efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); } -static void -layout_teardown() -{ - if (win) - { - efl_del(win); - win = NULL; - } -} - EFL_START_TEST (efl_ui_box_stack_class_check) { const char *class; @@ -237,7 +227,7 @@ EFL_END_TEST void efl_ui_test_box_stack(TCase *tc) { - tcase_add_checked_fixture(tc, layout_setup, layout_teardown); + tcase_add_checked_fixture(tc, layout_setup, NULL); tcase_add_test(tc, efl_ui_box_stack_class_check); tcase_add_test(tc, efl_ui_box_stack_layout_update); tcase_add_test(tc, efl_ui_box_stack_size); diff --git a/src/tests/elementary/efl_ui_test_grid.c b/src/tests/elementary/efl_ui_test_grid.c index 07b8cd0aca..50daae06bd 100644 --- a/src/tests/elementary/efl_ui_test_grid.c +++ b/src/tests/elementary/efl_ui_test_grid.c @@ -23,21 +23,6 @@ grid_setup() efl_gfx_entity_visible_set(win, EINA_TRUE); } -static void -grid_teardown() -{ - if (grid) - { - efl_del(grid); - grid = NULL; - } - if (win) - { - efl_del(win); - win = NULL; - } -} - static Eina_Bool grid_item_pack(Eo *grid, int count, Eina_List **l) { @@ -312,7 +297,7 @@ EFL_END_TEST void efl_ui_test_grid(TCase *tc) { - tcase_add_checked_fixture(tc, grid_setup, grid_teardown); + tcase_add_checked_fixture(tc, grid_setup, NULL); tcase_add_test(tc, efl_ui_grid_class_check); tcase_add_test(tc, efl_ui_grid_pack); tcase_add_test(tc, efl_ui_grid_unpack); diff --git a/src/tests/elementary/efl_ui_test_relative_layout.c b/src/tests/elementary/efl_ui_test_relative_layout.c index 06031aad8c..3f68cc0914 100644 --- a/src/tests/elementary/efl_ui_test_relative_layout.c +++ b/src/tests/elementary/efl_ui_test_relative_layout.c @@ -218,16 +218,6 @@ layout_setup() efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200)); } -static void -layout_teardown() -{ - if (win) - { - efl_del(win); - win = NULL; - } -} - EFL_START_TEST (efl_ui_relative_layout_class_check) { const char *class; @@ -375,7 +365,7 @@ EFL_END_TEST void efl_ui_test_relative_layout(TCase *tc) { - tcase_add_checked_fixture(tc, layout_setup, layout_teardown); + tcase_add_checked_fixture(tc, layout_setup, NULL); tcase_add_test(tc, efl_ui_relative_layout_class_check); tcase_add_test(tc, efl_ui_relative_layout_layout_update); tcase_add_test(tc, efl_ui_relative_layout_layout_update_chain); diff --git a/src/tests/elementary/efl_ui_test_table.c b/src/tests/elementary/efl_ui_test_table.c index abdd72d5ca..6cfbbf0ad9 100644 --- a/src/tests/elementary/efl_ui_test_table.c +++ b/src/tests/elementary/efl_ui_test_table.c @@ -254,16 +254,6 @@ layout_setup() layout = efl_add(EFL_UI_TABLE_CLASS, win); } -static void -layout_teardown() -{ - if (win) - { - efl_del(win); - win = NULL; - } -} - EFL_START_TEST (efl_ui_table_class_check) { const char *class; @@ -556,7 +546,7 @@ EFL_END_TEST void efl_ui_test_table(TCase *tc) { - tcase_add_checked_fixture(tc, layout_setup, layout_teardown); + tcase_add_checked_fixture(tc, layout_setup, NULL); tcase_add_test(tc, efl_ui_table_class_check); tcase_add_test(tc, efl_ui_table_size); tcase_add_test(tc, efl_ui_table_layout_update); --
