tests: use a global win object in fork mode when using buffer engine

Summary:
this avoids the creation of a new win object for each test

ref T6864

Reviewers: stefan_schmidt, cedric

Reviewed By: cedric

Subscribers: cedric

Maniphest Tasks: T6864

Differential Revision: https://phab.enlightenment.org/D5965

70 files changed, 212 insertions, 192 deletions

diff --git a/src/tests/elementary/elm_code_test_syntax.c b/src/tests/elementary/elm_code_test_syntax.c
index 880800916e..2af474cbf5 100644
--- a/src/tests/elementary/elm_code_test_syntax.c
+++ b/src/tests/elementary/elm_code_test_syntax.c
@@ -62,7 +62,7 @@ EFL_START_TEST (elm_code_syntax_c)
    code = elm_code_create();
    file = elm_code_file_new(code);
 
-   win = elm_win_add(NULL, "syntax", ELM_WIN_BASIC);
+   win = win_add(NULL, "syntax", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    elm_obj_code_widget_code_get(widget)->file->mime = "text/x-csrc";
    elm_code_widget_syntax_enabled_set(widget, EINA_TRUE);
diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index 10ef6cd6da..e510368fdb 100644
--- a/src/tests/elementary/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_code_widget_construct)
    elm_init(1, args);
    code = elm_code_create();
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    ck_assert(!!widget);
@@ -51,7 +51,7 @@ EFL_START_TEST (elm_code_widget_construct_nocode)
    char *args[] = { "exe" };
    elm_init(1, args);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, NULL);
    ck_assert(!widget);
 
@@ -70,7 +70,7 @@ EFL_START_TEST (elm_code_widget_position)
    elm_init(1, args);
    code = elm_code_create();
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    evas_object_show(widget);
    evas_object_resize(widget, 100, 100);
diff --git a/src/tests/elementary/elm_code_test_widget_selection.c b/src/tests/elementary/elm_code_test_widget_selection.c
index b5d5897ae0..8ad7611c6a 100644
--- a/src/tests/elementary/elm_code_test_widget_selection.c
+++ b/src/tests/elementary/elm_code_test_widget_selection.c
@@ -22,7 +22,7 @@ EFL_START_TEST (elm_code_test_widget_selection_set)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 1, 2);
@@ -48,7 +48,7 @@ EFL_START_TEST (elm_code_test_widget_selection_normalized_get)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 1, 3);
@@ -91,7 +91,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    ck_assert_str_eq("", elm_code_widget_selection_text_get(widget));
@@ -125,7 +125,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    ck_assert_str_eq("", elm_code_widget_selection_text_get(widget));
@@ -160,7 +160,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get_twoline)
    elm_code_file_line_append(file, "test", 4, NULL);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 1, 3);
@@ -190,7 +190,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get_twoline)
    elm_code_file_line_append(file, "test", 4, NULL);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 2, 2);
@@ -221,7 +221,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get_multiline)
    elm_code_file_line_append(file, "test", 4, NULL);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 1, 3);
@@ -252,7 +252,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get_multiline)
    elm_code_file_line_append(file, "test", 4, NULL);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_start(widget, 3, 2);
@@ -283,7 +283,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "text", 4, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, &length);
@@ -320,7 +320,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "text", 4, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, &length);
@@ -359,7 +359,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete_twoline)
    elm_code_file_line_append(file, "TEXT", 4, NULL);
    elm_code_file_line_append(file, "remove", 6, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, NULL);
@@ -407,7 +407,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete_twoline)
    elm_code_file_line_append(file, "TEXT", 4, NULL);
    elm_code_file_line_append(file, "remove", 6, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, NULL);
@@ -457,7 +457,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete_multiline)
    elm_code_file_line_append(file, "delete", 6, NULL);
    elm_code_file_line_append(file, "REMOVE", 6, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, NULL);
@@ -507,7 +507,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete_multiline)
    elm_code_file_line_append(file, "delete", 6, NULL);
    elm_code_file_line_append(file, "REMOVE", 6, NULL);
 
-   win = elm_win_add(NULL, "code", ELM_WIN_BASIC);
+   win = win_add(NULL, "code", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    line = elm_code_file_line_get(file, 1);
    text = elm_code_line_text_get(line, NULL);
@@ -553,7 +553,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_line)
    elm_code_file_line_append(file, "line2", 5, NULL);
    elm_code_file_line_append(file, "\ttab", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_select_line(widget, 1);
@@ -591,7 +591,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word)
    elm_code_file_line_append(file, "more stuff\tto test", 18, NULL);
    elm_code_file_line_append(file, "word \"symbols\" test", 19, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_select_word(widget, 1, 3);
@@ -631,7 +631,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word_punctuation)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "comma, stop. question? mark!", 38, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_select_word(widget, 1, 3);
@@ -671,7 +671,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word_symbols)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "colon: [array] (brackets) {braces}", 38, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_selection_select_word(widget, 1, 3);
diff --git a/src/tests/elementary/elm_code_test_widget_text.c b/src/tests/elementary/elm_code_test_widget_text.c
index 1e6a3b5ffa..e9eff3c1fd 100644
--- a/src/tests/elementary/elm_code_test_widget_text.c
+++ b/src/tests/elementary/elm_code_test_widget_text.c
@@ -16,7 +16,7 @@ EFL_START_TEST (elm_code_test_widget_text_tab_width)
    char *args[] = { "exe" };
    elm_init(1, args);
    code = elm_code_create();
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    elm_code_widget_tabstop_set(widget, 8);
 
@@ -44,7 +44,7 @@ EFL_START_TEST (elm_code_test_widget_text_position)
    elm_code_file_line_append(file, "a\tb", 4, NULL);
    line = elm_code_file_line_get(file, 1);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
    elm_code_widget_tabstop_set(widget, 8);
 
diff --git a/src/tests/elementary/elm_code_test_widget_undo.c b/src/tests/elementary/elm_code_test_widget_undo.c
index 248c0e421b..9d3e59c9f1 100644
--- a/src/tests/elementary/elm_code_test_widget_undo.c
+++ b/src/tests/elementary/elm_code_test_widget_undo.c
@@ -24,7 +24,7 @@ EFL_START_TEST (elm_code_test_widget_undo_text_insert)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_text_at_cursor_insert(widget, "a");
@@ -75,7 +75,7 @@ EFL_START_TEST (elm_code_test_widget_undo_text_insert_multiple)
    file = elm_code_file_new(code);
    elm_code_file_line_append(file, "test", 4, NULL);
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
    widget = elm_code_widget_add(win, code);
 
    elm_code_widget_text_at_cursor_insert(widget, "a");
diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c
index b7e07bd45b..b8e2a94860 100644
--- a/src/tests/elementary/elm_suite.c
+++ b/src/tests/elementary/elm_suite.c
@@ -8,6 +8,7 @@
 
 static int main_pid = -1;
 static Eina_Bool did_shutdown;
+static Evas_Object *global_win;
 
 static const Efl_Test_Case etc[] = {
   { "elm_config", elm_test_config },
@@ -130,10 +131,21 @@ static const Efl_Test_Case etc_init[] = {
   { NULL, NULL }
 };
 
+Evas_Object *
+win_add()
+{
+   if (getpid() != main_pid)
+     {
+        if (global_win) return global_win;
+     }
+   return elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);;
+}
+
 int
 main(int argc, char **argv)
 {
    int failed_count;
+   Eina_Bool buffer = EINA_FALSE;
 
    if (!_efl_test_option_disp(argc, argv, etc))
      return 0;
@@ -144,13 +156,17 @@ main(int argc, char **argv)
    if (!getenv("ELM_ENGINE"))
      putenv("ELM_ENGINE=buffer");
    if (eina_streq(getenv("ELM_ENGINE"), "buffer"))
-     putenv("TESTS_GL_DISABLED=1");
+     {
+        putenv("TESTS_GL_DISABLED=1");
+        buffer = EINA_TRUE;
+     }
 
    main_pid = getpid();
 
    failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
                                            "Elementary_Init", etc_init, SUITE_INIT_FN(elm), SUITE_SHUTDOWN_FN(elm));
    failed_count += !elm_init(1, (char*[]){"exe"});
+   if (buffer) global_win = elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);
    EINA_SAFETY_ON_TRUE_RETURN_VAL(failed_count, 255);
    /* preload default theme */
    failed_count += !elm_theme_group_path_find(NULL, "elm/button/base/default");
diff --git a/src/tests/elementary/elm_suite.h b/src/tests/elementary/elm_suite.h
index 41a5bfcd01..f8ea895818 100644
--- a/src/tests/elementary/elm_suite.h
+++ b/src/tests/elementary/elm_suite.h
@@ -4,6 +4,8 @@
 #include <check.h>
 #include "elm_test_helper.h"
 #include "../efl_check.h"
+
+#include <Evas.h>
 void elm_test_init(TCase *tc);
 void elm_test_config(TCase *tc);
 void elm_test_check(TCase *tc);
@@ -85,4 +87,6 @@ void elm_code_test_widget_text(TCase *tc);
 void elm_code_test_widget_selection(TCase *tc);
 void elm_code_test_widget_undo(TCase *tc);
 
+Evas_Object *win_add();
+
 #endif /* _ELM_SUITE_H */
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index 6adf7afc3d..5509cc79bb 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_actionslider_legacy_type_check)
    Evas_Object *win, *actionslider;
    const char *type;
 
-   win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
+   win = win_add(NULL, "actionslider", ELM_WIN_BASIC);
 
    actionslider = elm_actionslider_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *actionslider;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
+   win = win_add(NULL, "actionslider", ELM_WIN_BASIC);
 
    actionslider = elm_actionslider_add(win);
    role = efl_access_object_role_get(actionslider);
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 97524f4970..1ff61da3dc 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -14,7 +14,7 @@ static Evas_Object *g_win, *g_btn, *g_bg;
 
 void generate_app(void)
 {
-   g_win = elm_win_add(NULL, "Title", ELM_WIN_BASIC);
+   g_win = win_add(NULL, "Title", ELM_WIN_BASIC);
    evas_object_geometry_set(g_win, 100, 100, 100, 100);
 
    g_bg = elm_bg_add(g_win);
@@ -204,14 +204,14 @@ EFL_START_TEST (test_efl_access_children_and_parent)
 
    //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0));
 
-   ck_assert(eina_list_count(child_list) == 1);
+   ck_assert_int_eq(eina_list_count(child_list), 1);
 
    Eo *win = NULL;
 
    win = eina_list_nth(child_list, 0);
 
-   ck_assert(win != NULL);
-   ck_assert(win == g_win);
+   ck_assert_ptr_ne(win, NULL);
+   ck_assert_ptr_eq(win, g_win);
 
    efl_del(root);
 }
diff --git a/src/tests/elementary/elm_test_bg.c b/src/tests/elementary/elm_test_bg.c
index 6b4076c728..979a3c2a7c 100644
--- a/src/tests/elementary/elm_test_bg.c
+++ b/src/tests/elementary/elm_test_bg.c
@@ -10,7 +10,7 @@ EFL_START_TEST (elm_bg_legacy_type_check)
    Evas_Object *win, *bg;
    const char *type;
 
-   win = elm_win_add(NULL, "bg", ELM_WIN_BASIC);
+   win = win_add(NULL, "bg", ELM_WIN_BASIC);
 
    bg = elm_bg_add(win);
 
@@ -30,7 +30,7 @@ EFL_START_TEST (elm_bg_legacy_file_set_get_check)
    Evas_Object *win, *bg;
    const char *file = NULL, *key = NULL;
 
-   win = elm_win_add(NULL, "bg", ELM_WIN_BASIC);
+   win = win_add(NULL, "bg", ELM_WIN_BASIC);
 
    bg = elm_bg_add(win);
 
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index 86e27c8862..56261ec7ac 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_box_legacy_type_check)
    Evas_Object *win, *box;
    const char *type;
 
-   win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
+   win = win_add(NULL, "box", ELM_WIN_BASIC);
 
    box = elm_box_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *box;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
+   win = win_add(NULL, "box", ELM_WIN_BASIC);
 
    box = elm_box_add(win);
    role = efl_access_object_role_get(box);
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index dea1552c9c..3d6d71c458 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_bubble_legacy_type_check)
    Evas_Object *win, *bubble;
    const char *type;
 
-   win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
+   win = win_add(NULL, "bubble", ELM_WIN_BASIC);
 
    bubble = elm_bubble_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *bubble;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
+   win = win_add(NULL, "bubble", ELM_WIN_BASIC);
 
    bubble = elm_bubble_add(win);
    role = efl_access_object_role_get(bubble);
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index 99f15ef90b..f5bf6f117a 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_button_legacy_type_check)
    Evas_Object *win, *button;
    const char *type;
 
