From: Priya Kohli Date: Wed, 13 Feb 2019 10:19:29 +0000 (+0530) Subject: [ITC][media-controller][Non-ACR][Fixed two failing APIs] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F32%2F199632%2F7;p=test%2Ftct%2Fnative%2Fapi.git [ITC][media-controller][Non-ACR][Fixed two failing APIs] Change-Id: I074398c5d44eeaf53802494d0be5fe214dfc06ae Signed-off-by: Priya Kohli --- diff --git a/src/itc/media-controller/ITs-media-controller-client.c b/src/itc/media-controller/ITs-media-controller-client.c index be0be7096..53ac8edcb 100755 --- a/src/itc/media-controller/ITs-media-controller-client.c +++ b/src/itc/media-controller/ITs-media-controller-client.c @@ -436,6 +436,20 @@ void McServerSearchCmdReceivedCallBack(const char *client_name, const char *requ return; } +/* + * @function ServerCustomCmdReceivedCallback + * @description Callback Function + * @parameter const char client_name, const char *request_id, const char *command, bundle *data, void *user_data + * @return NA + */ +void ServerCustomCmdReceivedCallback(const char client_name, const char *request_id, const char *command, bundle *data, void *user_data) +{ +#if DEBUG + FPRINTF("[Line : %d][%s] %s Callback Invoked\\n", __LINE__, API_NAMESPACE, "ServerCustomCmdReceivedCallback"); +#endif + g_CallBackHit = true; + QuitGmainLoop(); +} /*****************************************************Callback End*****************************************************/ /** @@ -1373,7 +1387,7 @@ int ITc_mc_client_send_custom_cmd_p(void) * @since_tizen 4.0 * @description Sets the callback for receiving the result of the command from the media controller server. * @scenario The media controller client which calls this function will receives the result of the command from all media controller servers. - * @apicovered mc_client_set_cmd_reply_received_cb, mc_client_send_custom_cmd, mc_client_unset_cmd_reply_received_cb + * @apicovered mc_client_set_cmd_reply_received_cb, mc_client_send_custom_cmd, mc_client_unset_cmd_reply_received_cb, mc_server_set_custom_cmd_received_cb, mc_server_send_cmd_reply, mc_server_unset_custom_cmd_received_cb * @passcase If mc_client_set_cmd_reply_received_cb, mc_client_send_custom_cmd, mc_client_unset_cmd_reply_received_cb returns MEDIA_CONTROLLER_ERROR_NONE * @failcase If Precondition API or Target API Fails * @precondition NA @@ -1388,6 +1402,8 @@ int ITc_mc_client_set_unset_cmd_reply_received_cb_p(void) int nRet = -1; bundle *bundle_data = NULL; void *user_data = NULL; + void *usr_data = NULL; + int nCode = 0; nRet = GetCompleteServerInfo(); PRINT_RESULT(MEDIA_CONTROLLER_ERROR_NONE, nRet, "GetCompleteServerInfo", "Return Value Not Correct"); @@ -1395,14 +1411,29 @@ int ITc_mc_client_set_unset_cmd_reply_received_cb_p(void) nRet = mc_client_set_cmd_reply_received_cb(g_hMcClient, ClientCustomComandReplyCallBack, user_data); PRINT_RESULT(MEDIA_CONTROLLER_ERROR_NONE, nRet, "ClientCustomComandReplyCallBack", MediaControllerGetError(nRet)); + nRet = mc_server_set_custom_cmd_received_cb(g_hMcServer, ServerCustomCmdReceivedCallback, usr_data); + PRINT_RESULT_CLEANUP(MEDIA_CONTROLLER_ERROR_NONE, nRet, "ServerCustomCmdReceivedCallback", MediaControllerGetError(nRet), mc_client_unset_cmd_reply_received_cb(g_hMcClient)); + + g_CallBackHit = false; nRet = mc_client_send_custom_cmd(g_hMcClient, g_szServerName, TESTCOMMAND, bundle_data, g_request_id); - PRINT_RESULT_CLEANUP(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_client_send_custom_cmd", MediaControllerGetError(nRet), mc_client_unset_cmd_reply_received_cb(g_hMcClient)); + PRINT_RESULT_CLEANUP(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_client_send_custom_cmd", MediaControllerGetError(nRet), mc_client_unset_cmd_reply_received_cb(g_hMcClient); mc_server_unset_custom_cmd_received_cb(g_hMcServer)); IterateGmainLoop(); - PRINT_RESULT_CLEANUP(true, g_CallBackHit, "mc_client_set_cmd_reply_received_cb", "CallBack Not Invoked", mc_client_unset_cmd_reply_received_cb(g_hMcClient)); + PRINT_RESULT_CLEANUP(true, g_CallBackHit, "ServerCustomCmdReceivedCallback", "CallBack Not Invoked", mc_client_unset_cmd_reply_received_cb(g_hMcClient); mc_server_unset_custom_cmd_received_cb(g_hMcServer)); + + g_CallBackHit = false; + nRet = mc_server_send_cmd_reply(g_hMcServer, g_szClientName, g_request_id, nCode, bundle_data); + PRINT_RESULT_CLEANUP(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_server_send_cmd_reply", MediaControllerGetError(nRet), bundle_free(bundle_data); mc_client_unset_cmd_reply_received_cb(g_hMcClient); mc_server_unset_custom_cmd_received_cb(g_hMcServer)); + bundle_free(bundle_data); + + IterateGmainLoop(); + PRINT_RESULT_CLEANUP(true, g_CallBackHit, "ClientCustomComandReplyCallBack", "CallBack Not Invoked", mc_client_unset_cmd_reply_received_cb(g_hMcClient); mc_server_unset_custom_cmd_received_cb(g_hMcServer)); nRet = mc_client_unset_cmd_reply_received_cb(g_hMcClient); - PRINT_RESULT(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_client_unset_cmd_reply_received_cb", MediaControllerGetError(nRet)); + PRINT_RESULT_CLEANUP(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_client_unset_cmd_reply_received_cb", MediaControllerGetError(nRet), mc_server_unset_custom_cmd_received_cb(g_hMcServer)); + + nRet = mc_server_unset_custom_cmd_received_cb(g_hMcServer); + PRINT_RESULT_NORETURN(MEDIA_CONTROLLER_ERROR_NONE, nRet, "mc_server_unset_custom_cmd_received_cb", MediaControllerGetError(nRet)); return 0; } @@ -1415,7 +1446,7 @@ int ITc_mc_client_set_unset_cmd_reply_received_cb_p(void) * @since_tizen 4.0 * @description Sets and unsets the event callback for media controller client, and then checks if the callback is hit by sending event reply. * @scenario Sets callback with mc_client_set_custom_event_received_cb, checks with mc_client_send_event_reply and then unsets with mc_client_unset_custom_event_received_cb. - * @apicovered mc_client_set_custom_event_received_cb, mc_client_unset_custom_event_received_cb, mc_client_send_event_reply. + * @apicovered mc_client_set_custom_event_received_cb, mc_server_set_event_reply_received_cb, mc_client_unset_custom_event_received_cb, mc_client_send_event_reply, mc_server_foreach_client, mc_server_send_custom_event, mc_server_unset_event_reply_received_cb. * @passcase If mc_client_set_custom_event_received_cb, mc_client_send_event_reply and mc_client_unset_custom_event_received_cb return MEDIA_CONTROLLER_ERROR_NONE * @failcase If Precondition API or Target API Fails * @precondition NA @@ -1439,25 +1470,33 @@ int ITc_mc_client_set_unset_cb_send_event_reply_p(void) nRet = mc_client_set_custom_event_received_cb(g_hMcClient, EventReceivedCallback, NULL); PRINT_RESULT(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_client_set_custom_event_received_cb", MediaControllerGetError(nRet)); + nRet = mc_server_set_event_reply_received_cb(g_hMcServer, EventReceivedCallback, NULL); + PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_set_event_reply_received_cb", MediaControllerGetError(nRet), mc_client_unset_custom_event_received_cb(g_hMcClient)); + nRet = mc_server_foreach_client(g_hMcServer, McActivatedClientCb, &pszClientName); - PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_foreach_client", MediaControllerGetError(nRet), mc_client_unset_custom_event_received_cb(g_hMcClient)); - CHECK_HANDLE_CLEANUP(pszClientName, "mc_server_foreach_client", mc_client_unset_custom_event_received_cb(g_hMcClient)); + PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_foreach_client", MediaControllerGetError(nRet), mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); + CHECK_HANDLE_CLEANUP(pszClientName, "mc_server_foreach_client", mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); + g_CallBackHit = false; nRet = mc_server_send_custom_event(g_hMcServer, pszClientName, pszEvent, NULL, &pszRequestID); - PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_send_custom_event", MediaControllerGetError(nRet), FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient)); + PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_send_custom_event", MediaControllerGetError(nRet), FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); CHECK_HANDLE_CLEANUP(pszRequestID, "mc_server_send_custom_event", FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient)); - g_CallBackHit = false; IterateGmainLoop(); + PRINT_RESULT_CLEANUP(g_CallBackHit, true, "EventReceivedCallback", MediaControllerGetError(nRet), FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); + g_CallBackHit = false; nRet = mc_client_send_event_reply(g_hMcClient, pszClientName, pszRequestID, 0, NULL); - PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_client_send_event_reply", MediaControllerGetError(nRet), FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient)); - IterateGmainLoop(); + PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_client_send_event_reply", MediaControllerGetError(nRet), FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); - PRINT_RESULT_CLEANUP(g_CallBackHit, true, "mc_client_send_event_reply", "false", FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient)); + IterateGmainLoop(); + PRINT_RESULT_CLEANUP(g_CallBackHit, true, "EventReceivedCallback", "false", FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_client_unset_custom_event_received_cb(g_hMcClient); mc_server_unset_event_reply_received_cb(g_hMcServer)); nRet = mc_client_unset_custom_event_received_cb(g_hMcClient); - PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_client_unset_event_reply_received_cb", MediaControllerGetError(nRet), FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName)); + PRINT_RESULT_CLEANUP(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_client_unset_event_reply_received_cb", MediaControllerGetError(nRet), FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName); mc_server_unset_event_reply_received_cb(g_hMcServer)); + + nRet = mc_server_unset_event_reply_received_cb(g_hMcServer); + PRINT_RESULT_NORETURN(nRet, MEDIA_CONTROLLER_ERROR_NONE, "mc_server_unset_event_reply_received_cb", MediaControllerGetError(nRet)); FREE_MEMORY(pszRequestID); FREE_MEMORY(pszClientName);