From: jiyong.min <jiyong.min@samsung.com>
Date: Tue, 8 Oct 2019 07:21:29 +0000 (+0900)
Subject: [UTC][capi-media-controller][Non-ACR][Fix bug and optimize ability setting]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=963556cf175efd13ddf240c4beefedd27801bc5f;p=test%2Ftct%2Fnative%2Fapi.git

[UTC][capi-media-controller][Non-ACR][Fix bug and optimize ability setting]

Change-Id: Ibdc9a97e453f224b0b908f14647e004005e33185
---

diff --git a/src/utc/media-controller/utc-media-controller-common.c b/src/utc/media-controller/utc-media-controller-common.c
index ae28a4eb2..627c8f259 100755
--- a/src/utc/media-controller/utc-media-controller-common.c
+++ b/src/utc/media-controller/utc-media-controller-common.c
@@ -122,10 +122,10 @@ bool _mc_activated_server_cb(const char *server_name, void *user_data)
 		if(get_name != NULL)
 			*get_name = g_strdup(server_name);
 
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 bool _mc_activated_client_cb(const char *client_name, void *user_data)
@@ -137,10 +137,10 @@ bool _mc_activated_client_cb(const char *client_name, void *user_data)
 		if(get_name != NULL)
 			*get_name = g_strdup(client_name);
 
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 bool _mc_subscribed_server_cb(const char *server_name, void *user_data)
@@ -172,11 +172,11 @@ bool _mc_playlist_list_cb(mc_playlist_h playlist, void *user_data)
 	if(g_strcmp0(playlist_name, g_mc_test_playlist_name)) {
 		FPRINTF("[%d:%s] wrong playlist name [%s][%s]\\n", __LINE__, __FUNCTION__, playlist_name, g_mc_test_playlist_name);
 		free(playlist_name);
-		*result = FALSE;
+		*result = false;
 		return false;
 	}
 
-	*result = TRUE;
+	*result = true;
 
 	return true;
 }
@@ -194,11 +194,11 @@ bool _mc_search_condition_cb(mc_content_type_e content_type, mc_search_category_
 
 	if (g_strcmp0(search_keyword, g_mc_test_keywords[category])) {
 		FPRINTF("[%d:%s] wrong search keyword [%s][%s]\\n", __LINE__, __FUNCTION__, search_keyword, g_mc_test_keywords[category]);
-		*result = FALSE;
+		*result = false;
 		return false;
 	}
 
-	*result = TRUE;
+	*result = true;
 	return true;
 }
 
