Merge "[elm_label]Changed *.c file mode & Fix build fail & remove warning in TC"

diff --git a/TC/elm_ts/label/Makefile b/TC/elm_ts/label/Makefile
index 2f0ee9a..fdb1ee7 100755 (executable)
--- a/TC/elm_ts/label/Makefile
+++ b/TC/elm_ts/label/Makefile
@@ -4,17 +4,15 @@ TARGETS = utc_UIFW_elm_label_add_func \
        utc_UIFW_elm_label_background_color_set_func \
        utc_UIFW_elm_label_ellipsis_set_func \
        utc_UIFW_elm_label_fontsize_set_func \
-       utc_UIFW_elm_label_label_get_func \
        utc_UIFW_elm_label_line_wrap_get_func \
        utc_UIFW_elm_label_slide_duration_get_func \
        utc_UIFW_elm_label_slide_get_func \
        utc_UIFW_elm_label_text_align_set_func \
        utc_UIFW_elm_label_text_color_set_func \
        utc_UIFW_elm_label_wrap_height_get_func \
-       utc_UIFW_elm_label_wrap_mode_set_func \
        utc_UIFW_elm_label_wrap_width_get_func \
 
-PKGS = elementary
+PKGS = elementary evas
 
 LDFLAGS = `pkg-config --libs $(PKGS)`
 LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
@@ -27,8 +25,8 @@ CFLAGS += -Wall
 
 all: $(TARGETS)
 
-$(TARGET): %: %.c
-       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+$(TARGETS): %: %.c
+       $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
 
 clean:
        rm -f *~ *.o tet_captured tet_lock $(TARGETS)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_add_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_add_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_background_color_set_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_background_color_set_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_ellipsis_set_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_ellipsis_set_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_fontsize_set_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_fontsize_set_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_line_wrap_get_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_line_wrap_get_func.c
