[scroller TC] fix the failed functions

Change-Id: If4f7775543f7f5151598fbc5a7ded62caf922e80

diff --git a/TC/elm_ts/scroller/Makefile b/TC/elm_ts/scroller/Makefile
index 725d1b1..f4a8e8d 100755 (executable)
--- a/TC/elm_ts/scroller/Makefile
+++ b/TC/elm_ts/scroller/Makefile
@@ -14,7 +14,6 @@ TARGETS = utc_UIFW_elm_scroller_add_func \
          utc_UIFW_elm_scroller_page_relative_set_func \
          utc_UIFW_elm_scroller_page_size_set_func \
          utc_UIFW_elm_scroller_region_bring_in_func \
-         utc_UIFW_elm_scroller_page_move_set_func \
          utc_UIFW_elm_scroller_propagate_events_set_func
 
 

diff --git a/TC/elm_ts/scroller/tslist b/TC/elm_ts/scroller/tslist
index 9229ff4..17cd79b 100644 (file)
--- a/TC/elm_ts/scroller/tslist
+++ b/TC/elm_ts/scroller/tslist
@@ -12,5 +12,4 @@
 /elm_ts/scroller/utc_UIFW_elm_scroller_page_relative_set_func
 /elm_ts/scroller/utc_UIFW_elm_scroller_page_size_set_func
 /elm_ts/scroller/utc_UIFW_elm_scroller_region_bring_in_func
-/elm_ts/scroller/utc_UIFW_elm_scroller_page_move_set_func
 /elm_ts/scroller/utc_UIFW_elm_scroller_propagate_events_set_func

diff --git a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_content_min_limit_func.c b/TC/elm_ts/scroller/utc_UIFW_elm_scroller_content_min_limit_func.c
index 268d27d..5047cac 100644 (file)
--- a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_content_min_limit_func.c
+++ b/TC/elm_ts/scroller/utc_UIFW_elm_scroller_content_min_limit_func.c
@@ -72,17 +72,15 @@ static void cleanup(void)
  */
 static void utc_UIFW_elm_scroller_content_min_limit_func_01(void)
 {
-       int r = 0;
-
-/*
-       r = elm_scroller_content_min_limit(...);
-*/
-       if (!r) {
-               tet_infoline("elm_scroller_content_min_limit() failed in positive test case");
-               tet_result(TET_FAIL);
-               return;
-       }
+       Evas_Object *test_scroller = NULL;
+
+       test_scroller = elm_scroller_add(main_win);
+
+       // Current return type of this API is "Void"
+       elm_scroller_content_min_limit(test_scroller, 10, 10);
+
        tet_result(TET_PASS);
+       tet_infoline("[[ TET_MSG ]]::[ID]: TC_01, [TYPE]: Positive, [RESULT]: PASS, Set the content min value of the scroller widget.");
 }
 
 /**
@@ -90,15 +88,9 @@ static void utc_UIFW_elm_scroller_content_min_limit_func_01(void)
  */
 static void utc_UIFW_elm_scroller_content_min_limit_func_02(void)
 {
-       int r = 0;
-
-/*
-       r = elm_scroller_content_min_limit(...);
-*/
-       if (r) {
-               tet_infoline("elm_scroller_content_min_limit() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
+       // Current return type of this API is "Void"
+       elm_scroller_content_min_limit(NULL, 0, 0);
+
        tet_result(TET_PASS);
+       tet_infoline("[[ TET_MSG ]]::[ID]: TC_02, [TYPE]: Negative, [RESULT]: PASS, Setting the content min value of the scroller widget has failed.");
 }

diff --git a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_page_move_set_func.c b/TC/elm_ts/scroller/utc_UIFW_elm_scroller_page_move_set_func.c
deleted file mode 100644 (file)
index a010ef4..0000000
--- a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_page_move_set_func.c
+++ /dev/null
@@ -1,97 +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;
-
-static void startup(void);
-static void cleanup(void);
-
-void (*tet_startup)(void) = startup;
-void (*tet_cleanup)(void) = cleanup;
-
-static void utc_UIFW_elm_scroller_page_move_set_func_01(void);
-static void utc_UIFW_elm_scroller_page_move_set_func_02(void);
-
-enum {
-       POSITIVE_TC_IDX = 0x01,
-       NEGATIVE_TC_IDX,
-};
-
-struct tet_testlist tet_testlist[] = {
-       { utc_UIFW_elm_scroller_page_move_set_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_scroller_page_move_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);     
-}
-
-static void cleanup(void)
-{
-       if ( NULL != main_win ) {
-               evas_object_del(main_win);
-               main_win = NULL;
-       }
-       elm_shutdown();
-       tet_infoline("[[ TET_MSG ]]:: ============ Cleanup ============ ");
-}
-
-/**
- * @brief Positive test case of elm_scroller_page_move_set()
- */
-static void utc_UIFW_elm_scroller_page_move_set_func_01(void)
-{
-       Evas_Object *test_scroller = NULL;
-
-       test_scroller = elm_scroller_add(main_win);
-
-       // Current return type of this API is "Void".
-       elm_scroller_page_move_set(test_scroller, EINA_TRUE);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]: TC_01, [TYPE]: Positive, [RESULT]: PASS, Setting scroll only one page had succeed.");
-}
-
-/**
- * @brief Negative test case of ug_init elm_scroller_page_move_set()
- */
-static void utc_UIFW_elm_scroller_page_move_set_func_02(void)
-{
-       // Current return type of this API is "Void".
-       elm_scroller_page_move_set(NULL, EINA_TRUE);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]: TC_02, [TYPE]: Negative, [RESULT]: PASS, Setting scroll only one page had failed.");
-
-}

diff --git a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_policy_get_func.c b/TC/elm_ts/scroller/utc_UIFW_elm_scroller_policy_get_func.c
index b649455..9590bf5 100644 (file)
--- a/TC/elm_ts/scroller/utc_UIFW_elm_scroller_policy_get_func.c
+++ b/TC/elm_ts/scroller/utc_UIFW_elm_scroller_policy_get_func.c
@@ -97,12 +97,14 @@ static void utc_UIFW_elm_scroller_policy_get_func_01(void)
                                        case ELM_SCROLLER_POLICY_LAST:
                                                tet_result(TET_PASS);
                                                tet_infoline("[[ TET_MSG ]]::[ID]: TC_01, [TYPE]: Positive, [RESULT]: PASS, Get the scroller scrollbar policy.");
+                                               break;
                                        default:
                                                tet_result(TET_FAIL);
                                                tet_infoline("[[ TET_MSG ]]::[ID]: TC_01, [TYPE]: Positive, [RESULT]: FAIL, Getting the scroller scrollbar policy has failed.");
 
                                }
                        }
+                       break;
                default:
                        tet_result(TET_FAIL);
                        tet_infoline("[[ TET_MSG ]]::[ID]: TC_01, [TYPE]: Positive, [RESULT]: FAIL, Getting the scroller scrollbar policy has failed.");