@@ -213,7 +213,7 @@ bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data
 	if (index != NULL) {
 		if(strcmp(index, g_mc_test_playlist_idx)) {
 			FPRINTF("[%d:%s] wrong playlist index. expect [%s] but [%s]\\n", __LINE__, __FUNCTION__, g_mc_test_playlist_idx, index);
-			return FALSE;
+			return false;
 		}
 
 		ret = mc_metadata_get(meta, MC_META_MEDIA_TITLE, &value);
@@ -224,17 +224,17 @@ bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data
 			if(strcmp(value, g_mc_test_playlist_metadata[0])) {
 				FPRINTF("[%d:%s] fail mc_metadata_get [%s]\\n", __LINE__, __FUNCTION__, value);
 				free(value);
-				return FALSE;
+				return false;
 			}
 			free(value);
-			*result = TRUE;
+			*result = true;
 		}
 	} else {
 		FPRINTF("[%d:%s] wrong index\\n", __LINE__, __FUNCTION__);
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 
diff --git a/src/utc/media-controller/utc-media-controller-common.h b/src/utc/media-controller/utc-media-controller-common.h
index 071ea987c..d9f6a5ba6 100755
--- a/src/utc/media-controller/utc-media-controller-common.h
+++ b/src/utc/media-controller/utc-media-controller-common.h
@@ -89,6 +89,7 @@ static const mc_content_type_e g_mc_test_content_type = MC_CONTENT_TYPE_MUSIC;
 static const mc_content_age_rating_e g_mc_test_age_rating = MC_CONTENT_RATING_18_PLUS;
 static const char *g_mc_test_icon_path = "test.jpg";
 static const mc_ability_support_e g_mc_test_ability = MC_ABILITY_SUPPORTED_YES;
+static const mc_ability_support_e g_mc_test_ability_n = MC_ABILITY_SUPPORTED_NO;
 
 static const char *g_mc_test_keywords[] = {
 	"test_keyword",
diff --git a/src/utc/media-controller/utc-media-controller.c b/src/utc/media-controller/utc-media-controller.c
index 39d792f4e..5caeaf1a2 100755
--- a/src/utc/media-controller/utc-media-controller.c
+++ b/src/utc/media-controller/utc-media-controller.c
@@ -216,31 +216,6 @@ static int __mc_verify_metadata(mc_metadata_h metadata)
 	return MEDIA_CONTROLLER_ERROR_NONE;
 }
 
-static int __mc_server_set_ability(mc_ability_support_e support)
-{
-	int ret = MEDIA_CONTROLLER_ERROR_NONE;
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SHUFFLE, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_REPEAT, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYBACK_POSITION, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYLIST, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SEARCH, support);
-	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
-	return ret;
-}
-
 /**
  * @function		utc_media_controller_startup
  * @description		Called before each test
@@ -251,7 +226,7 @@ void utc_media_controller_startup(void)
 {
 	mc_error_e ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	// server start
+	// start server app
 	ret = mc_server_create(&g_mc_server);
 	if (ret != MEDIA_CONTROLLER_ERROR_NONE)
 	{
@@ -260,7 +235,7 @@ void utc_media_controller_startup(void)
 		return;
 	}
 
-	// server initialize data, it will be removed by destroying server when test finish
+	// initialize server data, it will be removed by destroying server when test finish
 	ret = mc_server_set_playback_state(g_mc_server, MC_PLAYBACK_STATE_PLAYING);
 	if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
 		FPRINTF("[%s:%d] mc_server_set_playback_state failed (code: %d)\\n", __FILE__, __LINE__, ret);
@@ -380,14 +355,7 @@ void utc_media_controller_startup(void)
 		return;
 	}
 
-	ret = __mc_server_set_ability(MC_ABILITY_SUPPORTED_NO);
-	if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-		FPRINTF("[%s:%d] __mc_server_set_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
-		startup_ret = ret;
-		return;
-	}
-
-	// client start
+	// start client app
 	ret = mc_client_create(&g_mc_client);
 	if (ret != MEDIA_CONTROLLER_ERROR_NONE)
 	{
@@ -2239,7 +2207,7 @@ int utc_mc_server_send_cmd_reply_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
@@ -3788,7 +3756,7 @@ int utc_mc_client_set_cmd_reply_received_cb_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
@@ -4955,7 +4923,7 @@ int utc_mc_client_get_server_shuffle_ability_support_p(void)
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 	mc_ability_support_e supported = MC_ABILITY_SUPPORTED_UNDECIDED;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SHUFFLE, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
@@ -5007,7 +4975,7 @@ int utc_mc_client_get_server_repeat_ability_support_p(void)
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 	mc_ability_support_e supported = MC_ABILITY_SUPPORTED_UNDECIDED;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_REPEAT, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
@@ -5059,7 +5027,22 @@ int utc_mc_client_get_server_ability_support_p(void)
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 	mc_ability_support_e supported = MC_ABILITY_SUPPORTED_UNDECIDED;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SHUFFLE, g_mc_test_ability);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_REPEAT, g_mc_test_ability);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYBACK_POSITION, g_mc_test_ability);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYLIST, g_mc_test_ability);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, g_mc_test_ability);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SEARCH, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
@@ -5566,7 +5549,7 @@ int utc_mc_client_send_playback_position_cmd_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYBACK_POSITION, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_playback_position_cmd_received_cb(g_mc_server, _mc_server_playback_position_cmd_received_cb, &g_request_id);
@@ -5593,6 +5576,9 @@ int utc_mc_client_send_playback_position_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYBACK_POSITION, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5619,7 +5605,7 @@ int utc_mc_client_send_shuffle_mode_cmd_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SHUFFLE, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_shuffle_mode_cmd_received_cb(g_mc_server, _mc_server_shuffle_mode_cmd_received_cb, &g_request_id);
@@ -5646,6 +5632,9 @@ int utc_mc_client_send_shuffle_mode_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SHUFFLE, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5675,7 +5664,7 @@ int utc_mc_client_send_repeat_mode_cmd_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_REPEAT, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_repeat_mode_cmd_received_cb(g_mc_server, _mc_server_repeat_mode_cmd_received_cb, &g_request_id);
@@ -5702,6 +5691,9 @@ int utc_mc_client_send_repeat_mode_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_REPEAT, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5731,7 +5723,7 @@ int utc_mc_client_send_playlist_cmd_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYLIST, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_playlist_cmd_received_cb(g_mc_server, _mc_server_playlist_cmd_received_cb, &g_request_id);
@@ -5758,6 +5750,9 @@ int utc_mc_client_send_playlist_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_PLAYLIST, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5790,7 +5785,7 @@ int utc_mc_client_send_custom_cmd_p(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_custom_cmd_received_cb(g_mc_server, _mc_server_custom_cmd_received_cb, NULL);
@@ -5817,6 +5812,9 @@ int utc_mc_client_send_custom_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_CLIENT_CUSTOM, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5845,7 +5843,7 @@ int utc_mc_client_send_search_cmd_p(void)
 	mc_search_h get_search = NULL;
 	gboolean cb_result = FALSE;
 
-	ret = __mc_server_set_ability(g_mc_test_ability);
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SEARCH, g_mc_test_ability);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
 	ret = mc_server_set_search_cmd_received_cb(g_mc_server, _mc_server_search_cmd_received_cb, &get_search);
@@ -5900,6 +5898,9 @@ int utc_mc_client_send_search_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SEARCH, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -5960,6 +5961,9 @@ int utc_mc_client_send_subtitles_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_SUBTITLES, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -6014,6 +6018,9 @@ int utc_mc_client_send_360_mode_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_ability_support(g_mc_server, MC_ABILITY_360_MODE, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -6069,6 +6076,10 @@ int utc_mc_client_send_display_mode_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_display_mode_ability(g_mc_server,
+		MC_DISPLAY_MODE_LETTER_BOX | MC_DISPLAY_MODE_ORIGIN_SIZE | MC_DISPLAY_MODE_FULL_SCREEN | MC_DISPLAY_MODE_CROPPED_FULL, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -6127,6 +6138,10 @@ int utc_mc_client_send_display_rotation_cmd_n(void)
 
 	int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+	ret = mc_server_set_display_rotation_ability(g_mc_server,
+		MC_DISPLAY_ROTATION_NONE | MC_DISPLAY_ROTATION_90 | MC_DISPLAY_ROTATION_180 | MC_DISPLAY_ROTATION_270, g_mc_test_ability_n);
+	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
 	ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state);
 	assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);