From: JaeKyung Lee Date: Mon, 11 Jul 2016 11:35:49 +0000 (-0700) Subject: Revert "[CTC][Platform-permission][ACR-571][Added Test cases for new module D2D... X-Git-Tag: Public_Final_RC6~601^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8afd2dd51b72c810131281fb4910c8ca089d9808;p=test%2Ftct%2Fnative%2Fapi.git Revert "[CTC][Platform-permission][ACR-571][Added Test cases for new module D2D in CTC]" This reverts commit 234ae042c834f92d58adc23f84d1c7529aa28d65. Change-Id: I9e714e9d89e8b06642d79dcc3d51cf25b55b44f7 --- diff --git a/packaging/ctc/native-platform-permission-ctc.spec b/packaging/ctc/native-platform-permission-ctc.spec index 604c791..4c4491c 100755 --- a/packaging/ctc/native-platform-permission-ctc.spec +++ b/packaging/ctc/native-platform-permission-ctc.spec @@ -73,7 +73,6 @@ BuildRequires: pkgconfig(stt) BuildRequires: cmake BuildRequires: pkgconfig(capi-network-http) BuildRequires: pkgconfig(capi-media-streamer) -BuildRequires: pkgconfig(d2d-conv-manager) %if %{?DEVICE_BUILD_TYPE_MOBILE:1}0 BuildRequires: pkgconfig(capi-messaging-email) BuildRequires: pkgconfig(contacts-service2) diff --git a/src/ctc/platform-permission/CMakeLists.txt b/src/ctc/platform-permission/CMakeLists.txt index bf9b711..3075c1b 100755 --- a/src/ctc/platform-permission/CMakeLists.txt +++ b/src/ctc/platform-permission/CMakeLists.txt @@ -61,7 +61,7 @@ SET(TC_SOURCES CTs-platform-permission-phonenumber-utils.c CTs-platform-permission-media-streamer.c CTs-platform-permission-http.c - CTs-platform-permission-d2d-conv-manager.c + ) ENDIF() @@ -95,7 +95,6 @@ SET(TC_SOURCES CTs-platform-permission-wifi.c CTs-platform-permission-http.c CTs-platform-permission-media-streamer.c - CTs-platform-permission-d2d-conv-manager.c ) ENDIF() @@ -118,7 +117,6 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED appcore-common appcore-efl capi-base-common - d2d-conv-manager core-sync-client efl-extension stt @@ -218,7 +216,6 @@ PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED capi-network-wifi capi-web-url-download capi-system-device - d2d-conv-manager tapi capi-telephony capi-appfw-package-manager diff --git a/src/ctc/platform-permission/CTs-platform-permission-d2d-conv-manager.c b/src/ctc/platform-permission/CTs-platform-permission-d2d-conv-manager.c deleted file mode 100755 index 84bb3b2..0000000 --- a/src/ctc/platform-permission/CTs-platform-permission-d2d-conv-manager.c +++ /dev/null @@ -1,133 +0,0 @@ -#include "CTs-platform-permission-common.h" -#include -#include - -#include - -#define D2D_CONV_FEATURE "http://tizen.org/feature/convergence.d2d" - -bool g_bIsD2dConvFeatureSupported; -char* D2dConvGetError(int nRet); - - -/** -* @function D2dConvGetError -* @description Maps error enums to string values -* @parameter nRet : error code returned -* @return error string -*/ -char* D2dConvGetError(int nRet) -{ - char *szErrorVal = NULL; - switch(nRet) - { - case CONV_ERROR_NONE: szErrorVal = "CONV_ERROR_NONE"; break; - case CONV_ERROR_INVALID_PARAMETER: szErrorVal = "CONV_ERROR_INVALID_PARAMETER"; break; - case CONV_ERROR_NOT_SUPPORTED: szErrorVal = "CONV_ERROR_NOT_SUPPORTED"; break; - case CONV_ERROR_INVALID_OPERATION: szErrorVal = "CONV_ERROR_INVALID_OPERATION"; break; - case CONV_ERROR_OUT_OF_MEMORY: szErrorVal = "CONV_ERROR_OUT_OF_MEMORY"; break; - case CONV_ERROR_PERMISSION_DENIED: szErrorVal = "CONV_ERROR_PERMISSION_DENIED"; break; - case CONV_ERROR_NO_DATA: szErrorVal = "CONV_ERROR_NO_DATA"; break; - default: szErrorVal = "Unknown Error"; break; - } - return szErrorVal; -} - - -/** -* @function DiscoveryCB -* @description Callback function to receive discovered device information -* @parameter conv_device_h device handle, conv_discovery_result_e result, void *user_data : The user data passed from the for each function -* @return NA -*/ -void DiscoveryCB(conv_device_h device_handle, conv_discovery_result_e result, void *user_data) -{ - FPRINTF("[Line : %d][%s] Callback DiscoveryCB hit \\n", __LINE__, API_NAMESPACE); - return ; -} -//& set: D2dConv-manager - -/** @addtogroup ctc-d2d-conv-manager -* @ingroup ctc -* @{ -*/ - -/** - * @function CTs_platform_permission_d2d_conv_manager_startup - * @description Called before each test - * @parameter NA - * @return NA - */ - -void CTs_platform_permission_d2d_conv_manager_startup(void) -{ - struct stat stBuff; - if ( stat(ERR_LOG, &stBuff) == 0 ) - { - remove(ERR_LOG); - } -#if DEBUG - FPRINTF("[Line : %d][%s] TEST SUIT start-up: CTs_platform_permission_d2d_conv_manager_startup\\n", __LINE__, API_NAMESPACE); -#endif - - g_bIsD2dConvFeatureSupported = true; - IS_FEATURE_SUPPORTED(D2D_CONV_FEATURE, g_bIsD2dConvFeatureSupported, API_NAMESPACE); - return; -} - - -/** - * @functio CTs_platform_permission_d2d_conv_manager_cleanup - * @description Called after each test - * @parameter NA - * @return NA - */ -void CTs_platform_permission_d2d_conv_manager_cleanup(void) -{ -#if DEBUG - FPRINTF("[Line : %d][%s] TEST SUIT clean-up: CTs_platform_permission_d2d_conv_manager_cleanup\\n", __LINE__, API_NAMESPACE); -#endif - return; -} - -//& purpose:To Check Privilege -//& type: auto -/** -* @testcase CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start -* @since_tizen 3.0 -* @author SRID(manoj.g2) -* @reviewer SRID(shobhit.v) -* @type auto -* @description Called when a nearby device which provides D2D services has been discovered. -* @scenario conv_discovery_start, conv_discovery_stop -* @apicovered conv_discovery_start, conv_discovery_stop -* @passcase If target privileged API returns TIZEN_ERROR_PERMISSION_DENIED -* @failcase If target privileged API does not return TIZEN_ERROR_PERMISSION_DENIED or non-privileged -* @precondition None -* @postcondition None -*/ -int CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start(void) -{ - START_TEST; - int nTimeoutSec = 10; - conv_h hConvHandle = NULL; - - if ( !g_bIsD2dConvFeatureSupported ) - { - FPRINTF("[Line : %d][%s] Feature %s is not supported\\n", __LINE__, API_NAMESPACE,D2D_CONV_FEATURE); - return 0; - } - //Target API - int nRet = conv_create(&hConvHandle); - PRINT_RESULT(CONV_ERROR_NONE, nRet," conv_create", D2dConvGetError(nRet)); - CHECK_HANDLE(hConvHandle,"conv_create"); - - nRet = conv_discovery_start(hConvHandle, nTimeoutSec, DiscoveryCB, NULL); - PRINT_RESULT_CLEANUP(TIZEN_ERROR_PERMISSION_DENIED, nRet,"conv_discovery_start", D2dConvGetError(nRet),conv_destroy(hConvHandle)); - - conv_discovery_stop(hConvHandle); - conv_destroy(hConvHandle); - - return 0; -} - diff --git a/src/ctc/platform-permission/tct-platform-permission-native_mobile.h b/src/ctc/platform-permission/tct-platform-permission-native_mobile.h index 7ae770b..7584d5c 100755 --- a/src/ctc/platform-permission/tct-platform-permission-native_mobile.h +++ b/src/ctc/platform-permission/tct-platform-permission-native_mobile.h @@ -47,8 +47,6 @@ extern void CTs_platform_permission_datacontrol_startup(void); extern void CTs_platform_permission_datacontrol_cleanup(void); extern void CTs_platform_permission_device_startup(void); extern void CTs_platform_permission_device_cleanup(void); -extern void CTs_platform_permission_d2d_conv_manager_startup(void); -extern void CTs_platform_permission_d2d_conv_manager_cleanup(void); extern void CTs_platform_permission_email_startup(void); extern void CTs_platform_permission_email_cleanup(void); extern void CTs_platform_permission_ime_startup(void); @@ -238,7 +236,6 @@ extern int CTc_Device_PrivilegeLed_play_stop(void); extern int CTc_Device_PrivilegePower_request_release(void); extern int CTc_Device_Privilege_ir_is_available(void); extern int CTc_Device_Privilege_ir_transmit(void); -extern int CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start(void); extern int CTc_Email_PrivilegeMessagingEmail_create_message(void); extern int CTc_IME_PrivilegeIME_IME_Run(void); extern int CTc_IME_PrivilegeIME_IME_Event_Set_Focus_In_cb(void); @@ -684,9 +681,9 @@ testcase tc_array[] = { {"CTc_PhoneNumber_PrivilegePhoneNumberUtils_get_normalized_number", CTc_PhoneNumber_PrivilegePhoneNumberUtils_get_normalized_number, CTs_platform_permission_phonenumber_utils_startup, CTs_platform_permission_phonenumber_utils_cleanup}, {"CTc_MediaStreamer_PrivilegeMediaStorage_node_create_src", CTc_MediaStreamer_PrivilegeMediaStorage_node_create_src, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, {"CTc_MediaStreamer_PrivilegeMediaStorage_node_create_sink", CTc_MediaStreamer_PrivilegeMediaStorage_node_create_sink, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, + {"CTc_MediaStreamer_PrivilegeMediaStorage_node_set_param", CTc_MediaStreamer_PrivilegeMediaStorage_node_set_param, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, {"CTc_MediaStreamer_PrivilegeMediaStorage_node_set_params", CTc_MediaStreamer_PrivilegeMediaStorage_node_set_params, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, - {"CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start", CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start, CTs_platform_permission_d2d_conv_manager_startup, CTs_platform_permission_d2d_conv_manager_cleanup}, {NULL, NULL} }; diff --git a/src/ctc/platform-permission/tct-platform-permission-native_wearable.h b/src/ctc/platform-permission/tct-platform-permission-native_wearable.h index 81d73d9..6ff4a8f 100755 --- a/src/ctc/platform-permission/tct-platform-permission-native_wearable.h +++ b/src/ctc/platform-permission/tct-platform-permission-native_wearable.h @@ -37,8 +37,6 @@ extern void CTs_platform_permission_datacontrol_startup(void); extern void CTs_platform_permission_datacontrol_cleanup(void); extern void CTs_platform_permission_device_startup(void); extern void CTs_platform_permission_device_cleanup(void); -extern void CTs_platform_permission_d2d_conv_manager_startup(void); -extern void CTs_platform_permission_d2d_conv_manager_cleanup(void); extern void CTs_platform_permission_locationmanager_startup(void); extern void CTs_platform_permission_locationmanager_cleanup(void); extern void CTs_platform_permission_mediacontent_startup(void); @@ -127,7 +125,6 @@ extern int CTc_Device_PrivilegeFlash_get_brightness(void); extern int CTc_Device_PrivilegeHaptic_open(void); extern int CTc_Device_PrivilegeLed_play_stop(void); extern int CTc_Device_PrivilegePower_request_release(void); -extern int CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start(void); extern int CTc_Location_PrivilegeLocation_start(void); extern int CTc_Location_PrivilegeLocation_set_satelite_updated_cb(void); extern int CTc_Location_PrivilegeLocation_enable_mock_location(void); @@ -394,7 +391,6 @@ testcase tc_array[] = { {"CTc_MediaStreamer_PrivilegeMediaStorage_node_set_param", CTc_MediaStreamer_PrivilegeMediaStorage_node_set_param, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, {"CTc_MediaStreamer_PrivilegeMediaStorage_node_set_params", CTc_MediaStreamer_PrivilegeMediaStorage_node_set_params, CTs_platform_permission_media_streamer_startup, CTs_platform_permission_media_streamer_cleanup}, - {"CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start", CTc_D2D_PrivilegeD2DConv_d2d_conv_discovery_start, CTs_platform_permission_d2d_conv_manager_startup, CTs_platform_permission_d2d_conv_manager_cleanup}, {NULL, NULL} };