-   win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
+   win = win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
 
@@ -33,7 +33,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *button;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
+   win = win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
    role = efl_access_object_role_get(button);
@@ -47,7 +47,7 @@ EFL_START_TEST (elm_atspi_interfaces_check)
 {
    Evas_Object *win, *button;
 
-   win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
+   win = win_add(NULL, "button", ELM_WIN_BASIC);
 
    button = elm_button_add(win);
 
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 8ac4d3d937..cf30958297 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_calendar_legacy_type_check)
    Evas_Object *win, *calendar;
    const char *type;
 
-   win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
+   win = win_add(NULL, "calendar", ELM_WIN_BASIC);
 
    calendar = elm_calendar_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *calendar;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
+   win = win_add(NULL, "calendar", ELM_WIN_BASIC);
 
    calendar = elm_calendar_add(win);
    role = efl_access_object_role_get(calendar);
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 243c38e591..af65407f00 100644
--- a/src/tests/elementary/elm_test_check.c
+++ b/src/tests/elementary/elm_test_check.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_check_legacy_type_check)
    Evas_Object *win, *check;
    const char *type;
 
-   win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
+   win = win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
 
@@ -30,7 +30,7 @@ EFL_START_TEST (elm_check_onoff_text)
 {
    Evas_Object *win, *check;
 
-   win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
+   win = win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
    elm_object_style_set(check, "toggle");
@@ -52,7 +52,7 @@ EFL_START_TEST (elm_check_state)
    Evas_Object *win, *check;
    Eina_Bool state = EINA_TRUE;
 
-   win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
+   win = win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
    elm_check_state_pointer_set(check, &state);
@@ -71,7 +71,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *check;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
+   win = win_add(NULL, "check", ELM_WIN_BASIC);
 
    check = elm_check_add(win);
    role = efl_access_object_role_get(check);
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index 568cb5b883..fde065ee4f 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_clock_legacy_type_check)
    Evas_Object *win, *clock;
    const char *type;
 
-   win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
+   win = win_add(NULL, "clock", ELM_WIN_BASIC);
 
    clock = elm_clock_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *clk;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
+   win = win_add(NULL, "clock", ELM_WIN_BASIC);
 
    clk = elm_clock_add(win);
    role = efl_access_object_role_get(clk);
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index bc7a055934..194856f2b9 100644
--- a/src/tests/elementary/elm_test_colorselector.c
+++ b/src/tests/elementary/elm_test_colorselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_colorselector_legacy_type_check)
    Evas_Object *win, *colorselector;
    const char *type;
 
-   win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "colorselector", ELM_WIN_BASIC);
 
    colorselector = elm_colorselector_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_colorselector_palette)
    Evas_Object *win, *c;
    unsigned int palette_cnt;
 
-   win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
+   win = win_add(NULL, "check", ELM_WIN_BASIC);
 
    c = elm_colorselector_add(win);
    /* Get the count of default palettes */
@@ -56,7 +56,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *c;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "colorselector", ELM_WIN_BASIC);
 
    c = elm_colorselector_add(win);
    role = efl_access_object_role_get(c);
diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c
index 5bd0454c03..cdfbd0402b 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_conformant_legacy_type_check)
    Evas_Object *win, *conformant;
    const char *type;
 
-   win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
+   win = win_add(NULL, "conformant", ELM_WIN_BASIC);
 
    conformant = elm_conformant_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *conformant;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
+   win = win_add(NULL, "conformant", ELM_WIN_BASIC);
 
    conformant = elm_conformant_add(win);
    role = efl_access_object_role_get(conformant);
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 7d482b8f8d..a9d066e1ed 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_ctxpopup_legacy_type_check)
    Evas_Object *win, *ctxpopup;
    const char *type;
 
-   win = elm_win_add(NULL, "ctxpopup", ELM_WIN_BASIC);
+   win = win_add(NULL, "ctxpopup", ELM_WIN_BASIC);
 
    ctxpopup = elm_ctxpopup_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *ctxpopup;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
+   win = win_add(NULL, "icon", ELM_WIN_BASIC);
 
    ctxpopup = elm_ctxpopup_add(win);
    role = efl_access_object_role_get(ctxpopup);
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 3f35de79d2..7a874516ba 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_datetime_legacy_type_check)
    Evas_Object *win, *datetime;
    const char *type;
 
-   win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
+   win = win_add(NULL, "datetime", ELM_WIN_BASIC);
 
    datetime = elm_datetime_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *datetime;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
+   win = win_add(NULL, "datetime", ELM_WIN_BASIC);
 
    datetime = elm_datetime_add(win);
    role = efl_access_object_role_get(datetime);
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index c92eb8fe28..776687a157 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_dayselector_legacy_type_check)
    Evas_Object *win, *dayselector;
    const char *type;
 
-   win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "dayselector", ELM_WIN_BASIC);
 
    dayselector = elm_dayselector_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *dayselector;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "dayselector", ELM_WIN_BASIC);
 
    dayselector = elm_dayselector_add(win);
    role = efl_access_object_role_get(dayselector);
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index 19162cd0aa..19bf3600ce 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_diskselector_legacy_type_check)
    Evas_Object *win, *diskselector;
    const char *type;
 
-   win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "diskselector", ELM_WIN_BASIC);
 
    diskselector = elm_diskselector_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *diskselector;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "diskselector", ELM_WIN_BASIC);
 
    diskselector = elm_diskselector_add(win);
    role = efl_access_object_role_get(diskselector);
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 3fde6b9a7a..8b8091120a 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_entry_legacy_type_check)
    Evas_Object *win, *entry;
    const char *type;
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
 
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_entry_del)
 {
    Evas_Object *win, *entry;
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, "TEST");
@@ -52,7 +52,7 @@ EFL_START_TEST (elm_entry_signal_callback)
    void *data;
    int k;
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
 
@@ -94,7 +94,7 @@ EFL_START_TEST (elm_entry_atspi_text_char_get)
    const char *txt = "ĄA11Y Ł TEST";
    const char *mtxt = "<b>ĄA11Y</b> <title>Ł</> TEST";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, mtxt);
@@ -130,7 +130,7 @@ EFL_START_TEST (elm_entry_atspi_text_char_count)
 
    const char *mtxt = "<b>AĄ11Y</b> <title>Ł</> TEST";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, mtxt);
@@ -149,7 +149,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_char)
 
    const char *txt = "Lorem ipśum   dolor sit amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
