From b82fbab1d13d06c9cd5a9ab4e7a574ebd9af3a1c Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Fri, 26 Mar 2021 16:39:03 +0900 Subject: [PATCH] [MediaController][Non-ACR] Fix deadlock issue Change-Id: I5b8685bd43dc3bc09b215b333f437f49de67164a --- .../testcase/TSMediaControlServer.cs | 14 ++++---------- .../testcase/TSMediaController.cs | 18 ++++++------------ 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaControlServer.cs b/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaControlServer.cs index f8d1f41..ffba1dc 100644 --- a/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaControlServer.cs +++ b/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaControlServer.cs @@ -606,11 +606,8 @@ namespace Tizen.Multimedia.Remoting.Tests { MediaControlServer.CustomCommandReceived += eventHandler; - await Task.Run(() => - { - var serverResult = controller.RequestCommandAsync(new CustomCommand("Custom")); - Assert.AreEqual(serverResult.Result.result, (int)result, "Should be same value"); - }); + var serverResult = await controller.RequestCommandAsync(new CustomCommand("Custom")); + Assert.AreEqual(serverResult.result, (int)result, "Should be same value"); } finally { @@ -679,11 +676,8 @@ namespace Tizen.Multimedia.Remoting.Tests { MediaControlServer.CustomCommandReceived += eventHandler; - await Task.Run(() => - { - var serverResult = controller.RequestCommandAsync(new CustomCommand("Custom")); - Assert.AreEqual(serverResult.Result.result, (int)result, "Should be same value"); - }); + var serverResult = await controller.RequestCommandAsync(new CustomCommand("Custom")); + Assert.AreEqual(serverResult.result, (int)result, "Should be same value"); } finally { diff --git a/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaController.cs b/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaController.cs index 56247ae..cc9efb4 100644 --- a/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaController.cs +++ b/tct-suite-vs/Tizen.MediaController.Tests/testcase/TSMediaController.cs @@ -1251,13 +1251,10 @@ namespace Tizen.Multimedia.Remoting.Tests { _controller.CustomCommandReceived += eventHandler; - await Task.Run(() => - { - var clientResult = MediaControlServer.RequestCommandAsync(new CustomCommand("CustomCommand"), - Application.Current.ApplicationInfo.ApplicationId); + var clientResult = await MediaControlServer.RequestCommandAsync(new CustomCommand("CustomCommand"), + Application.Current.ApplicationInfo.ApplicationId); - Assert.AreEqual(clientResult.Result.result, (int)result, "Should be same value"); - }); + Assert.AreEqual(clientResult.result, (int)result, "Should be same value"); } finally { @@ -1321,13 +1318,10 @@ namespace Tizen.Multimedia.Remoting.Tests { _controller.CustomCommandReceived += eventHandler; - await Task.Run(() => - { - var clientResult = MediaControlServer.RequestCommandAsync(new CustomCommand("CustomCommand"), - Application.Current.ApplicationInfo.ApplicationId); + var clientResult = await MediaControlServer.RequestCommandAsync(new CustomCommand("CustomCommand"), + Application.Current.ApplicationInfo.ApplicationId); - Assert.AreEqual(clientResult.Result.result, (int)result, "Should be same value"); - }); + Assert.AreEqual(clientResult.result, (int)result, "Should be same value"); } finally { -- 2.7.4