From c7970b437e9e109ed9b4f32639d850944325ebab Mon Sep 17 00:00:00 2001 From: zhongyuan Date: Thu, 9 Jan 2020 14:58:14 +0800 Subject: [PATCH] [common][mediacontroller][improve 4 tc to avoid block issue] Change-Id: I825b7257da70909fd387b135fe8a3fa170ea76a7 --- ...ontrollerPlaybackInfoChangeCallback_onmetadatachanged.html | 4 +++- ...ontrollerPlaybackInfoChangeCallback_onplaybackchanged.html | 4 +++- ...rollerPlaybackInfoChangeCallback_onrepeatstatechanged.html | 4 +++- ...rollerPlaybackInfoChangeCallback_onshufflemodechanged.html | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onmetadatachanged.html b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onmetadatachanged.html index f78c0cdf7..4b65b2181 100755 --- a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onmetadatachanged.html +++ b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onmetadatachanged.html @@ -40,11 +40,13 @@ setup({timeout: 30000}); var t = async_test(document.title, {timeout: 30000}), mcServer, mcClient, mcServerInfo, playbackListener, watcherId, beforedata; t.step(function () { + add_result_callback(function(){ + mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); + }); playbackListener = { onmetadatachanged: t.step_func(function(metadata) { assert_type(metadata, "object", "metadata should be an object"); assert_equals(JSON.stringify(metadata), JSON.stringify(beforedata), "metadata should be updated"); - mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); t.done(); }) }; diff --git a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onplaybackchanged.html b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onplaybackchanged.html index f3d884c12..f46756f18 100755 --- a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onplaybackchanged.html +++ b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onplaybackchanged.html @@ -40,12 +40,14 @@ setup({timeout: 30000}); var t = async_test(document.title, {timeout: 30000}), mcServer, mcClient, mcServerInfo, playbackListener, watcherId; t.step(function () { + add_result_callback(function(){ + mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); + }); playbackListener = { onplaybackchanged: t.step_func(function(state, position) { assert_type(state, "string", "state should be a string"); assert_equals(state, "STOP", "state should be PLAY"); assert_type(position, "long", "position should be a long"); - mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); t.done(); }) }; diff --git a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onrepeatstatechanged.html b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onrepeatstatechanged.html index b907dc489..1305219af 100755 --- a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onrepeatstatechanged.html +++ b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onrepeatstatechanged.html @@ -40,11 +40,13 @@ setup({timeout: 30000}); var t = async_test(document.title, {timeout: 30000}), mcServer, mcClient, mcServerInfo, playbackListener, watcherId = null; t.step(function () { + add_result_callback(function(){ + mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); + }); playbackListener = { onrepeatstatechanged: t.step_func(function(state) { assert_type(state, "string", "state should be a string"); assert_equals(state, "REPEAT_ALL", "state should be updated"); - mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); t.done(); }) }; diff --git a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onshufflemodechanged.html b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onshufflemodechanged.html index bf86ac959..27cd41910 100755 --- a/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onshufflemodechanged.html +++ b/common/tct-mediacontroller-tizen-tests/mediacontroller/MediaControllerPlaybackInfoChangeCallback_onshufflemodechanged.html @@ -40,11 +40,13 @@ setup({timeout: 30000}); var t = async_test(document.title, {timeout: 30000}), mcServer, mcClient, mcServerInfo, playbackListener, watcherId, beforemode; t.step(function () { + add_result_callback(function(){ + mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); + }); playbackListener = { onshufflemodechanged: t.step_func(function(mode) { assert_type(mode, "boolean", "mode should be a boolean"); assert_equals(mode, !beforemode, "mode should be updated"); - mcServerInfo.playback.removePlaybackInfoChangeListener(watcherId); t.done(); }) }; -- 2.34.1