@@ -192,7 +192,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_word)
 
    const char *txt = "Lorem ipśum   dolor sit amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
@@ -236,7 +236,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_paragraph)
 
    const char *txt = "Lorem ipśum<br>   dolor sit<br> amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
@@ -280,7 +280,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_line)
 
    const char *txt = "Lorem ipśum<br>   dolor sit amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    evas_object_resize(entry, 500, 500);
@@ -311,7 +311,7 @@ EFL_START_TEST (elm_entry_atspi_text_text_get)
    char *val;
    const char *txt = "Lorem Xpśum dolor sit amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
@@ -342,7 +342,7 @@ EFL_START_TEST (elm_entry_atspi_text_selections)
    Eina_Bool ret;
    const char *txt = "Lorem ipśum<br>   dolor sit\n amęt";
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    elm_object_text_set(entry, txt);
@@ -383,7 +383,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *entry;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "entry", ELM_WIN_BASIC);
 
    entry = elm_entry_add(win);
    role = efl_access_object_role_get(entry);
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index d62ee349f4..5a5d913746 100644
--- a/src/tests/elementary/elm_test_fileselector.c
+++ b/src/tests/elementary/elm_test_fileselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_legacy_type_check)
    Evas_Object *win, *fileselector;
    const char *type;
 
-   win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *fileselector;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
    role = efl_access_object_role_get(fileselector);
@@ -72,7 +72,7 @@ EFL_START_TEST (elm_fileselector_selected)
    fp = fopen(exist, "w");
    fclose(fp);
 
-   win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
 
    fileselector = elm_fileselector_add(win);
    evas_object_smart_callback_add(fileselector, "directory,open", _ready_cb, &open);
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 5d315d903b..c5bba5ccfa 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_button_legacy_type_check)
    Evas_Object *win, *fs_button;
    const char *type;
 
-   win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
 
    fs_button = elm_fileselector_button_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *fs_button;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
 
    fs_button = elm_fileselector_button_add(win);
    role = efl_access_object_role_get(fs_button);
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index 9d7cfc40e2..9fa0f14b66 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_entry_legacy_type_check)
    Evas_Object *win, *fileselector_entry;
    const char *type;
 
-   win = elm_win_add(NULL, "fileselector_entry", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselector_entry", ELM_WIN_BASIC);
 
    fileselector_entry = elm_fileselector_entry_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *fs_entry;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
+   win = win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
 
    fs_entry = elm_fileselector_entry_add(win);
    role = efl_access_object_role_get(fs_entry);
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 661105d0bc..c0bbd4e79f 100644
--- a/src/tests/elementary/elm_test_flip.c
+++ b/src/tests/elementary/elm_test_flip.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_flip_legacy_type_check)
    Evas_Object *win, *flip;
    const char *type;
 
-   win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
+   win = win_add(NULL, "flip", ELM_WIN_BASIC);
 
    flip = elm_flip_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *flip;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
+   win = win_add(NULL, "flip", ELM_WIN_BASIC);
 
    flip = elm_flip_add(win);
    role = efl_access_object_role_get(flip);
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index ba15290f50..a4c3bafa88 100644
--- a/src/tests/elementary/elm_test_flipselector.c
+++ b/src/tests/elementary/elm_test_flipselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_flipselector_legacy_type_check)
    Evas_Object *win, *flipselector;
    const char *type;
 
-   win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "flipselector", ELM_WIN_BASIC);
 
    flipselector = elm_flipselector_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *flipselector;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
+   win = win_add(NULL, "flipselector", ELM_WIN_BASIC);
 
    flipselector = elm_flipselector_add(win);
    role = efl_access_object_role_get(flipselector);
diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c
index 0d0492a99d..4b56c9170f 100644
--- a/src/tests/elementary/elm_test_frame.c
+++ b/src/tests/elementary/elm_test_frame.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_frame_legacy_type_check)
    Evas_Object *win, *frame;
    const char *type;
 
-   win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
+   win = win_add(NULL, "frame", ELM_WIN_BASIC);
 
    frame = elm_frame_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *frame;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
+   win = win_add(NULL, "frame", ELM_WIN_BASIC);
 
    frame = elm_frame_add(win);
    role = efl_access_object_role_get(frame);
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 9134b2fe67..b388891ec0 100644
--- a/src/tests/elementary/elm_test_gengrid.c
+++ b/src/tests/elementary/elm_test_gengrid.c
@@ -12,7 +12,7 @@ EFL_START_TEST (elm_gengrid_legacy_type_check)
    Evas_Object *win, *gengrid;
    const char *type;
 
-   win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
+   win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
 
    gengrid = elm_gengrid_add(win);
 
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *gengrid;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
+   win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
 
    gengrid = elm_gengrid_add(win);
    role = efl_access_object_role_get(gengrid);
@@ -64,7 +64,7 @@ EFL_START_TEST(elm_atspi_children_parent)
    elm_config_atspi_mode_set(EINA_TRUE);
    static Elm_Gengrid_Item_Class itc;
 
-   Evas_Object *win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
+   Evas_Object *win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
    evas_object_resize(win, 100, 100);
    Evas_Object *gengrid = elm_gengrid_add(win);
    evas_object_resize(gengrid, 100, 100);
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 74b7575c5b..e317bfc3de 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -58,7 +58,7 @@ EFL_START_TEST (elm_genlist_group)
    Elm_Object_Item *git;
    int i;
 
-   win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
+   win = win_add(NULL, "genlist", ELM_WIN_BASIC);
 
    genlist = elm_genlist_add(win);
 
@@ -75,7 +75,7 @@ EFL_START_TEST (elm_genlist_legacy_type_check)
 {
    const char *type;
 
-   win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
+   win = win_add(NULL, "genlist", ELM_WIN_BASIC);
 
    genlist = elm_genlist_add(win);
 
@@ -93,7 +93,7 @@ EFL_END_TEST
 void test_init(void)
 {
    elm_config_atspi_mode_set(EINA_TRUE);
-   win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
+   win = win_add(NULL, "genlist", ELM_WIN_BASIC);
    genlist = elm_genlist_add(win);
 }
 
@@ -270,7 +270,7 @@ EFL_START_TEST(elm_genlist_item_destroy)
 {
    Elm_Object_Item *git;
 
-   win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC);
+   win = win_add(NULL, "genlist", ELM_WIN_BASIC);
 
    genlist = elm_genlist_add(win);
    efl_event_callback_add(genlist, EFL_EVENT_DESTRUCT, _gl_destroy, NULL);
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index 7c38e4584c..2d1c8a3609 100644
--- a/src/tests/elementary/elm_test_glview.c
+++ b/src/tests/elementary/elm_test_glview.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_glview_legacy_type_check)
    Evas_Object *win, *glview;
    const char *type;
 
