From d0845de6b36c3cf6f2f5dc4153fb3b3b650641da Mon Sep 17 00:00:00 2001
From: Christopher Michael <cp.michael@samsung.com>
Date: Thu, 9 Jan 2020 10:46:54 -0500
Subject: [PATCH] tests/ecore_wl2: Simplify test infrastructure

This commit adds the _display_connect function to the tests_helpers
file so that we do not have to duplicate the function across files.

ref T8016
---
 src/tests/ecore_wl2/ecore_wl2_test_display.c  |  6 ++++++
 src/tests/ecore_wl2/ecore_wl2_test_input.c    | 10 +---------
 src/tests/ecore_wl2/ecore_wl2_test_window.c   | 10 +---------
 src/tests/ecore_wl2/ecore_wl2_tests_helpers.h | 14 +-------------
 4 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/tests/ecore_wl2/ecore_wl2_test_display.c b/src/tests/ecore_wl2/ecore_wl2_test_display.c
index dd0799c3fd..fcc560311d 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_display.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_display.c
@@ -11,6 +11,12 @@
 #include "ecore_wl2_suite.h"
 #include "ecore_wl2_tests_helpers.h"
 
+static Ecore_Wl2_Display *
+_display_setup(void)
+{
+   return ecore_wl2_display_create(NULL);
+}
+
 EFL_START_TEST(wl2_display_create)
 {
    Ecore_Wl2_Display *disp;
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_input.c b/src/tests/ecore_wl2/ecore_wl2_test_input.c
index 98b9e9758e..db6cbf3ea5 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_input.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_input.c
@@ -9,15 +9,7 @@
 #include <Ecore_Wl2.h>
 
 #include "ecore_wl2_suite.h"
-
-static Ecore_Wl2_Display *
-_display_connect(void)
-{
-   Ecore_Wl2_Display *disp;
-
-   disp = ecore_wl2_display_connect(NULL);
-   return disp;
-}
+#include "ecore_wl2_tests_helpers.h"
 
 EFL_START_TEST(wl2_input_seat_get)
 {
diff --git a/src/tests/ecore_wl2/ecore_wl2_test_window.c b/src/tests/ecore_wl2/ecore_wl2_test_window.c
index 611b36768c..b3ed5a7cb6 100644
--- a/src/tests/ecore_wl2/ecore_wl2_test_window.c
+++ b/src/tests/ecore_wl2/ecore_wl2_test_window.c
@@ -9,19 +9,11 @@
 #include <Ecore_Wl2.h>
 
 #include "ecore_wl2_suite.h"
+#include "ecore_wl2_tests_helpers.h"
 
 #define WIDTH 480
 #define HEIGHT 360
 
-static Ecore_Wl2_Display *
-_display_connect(void)
-{
-   Ecore_Wl2_Display *disp;
-
-   disp = ecore_wl2_display_connect(NULL);
-   return disp;
-}
-
 static Ecore_Wl2_Window *
 _window_create(Ecore_Wl2_Display *disp)
 {
diff --git a/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h b/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
index f897dc9123..257838f50c 100644
--- a/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
+++ b/src/tests/ecore_wl2/ecore_wl2_tests_helpers.h
@@ -3,22 +3,10 @@
 
 # include <Ecore_Wl2.h>
 
-static Ecore_Wl2_Display *
-_display_setup(void)
-{
-   Ecore_Wl2_Display *disp;
-
-   disp = ecore_wl2_display_create(NULL);
-   return disp;
-}
-
 static Ecore_Wl2_Display *
 _display_connect(void)
 {
-   Ecore_Wl2_Display *disp;
-
-   disp = ecore_wl2_display_connect(NULL);
-   return disp;
+   return ecore_wl2_display_connect(NULL);
 }
 
 #endif