not include e.h

   e-tizen-testcase is not a module of enlightenment. Now latest
   enlightenment also offers elm_win_add. It made build-break. It's
   conflict with elm_win.h

Change-Id: I0d4dec2782a4cffc677f96e1f21346d3e6cb1a5a

diff --git a/src/0000_easy.c b/src/0000_easy.c
index 773b1b5..4df3222 100644 (file)
--- a/src/0000_easy.c
+++ b/src/0000_easy.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 
 Eina_Bool

diff --git a/src/0001_introspect.c b/src/0001_introspect.c
index 4e7a779..783ef5f 100644 (file)
--- a/src/0001_introspect.c
+++ b/src/0001_introspect.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 
 static Eina_Bool pass = EINA_FALSE;

diff --git a/src/0002_deregister.c b/src/0002_deregister.c
index 79317ba..6fdc3cc 100644 (file)
--- a/src/0002_deregister.c
+++ b/src/0002_deregister.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 
 static const Ecore_Window custom_win = 0x123456;

diff --git a/src/0100_basic.c b/src/0100_basic.c
index 0c86a17..06464c4 100644 (file)
--- a/src/0100_basic.c
+++ b/src/0100_basic.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "0100_basic.h"
 
@@ -126,7 +125,7 @@ test_case_0100_basic(E_Test_Case *tc)
    E_TC_Client client = { NULL, // evas object
                           "0100_basic", // name
                           0, 0, 320, 320, // geometry(x,y,w,h)
-                          E_LAYER_CLIENT_NORMAL, //layer
+                          200, //E_LAYER_CLIENT_NORMAL, //layer
                           -1, -1, 0 // visible, arg, win
    };
 

diff --git a/src/0101_basic_stack.c b/src/0101_basic_stack.c
index 823b12b..a92a509 100644 (file)
--- a/src/0101_basic_stack.c
+++ b/src/0101_basic_stack.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0100_basic.h"

diff --git a/src/0110_transient_for.c b/src/0110_transient_for.c
index 533a566..2e544d9 100644 (file)
--- a/src/0110_transient_for.c
+++ b/src/0110_transient_for.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0110_transient_for.h"
@@ -159,7 +158,7 @@ test_case_0110_transient_for(E_Test_Case *tc)
    E_TC_Client client = { NULL, // evas object
                           "0110_transient_for", // name
                           0, 0, 320, 320, // geometry(x,y,w,h)
-                          E_LAYER_CLIENT_NORMAL, //layer
+                          200, //E_LAYER_CLIENT_NORMAL, //layer
                           -1, -1, 0 // visible, arg, win
    };
 

diff --git a/src/0111_transient_for_raise.c b/src/0111_transient_for_raise.c
index 91416a0..5f3ae79 100644 (file)
--- a/src/0111_transient_for_raise.c
+++ b/src/0111_transient_for_raise.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0110_transient_for.h"

diff --git a/src/0112_transient_for_lower.c b/src/0112_transient_for_lower.c
index 95f1ac4..80f7421 100644 (file)
--- a/src/0112_transient_for_lower.c
+++ b/src/0112_transient_for_lower.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0110_transient_for.h"

diff --git a/src/0113_transient_for_stack_above.c b/src/0113_transient_for_stack_above.c
index d41de48..bd59eb5 100644 (file)
--- a/src/0113_transient_for_stack_above.c
+++ b/src/0113_transient_for_stack_above.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0110_transient_for.h"

diff --git a/src/0114_transient_for_stack_below.c b/src/0114_transient_for_stack_below.c
index 9347efa..2a23eec 100644 (file)
--- a/src/0114_transient_for_stack_below.c
+++ b/src/0114_transient_for_stack_below.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 #include "0110_transient_for.h"

diff --git a/src/0120_notification_level.c b/src/0120_notification_level.c
index 7c909ab..1856a20 100644 (file)
--- a/src/0120_notification_level.c
+++ b/src/0120_notification_level.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"
 

diff --git a/src/e_test_case_main.c b/src/e_test_case_main.c
index 4268831..7ce17f3 100644 (file)
--- a/src/e_test_case_main.c
+++ b/src/e_test_case_main.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 
 #define ADD_TEST_CASE(type_, num_, test_, name_, expect_, is_stopper_) \
@@ -12,6 +11,8 @@ Eldbus_Object *dbus_obj;
 
 static Eina_List *tcs = NULL;
 