-   win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
+   win = win_add(NULL, "glview", ELM_WIN_BASIC);
 
    glview = elm_glview_add(win);
 
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *glview;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
+   win = win_add(NULL, "glview", ELM_WIN_BASIC);
 
    glview = elm_glview_add(win);
 
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index f7c74e020a..f014c712a3 100644
--- a/src/tests/elementary/elm_test_grid.c
+++ b/src/tests/elementary/elm_test_grid.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_grid_legacy_type_check)
    Evas_Object *win, *grid;
    const char *type;
 
-   win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
+   win = win_add(NULL, "grid", ELM_WIN_BASIC);
 
    grid = elm_grid_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *grid;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
+   win = win_add(NULL, "grid", ELM_WIN_BASIC);
 
    grid = elm_grid_add(win);
    role = efl_access_object_role_get(grid);
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index 4455f87692..42db4b667f 100644
--- a/src/tests/elementary/elm_test_hover.c
+++ b/src/tests/elementary/elm_test_hover.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_hover_legacy_type_check)
    Evas_Object *win, *hover;
    const char *type;
 
-   win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
+   win = win_add(NULL, "hover", ELM_WIN_BASIC);
 
    hover = elm_hover_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *hover;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
+   win = win_add(NULL, "hover", ELM_WIN_BASIC);
 
    hover = elm_hover_add(win);
    role = efl_access_object_role_get(hover);
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index cf27c0abda..982ab6f824 100644
--- a/src/tests/elementary/elm_test_hoversel.c
+++ b/src/tests/elementary/elm_test_hoversel.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_hoversel_legacy_type_check)
    Evas_Object *win, *hoversel;
    const char *type;
 
-   win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
+   win = win_add(NULL, "hoversel", ELM_WIN_BASIC);
 
    hoversel = elm_hoversel_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *hoversel;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
+   win = win_add(NULL, "hoversel", ELM_WIN_BASIC);
 
    hoversel = elm_hoversel_add(win);
    role = efl_access_object_role_get(hoversel);
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 1b9aa33a3e..9580e4ebb4 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_icon_legacy_type_check)
    Evas_Object *win, *icon;
    const char *type;
 
-   win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
+   win = win_add(NULL, "icon", ELM_WIN_BASIC);
 
    icon = elm_icon_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *icon;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
+   win = win_add(NULL, "icon", ELM_WIN_BASIC);
 
    icon = elm_icon_add(win);
    role = efl_access_object_role_get(icon);
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 0efb0e4a76..41b7e70513 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -22,7 +22,7 @@ EFL_START_TEST (elm_image_legacy_type_check)
    Evas_Object *win, *image;
    const char *type;
 
-   win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
+   win = win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = elm_image_add(win);
 
@@ -42,7 +42,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *image;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
+   win = win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = elm_image_add(win);
    role = efl_access_object_role_get(image);
@@ -133,7 +133,7 @@ EFL_START_TEST (elm_image_async_path)
    Eina_Bool ok;
    Test_Data td;
 
-   win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
+   win = win_add(NULL, "image", ELM_WIN_BASIC);
 
    td.success = 0;
    td.image_id = 0;
@@ -163,7 +163,7 @@ EFL_START_TEST (elm_image_async_mmap)
    Eina_File *f;
    char path[PATH_MAX];
 
-   win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
+   win = win_add(NULL, "image", ELM_WIN_BASIC);
 
    td.success = 1; // skip "error" case
    td.image_id = 1;
@@ -197,7 +197,7 @@ EFL_START_TEST (efl_ui_image_icon)
    Eina_Bool ok;
    const char *icon_name;
 
-   win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
+   win = win_add(NULL, "image", ELM_WIN_BASIC);
 
    image = efl_add(EFL_UI_IMAGE_CLASS, win);
    evas_object_show(image);
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index 75d365ead7..c335da6551 100644
--- a/src/tests/elementary/elm_test_index.c
+++ b/src/tests/elementary/elm_test_index.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_index_legacy_type_check)
    Evas_Object *win, *index;
    const char *type;
 
-   win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
+   win = win_add(NULL, "index", ELM_WIN_BASIC);
 
    index = elm_index_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *idx;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
+   win = win_add(NULL, "index", ELM_WIN_BASIC);
 
    idx = elm_index_add(win);
    role = efl_access_object_role_get(idx);
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index c330a63cf4..5817aeb32a 100644
--- a/src/tests/elementary/elm_test_inwin.c
+++ b/src/tests/elementary/elm_test_inwin.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_inwin_legacy_type_check)
    Evas_Object *win, *inwin;
    const char *type;
 
-   win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
+   win = win_add(NULL, "inwin", ELM_WIN_BASIC);
 
    inwin = elm_win_inwin_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *inwin;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
+   win = win_add(NULL, "inwin", ELM_WIN_BASIC);
 
    inwin = elm_win_inwin_add(win);
    role = efl_access_object_role_get(inwin);
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index a79ae73711..55ca1becdb 100644
--- a/src/tests/elementary/elm_test_label.c
+++ b/src/tests/elementary/elm_test_label.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_label_legacy_type_check)
    Evas_Object *win, *label;
    const char *type;
 
-   win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
+   win = win_add(NULL, "label", ELM_WIN_BASIC);
 
    label = elm_label_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *label;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
+   win = win_add(NULL, "label", ELM_WIN_BASIC);
 
    label = elm_label_add(win);
    role = efl_access_object_role_get(label);
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 476c0cb9a8..cdd372e875 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_layout_legacy_type_check)
    Evas_Object *win, *layout;
    const char *type;
 
-   win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
+   win = win_add(NULL, "layout", ELM_WIN_BASIC);
 
    layout = elm_layout_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST(elm_atspi_role_get)
    Evas_Object *win, *layout;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
+   win = win_add(NULL, "layout", ELM_WIN_BASIC);
 
    layout = elm_layout_add(win);
    role = efl_access_object_role_get(layout);
@@ -46,7 +46,7 @@ EFL_START_TEST(elm_layout_swallows)
    char buf[PATH_MAX];
    Evas_Object *win, *ly, *bt, *bt2;
 
