Merge "[controlbar] fix TC build error"

diff --git a/TC/elm_ts/editfield/Makefile b/TC/elm_ts/editfield/Makefile
index 23821de..d1c2255 100755 (executable)
--- a/TC/elm_ts/editfield/Makefile
+++ b/TC/elm_ts/editfield/Makefile
@@ -6,10 +6,6 @@ TARGETS = utc_UIFW_elm_editfield_add_func \
          utc_UIFW_elm_editfield_guide_text_set_func\
          utc_UIFW_elm_editfield_guide_text_get_func\
          utc_UIFW_elm_editfield_entry_get_func\
-         utc_UIFW_elm_editfield_right_icon_set_func\
-         utc_UIFW_elm_editfield_right_icon_get_func\
-         utc_UIFW_elm_editfield_left_icon_set_func\
-         utc_UIFW_elm_editfield_left_icon_get_func\
          utc_UIFW_elm_editfield_entry_single_line_set_func\
          utc_UIFW_elm_editfield_entry_single_line_get_func\
          utc_UIFW_elm_editfield_entry_eraser_set_func\

diff --git a/TC/elm_ts/editfield/tslist b/TC/elm_ts/editfield/tslist
index 7bec1ff..dbf4165 100644 (file)
--- a/TC/elm_ts/editfield/tslist
+++ b/TC/elm_ts/editfield/tslist
@@ -4,10 +4,6 @@
 /elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_set_func
 /elm_ts/editfield/utc_UIFW_elm_editfield_guide_text_get_func
 /elm_ts/editfield/utc_UIFW_elm_editfield_entry_get_func
-/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func
-/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func
-/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func
-/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func
 /elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_set_func
 /elm_ts/editfield/utc_UIFW_elm_editfield_entry_single_line_get_func
 /elm_ts/editfield/utc_UIFW_elm_editfield_entry_eraser_set_func

diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c
deleted file mode 100644 (file)
index 942de2b..0000000
--- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_get_func.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win;
-Evas_Object *ef;
-Evas_Object *ic;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_editfield_left_icon_get_func_01(void);
-static void utc_UIFW_elm_editfield_left_icon_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_editfield_left_icon_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_editfield_left_icon_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);
-       ef = elm_editfield_add(main_win);
-       evas_object_show(ef);
-       ic = elm_icon_add(main_win);
-       evas_object_show(ic);
-       elm_editfield_left_icon_set(ef, ic);
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != ef ) {
-               evas_object_del(ef);
-               ef = NULL;
-       }
-       if ( NULL != ic ) {
-               evas_object_del(ic);
-               ic = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_editfield_left_icon_get()
- */
-static void utc_UIFW_elm_editfield_left_icon_get_func_01(void)
-{
-       Evas_Object *r = NULL;
-       r = elm_editfield_left_icon_get(ef);
-
-       if (!r) {
-               tet_infoline("elm_editfield_left_icon_get() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_editfield_left_icon_get()
- */
-static void utc_UIFW_elm_editfield_left_icon_get_func_02(void)
-{
-       Evas_Object *r = NULL;
-       r = elm_editfield_left_icon_get(NULL);
-
-       if (r) {
-               tet_infoline("elm_editfield_left_icon_get() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c
deleted file mode 100644 (file)
index 2800b34..0000000
--- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_left_icon_set_func.c
+++ /dev/null
@@ -1,101 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win;
-Evas_Object *ef;
-Evas_Object *ic;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_editfield_left_icon_set_func_01(void);
-static void utc_UIFW_elm_editfield_left_icon_set_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_editfield_left_icon_set_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_editfield_left_icon_set_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);
-       ef = elm_editfield_add(main_win);
-       evas_object_show(ef);
-       ic = elm_icon_add(main_win);
-       evas_object_show(ic);
-
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != ef ) {
-               evas_object_del(ef);
-               ef = NULL;
-       }
-       if ( NULL != ic ) {
-               evas_object_del(ic);
-               ic = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_editfield_left_icon_set()
- */
-static void utc_UIFW_elm_editfield_left_icon_set_func_01(void)
-{
-       elm_editfield_left_icon_set(ef, ic);
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_editfield_left_icon_set()
- */
-static void utc_UIFW_elm_editfield_left_icon_set_func_02(void)
-{
-       elm_editfield_left_icon_set(ef, NULL);
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c
deleted file mode 100644 (file)
index 296c0f6..0000000
--- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_get_func.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win;
-Evas_Object *ef;
-Evas_Object *ic;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_editfield_right_icon_get_func_01(void);
-static void utc_UIFW_elm_editfield_right_icon_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_editfield_right_icon_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_editfield_right_icon_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);
-       ef = elm_editfield_add(main_win);
-       evas_object_show(ef);
-       ic = elm_icon_add(main_win);
-       evas_object_show(ic);
-       elm_editfield_right_icon_set(ef, ic);
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != ef ) {
-               evas_object_del(ef);
-               ef = NULL;
-       }
-       if ( NULL != ic ) {
-               evas_object_del(ic);
-               ic = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_editfield_right_icon_get()
- */
-static void utc_UIFW_elm_editfield_right_icon_get_func_01(void)
-{
-       Evas_Object *r = NULL;
-       r = elm_editfield_right_icon_get(ef);
-
-       if (!r) {
-               tet_infoline("elm_editfield_right_icon_get() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_editfield_right_icon_get()
- */
-static void utc_UIFW_elm_editfield_right_icon_get_func_02(void)
-{
-       Evas_Object *r = NULL;
-       r = elm_editfield_right_icon_get(NULL);
-
-       if (r) {
-               tet_infoline("elm_editfield_right_icon_get() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c b/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c
deleted file mode 100644 (file)
index 7335101..0000000
--- a/TC/elm_ts/editfield/utc_UIFW_elm_editfield_right_icon_set_func.c
+++ /dev/null
@@ -1,100 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win;
-Evas_Object *ef;
-Evas_Object *ic;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_editfield_right_icon_set_func_01(void);
-static void utc_UIFW_elm_editfield_right_icon_set_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_editfield_right_icon_set_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_editfield_right_icon_set_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);
-       ef = elm_editfield_add(main_win);
-       evas_object_show(ef);
-       ic = elm_icon_add(main_win);
-       evas_object_show(ic);
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != ef ) {
-               evas_object_del(ef);
-               ef = NULL;
-       }
-       if ( NULL != ic ) {
-               evas_object_del(ic);
-               ic = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_editfield_right_icon_set()
- */
-static void utc_UIFW_elm_editfield_right_icon_set_func_01(void)
-{
-       elm_editfield_right_icon_set(ef, ic);
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_editfield_right_icon_set()
- */
-static void utc_UIFW_elm_editfield_right_icon_set_func_02(void)
-{
-       elm_editfield_right_icon_set(ef, NULL);
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/entry/Makefile b/TC/elm_ts/entry/Makefile
index 2b17312..4090a0f 100755 (executable)
--- a/TC/elm_ts/entry/Makefile
+++ b/TC/elm_ts/entry/Makefile
@@ -16,8 +16,7 @@ TARGETS = utc_UIFW_elm_entry_add_func \
          utc_UIFW_elm_entry_password_get_func \
          utc_UIFW_elm_entry_selection_get_func \
          utc_UIFW_elm_entry_single_line_get_func \
-         utc_UIFW_elm_entry_utf8_to_markup_func \
-         utc_UIFW_elm_entry_wrap_width_get_func
+         utc_UIFW_elm_entry_utf8_to_markup_func
 
 PKGS = elementary evas
 

diff --git a/TC/elm_ts/entry/tslist b/TC/elm_ts/entry/tslist
index ed0dec3..fcceee8 100644 (file)
--- a/TC/elm_ts/entry/tslist
+++ b/TC/elm_ts/entry/tslist
@@ -2,7 +2,6 @@
 /elm_ts/entry/utc_UIFW_elm_entry_single_line_get_func
 /elm_ts/entry/utc_UIFW_elm_entry_password_get_func
 /elm_ts/entry/utc_UIFW_elm_entry_entry_get_func
-/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func
 /elm_ts/entry/utc_UIFW_elm_entry_editable_get_func
 /elm_ts/entry/utc_UIFW_elm_entry_selection_get_func
 /elm_ts/entry/utc_UIFW_elm_entry_cursor_next_func

diff --git a/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c b/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c
deleted file mode 100644 (file)
index 8aa2922..0000000
--- a/TC/elm_ts/entry/utc_UIFW_elm_entry_wrap_width_get_func.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <tet_api.h>
-#include <Elementary.h>
-
-// Definitions
-// For checking the result of the positive test case.
-#define TET_CHECK_PASS(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err == (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_PASS]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-// For checking the result of the negative test case.
-#define TET_CHECK_FAIL(x1, y...) \
-{ \
-       Evas_Object *err = y; \
-       if (err != (x1)) \
-               { \
-                       tet_printf("[TET_CHECK_FAIL]:: %s[%d] : Test has failed..", __FILE__,__LINE__); \
-                       tet_result(TET_FAIL); \
-                       return; \
-               } \
-}
-
-
-Evas_Object *main_win;
-Evas_Object *entry;
-const Evas_Coord test_wrap_width = 10;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_entry_wrap_width_get_func_01(void);
-static void utc_UIFW_elm_entry_wrap_width_get_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_entry_wrap_width_get_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_entry_wrap_width_get_func_02, NEGATIVE_TC_IDX },
-       { NULL, 0 }
-};
-
-static void startup(void)
-{
-       tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
-       elm_init(0, NULL);
-       main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-       evas_object_show(main_win);
-       entry = elm_entry_add(main_win);
-       evas_object_show(entry);
-       elm_entry_wrap_width_set(entry, test_wrap_width);
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != entry ) {
-               evas_object_del(entry);
-               entry = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_entry_wrap_width_get()
- */
-static void utc_UIFW_elm_entry_wrap_width_get_func_01(void)
-{
-       Evas_Coord w = 0;
-       w = elm_entry_wrap_width_get(entry);
-
-       if (w!=test_wrap_width) {
-               tet_infoline("elm_entry_wrap_width_get() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_entry_wrap_width_get()
- */
-static void utc_UIFW_elm_entry_wrap_width_get_func_02(void)
-{
-       Evas_Coord w = 0;
-       w = elm_entry_wrap_width_get(NULL);
-
-       if (w) {
-               tet_infoline("elm_entry_wrap_width_get() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}