old mode 100755 (executable)
new mode 100644 (file)
index 822d491..5fb4991
--- a/TC/elm_ts/label/utc_UIFW_elm_label_line_wrap_get_func.c
+++ b/TC/elm_ts/label/utc_UIFW_elm_label_line_wrap_get_func.c
@@ -151,14 +151,18 @@ cleanup()
  */
 static void utc_UIFW_elm_label_line_wrap_get_func_01(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_line_wrap_set(test_eo, 1);
-       int ret = 0;
-       ret = elm_label_line_wrap_get(test_eo);
-       TET_CHECK_PASS(NULL, ret);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, An Label wrap get/set is success.");
+   test_eo = elm_label_add(test_win);
+   elm_label_line_wrap_set(test_eo, 1);
+   int ret = 0;
+   ret = elm_label_line_wrap_get(test_eo);
+
+   if (!ret) {
+        tet_infoline("elm_label_line_wrap_get() failed in positive test case");
+        tet_result(TET_FAIL);
+        return;
+   }
+   tet_result(TET_PASS);
+
 }
 
 /**
@@ -166,12 +170,15 @@ static void utc_UIFW_elm_label_line_wrap_get_func_01(void)
  */
 static void utc_UIFW_elm_label_line_wrap_get_func_02(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_line_wrap_set(test_eo, 0);
-       int ret = 0;
-       ret = elm_label_line_wrap_get(test_eo);
-       TET_CHECK_FAIL(NULL, ret);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, Label wrap get/set is failed.");
+   test_eo = elm_label_add(test_win);
+   elm_label_line_wrap_set(test_eo, 0);
+   int ret = 0;
+   ret = elm_label_line_wrap_get(test_eo);
+
+   if(ret) {
+        tet_result(TET_FAIL);
+        tet_infoline("elm_label_line_wrap_get() failed in negative test case");
+        return;
+   }
+   tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_slide_duration_get_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_slide_duration_get_func.c
old mode 100755 (executable)
new mode 100644 (file)
index ff63aae..ba86fb2
--- a/TC/elm_ts/label/utc_UIFW_elm_label_slide_duration_get_func.c
+++ b/TC/elm_ts/label/utc_UIFW_elm_label_slide_duration_get_func.c
@@ -151,14 +151,17 @@ cleanup()
  */
 static void utc_UIFW_elm_label_slide_duration_get_func_01(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_label_set(test_eo, "test string");
-       elm_label_slide_duration_set(test_eo, 10);
-       int r = elm_label_slide_duration_get(test_eo);
-       TET_CHECK_PASS(0, r);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, A Label slide duration get is success.");
+   test_eo = elm_label_add(test_win);
+   elm_object_text_set(test_eo, "test string");
+   elm_label_slide_duration_set(test_eo, 10);
+   int r = elm_label_slide_duration_get(test_eo);
+
+   if (!r) {
+        tet_infoline("elm_label_slide_duration_get() failed in positive test case");
+        tet_result(TET_FAIL);
+        return;
+   }
+   tet_result(TET_PASS);
 }
 
 /**
@@ -166,12 +169,15 @@ static void utc_UIFW_elm_label_slide_duration_get_func_01(void)
  */
 static void utc_UIFW_elm_label_slide_duration_get_func_02(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_label_set(test_eo, NULL);
-       elm_label_slide_duration_set(test_eo, 10);
-       int r = elm_label_slide_duration_get(NULL);
-       TET_CHECK_FAIL(1, r);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, A Label slide duration get is failed.");
+   test_eo = elm_label_add(test_win);
+   elm_object_text_set(test_eo, NULL);
+   elm_label_slide_duration_set(test_eo, 10);
+   int r = elm_label_slide_duration_get(NULL);
+
+   if(r) {
+        tet_result(TET_FAIL);
+        tet_infoline("elm_label_slide_duration_get() failed in negative test case");
+        return;
+   }
+   tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_slide_get_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_slide_get_func.c
old mode 100755 (executable)
new mode 100644 (file)
index c3a4a24..ed0d0dd
--- a/TC/elm_ts/label/utc_UIFW_elm_label_slide_get_func.c
+++ b/TC/elm_ts/label/utc_UIFW_elm_label_slide_get_func.c
@@ -151,14 +151,17 @@ cleanup()
  */
 static void utc_UIFW_elm_label_slide_get_func_01(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_label_set(test_eo, "test string");
-       elm_label_slide_set(test_eo, EINA_TRUE);
-       Eina_Bool r = elm_label_slide_get(test_eo);
-       TET_CHECK_PASS(EINA_FALSE, r);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, A Label slide get is success.");
+   test_eo = elm_label_add(test_win);
+   elm_object_text_set(test_eo, "test string");
+   elm_label_slide_set(test_eo, EINA_TRUE);
+   Eina_Bool r = elm_label_slide_get(test_eo);
+
+   if (!r) {
+        tet_infoline("elm_label_slide_get() failed in positive test case");
+        tet_result(TET_FAIL);
+        return;
+   }
+   tet_result(TET_PASS);
 }
 
 /**
@@ -166,9 +169,12 @@ static void utc_UIFW_elm_label_slide_get_func_01(void)
  */
 static void utc_UIFW_elm_label_slide_get_func_02(void)
 {
-       Eina_Bool r = elm_label_slide_get(NULL);
-       TET_CHECK_FAIL(EINA_TRUE, r);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, A Label slide get is failed.");
+   Eina_Bool r = elm_label_slide_get(NULL);
+
+   if(r) {
+        tet_result(TET_FAIL);
+        tet_infoline("elm_label_slide_get() failed in negative test case");
+        return;
+   }
+   tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_text_align_set_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_text_align_set_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_text_color_set_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_text_color_set_func.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_wrap_height_get_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_wrap_height_get_func.c
old mode 100755 (executable)
new mode 100644 (file)
index c476886..707d1c8
--- a/TC/elm_ts/label/utc_UIFW_elm_label_wrap_height_get_func.c
+++ b/TC/elm_ts/label/utc_UIFW_elm_label_wrap_height_get_func.c
@@ -151,14 +151,19 @@ cleanup()
  */
 static void utc_UIFW_elm_label_wrap_height_get_func_01(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_wrap_height_set(test_eo, 10);
-       int ret = 0;
-       ret = elm_label_wrap_height_get(test_eo);
-       TET_CHECK_PASS(NULL, ret);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_01, [TYPE]: Positive, [RESULT]:PASS, Label height get/set is success.");
+   test_eo = elm_label_add(test_win);
+   elm_label_wrap_height_set(test_eo, 10);
+   int ret = 0;
+   ret = elm_label_wrap_height_get(test_eo);
+
+   if (!ret) {
+        tet_infoline("elm_label_wrap_height_get() failed in positive test case");
+        tet_result(TET_FAIL);
+        return;
+   }
+   tet_result(TET_PASS);
+
+
 }
 
 /**
@@ -166,12 +171,15 @@ static void utc_UIFW_elm_label_wrap_height_get_func_01(void)
  */
 static void utc_UIFW_elm_label_wrap_height_get_func_02(void)
 {
-       test_eo = elm_label_add(test_win);
-       elm_label_wrap_height_set(test_eo, 0);
-       int ret = 0;
-       ret = elm_label_wrap_height_get(test_eo);
-       TET_CHECK_FAIL(NULL, ret);
-
-       tet_result(TET_PASS);
-       tet_infoline("[[ TET_MSG ]]::[ID]:TC_02, [TYPE]: Negative, [RESULT]:PASS, Label height get/set is failed.");
+   test_eo = elm_label_add(test_win);
+   elm_label_wrap_height_set(test_eo, 0);
+   int ret = 0;
+   ret = elm_label_wrap_height_get(test_eo);
+
+   if(ret) {
+        tet_result(TET_FAIL);
+        tet_infoline("elm_label_wrap_height_get() failed in negative test case");
+        return;
+   }
+   tet_result(TET_PASS);
 }

diff --git a/TC/elm_ts/label/utc_UIFW_elm_label_wrap_width_get_func.c b/TC/elm_ts/label/utc_UIFW_elm_label_wrap_width_get_func.c
old mode 100755 (executable)
new mode 100644 (file)