-   win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
+   win = win_add(NULL, "layout", ELM_WIN_BASIC);
 
    ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win);
    snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
@@ -79,7 +79,7 @@ EFL_START_TEST(elm_layout_model_connect)
    const char *part_text;
    const char text_value[] = "A random string for elm_layout_model_connect test";
 
-   win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
+   win = win_add(NULL, "layout", ELM_WIN_BASIC);
 
    ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win);
    snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index 67a4663f80..125292613f 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_list_legacy_type_check)
    Evas_Object *win, *list;
    const char *type;
 
-   win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+   win = win_add(NULL, "list", ELM_WIN_BASIC);
 
    list = elm_list_add(win);
 
@@ -39,7 +39,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_children_count_get)
  int val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -65,7 +65,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_select)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -84,7 +84,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_child_deselect)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  elm_list_multi_select_set(list, EINA_TRUE);
@@ -106,7 +106,7 @@ EFL_START_TEST (elm_list_atspi_selection_is_child_selected)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -128,7 +128,7 @@ EFL_START_TEST (elm_list_atspi_selection_all_children_select)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
 
@@ -155,7 +155,7 @@ EFL_START_TEST (elm_list_atspi_selection_clear)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  elm_list_multi_select_set(list, EINA_TRUE);
@@ -180,7 +180,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_deselect)
  Eina_Bool val;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  elm_list_multi_select_set(list, EINA_TRUE);
@@ -203,7 +203,7 @@ EFL_START_TEST (elm_atspi_role_get)
  Efl_Access_Role role;
 
 
- win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+ win = win_add(NULL, "list", ELM_WIN_BASIC);
 
  list = elm_list_add(win);
  role = efl_access_object_role_get(list);
@@ -223,7 +223,7 @@ EFL_START_TEST(elm_atspi_children_parent)
    Efl_Access_Object *parent;
    Elm_Object_Item *it;
 
-   Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
+   Evas_Object *win = win_add(NULL, "list", ELM_WIN_BASIC);
 
    Evas_Object *icon = elm_icon_add(win);
    Evas_Object *end = elm_icon_add(win);
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index 5e5b07c7b0..c39da353b2 100644
--- a/src/tests/elementary/elm_test_map.c
+++ b/src/tests/elementary/elm_test_map.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_map_legacy_type_check)
    Evas_Object *win, *map;
    const char *type;
 
-   win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
+   win = win_add(NULL, "map", ELM_WIN_BASIC);
 
    map = elm_map_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *map;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
+   win = win_add(NULL, "map", ELM_WIN_BASIC);
 
    map = elm_map_add(win);
    role = efl_access_object_role_get(map);
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index bf4c1e6a7b..9a1111d1b9 100644
--- a/src/tests/elementary/elm_test_mapbuf.c
+++ b/src/tests/elementary/elm_test_mapbuf.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_mapbuf_legacy_type_check)
    Evas_Object *win, *mapbuf;
    const char *type;
 
-   win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
+   win = win_add(NULL, "mapbuf", ELM_WIN_BASIC);
 
    mapbuf = elm_mapbuf_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *mapbuf;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
+   win = win_add(NULL, "mapbuf", ELM_WIN_BASIC);
 
    mapbuf = elm_mapbuf_add(win);
    role = efl_access_object_role_get(mapbuf);
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 16ce607aec..05b9996e2e 100644
--- a/src/tests/elementary/elm_test_menu.c
+++ b/src/tests/elementary/elm_test_menu.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_menu_legacy_type_check)
    Evas_Object *win, *menu;
    const char *type;
 
-   win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
+   win = win_add(NULL, "menu", ELM_WIN_BASIC);
 
    menu = elm_menu_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *menu;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
+   win = win_add(NULL, "menu", ELM_WIN_BASIC);
 
    menu = elm_menu_add(win);
    role = efl_access_object_role_get(menu);
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index 501a79eeeb..b611b390d7 100644
--- a/src/tests/elementary/elm_test_multibuttonentry.c
+++ b/src/tests/elementary/elm_test_multibuttonentry.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_multibuttonentry_legacy_type_check)
    Evas_Object *win, *multibuttonentry;
    const char *type;
 
-   win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
+   win = win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
 
    multibuttonentry = elm_multibuttonentry_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *multibuttonentry;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
+   win = win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
 
    multibuttonentry = elm_multibuttonentry_add(win);
    role = efl_access_object_role_get(multibuttonentry);
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index 4e34ba5819..f28f2e21be 100644
--- a/src/tests/elementary/elm_test_naviframe.c
+++ b/src/tests/elementary/elm_test_naviframe.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_naviframe_legacy_type_check)
    Evas_Object *win, *naviframe;
    const char *type;
 
-   win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
+   win = win_add(NULL, "naviframe", ELM_WIN_BASIC);
 
    naviframe = elm_naviframe_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *naviframe;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
+   win = win_add(NULL, "naviframe", ELM_WIN_BASIC);
 
    naviframe = elm_naviframe_add(win);
    role = efl_access_object_role_get(naviframe);
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index a7e890ab9f..d32e596cb8 100644
--- a/src/tests/elementary/elm_test_notify.c
+++ b/src/tests/elementary/elm_test_notify.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_notify_legacy_type_check)
    Evas_Object *win, *notify;
    const char *type;
 
-   win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
+   win = win_add(NULL, "notify", ELM_WIN_BASIC);
 
    notify = elm_notify_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *notify;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
+   win = win_add(NULL, "notify", ELM_WIN_BASIC);
 
    notify = elm_notify_add(win);
    role = efl_access_object_role_get(notify);
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index e10995f4b4..2460443e53 100644
--- a/src/tests/elementary/elm_test_panel.c
+++ b/src/tests/elementary/elm_test_panel.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_panel_legacy_type_check)
    Evas_Object *win, *panel;
    const char *type;
 
-   win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
+   win = win_add(NULL, "panel", ELM_WIN_BASIC);
 
    panel = elm_panel_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *panel;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
+   win = win_add(NULL, "panel", ELM_WIN_BASIC);
 
    panel = elm_panel_add(win);
    role = efl_access_object_role_get(panel);
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index f084ee67e4..367fce6943 100644
--- a/src/tests/elementary/elm_test_panes.c
+++ b/src/tests/elementary/elm_test_panes.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_panes_legacy_type_check)
    Evas_Object *win, *panes;
    const char *type;
 
