fixed TC bugs

diff --git a/TC/elm_ts/transit/Makefile b/TC/elm_ts/transit/Makefile
new file mode 100755 (executable)
index 0000000..cbab42a
--- /dev/null
+++ b/TC/elm_ts/transit/Makefile
@@ -0,0 +1,49 @@
+CC ?= gcc
+
+TARGETS = uts_elm_transit_add_func \
+         uts_elm_transit_auto_reverse_set_func \
+         uts_elm_transit_completion_callback_set_func \
+         uts_elm_transit_curve_style_set_func \
+         uts_elm_transit_del_func \
+         uts_elm_transit_event_block_disabled_get_func \
+         uts_elm_transit_event_block_disabled_set_func \
+         uts_elm_transit_fx_clear_func \
+         uts_elm_transit_fx_insert_func \
+         uts_elm_transit_pause_func \
+         uts_elm_transit_repeat_set_func \
+         uts_elm_transit_resume_func \
+         uts_elm_transit_run_func \
+         uts_elm_transit_stop_func \
+         uts_elm_transit_fx_blend_add_func \
+     uts_elm_transit_fx_color_add_func \
+     uts_elm_transit_fx_fade_add_func \
+         uts_elm_transit_fx_flip_add_func \
+         uts_elm_transit_fx_image_animation_add_func \
+     uts_elm_transit_fx_resizable_flip_add_func \
+     uts_elm_transit_fx_resizing_add_func \
+         uts_elm_transit_fx_rotation3d_add_func \
+     uts_elm_transit_fx_roation_add_func \
+         uts_elm_transit_fx_translation_add_func \
+         uts_elm_transit_fx_wipe_add_func \
+         uts_elm_transit_fx_zoom_add_func \
+
+PKGS = elementary
+
+LDFLAGS = `pkg-config --libs $(PKGS)`
+LDFLAGS += $(TET_ROOT)/lib/tet3/tcm_s.o
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -ltcm_s
+LDFLAGS += -L$(TET_ROOT)/lib/tet3 -lapi_s
+
+CFLAGS = -I. `pkg-config --cflags $(PKGS)`
+CFLAGS += -I$(TET_ROOT)/inc/tet3
+CFLAGS += -Wall
+
+all: $(TARGETS)
+
+$(TARGET): %: %.c
+       $(CC) -o $@ $< $(CFLAGS) $(LDFLAGS)
+
+clean:
+       rm -f $(TARGETS)
+       rm -f tet_captured
+       rm -f *~

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
index 9a781cd..c090771 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_add_func.c
@@ -46,7 +46,6 @@ enum {
 
 struct tet_testlist tet_testlist[] = {
        { utc_UIFW_elm_transit_add_func_01, POSITIVE_TC_IDX },
-       { utc_UIFW_elm_transit_add_func_02, NEGATIVE_TC_IDX },
        { NULL, 0 }
 };
 
@@ -86,18 +85,3 @@ static void utc_UIFW_elm_transit_add_func_01(void)
        }
        tet_result(TET_PASS);
 }
-
-/**
- * @brief Negative test case of ug_init elm_transit_add()
- */
-static void utc_UIFW_elm_transit_add_func_02(void)
-{
-       transit = elm_transit_add(NULL);
-
-       if (transit) {
-               tet_infoline("elm_transit_add() failed in negative test case");
-               tet_result(TET_FAIL);
-               return;
-       }
-       tet_result(TET_PASS);
-}

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
index 8337494..65e555b 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_event_block_disabled_set_func.c
@@ -79,7 +79,7 @@ static void utc_UIFW_elm_transit_event_block_disbled_set_func_01(void)
 {
        Eina_Bool r = EINA_FALSE;
        
-       elm_transit_add(transit);
+       transit = elm_transit_add(main_win);
        elm_transit_event_block_disabled_set(transit, EINA_TRUE);
        r = elm_transit_event_block_disabled_get(transit);
        elm_transit_run(transit, 1.0);
@@ -99,12 +99,12 @@ static void utc_UIFW_elm_transit_event_block_disbled_set_func_02(void)
 {
        Eina_Bool r = EINA_FALSE;
        
-       elm_transit_add(transit);
+       elm_transit_add(main_win);
        elm_transit_event_block_disabled_set(NULL, EINA_TRUE);
-       r = elm_transit_event_block_disabled_get(transit);
+       r = elm_transit_event_block_disabled_get(NULL);
        elm_transit_run(transit, 1.0);
 
-       if (r = EINA_TRUE) {
+       if (r == EINA_TRUE) {
                tet_infoline("elm_transit_event_block_disbled_set() failed in negative test case");
                tet_result(TET_FAIL);
                return;

diff --git a/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c b/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
index 024fe84..fb2b9f5 100644 (file)
--- a/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
+++ b/TC/elm_ts/transit/utc_UIFW_elm_transit_fx_insert_func.c
@@ -102,7 +102,7 @@ static void utc_UIFW_elm_transit_fx_insert_func_02(void)
        Elm_Effect *effect = elm_fx_fade_add(main_win, main_win);
        r = elm_transit_fx_insert(transit, NULL);
 
-       if (r = EINA_TRUE) {
+       if (r == EINA_TRUE) {
                tet_infoline("elm_transit_fx_insert() failed in negative test case");
                tet_result(TET_FAIL);
                return;

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 2143e41..ff635c7 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -218,16 +218,16 @@ elm_transit_event_block_disabled_set(Elm_Transit *transit, Eina_Bool disabled)
 
    if (disabled)
      {
-       if (transit->block_rect)
-         {
-            evas_object_del(transit->block_rect);
-            transit->block_rect = NULL;
-         }
+        if (transit->block_rect)
+          {
+             evas_object_del(transit->block_rect);
+             transit->block_rect = NULL;
+          }
      }
    else
      {
-       if (!transit->block_rect)
-          transit->block_rect = _create_block_rect(transit->parent);
+        if (!transit->block_rect)
+          transit->block_rect = _create_block_rect(transit->parent);
      }
 }
 
@@ -245,9 +245,8 @@ elm_transit_event_block_disabled_set(Elm_Transit *transit, Eina_Bool disabled)
 EAPI Eina_Bool
 elm_transit_event_block_disabled_get(const Elm_Transit *transit)
 {
-       ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE);
-   
-       return transit->block_rect ? EINA_TRUE : EINA_FALSE;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE);
+   return transit->block_rect ? EINA_FALSE : EINA_TRUE;
 }
 
 /**
@@ -449,6 +448,8 @@ elm_transit_tween_mode_get(const Elm_Transit *transit)
 EAPI Elm_Transit *
 elm_transit_add(Evas_Object *parent)
 {
+   if (!parent) return NULL;
+
    Elm_Transit *transit = ELM_NEW(Elm_Transit);
 
    if (!transit) return NULL;
@@ -520,13 +521,15 @@ elm_transit_fx_insert(Elm_Transit *transit, Elm_Effect *effect)
        
    Elm_Effect *_effect;
 
-       Eina_List *elist;
+   Eina_List *elist;
+
+   if (!effect) return EINA_FALSE;
 
    EINA_LIST_FOREACH(transit->effect_list, elist, _effect)
-   {
-      if (_effect == effect)
-        return EINA_FALSE;
-   }
+     {
+        if (_effect == effect)
+          return EINA_FALSE;
+     }
 
    ++effect->shared_cnt;
    transit->effect_list = eina_list_append(transit->effect_list, effect);