zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6e048a4069e0d938f8e678126385b40331e84f2e
commit 6e048a4069e0d938f8e678126385b40331e84f2e
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Mon Jun 10 09:54:22 2019 -0400
tests/efl_ui: reset active view counter structs between tests
Summary: this fixes running the tests with CK_FORK=no
Reviewers: bu5hm4n
Reviewed By: bu5hm4n
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D9080
---
src/tests/elementary/efl_ui_test_active_view.c | 77 +++++++++++++-------------
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/src/tests/elementary/efl_ui_test_active_view.c
b/src/tests/elementary/efl_ui_test_active_view.c
index 0024b669e2..8643fcb8ed 100644
--- a/src/tests/elementary/efl_ui_test_active_view.c
+++ b/src/tests/elementary/efl_ui_test_active_view.c
@@ -14,43 +14,6 @@ static Efl_Ui_Active_View_Container *container;
static int tree_abort;
static int tree_abort_level;
-static void
-_shutdown(void)
-{
- eina_log_abort_on_critical_set(tree_abort);
- eina_log_abort_on_critical_level_set(tree_abort_level);
-}
-
-static void
-_setup(void)
-{
- tree_abort = eina_log_abort_on_critical_get();
- tree_abort_level = eina_log_abort_on_critical_level_get();
- eina_log_abort_on_critical_level_set(2);
- eina_log_abort_on_critical_set(1);
-}
-static void
-active_view_setup()
-{
- win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
- efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
-
- container = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, win,
- efl_content_set(win, efl_added));
-
- efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
-}
-
-static void
-active_view_teardown()
-{
- if (win)
- {
- efl_del(win);
- win = NULL;
- }
-}
-
typedef struct {
struct {
int called;
@@ -556,6 +519,46 @@ EFL_START_TEST (efl_ui_active_view_active_index_not_update)
}
EFL_END_TEST
+static void
+_shutdown(void)
+{
+ eina_log_abort_on_critical_set(tree_abort);
+ eina_log_abort_on_critical_level_set(tree_abort_level);
+}
+
+static void
+_setup(void)
+{
+ tree_abort = eina_log_abort_on_critical_get();
+ tree_abort_level = eina_log_abort_on_critical_level_get();
+ eina_log_abort_on_critical_level_set(2);
+ eina_log_abort_on_critical_set(1);
+}
+
+static void
+active_view_setup()
+{
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
+ efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC));
+
+ container = efl_add(EFL_UI_ACTIVE_VIEW_CONTAINER_CLASS, win,
+ efl_content_set(win, efl_added));
+
+ efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
+}
+
+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));
+}
+
void efl_ui_test_active_view(TCase *tc)
{
tcase_add_checked_fixture(tc, _setup, _shutdown);
--
