tests/ecore_wl2: Remove use of macros for display setup & connect

ref T8016

diff --git a/src/tests/ecore_wl2/ecore_wl2_test_display.c b/src/tests/ecore_wl2/ecore_wl2_test_display.c
index 828db2f..f988d3a 100644 (file)
--- a/src/tests/ecore_wl2/ecore_wl2_test_display.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_display.c
@@ -15,7 +15,7 @@ EFL_START_TEST(wl2_display_create)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_SETUP();
+   disp = _display_setup();
    ck_assert(disp != NULL);
 }
 EFL_END_TEST
@@ -24,7 +24,7 @@ EFL_START_TEST(wl2_display_destroy)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_SETUP();
+   disp = _display_setup();
    ck_assert(disp != NULL);
 
    ecore_wl2_display_destroy(disp);
@@ -36,7 +36,7 @@ EFL_START_TEST(wl2_display_get)
    Ecore_Wl2_Display *disp;
    struct wl_display *wdisp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_SETUP();
+   disp = _display_setup();
    ck_assert(disp != NULL);
 
    wdisp = ecore_wl2_display_get(disp);
@@ -48,7 +48,7 @@ EFL_START_TEST(wl2_display_name_get)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_SETUP();
+   disp = _display_setup();
    ck_assert(disp != NULL);
 
    ck_assert(ecore_wl2_display_name_get(disp) != NULL);
@@ -59,7 +59,7 @@ EFL_START_TEST(wl2_display_connect)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 }
 EFL_END_TEST
@@ -68,7 +68,7 @@ EFL_START_TEST(wl2_display_disconnect)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    ecore_wl2_display_disconnect(disp);
@@ -79,7 +79,7 @@ EFL_START_TEST(wl2_display_registry_get)
 {
    Ecore_Wl2_Display *disp;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    ck_assert(ecore_wl2_display_registry_get(disp) != NULL);
@@ -91,7 +91,7 @@ EFL_START_TEST(wl2_display_shm_get)
    Ecore_Wl2_Display *disp;
    struct wl_shm *shm;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    shm = ecore_wl2_display_shm_get(disp);
@@ -104,7 +104,7 @@ EFL_START_TEST(wl2_display_dmabuf_get)
    Ecore_Wl2_Display *disp;
    void *dma;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    dma = ecore_wl2_display_dmabuf_get(disp);
@@ -119,7 +119,7 @@ EFL_START_TEST(wl2_display_globals_get)
    Eina_Iterator *itr;
    void *data;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    itr = ecore_wl2_display_globals_get(disp);
@@ -140,7 +140,7 @@ EFL_START_TEST(wl2_display_screen_size_get)
    Ecore_Wl2_Display *disp;
    int w, h;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    ecore_wl2_display_screen_size_get(disp, &w, &h);
@@ -154,7 +154,7 @@ EFL_START_TEST(wl2_display_inputs_get)
    Ecore_Wl2_Display *disp;
    Eina_Iterator *itr;
 
-   disp = ECORE_WL2_TEST_DISPLAY_CONNECT();
+   disp = _display_connect();
    ck_assert(disp != NULL);
 
    itr = ecore_wl2_display_inputs_get(disp);

diff --git a/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h b/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
index e06cea7..f897dc9 100644 (file)
--- a/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
+++ b/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
@@ -3,11 +3,8 @@
 
 # include <Ecore_Wl2.h>
 
-# define ECORE_WL2_TEST_DISPLAY_SETUP() _setup_display()
-# define ECORE_WL2_TEST_DISPLAY_CONNECT() _connect_display()
-
 static Ecore_Wl2_Display *
-_setup_display(void)
+_display_setup(void)
 {
    Ecore_Wl2_Display *disp;
 
@@ -16,7 +13,7 @@ _setup_display(void)
 }
 
 static Ecore_Wl2_Display *
-_connect_display(void)
+_display_connect(void)
 {
    Ecore_Wl2_Display *disp;