[controlbar] fix TC build error

Change-Id: I60efa4975390887153214c7f8781749149a453a7

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_alpha_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_alpha_set_func.c
index ee020f3..5c588d6 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_alpha_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_alpha_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_auto_align_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_auto_align_set_func.c
index 8cdcfe8..2e4a81c 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_auto_align_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_auto_align_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_get_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_get_func.c
index e0984e9..5bc5e25 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_get_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_get_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_set_func.c
index b51c650..e56da21 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_icon_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -79,9 +80,12 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_item_icon_set_func_01(void)
 {
+       char buf[255];
+
        Evas_Object *icon = NULL;
 
-       elm_controlbar_item_icon_set(item1, CONTROLBAR_SYSTEM_ICON_SONGS);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       elm_controlbar_item_icon_set(item1, buf);
 
        icon = elm_controlbar_item_icon_get(item1);
 

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_get_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_get_func.c
index 4b4713a..2ca18ff 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_get_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_get_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_set_func.c
index 0a2abea..d591aee 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_item_view_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_mode_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_mode_set_func.c
index ab75e51..444a6db 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_mode_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_mode_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -53,13 +54,16 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       item1 = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item1 = elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_append_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_append_func.c
index 56c6ad9..718696b 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_append_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_append_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -87,8 +88,11 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_append_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(controlbar, buf, "Songs", view);
 
        if (!item) {
                tet_infoline("elm_controlbar_tab_item_append() failed in positive test case");
@@ -103,8 +107,11 @@ static void utc_UIFW_elm_controlbar_tab_item_append_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_append_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tab_item_append(NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(NULL, buf, "Songs", view);
 
        if (item) {
                tet_infoline("elm_controlbar_tab_item_append() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_after_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_after_func.c
index 881a565..8f01b22 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_after_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_after_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -87,10 +88,13 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_insert_after_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
-       item2 = elm_controlbar_tab_item_insert_after(controlbar, item, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(controlbar, buf, "Songs", view);
+       item2 = elm_controlbar_tab_item_insert_after(controlbar, item, buf, "Songs", view);
 
        if (!item2) {
                tet_infoline("elm_controlbar_tab_item_insert_after() failed in positive test case");
@@ -105,10 +109,13 @@ static void utc_UIFW_elm_controlbar_tab_item_insert_after_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_insert_after_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
-       item2 = elm_controlbar_tab_item_insert_after(controlbar, NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(controlbar, buf, "Songs", view);
+       item2 = elm_controlbar_tab_item_insert_after(controlbar, NULL, buf, "Songs", view);
 
        if (item2) {
                tet_infoline("elm_controlbar_tab_item_insert_after() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_before_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_before_func.c
index d799efc..4db4d57 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_before_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_insert_before_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -87,10 +88,13 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_insert_before_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
-       item2 = elm_controlbar_tab_item_insert_before(controlbar, item, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(controlbar, buf, "Songs", view);
+       item2 = elm_controlbar_tab_item_insert_before(controlbar, item, buf, "Songs", view);
 
        if (!item2) {
                tet_infoline("elm_controlbar_tab_item_insert_before() failed in positive test case");
@@ -105,10 +109,13 @@ static void utc_UIFW_elm_controlbar_tab_item_insert_before_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_insert_before_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
-       item2 = elm_controlbar_tab_item_insert_before(controlbar, NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_append(controlbar, buf, "Songs", view);
+       item2 = elm_controlbar_tab_item_insert_before(controlbar, NULL, buf, "Songs", view);
 
        if (item2) {
                tet_infoline("elm_controlbar_tab_item_insert_before() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_prepend_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_prepend_func.c
index 0fb5229..c758fac 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_prepend_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tab_item_prepend_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -87,8 +88,11 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_prepend_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tab_item_prepend(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_prepend(controlbar, buf, "Songs", view);
 
        if (!item) {
                tet_infoline("elm_controlbar_tab_item_prepend() failed in positive test case");
@@ -103,8 +107,11 @@ static void utc_UIFW_elm_controlbar_tab_item_prepend_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tab_item_prepend_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tab_item_prepend(NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", view);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tab_item_prepend(NULL, buf, "Songs", view);
 
        if (item) {
                tet_infoline("elm_controlbar_tab_item_prepend() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_append_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_append_func.c
index f7b3900..31cb935 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_append_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_append_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -80,8 +81,11 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_append_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tool_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(controlbar, buf, "Songs", NULL, NULL);
 
        if (!item) {
                tet_infoline("elm_controlbar_tool_item_append() failed in positive test case");
@@ -96,8 +100,11 @@ static void utc_UIFW_elm_controlbar_tool_item_append_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_append_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tool_item_append(NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(NULL, buf, "Songs", NULL, NULL);
 
        if (item) {
                tet_infoline("elm_controlbar_tool_item_append() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_after_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_after_func.c
index 5715720..d2733fb 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_after_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_after_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -80,10 +81,13 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_insert_after_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tool_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
-       item2 = elm_controlbar_tool_item_insert_after(controlbar, item, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(controlbar, buf, "Songs", NULL, NULL);
+       item2 = elm_controlbar_tool_item_insert_after(controlbar, item, buf, "Songs", NULL, NULL);
 
        if (!item2) {
                tet_infoline("elm_controlbar_tool_item_insert_after() failed in positive test case");
@@ -98,10 +102,13 @@ static void utc_UIFW_elm_controlbar_tool_item_insert_after_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_insert_after_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tool_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
-       item2 = elm_controlbar_tool_item_insert_after(controlbar, NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(controlbar, buf, "Songs", NULL, NULL);
+       item2 = elm_controlbar_tool_item_insert_after(controlbar, NULL, buf, "Songs", NULL, NULL);
 
        if (item2) {
                tet_infoline("elm_controlbar_tool_item_insert_after() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_before_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_before_func.c
index 9ddb696..facbf22 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_before_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_insert_before_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -80,10 +81,13 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_insert_before_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tool_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
-       item2 = elm_controlbar_tool_item_insert_before(controlbar, item, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(controlbar, buf, "Songs", NULL, NULL);
+       item2 = elm_controlbar_tool_item_insert_before(controlbar, item, buf, "Songs", NULL, NULL);
 
        if (!item2) {
                tet_infoline("elm_controlbar_tool_item_insert_before() failed in positive test case");
@@ -98,10 +102,13 @@ static void utc_UIFW_elm_controlbar_tool_item_insert_before_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_insert_before_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
        Elm_Controlbar_Item *item2 = NULL;
-       item = elm_controlbar_tool_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
-       item2 = elm_controlbar_tool_item_insert_before(controlbar, NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_append(controlbar, buf, "Songs", NULL, NULL);
+       item2 = elm_controlbar_tool_item_insert_before(controlbar, NULL, buf, "Songs", NULL, NULL);
 
        if (item2) {
                tet_infoline("elm_controlbar_tool_item_insert_before() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_prepend_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_prepend_func.c
index c20f1a1..b812d6f 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_prepend_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_tool_item_prepend_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -80,8 +81,11 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_prepend_func_01(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tool_item_prepend(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_prepend(controlbar, buf, "Songs", NULL, NULL);
 
        if (!item) {
                tet_infoline("elm_controlbar_tool_item_prepend() failed in positive test case");
@@ -96,8 +100,11 @@ static void utc_UIFW_elm_controlbar_tool_item_prepend_func_01(void)
  */
 static void utc_UIFW_elm_controlbar_tool_item_prepend_func_02(void)
 {
+       char buf[255];
+
        Elm_Controlbar_Item *item = NULL;
-       item = elm_controlbar_tool_item_prepend(NULL, CONTROLBAR_SYSTEM_ICON_SONGS, "Songs", NULL, NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       item = elm_controlbar_tool_item_prepend(NULL, buf, "Songs", NULL, NULL);
 
        if (item) {
                tet_infoline("elm_controlbar_tool_item_prepend() failed in negative test case");

diff --git a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_vertical_set_func.c b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_vertical_set_func.c
index e07777e..b986d98 100644 (file)
--- a/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_vertical_set_func.c
+++ b/TC/elm_ts/controlbar/utc_UIFW_elm_controlbar_vertical_set_func.c
@@ -1,5 +1,6 @@
 #include <tet_api.h>
 #include <Elementary.h>
+#define ICON_DIR "usr/share/elementary/images"
 
 // Definitions
 // For checking the result of the positive test case.
@@ -52,16 +53,19 @@ struct tet_testlist tet_testlist[] = {
 
 static void startup(void)
 {
+       char buf[255];
+
        tet_infoline("[[ TET_MSG ]]:: ============ Startup ============ ");
        elm_init(0, NULL);
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
 
        controlbar = elm_controlbar_add(main_win);
-       elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
-       elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
-       elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
-       elm_controlbar_tab_item_append(controlbar, CONTROLBAR_SYSTEM_ICON_SONGS, "Controlbar", NULL);
+       snprintf(buf, sizeof(buf), "%s/logo_small.png", ICON_DIR);
+       elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
+       elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
+       elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
+       elm_controlbar_tab_item_append(controlbar, buf, "Controlbar", NULL);
 }
 
 static void cleanup(void)