-   win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
+   win = win_add(NULL, "panes", ELM_WIN_BASIC);
 
    panes = elm_panes_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *panes;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
+   win = win_add(NULL, "panes", ELM_WIN_BASIC);
 
    panes = elm_panes_add(win);
    role = efl_access_object_role_get(panes);
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 29ddcdba2b..ec610996ff 100644
--- a/src/tests/elementary/elm_test_photo.c
+++ b/src/tests/elementary/elm_test_photo.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_photo_legacy_type_check)
    Evas_Object *win, *photo;
    const char *type;
 
-   win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
+   win = win_add(NULL, "photo", ELM_WIN_BASIC);
 
    photo = elm_photo_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *photo;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
+   win = win_add(NULL, "photo", ELM_WIN_BASIC);
 
    photo = elm_photo_add(win);
    role = efl_access_object_role_get(photo);
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index d374cbd983..311b73525b 100644
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_photocam_legacy_type_check)
    Evas_Object *win, *photocam;
    const char *type;
 
-   win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
+   win = win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    photocam = elm_photocam_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *photocam;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
+   win = win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    photocam = elm_photocam_add(win);
    role = efl_access_object_role_get(photocam);
@@ -47,7 +47,7 @@ EFL_START_TEST (efl_ui_image_zoomable_icon)
    Eina_Bool ok;
    const char *icon_name;
 
-   win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
+   win = win_add(NULL, "photocam", ELM_WIN_BASIC);
 
    img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
    evas_object_show(img_zoomable);
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index c300a27284..307aa301b9 100644
--- a/src/tests/elementary/elm_test_player.c
+++ b/src/tests/elementary/elm_test_player.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_player_legacy_type_check)
    Evas_Object *win, *player;
    const char *type;
 
-   win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
+   win = win_add(NULL, "player", ELM_WIN_BASIC);
 
    player = elm_player_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *player;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
+   win = win_add(NULL, "player", ELM_WIN_BASIC);
 
    player = elm_player_add(win);
    role = efl_access_object_role_get(player);
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index dff2d69684..3f3441862c 100644
--- a/src/tests/elementary/elm_test_plug.c
+++ b/src/tests/elementary/elm_test_plug.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_plug_legacy_type_check)
    Evas_Object *win, *plug;
    const char *type;
 
-   win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
+   win = win_add(NULL, "plug", ELM_WIN_BASIC);
 
    plug = elm_plug_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *plug;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
+   win = win_add(NULL, "plug", ELM_WIN_BASIC);
 
    plug = elm_plug_add(win);
    role = efl_access_object_role_get(plug);
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 99c07c63f1..4defd3ecae 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_popup_legacy_type_check)
    Evas_Object *win, *popup;
    const char *type;
 
-   win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
+   win = win_add(NULL, "popup", ELM_WIN_BASIC);
 
    popup = elm_popup_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *popup;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
+   win = win_add(NULL, "popup", ELM_WIN_BASIC);
 
    popup = elm_popup_add(win);
    role = efl_access_object_role_get(popup);
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index a881512cf9..64186e56ec 100644
--- a/src/tests/elementary/elm_test_prefs.c
+++ b/src/tests/elementary/elm_test_prefs.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_prefs_legacy_type_check)
    Evas_Object *win, *prefs;
    const char *type;
 
-   win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
+   win = win_add(NULL, "prefs", ELM_WIN_BASIC);
 
    prefs = elm_prefs_add(win);
 
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *prefs;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
+   win = win_add(NULL, "prefs", ELM_WIN_BASIC);
 
    prefs = elm_prefs_add(win);
    role = efl_access_object_role_get(prefs);
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index e561bb3575..c0f6f0fb5b 100644
--- a/src/tests/elementary/elm_test_progressbar.c
+++ b/src/tests/elementary/elm_test_progressbar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_progressbar_legacy_type_check)
    Evas_Object *win, *progressbar;
    const char *type;
 
-   win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
+   win = win_add(NULL, "progressbar", ELM_WIN_BASIC);
 
    progressbar = elm_progressbar_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *progressbar;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
+   win = win_add(NULL, "progressbar", ELM_WIN_BASIC);
 
    progressbar = elm_progressbar_add(win);
    role = efl_access_object_role_get(progressbar);
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 13de95d6bf..fedc14f2a5 100644
--- a/src/tests/elementary/elm_test_radio.c
+++ b/src/tests/elementary/elm_test_radio.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_radio_legacy_type_check)
    Evas_Object *win, *radio;
    const char *type;
 
-   win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
+   win = win_add(NULL, "radio", ELM_WIN_BASIC);
 
    radio = elm_radio_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *radio;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
+   win = win_add(NULL, "radio", ELM_WIN_BASIC);
 
    radio = elm_radio_add(win);
    role = efl_access_object_role_get(radio);
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index 00df0038fb..cd2b52d0d1 100644
--- a/src/tests/elementary/elm_test_scroller.c
+++ b/src/tests/elementary/elm_test_scroller.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_scroller_legacy_type_check)
    Evas_Object *win, *scroller;
    const char *type;
 
-   win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
+   win = win_add(NULL, "scroller", ELM_WIN_BASIC);
 
    scroller = elm_scroller_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *scroller;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
+   win = win_add(NULL, "scroller", ELM_WIN_BASIC);
 
    scroller = elm_scroller_add(win);
    role = efl_access_object_role_get(scroller);
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index fa57c060c3..7f29ce7977 100644
--- a/src/tests/elementary/elm_test_segmentcontrol.c
+++ b/src/tests/elementary/elm_test_segmentcontrol.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_segment_control_legacy_type_check)
    Evas_Object *win, *segment_control;
    const char *type;
 
-   win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC);
+   win = win_add(NULL, "segment_control", ELM_WIN_BASIC);
 
    segment_control = elm_segment_control_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *segmentcontrol;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
+   win = win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
 
    segmentcontrol = elm_segment_control_add(win);
    role = efl_access_object_role_get(segmentcontrol);
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index a9863859ea..568e1c20d3 100644
--- a/src/tests/elementary/elm_test_separator.c
+++ b/src/tests/elementary/elm_test_separator.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_separator_legacy_type_check)
    Evas_Object *win, *separator;
    const char *type;
 
-   win = elm_win_add(NULL, "separator", ELM_WIN_BASIC);
+   win = win_add(NULL, "separator", ELM_WIN_BASIC);
 
    separator = elm_separator_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *separator;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
+   win = win_add(NULL, "icon", ELM_WIN_BASIC);
 
    separator = elm_separator_add(win);
    role = efl_access_object_role_get(separator);
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index b3445a01ca..f28682f321 100644
--- a/src/tests/elementary/elm_test_slider.c
+++ b/src/tests/elementary/elm_test_slider.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_slider_legacy_type_check)
    Evas_Object *win, *slider;
    const char *type;
 
-   win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
+   win = win_add(NULL, "slider", ELM_WIN_BASIC);
 
    slider = elm_slider_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *slider;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
+   win = win_add(NULL, "slider", ELM_WIN_BASIC);
 
    slider = elm_slider_add(win);
    role = efl_access_object_role_get(slider);
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index 31e4edc8bc..25ec7dd196 100644
--- a/src/tests/elementary/elm_test_slideshow.c
+++ b/src/tests/elementary/elm_test_slideshow.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_slideshow_legacy_type_check)
    Evas_Object *win, *slideshow;
    const char *type;
 
-   win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
+   win = win_add(NULL, "slideshow", ELM_WIN_BASIC);
 
    slideshow = elm_slideshow_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *slideshow;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
+   win = win_add(NULL, "slideshow", ELM_WIN_BASIC);
 
    slideshow = elm_slideshow_add(win);
    role = efl_access_object_role_get(slideshow);
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index c954ef5b26..a6da140dda 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_spinner_legacy_type_check)
    Evas_Object *win, *spinner;
    const char *type;
 
-   win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
+   win = win_add(NULL, "spinner", ELM_WIN_BASIC);
 
    spinner = elm_spinner_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *spinner;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
+   win = win_add(NULL, "spinner", ELM_WIN_BASIC);
 
    spinner = elm_spinner_add(win);
    role = efl_access_object_role_get(spinner);
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index 6fb1c7092f..4ba155193c 100644
--- a/src/tests/elementary/elm_test_table.c
+++ b/src/tests/elementary/elm_test_table.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_table_legacy_type_check)
    Evas_Object *win, *table;
    const char *type;
 
-   win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
+   win = win_add(NULL, "table", ELM_WIN_BASIC);
 
    table = elm_table_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *table;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
+   win = win_add(NULL, "table", ELM_WIN_BASIC);
 
    table = elm_table_add(win);
    role = efl_access_object_role_get(table);
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index a4983b8175..9ca838db99 100644
--- a/src/tests/elementary/elm_test_thumb.c
+++ b/src/tests/elementary/elm_test_thumb.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_thumb_legacy_type_check)
    Evas_Object *win, *thumb;
    const char *type;
 
-   win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
+   win = win_add(NULL, "thumb", ELM_WIN_BASIC);
 
    thumb = elm_thumb_add(win);
 
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *thumb;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
+   win = win_add(NULL, "thumb", ELM_WIN_BASIC);
 
    thumb = elm_thumb_add(win);
    role = efl_access_object_role_get(thumb);
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index 39221277b2..b10350dfa5 100644
--- a/src/tests/elementary/elm_test_toolbar.c
+++ b/src/tests/elementary/elm_test_toolbar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_toolbar_legacy_type_check)
    Evas_Object *win, *toolbar;
    const char *type;
 
-   win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
+   win = win_add(NULL, "toolbar", ELM_WIN_BASIC);
 
    toolbar = elm_toolbar_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *toolbar;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
+   win = win_add(NULL, "toolbar", ELM_WIN_BASIC);
 
    toolbar = elm_toolbar_add(win);
    role = efl_access_object_role_get(toolbar);
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index e643475632..676e128c89 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_video_legacy_type_check)
    Evas_Object *win, *video;
    const char *type;
 
-   win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
+   win = win_add(NULL, "video", ELM_WIN_BASIC);
 
    video = elm_video_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *video;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
+   win = win_add(NULL, "video", ELM_WIN_BASIC);
 
    video = elm_video_add(win);
    role = efl_access_object_role_get(video);
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index 28607fac5b..5108cea1c1 100644
--- a/src/tests/elementary/elm_test_web.c
+++ b/src/tests/elementary/elm_test_web.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_web_legacy_type_check)
    Evas_Object *win, *web;
    const char *type;
 
-   win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
+   win = win_add(NULL, "web", ELM_WIN_BASIC);
 
    web = elm_web_add(win);
 
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win, *web;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
+   win = win_add(NULL, "web", ELM_WIN_BASIC);
 
    web = elm_web_add(win);
    role = efl_access_object_role_get(web);
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 941495bb5a..1492a7693b 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -68,7 +68,7 @@ EFL_START_TEST (elm_win_legacy_type_check)
    Evas_Object *win;
    const char *type;
 
-   win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   win = win_add(NULL, "win", ELM_WIN_BASIC);
 
    type = elm_object_widget_type_get(win);
    ck_assert(type != NULL);
@@ -86,7 +86,7 @@ EFL_START_TEST (elm_atspi_role_get)
    Evas_Object *win;
    Efl_Access_Role role;
 
-   win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   win = win_add(NULL, "win", ELM_WIN_BASIC);
 
    role = efl_access_object_role_get(win);
 
@@ -100,7 +100,7 @@ EFL_START_TEST (elm_atspi_component_screen_position)
    Eina_Bool ret;
    int x, y;
 
-   Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
 
    ret = efl_access_component_screen_position_set(win, 45, 45);
    ck_assert(ret == EINA_TRUE);
@@ -116,7 +116,7 @@ EFL_END_TEST
 
 EFL_START_TEST (elm_win_autohide)
 {
-   Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
    if (elm_win_xwindow_get(win))
      {
         elm_win_autohide_set(win, EINA_TRUE);
@@ -139,7 +139,7 @@ EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
 {
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
-   Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
    efl_gfx_entity_visible_set(win, EINA_TRUE);
 
    Eina_Bool fail_flag = EINA_FALSE;
@@ -162,7 +162,7 @@ EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
 {
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
 
-   Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
    if (elm_win_xwindow_get(win))
      {
         elm_win_autohide_set(win, EINA_TRUE);
@@ -363,7 +363,7 @@ EFL_START_TEST (efl_ui_win_multi_touch_inputs)
 
    elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
 
-   win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
+   win = win_add(NULL, "win", ELM_WIN_BASIC);
    elm_win_autohide_set(win, EINA_TRUE);
    efl_gfx_entity_visible_set(win, EINA_TRUE);
    efl_gfx_entity_size_set(win, EINA_SIZE2D(100,  100));