[UTC][capi-media-controller][Non-ACR][bug fix. modified incorrect behavior for TCs]

Change-Id: Iac9aef74a30f134a80955c5781188ecf09dc67b6

diff --git a/src/utc/media-controller/utc-media-controller-client.c b/src/utc/media-controller/utc-media-controller-client.c
index 71136e6cd3b652ff7580c082c0ac6846e68e2d43..13512d80aab9b342a63095c4e8fcc3c910387d7c 100644 (file)
--- a/src/utc/media-controller/utc-media-controller-client.c
+++ b/src/utc/media-controller/utc-media-controller-client.c
@@ -258,9 +258,6 @@ int utc_mc_client_set_server_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-       ret = mc_client_unset_server_updated_cb(g_mc_client);
-       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
        ret = mc_client_set_server_updated_cb(g_mc_client, _mc_client_server_state_updated_cb, NULL);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -283,9 +280,6 @@ int utc_mc_client_set_server_updated_cb_n(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
-       ret = mc_client_unset_server_updated_cb(g_mc_client);
-       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
-
        ret = mc_client_set_server_updated_cb(NULL, _mc_client_server_state_updated_cb, NULL);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER);
 
@@ -306,6 +300,9 @@ int utc_mc_client_unset_server_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_server_updated_cb(g_mc_client, _mc_client_server_state_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_server_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -379,6 +376,9 @@ int utc_mc_client_unset_playback_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_playback_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -456,6 +456,9 @@ int utc_mc_client_unset_metadata_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_client_metadata_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_metadata_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -529,6 +532,9 @@ int utc_mc_client_unset_shuffle_mode_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_client_shuffle_mode_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_shuffle_mode_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -602,6 +608,9 @@ int utc_mc_client_unset_repeat_mode_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_client_repeat_mode_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_repeat_mode_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -675,6 +684,9 @@ int utc_mc_client_unset_playback_ability_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_playback_ability_updated_cb(g_mc_client, _mc_client_playback_ability_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_playback_ability_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -748,6 +760,9 @@ int utc_mc_client_unset_shuffle_ability_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, _mc_client_shuffle_ability_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_shuffle_ability_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -820,6 +835,9 @@ int utc_mc_client_unset_repeat_ability_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, _mc_client_repeat_ability_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_repeat_ability_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -892,6 +910,9 @@ int utc_mc_client_unset_ability_support_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_client_ability_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_ability_support_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -1429,6 +1450,9 @@ int utc_mc_client_unset_display_mode_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_display_mode_updated_cb(g_mc_client, _mc_client_display_mode_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_display_mode_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
 
@@ -1500,6 +1524,9 @@ int utc_mc_client_unset_display_rotation_updated_cb_p(void)
 
        int ret = MEDIA_CONTROLLER_ERROR_NONE;
 
+       ret = mc_client_set_display_rotation_updated_cb(g_mc_client, _mc_client_display_rotation_updated_cb, NULL);
+       assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);
+
        ret = mc_client_unset_display_rotation_updated_cb(g_mc_client);
        assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE);