From: Jihun Park Date: Thu, 14 Sep 2017 02:33:11 +0000 (+0000) Subject: Revert "[ITC][efl-extension][ACR-1061][Added Surface Related TCS]" X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4c85b46fe70451ba9f7e977781e69541109331e;p=test%2Ftct%2Fnative%2Fapi.git Revert "[ITC][efl-extension][ACR-1061][Added Surface Related TCS]" This reverts commit 46982e583a9842a2670b17359211df32b005ef03. Change-Id: I287fec94be8729b7a0b185e15985aff410e235dd --- diff --git a/src/itc/efl-ext/ITs-efl-ext.c b/src/itc/efl-ext/ITs-efl-ext.c old mode 100644 new mode 100755 index 2d1cc5c35..450b675fb --- a/src/itc/efl-ext/ITs-efl-ext.c +++ b/src/itc/efl-ext/ITs-efl-ext.c @@ -80,10 +80,10 @@ int ITc_eext_win_keygrab_set_unset_p(void) START_TEST; Eina_Bool bRet; - + int nRet = CreateEvasWindow(); PRINT_RESULT(0, nRet, "CreateEvasWindow", "Create Window failed"); - + bRet = eext_win_keygrab_set(g_pEvasWindow, KEY_POWEROFF); if (!bRet) { @@ -91,7 +91,7 @@ int ITc_eext_win_keygrab_set_unset_p(void) DeleteEvasWindow(); return 1; } - + bRet = eext_win_keygrab_unset(g_pEvasWindow, KEY_POWEROFF); if (!bRet) { @@ -99,7 +99,7 @@ int ITc_eext_win_keygrab_set_unset_p(void) DeleteEvasWindow(); return 1; } - + DeleteEvasWindow(); return 0; } @@ -165,12 +165,12 @@ int ITc_eext_floatingbutton_movement_block_set_get_p(void) START_TEST; Eina_Bool setBlock = true; Eina_Bool getBlock; - + int nRet = CreateFloatingButon(); PRINT_RESULT(0, nRet, "CreateFloatingButon", "Returned Value not correct"); - + eext_floatingbutton_movement_block_set(g_pFloatingButton, setBlock); - + getBlock = eext_floatingbutton_movement_block_get(g_pFloatingButton); if (setBlock != getBlock) { @@ -206,10 +206,10 @@ int ITc_eext_floatingbutton_movement_block_set_get_p(void) START_TEST; Eina_Bool bRet; - + int nRet = CreateEvasWindow(); PRINT_RESULT(0, nRet, "CreateEvasWindow", "Create Window failed"); - + bRet = eext_win_keygrab_set(g_pEvasWindow, KEY_VOLUMEUP); if (!bRet) { @@ -217,7 +217,7 @@ int ITc_eext_floatingbutton_movement_block_set_get_p(void) DeleteEvasWindow(); return 1; } - + bRet = eext_win_keygrab_unset(g_pEvasWindow, KEY_VOLUMEUP); if (!bRet) { @@ -225,7 +225,7 @@ int ITc_eext_floatingbutton_movement_block_set_get_p(void) DeleteEvasWindow(); return 1; } - + DeleteEvasWindow(); return 0; } @@ -259,16 +259,16 @@ int ITc_eext_floatingbutton_mode_set_get_p(void) Eext_Floatingbutton_Mode FloatingButtonModeType[] = { EEXT_FLOATINGBUTTON_MODE_DEFAULT, EEXT_FLOATINGBUTTON_MODE_BOTH_SIDES}; - + int nEnumSize = sizeof(FloatingButtonModeType) / sizeof(FloatingButtonModeType[0]); int nEnumCounter = 0; - + for(nEnumCounter=0; nEnumCounter < nEnumSize; nEnumCounter++) { eext_floatingbutton_mode_set(g_pFloatingButton, FloatingButtonModeType[nEnumCounter]); ret = eext_floatingbutton_mode_get(g_pFloatingButton); - + if(ret != FloatingButtonModeType[nEnumCounter]) { FPRINTF("[Line : %d][%s] eext_floatingbutton_mode_get failed due to mismatch in set and get values\\n", __LINE__, API_NAMESPACE); @@ -277,7 +277,7 @@ int ITc_eext_floatingbutton_mode_set_get_p(void) return 1; } } - + DeleteEvasWindow(); return 0; } @@ -303,7 +303,7 @@ int ITc_eext_floatingbutton_pos_bring_in_p(void) { START_TEST; Eina_Bool bRet; - + int nRet = CreateFloatingButon(); PRINT_RESULT(0, nRet, "CreateFloatingButon", "Returned Value not correct"); @@ -315,7 +315,7 @@ int ITc_eext_floatingbutton_pos_bring_in_p(void) int nEnumSize = sizeof(FloatingButtonPosType) / sizeof(FloatingButtonPosType[0]); int nEnumCounter = 0; - + for(nEnumCounter=0; nEnumCounter < nEnumSize; nEnumCounter++) { bRet = eext_floatingbutton_pos_bring_in(g_pFloatingButton, FloatingButtonPosType[nEnumCounter]); @@ -327,7 +327,7 @@ int ITc_eext_floatingbutton_pos_bring_in_p(void) return 1; } } - + DeleteEvasWindow(); return 0; } @@ -361,35 +361,7 @@ Eina_Bool RotaryHandlerCallBack(void *data, Eext_Rotary_Event_Info *info) FPRINTF("[Line : %d][%s] %s Callback Invoked\\n", __LINE__, API_NAMESPACE, "RotaryHandlerCallBack"); return EINA_TRUE; } -/** - * @function WinDelete - * @description Called when delete of window is called for new circle scroller object - * @parameter void *data, Evas_Object *obj, void *event - * @return NA - */ -static void WinDelete(void *data, Evas_Object *obj, void *event) -{ - elm_exit(); -} -/** - * @function CreateWin - * @description Called to create window for new circle scroller object - * @parameter const char *name - * @return NA - */ -static Evas_Object* CreateWin(const char *name) -{ - Evas_Object *obj = NULL; - - obj = elm_win_add(NULL, name, ELM_WIN_BASIC); - if (obj) - { - elm_win_title_set(obj, name); - evas_object_smart_callback_add(obj, "delete,request",WinDelete, NULL); - } - return obj; -} /**********************************************************************CallBack Functions End**********************************************************************/ /** @@ -454,10 +426,10 @@ void ITs_efl_ext_cleanup(void) START_TEST; Eina_Bool bRet; - + int nRet = CreateEvasWindow(); PRINT_RESULT(0, nRet, "CreateEvasWindow", "Create Window failed"); - + bRet = eext_win_keygrab_set(g_pEvasWindow, KEY_VOLUMEUP); if (!bRet) { @@ -465,7 +437,7 @@ void ITs_efl_ext_cleanup(void) DeleteEvasWindow(); return 1; } - + bRet = eext_win_keygrab_unset(g_pEvasWindow, KEY_VOLUMEUP); if (!bRet) { @@ -473,7 +445,7 @@ void ITs_efl_ext_cleanup(void) DeleteEvasWindow(); return 1; } - + DeleteEvasWindow(); return 0; } @@ -2376,20 +2348,20 @@ int ITc_eext_circle_object_item_value_set_get_p(void) Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); - + EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - + eext_circle_object_item_value_set(EvasCircleObj, pszItemName, dSetValue); dGetValue = eext_circle_object_item_value_get(EvasCircleObj, pszItemName); PRINT_RESULT(dSetValue, dGetValue, "eext_circle_object_item_value_get", "Set Get value mismatch"); - + return 0; } @@ -2418,28 +2390,28 @@ int ITc_eext_circle_object_item_color_set_get_p(void) const char *pszItemName = "default"; int nRedSetVal = 5, nGreenSetVal = 10, nBlueSetVal = 15, nAlphaSetVal = 20; int nRedGetVal = 0, nGreenGetVal = 0, nBlueGetVal = 0, nAlphaGetVal = 0; - + Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); - + EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - + eext_circle_object_item_color_set(EvasCircleObj, pszItemName, nRedSetVal, nGreenSetVal, nBlueSetVal, nAlphaSetVal); eext_circle_object_item_color_get(EvasCircleObj, pszItemName, &nRedGetVal, &nGreenGetVal, &nBlueGetVal, &nAlphaGetVal); - + PRINT_RESULT(nRedSetVal, nRedGetVal, "eext_circle_object_item_color_get", "Set Get Red value mismatch"); PRINT_RESULT(nGreenSetVal, nGreenGetVal, "eext_circle_object_item_color_get", "Set Get Green value mismatch"); PRINT_RESULT(nBlueSetVal, nBlueGetVal, "eext_circle_object_item_color_get", "Set Get Blue value mismatch"); PRINT_RESULT(nAlphaSetVal, nAlphaGetVal, "eext_circle_object_item_color_get", "Set Get Alpha value mismatch"); - + return 0; } @@ -2464,13 +2436,13 @@ int ITc_eext_circle_object_item_color_set_get_p(void) int ITc_eext_circle_object_item_radius_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; double dSetRad = 10, dGetRad = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); @@ -2484,7 +2456,7 @@ int ITc_eext_circle_object_item_radius_set_get_p(void) dGetRad = eext_circle_object_item_radius_get(EvasCircleObj, pszItemName); PRINT_RESULT(dSetRad, dGetRad, "eext_circle_object_item_radius_get", "Set Get Radius value mismatch"); - return 0; + return 0; } /** @@ -2508,19 +2480,19 @@ int ITc_eext_circle_object_item_radius_set_get_p(void) int ITc_eext_circle_object_item_line_width_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; int nSetLineWidth = 10, nGetLineWidth = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); - + EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); @@ -2528,7 +2500,7 @@ int ITc_eext_circle_object_item_line_width_set_get_p(void) nGetLineWidth = eext_circle_object_item_line_width_get(EvasCircleObj, pszItemName); PRINT_RESULT(nSetLineWidth, nGetLineWidth, "eext_circle_object_item_line_width_get", "Set Get Line Width value mismatch"); - return 0; + return 0; } /** @@ -2552,13 +2524,13 @@ int ITc_eext_circle_object_item_line_width_set_get_p(void) int ITc_eext_circle_object_item_angle_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; double dSetItemAngle = 10, dGetItemAngle = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); @@ -2568,9 +2540,10 @@ int ITc_eext_circle_object_item_angle_set_get_p(void) EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - eext_circle_object_item_angle_set(EvasCircleObj, pszItemName, dSetItemAngle); - dGetItemAngle = eext_circle_object_item_angle_get(EvasCircleObj, pszItemName); - PRINT_RESULT(dSetItemAngle, dGetItemAngle, "eext_circle_object_item_angle_get", "Set Get Item Angle value mismatch"); + + eext_circle_object_item_angle_set(EvasCircleObj, pszItemName, dSetItemAngle); + dGetItemAngle = eext_circle_object_item_angle_get(EvasCircleObj, pszItemName); + PRINT_RESULT(dSetItemAngle, dGetItemAngle, "eext_circle_object_item_angle_get", "Set Get Item Angle value mismatch"); return 0; } @@ -2596,27 +2569,28 @@ int ITc_eext_circle_object_item_angle_set_get_p(void) int ITc_eext_circle_object_item_angle_offset_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; double dSetItmAnglOfst = 10, dGetItmAnglOfst = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); - + EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - eext_circle_object_item_angle_offset_set(EvasCircleObj, pszItemName, dSetItmAnglOfst); - dGetItmAnglOfst = eext_circle_object_item_angle_offset_get(EvasCircleObj, pszItemName); - PRINT_RESULT(dSetItmAnglOfst, dGetItmAnglOfst, "eext_circle_object_item_angle_offset_get", "Set Get Item Angle Offset value mismatch"); - return 0; + eext_circle_object_item_angle_offset_set(EvasCircleObj, pszItemName, dSetItmAnglOfst); + dGetItmAnglOfst = eext_circle_object_item_angle_offset_get(EvasCircleObj, pszItemName); + PRINT_RESULT(dSetItmAnglOfst, dGetItmAnglOfst, "eext_circle_object_item_angle_offset_get", "Set Get Item Angle Offset value mismatch"); + + return 0; } /** @@ -2640,29 +2614,30 @@ int ITc_eext_circle_object_item_angle_offset_set_get_p(void) int ITc_eext_circle_object_item_angle_min_max_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; double dSetItemAngleMin = 5, dGetItemAngleMin = 0; double dSetItemAngleMax = 10, dGetItemAngleMax = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - eext_circle_object_item_angle_min_max_set(EvasCircleObj, pszItemName, dSetItemAngleMin, dSetItemAngleMax); - eext_circle_object_item_angle_min_max_get(EvasCircleObj, pszItemName, &dGetItemAngleMin, &dGetItemAngleMax); - PRINT_RESULT(dSetItemAngleMin, dGetItemAngleMin, "eext_circle_object_item_angle_min_max_get", "Set Get Item Angle Min value mismatch"); - PRINT_RESULT(dSetItemAngleMax, dGetItemAngleMax, "eext_circle_object_item_angle_min_max_get", "Set Get Item Angle Max value mismatch"); - return 0; + eext_circle_object_item_angle_min_max_set(EvasCircleObj, pszItemName, dSetItemAngleMin, dSetItemAngleMax); + eext_circle_object_item_angle_min_max_get(EvasCircleObj, pszItemName, &dGetItemAngleMin, &dGetItemAngleMax); + PRINT_RESULT(dSetItemAngleMin, dGetItemAngleMin, "eext_circle_object_item_angle_min_max_get", "Set Get Item Angle Min value mismatch"); + PRINT_RESULT(dSetItemAngleMax, dGetItemAngleMax, "eext_circle_object_item_angle_min_max_get", "Set Get Item Angle Max value mismatch"); + + return 0; } /** @@ -2686,71 +2661,28 @@ int ITc_eext_circle_object_item_angle_min_max_set_get_p(void) int ITc_eext_circle_object_item_value_min_max_set_get_p(void) { START_TEST; - + const char *pszItemName = "default"; double dSetItemValueMin = 5, dGetItemValueMin = 0; double dSetItemValueMax = 10, dGetItemValueMax = 0; Evas_Object *EvasWin = NULL; Evas_Object *EvasScrolr = NULL; Evas_Object *EvasCircleObj = NULL; - + EvasWin = CreateElmWindow("window"); CHECK_HANDLE(EvasWin, "CreateElmWindow"); - + EvasScrolr = elm_scroller_add(EvasWin); CHECK_HANDLE(EvasScrolr, "elm_scroller_add"); - + EvasCircleObj = eext_circle_object_add(EvasScrolr, NULL); CHECK_HANDLE(EvasCircleObj, "eext_circle_object_add"); - eext_circle_object_item_value_min_max_set(EvasCircleObj, pszItemName, dSetItemValueMin, dSetItemValueMax); - eext_circle_object_item_value_min_max_get(EvasCircleObj, pszItemName, &dGetItemValueMin, &dGetItemValueMax); - PRINT_RESULT(dSetItemValueMin, dSetItemValueMin, "eext_circle_object_item_value_min_max_get", "Set Get Item Value Min value mismatch"); - PRINT_RESULT(dSetItemValueMax, dGetItemValueMax, "eext_circle_object_item_value_min_max_get", "Set Get Item Value Max value mismatch"); - - return 0; -} - -/** -* @testcase ITc_efl_ext_eext_circle_object_mirrored_set_get_p -* @since_tizen 3.0 -* @author SRID(bipin.k) -* @reviewer SRID(shobhit.v) -* @type auto -* @description eext_circle_object_mirrored_set, eext_circle_object_mirrored_get values to be -* same for the mirrorred state of the object. -* @scenario Creating a new circle scroller object and then setting and getting of a mirrorred state -* of a given object. -* @apicovered elm_scroller_add, eext_circle_object_scroller_add,eext_circle_object_mirrored_set,eext_circle_object_mirrored_get -* @passcase When Set and Get values are same. -* @failcase Set and Get values are not same or any precondition API fails -* @precondition None -* @postcondition None -*/ -//& purpose: Test Set and Get of a mirrored state of a given circle object. -//& type: auto - -int ITc_efl_ext_eext_circle_object_mirrored_set_get_p(void) -{ - START_TEST; - Evas_Object *win=NULL; - Evas_Object *scroller=NULL; - Evas_Object *circle_scroller=NULL; - - win = CreateWin("window"); - CHECK_HANDLE(win,"CreateWin"); - - scroller = elm_scroller_add(win); - CHECK_HANDLE_CLEANUP(scroller,"elm_scroller_add",evas_object_del(win)); - - circle_scroller = eext_circle_object_scroller_add(scroller, NULL); - CHECK_HANDLE_CLEANUP(circle_scroller,"eext_circle_object_scroller_add",evas_object_del(win)); - - eext_circle_object_mirrored_set(circle_scroller, EEXT_CIRCLE_MIRRORED_ON); - int mirror_mode = eext_circle_object_mirrored_get(circle_scroller); - PRINT_RESULT_CLEANUP(EEXT_CIRCLE_MIRRORED_ON,mirror_mode, "eext_circle_object_mirrored_set and eext_circle_object_mirrored_get ","Returned value not correct ",evas_object_del(win) ); - evas_object_del(win); + eext_circle_object_item_value_min_max_set(EvasCircleObj, pszItemName, dSetItemValueMin, dSetItemValueMax); + eext_circle_object_item_value_min_max_get(EvasCircleObj, pszItemName, &dGetItemValueMin, &dGetItemValueMax); + PRINT_RESULT(dSetItemValueMin, dSetItemValueMin, "eext_circle_object_item_value_min_max_get", "Set Get Item Value Min value mismatch"); + PRINT_RESULT(dSetItemValueMax, dGetItemValueMax, "eext_circle_object_item_value_min_max_get", "Set Get Item Value Max value mismatch"); return 0; } diff --git a/src/itc/efl-ext/tct-efl-ext-native_wearable.h b/src/itc/efl-ext/tct-efl-ext-native_wearable.h index 3cd563711..f94f19e9b 100755 --- a/src/itc/efl-ext/tct-efl-ext-native_wearable.h +++ b/src/itc/efl-ext/tct-efl-ext-native_wearable.h @@ -81,7 +81,6 @@ extern int ITc_eext_circle_object_item_angle_set_get_p(void); extern int ITc_eext_circle_object_item_angle_offset_set_get_p(void); extern int ITc_eext_circle_object_item_angle_min_max_set_get_p(void); extern int ITc_eext_circle_object_item_value_min_max_set_get_p(void); -extern int ITc_efl_ext_eext_circle_object_mirrored_set_get_p(void); testcase tc_array[] = { {"ITc_eext_circle_object_scroller_add_p", ITc_eext_circle_object_scroller_add_p, ITs_efl_ext_startup, ITs_efl_ext_cleanup}, @@ -143,7 +142,6 @@ testcase tc_array[] = { {"ITc_eext_circle_object_item_angle_offset_set_get_p", ITc_eext_circle_object_item_angle_offset_set_get_p, ITs_efl_ext_startup, ITs_efl_ext_cleanup}, {"ITc_eext_circle_object_item_angle_min_max_set_get_p", ITc_eext_circle_object_item_angle_min_max_set_get_p, ITs_efl_ext_startup, ITs_efl_ext_cleanup}, {"ITc_eext_circle_object_item_value_min_max_set_get_p", ITc_eext_circle_object_item_value_min_max_set_get_p, ITs_efl_ext_startup, ITs_efl_ext_cleanup}, - {"ITc_efl_ext_eext_circle_object_mirrored_set_get_p",ITc_efl_ext_eext_circle_object_mirrored_set_get_p, ITs_efl_ext_startup, ITs_efl_ext_cleanup}, {NULL, NULL} };