[elm_popup-: rotation set API removed and test case fail issues solved.

diff --git a/TC/elm_ts/popup/Makefile b/TC/elm_ts/popup/Makefile
index ace7a7c..2dffa5b 100755 (executable)
--- a/TC/elm_ts/popup/Makefile
+++ b/TC/elm_ts/popup/Makefile
@@ -15,7 +15,6 @@ TARGETS = utc_UIFW_elm_popup_add_func \
          utc_UIFW_elm_popup_mode_set_func \
          utc_UIFW_elm_popup_response_func \
          utc_UIFW_elm_popup_orient_set_func \
-         utc_UIFW_elm_popup_rotation_set_func \
          utc_UIFW_elm_popup_run_func
 
 PKGS = elementary

diff --git a/TC/elm_ts/popup/tslist b/TC/elm_ts/popup/tslist
index a2e27b9..9e892ff 100644 (file)
--- a/TC/elm_ts/popup/tslist
+++ b/TC/elm_ts/popup/tslist
@@ -13,5 +13,4 @@
 /elm_ts/popup/utc_UIFW_elm_popup_mode_set_func
 /elm_ts/popup/utc_UIFW_elm_popup_response_func
 /elm_ts/popup/utc_UIFW_elm_popup_orient_set_func
-/elm_ts/popup/utc_UIFW_elm_popup_rotation_set_func
 /elm_ts/popup/utc_UIFW_elm_popup_run_func

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
index 57fc708..ce5bc54 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_content_get_func.c
@@ -55,6 +55,13 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
+       Evas_Object *icon = elm_icon_add(popup);
+       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       elm_icon_file_set(icon, buf, NULL);
+       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_scale_set(icon, 1, 1);
+       
+       elm_popup_content_set(popup,icon);
        evas_object_show(popup);        
 }
 

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_desc_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_desc_get_func.c
index 3c671cf..dfd15e4 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_desc_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_desc_get_func.c
@@ -55,6 +55,7 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);
        popup = elm_popup_add(main_win);
+       elm_popup_desc_set(popup, "Demo Text");
        evas_object_show(popup);        
 }
 
@@ -94,7 +95,7 @@ static void utc_UIFW_elm_popup_desc_get_func_01(void)
 static void utc_UIFW_elm_popup_desc_get_func_02(void)
 {
        const char *text = NULL;
-       text = elm_popup_desc_get(popup);
+       text = elm_popup_desc_get(NULL);
        if (text) {
                tet_infoline("elm_popup_desc_get() failed in negative test case");
                tet_result(TET_FAIL);

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_rotation_set_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_rotation_set_func.c
deleted file mode 100644 (file)
index b114d73..0000000
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_rotation_set_func.c
+++ /dev/null
@@ -1,92 +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, *popup;
-
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_popup_rotation_set_func_01(void);
-static void utc_UIFW_elm_popup_rotation_set_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_popup_rotation_set_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_popup_rotation_set_func_02, NEGATIVE_TC_IDX },
-};
-
-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);
-       popup = elm_popup_add(main_win);
-       evas_object_show(popup);        
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       if ( NULL != popup ) {
-               evas_object_del(popup);
-               popup = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_popup_rotation_set()
- */
-static void utc_UIFW_elm_popup_rotation_set_func_01(void)
-{
-       elm_popup_rotation_set(popup,90);
-       tet_result(TET_PASS);
-}
-
-/**
- * @brief Negative test case of ug_init elm_popup_rotation_set()
- */
-static void utc_UIFW_elm_popup_rotation_set_func_02(void)
-{
-       elm_popup_rotation_set(NULL,90);
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
index 9d17a8a..fd544f7 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_icon_get_func.c
@@ -56,6 +56,13 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
+       Evas_Object *icon = elm_icon_add(popup);
+       snprintf(buf, sizeof(buf), "%s/00_volume_icon.png", ICON_DIR);
+       elm_icon_file_set(icon, buf, NULL);
+       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+       elm_icon_scale_set(icon, 1, 1);
+       
+       elm_popup_title_icon_set(popup,icon);
        evas_object_show(popup);        
 }
 

diff --git a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_label_get_func.c b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_label_get_func.c
index e6e3e1f..00d20cb 100644 (file)
--- a/TC/elm_ts/popup/utc_UIFW_elm_popup_title_label_get_func.c
+++ b/TC/elm_ts/popup/utc_UIFW_elm_popup_title_label_get_func.c
@@ -56,6 +56,7 @@ static void startup(void)
        main_win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
        evas_object_show(main_win);     
        popup = elm_popup_add(main_win);
+       elm_popup_title_label_set(popup, "title");
        evas_object_show(popup);        
 }