summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-12 08:54:20 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-06-12 08:54:20 -0400
commitab7c48de757c6497f8083edcb6888a51c832c902 (patch)
treeda372eee7080fc1cb1aa12fd3795a4b5caabb40e
parent0d158900b4e8db7eac6d84e46e0955456351c9f7 (diff)
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
-rw-r--r--src/tests/elementary/efl_ui_test_active_view.c5
-rw-r--r--src/tests/elementary/efl_ui_test_box.c12
-rw-r--r--src/tests/elementary/efl_ui_test_box_flow.c12
-rw-r--r--src/tests/elementary/efl_ui_test_box_stack.c12
-rw-r--r--src/tests/elementary/efl_ui_test_grid.c17
-rw-r--r--src/tests/elementary/efl_ui_test_relative_layout.c12
-rw-r--r--src/tests/elementary/efl_ui_test_table.c12
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()
550static void 550static void
551active_view_teardown() 551active_view_teardown()
552{ 552{
553 if (win)
554 {
555 efl_del(win);
556 win = NULL;
557 }
558 memset(&transition_calls, 0, sizeof(transition_calls)); 553 memset(&transition_calls, 0, sizeof(transition_calls));
559 memset(&indicator_calls, 0, sizeof(indicator_calls)); 554 memset(&indicator_calls, 0, sizeof(indicator_calls));
560} 555}
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()
228 layout = efl_add(EFL_UI_BOX_CLASS, win); 228 layout = efl_add(EFL_UI_BOX_CLASS, win);
229} 229}
230 230
231static void
232layout_teardown()
233{
234 if (win)
235 {
236 efl_del(win);
237 win = NULL;
238 }
239}
240
241EFL_START_TEST (efl_ui_box_class_check) 231EFL_START_TEST (efl_ui_box_class_check)
242{ 232{
243 const char *class; 233 const char *class;
@@ -565,7 +555,7 @@ EFL_END_TEST
565 555
566void efl_ui_test_box(TCase *tc) 556void efl_ui_test_box(TCase *tc)
567{ 557{
568 tcase_add_checked_fixture(tc, layout_setup, layout_teardown); 558 tcase_add_checked_fixture(tc, layout_setup, NULL);
569 tcase_add_test(tc, efl_ui_box_class_check); 559 tcase_add_test(tc, efl_ui_box_class_check);
570 tcase_add_test(tc, efl_ui_box_layout_update); 560 tcase_add_test(tc, efl_ui_box_layout_update);
571 tcase_add_test(tc, efl_ui_box_layout_update_pack); 561 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()
228 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); 228 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
229} 229}
230 230
231static void
232layout_teardown()
233{
234 if (win)
235 {
236 efl_del(win);
237 win = NULL;
238 }
239}
240
241EFL_START_TEST (efl_ui_box_flow_class_check) 231EFL_START_TEST (efl_ui_box_flow_class_check)
242{ 232{
243 const char *class; 233 const char *class;
@@ -408,7 +398,7 @@ EFL_END_TEST
408 398
409void efl_ui_test_box_flow(TCase *tc) 399void efl_ui_test_box_flow(TCase *tc)
410{ 400{
411 tcase_add_checked_fixture(tc, layout_setup, layout_teardown); 401 tcase_add_checked_fixture(tc, layout_setup, NULL);
412 tcase_add_test(tc, efl_ui_box_flow_class_check); 402 tcase_add_test(tc, efl_ui_box_flow_class_check);
413 tcase_add_test(tc, efl_ui_box_flow_layout_update); 403 tcase_add_test(tc, efl_ui_box_flow_layout_update);
414 tcase_add_test(tc, efl_ui_box_flow_layout_update_pack); 404 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()
137 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL)); 137 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL));
138} 138}
139 139
140static void
141layout_teardown()
142{
143 if (win)
144 {
145 efl_del(win);
146 win = NULL;
147 }
148}
149
150EFL_START_TEST (efl_ui_box_stack_class_check) 140EFL_START_TEST (efl_ui_box_stack_class_check)
151{ 141{
152 const char *class; 142 const char *class;
@@ -237,7 +227,7 @@ EFL_END_TEST
237 227
238void efl_ui_test_box_stack(TCase *tc) 228void efl_ui_test_box_stack(TCase *tc)
239{ 229{
240 tcase_add_checked_fixture(tc, layout_setup, layout_teardown); 230 tcase_add_checked_fixture(tc, layout_setup, NULL);
241 tcase_add_test(tc, efl_ui_box_stack_class_check); 231 tcase_add_test(tc, efl_ui_box_stack_class_check);
242 tcase_add_test(tc, efl_ui_box_stack_layout_update); 232 tcase_add_test(tc, efl_ui_box_stack_layout_update);
243 tcase_add_test(tc, efl_ui_box_stack_size); 233 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()
23 efl_gfx_entity_visible_set(win, EINA_TRUE); 23 efl_gfx_entity_visible_set(win, EINA_TRUE);
24} 24}
25 25
26static void
27grid_teardown()
28{
29 if (grid)
30 {
31 efl_del(grid);
32 grid = NULL;
33 }
34 if (win)
35 {
36 efl_del(win);
37 win = NULL;
38 }
39}
40
41static Eina_Bool 26static Eina_Bool
42grid_item_pack(Eo *grid, int count, Eina_List **l) 27grid_item_pack(Eo *grid, int count, Eina_List **l)
43{ 28{
@@ -312,7 +297,7 @@ EFL_END_TEST
312 297
313void efl_ui_test_grid(TCase *tc) 298void efl_ui_test_grid(TCase *tc)
314{ 299{
315 tcase_add_checked_fixture(tc, grid_setup, grid_teardown); 300 tcase_add_checked_fixture(tc, grid_setup, NULL);
316 tcase_add_test(tc, efl_ui_grid_class_check); 301 tcase_add_test(tc, efl_ui_grid_class_check);
317 tcase_add_test(tc, efl_ui_grid_pack); 302 tcase_add_test(tc, efl_ui_grid_pack);
318 tcase_add_test(tc, efl_ui_grid_unpack); 303 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()
218 efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200)); 218 efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
219} 219}
220 220
221static void
222layout_teardown()
223{
224 if (win)
225 {
226 efl_del(win);
227 win = NULL;
228 }
229}
230
231EFL_START_TEST (efl_ui_relative_layout_class_check) 221EFL_START_TEST (efl_ui_relative_layout_class_check)
232{ 222{
233 const char *class; 223 const char *class;
@@ -375,7 +365,7 @@ EFL_END_TEST
375 365
376void efl_ui_test_relative_layout(TCase *tc) 366void efl_ui_test_relative_layout(TCase *tc)
377{ 367{
378 tcase_add_checked_fixture(tc, layout_setup, layout_teardown); 368 tcase_add_checked_fixture(tc, layout_setup, NULL);
379 tcase_add_test(tc, efl_ui_relative_layout_class_check); 369 tcase_add_test(tc, efl_ui_relative_layout_class_check);
380 tcase_add_test(tc, efl_ui_relative_layout_layout_update); 370 tcase_add_test(tc, efl_ui_relative_layout_layout_update);
381 tcase_add_test(tc, efl_ui_relative_layout_layout_update_chain); 371 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()
254 layout = efl_add(EFL_UI_TABLE_CLASS, win); 254 layout = efl_add(EFL_UI_TABLE_CLASS, win);
255} 255}
256 256
257static void
258layout_teardown()
259{
260 if (win)
261 {
262 efl_del(win);
263 win = NULL;
264 }
265}
266
267EFL_START_TEST (efl_ui_table_class_check) 257EFL_START_TEST (efl_ui_table_class_check)
268{ 258{
269 const char *class; 259 const char *class;
@@ -556,7 +546,7 @@ EFL_END_TEST
556 546
557void efl_ui_test_table(TCase *tc) 547void efl_ui_test_table(TCase *tc)
558{ 548{
559 tcase_add_checked_fixture(tc, layout_setup, layout_teardown); 549 tcase_add_checked_fixture(tc, layout_setup, NULL);
560 tcase_add_test(tc, efl_ui_table_class_check); 550 tcase_add_test(tc, efl_ui_table_class_check);
561 tcase_add_test(tc, efl_ui_table_size); 551 tcase_add_test(tc, efl_ui_table_size);
562 tcase_add_test(tc, efl_ui_table_layout_update); 552 tcase_add_test(tc, efl_ui_table_layout_update);