+int _e_tizen_testcase_log_dom = -1;
+
 static void
 _e_test_case_inner_add(E_Test_Case* gtc,
                        E_Test_Case_Type type,
@@ -214,6 +215,13 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
    E_Test_Case *tc;
    Eina_List *l;
 
+   _e_tizen_testcase_log_dom = eina_log_domain_register ("e_tizen-testcase", EINA_COLOR_BLUE);
+   if(_e_tizen_testcase_log_dom < 0)
+     {
+       ERR("Impossible to create a log domain for the ecore input module.");
+       return -1;
+     }
+
    if (!eldbus_init()) return -1;
 
    /* connect to dbus */
@@ -240,6 +248,9 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
         E_FREE(tc);
      }
 
+   eina_log_domain_unregister(_e_tizen_testcase_log_dom);
+   _e_tizen_testcase_log_dom = -1;
+
    eldbus_proxy_unref(dbus_proxy);
    eldbus_object_unref(dbus_obj);
    eldbus_connection_unref(dbus_conn);

diff --git a/src/e_test_case_main.h b/src/e_test_case_main.h
index deafd49..a1a12ae 100644 (file)
--- a/src/e_test_case_main.h
+++ b/src/e_test_case_main.h
@@ -1,6 +1,88 @@
 #ifndef E_MOD_TEST_CASE_H
 #define E_MOD_TEST_CASE_H
 
+# include <Eo.h>
+# include <Eina.h>
+# include <Eet.h>
+# include <Evas.h>
+# include <Evas_Engine_Buffer.h>
+# include <Ecore.h>
+# include <Ecore_Getopt.h>
+# include <Ecore_Evas.h>
+# include <Ecore_Input.h>
+# include <Ecore_Input_Evas.h>
+# include <Ecore_Con.h>
+# include <Ecore_Ipc.h>
+# include <Ecore_File.h>
+# include <Efreet.h>
+# include <Efreet_Mime.h>
+# include <Edje.h>
+# include <Eldbus.h>
+# include <Eio.h>
+# include <Emotion.h>
+# include <Elementary.h>
+
+extern int _e_tizen_testcase_log_dom;
+
+#ifdef ERR
+# undef ERR
+#endif
+#define ERR(...) EINA_LOG_DOM_ERR(_e_tizen_testcase_log_dom, __VA_ARGS__)
+
+#ifdef DBG
+# undef DBG
+#endif
+#define DBG(...) EINA_LOG_DOM_DBG(_e_tizen_testcase_log_dom, __VA_ARGS__)
+
+#ifdef INF
+# undef INF
+#endif
+#define INF(...) EINA_LOG_DOM_INFO(_e_tizen_testcase_log_dom, __VA_ARGS__)
+
+#ifdef WRN
+# undef WRN
+#endif
+#define WRN(...) EINA_LOG_DOM_WARN(_e_tizen_testcase_log_dom, __VA_ARGS__)
+
+#ifdef CRI
+# undef CRI
+#endif
+#define CRI(...) EINA_LOG_DOM_CRIT(_e_tizen_testcase_log_dom, __VA_ARGS__)
+
+#ifdef E_REALLOC
+# undef E_REALLOC
+#endif
+# define E_REALLOC(p, s, n)   p = (s *)realloc(p, sizeof(s) * n)
+
+#ifdef E_NEW
+# undef E_NEW
+#endif
+# define E_NEW(s, n)          (s *)calloc(n, sizeof(s))
+
+#ifdef E_NEW_RAW
+# undef E_NEW_RAW
+#endif
+# define E_NEW_RAW(s, n)      (s *)malloc(n * sizeof(s))
+
+#ifdef E_FREE
+# undef E_FREE
+#endif
+# define E_FREE(p)            do { free(p); p = NULL; } while (0)
+
+#ifdef E_FREE_LIST
+# undef E_FREE_LIST
+#endif
+# define E_FREE_LIST(list, free)    \
+  do                                \
+    {                               \
+       void *_tmp_;                 \
+       EINA_LIST_FREE(list, _tmp_) \
+         {                          \
+            free(_tmp_);            \
+         }                          \
+    }                               \
+  while (0)
+
 extern Eldbus_Connection *dbus_conn;
 extern Eldbus_Proxy *dbus_proxy;
 extern Eldbus_Object *dbus_obj;

diff --git a/src/e_test_case_util.c b/src/e_test_case_util.c
index 2f0abe8..8376c98 100644 (file)
--- a/src/e_test_case_util.c
+++ b/src/e_test_case_util.c
@@ -1,4 +1,3 @@
-#include "e.h"
 #include "e_test_case_main.h"
 #include "e_test_case_util.h"