From: hj kim Date: Fri, 26 Jun 2020 06:21:37 +0000 (+0900) Subject: [UTC][capi-media-controller][Non-ACR]Improve media-conroller TC X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcdf31425cf63222ebe5a991468d6fae4288369d;p=test%2Ftct%2Fnative%2Fapi.git [UTC][capi-media-controller][Non-ACR]Improve media-conroller TC Remove unnecessary codes Change-Id: I6680292197573480b941fb439fafde228794192e --- diff --git a/src/utc/media-controller/utc-media-controller.c b/src/utc/media-controller/utc-media-controller.c index 3bd87184f..2ea305b99 100755 --- a/src/utc/media-controller/utc-media-controller.c +++ b/src/utc/media-controller/utc-media-controller.c @@ -56,13 +56,6 @@ void utc_mc_playlist_startup(void) return; } - ret = mc_server_set_playback_position(g_mc_server, 10000); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_playback_position failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - ret = mc_server_set_playlist_item_info(g_mc_server, g_mc_test_playlist_name, g_mc_test_playlist_index); if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { FPRINTF("[%s:%d] mc_server_set_playlist_item_info failed (code: %d)\\n", __FILE__, __LINE__, ret); @@ -560,13 +553,6 @@ void utc_mc_metadata_startup(void) return; } - ret = mc_server_set_playback_position(g_mc_server, 10000); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_playback_position failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - ret = mc_server_update_playback_info(g_mc_server); if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { FPRINTF("[%s:%d] mc_server_update_playback_info failed (code: %d)\\n", __FILE__, __LINE__, ret); @@ -1031,55 +1017,6 @@ void utc_mc_playback_ability_startup(void) return; } - ret = mc_server_set_playback_position(g_mc_server, 10000); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_playback_position failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_set_playback_content_type(g_mc_server, g_mc_test_content_type); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_playback_content_type failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_set_content_age_rating(g_mc_server, g_mc_test_age_rating); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_content_age_rating failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_set_playlist_item_info(g_mc_server, g_mc_test_playlist_name, g_mc_test_playlist_index); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_set_playlist_item_info failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_update_playback_info(g_mc_server); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_update_playback_info failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_update_shuffle_mode(g_mc_server, MC_SHUFFLE_MODE_ON); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_update_shuffle_mode failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - - ret = mc_server_update_repeat_mode(g_mc_server, MC_REPEAT_MODE_ON); - if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { - FPRINTF("[%s:%d] mc_server_update_repeat_mode failed (code: %d)\\n", __FILE__, __LINE__, ret); - startup_ret = ret; - return; - } - ret = _mc_register_ability(g_mc_server); if ( ret != MEDIA_CONTROLLER_ERROR_NONE) { FPRINTF("[%s:%d] _mc_register_ability failed (code: %d)\\n", __FILE__, __LINE__, ret); @@ -1117,9 +1054,6 @@ void utc_mc_playback_ability_cleanup(void) g_free(g_mc_server_name); g_mc_server_name = NULL; - mc_search_destroy(g_mc_search); - g_mc_search = NULL; - return; } @@ -1307,7 +1241,9 @@ void utc_mc_search_startup(void) */ void utc_mc_search_cleanup(void) { - mc_search_destroy(g_mc_search); + if (g_mc_search) + mc_search_destroy(g_mc_search); + g_mc_search = NULL; return; @@ -1325,10 +1261,6 @@ int utc_mc_search_create_p(void) ret = mc_search_create(&g_mc_search); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1377,10 +1309,6 @@ int utc_mc_search_set_condition_p(void) ret = mc_search_set_condition(g_mc_search, g_mc_test_content_type, MC_SEARCH_TPO, g_mc_test_keywords[MC_SEARCH_TPO], NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1408,10 +1336,6 @@ int utc_mc_search_set_condition_n(void) ret = mc_search_set_condition(g_mc_search, g_mc_test_content_type, MC_SEARCH_TITLE, NULL, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1450,10 +1374,6 @@ int utc_mc_search_get_condition_count_p(void) assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(_cnt, 6); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1472,10 +1392,6 @@ int utc_mc_search_get_condition_count_n(void) ret = mc_search_get_condition_count(g_mc_search, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1514,10 +1430,6 @@ int utc_mc_search_foreach_condition_p(void) assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(cb_result, TRUE); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1539,10 +1451,6 @@ int utc_mc_search_foreach_condition_n(void) ret = mc_search_foreach_condition(g_mc_search, NULL, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1565,10 +1473,6 @@ int utc_mc_search_clone_p(void) ret = mc_search_destroy(search_dst); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; } @@ -1591,10 +1495,6 @@ int utc_mc_search_clone_n(void) ret = mc_search_clone(g_mc_search, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); - ret = mc_search_destroy(g_mc_search); - assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - g_mc_search = NULL; - return 0; }