From 228a4d4674b3fed495232b59ecb0de706e73566b Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Mon, 10 May 2021 18:38:54 +0900 Subject: [PATCH] [Multimedia.Manual][Non-ACR] Fix bug when display NotSupported message Change-Id: Ib2196a6624a3a6f7ab595a254eb503f89493188d --- .../testcase/Camera/TSCamera.cs | 32 ++++++--------- .../Camera/TSCameraFocusStateChangedEventArgs.cs | 3 +- .../testcase/Camera/TSFaceDetectedEventArgs.cs | 3 +- .../testcase/Camera/TSFaceDetectionData.cs | 18 +++------ .../testcase/Multimedia/TSAudioDevice.cs | 9 ++--- .../TSAudioDeviceConnectionChangedEventArgs.cs | 6 +-- .../TSAudioDeviceStateChangedEventArgs.cs | 6 +-- .../testcase/Multimedia/TSAudioManager.cs | 6 +-- .../testcase/Radio/TSRadio.cs | 12 +++--- .../testcase/Recorder/TSRecorder.cs | 16 +++----- .../testcase/ScreenMirroring/TSScreenMirroring.cs | 7 +--- .../ScreenMirroring/TSScreenMirroringAudioInfo.cs | 28 ++------------ .../ScreenMirroring/TSScreenMirroringVideoInfo.cs | 21 ++-------- .../testcase/TSMultimediaHelper.cs | 45 ---------------------- .../testcase/support/CameraTestBase.cs | 16 ++++---- .../testcase/support/ScreenMirroringTestBase.cs | 8 ++-- 16 files changed, 61 insertions(+), 175 deletions(-) mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCamera.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCameraFocusStateChangedEventArgs.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectedEventArgs.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectionData.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Radio/TSRadio.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Recorder/TSRecorder.cs delete mode 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/TSMultimediaHelper.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/CameraTestBase.cs mode change 100644 => 100755 tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/ScreenMirroringTestBase.cs diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCamera.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCamera.cs old mode 100644 new mode 100755 index b903e32..4f9007b --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCamera.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCamera.cs @@ -24,7 +24,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartPreview_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(StartPreview_CHANGE_STATUS))) + if (await CheckCameraSupported()) { return; } @@ -69,7 +69,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartPreview_THROWS_IF_STATE_IS_INVALID() { - if (await CheckCameraSupported(nameof(StartPreview_THROWS_IF_STATE_IS_INVALID))) + if (await CheckCameraSupported()) { return; } @@ -119,7 +119,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartCapture_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(StartCapture_CHANGE_STATUS))) + if (await CheckCameraSupported()) { return; } @@ -169,7 +169,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartCapture_THROWS_IF_INVALID_OPERATION() { - if (await CheckCameraSupported(nameof(StartCapture_THROWS_IF_INVALID_OPERATION))) + if (await CheckCameraSupported()) { return; } @@ -218,8 +218,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartCapture_CONTINUOUSLY_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(StartCapture_CONTINUOUSLY_CHANGE_STATUS)) || - await CheckContinuousCaptureSupported(nameof(StartCapture_CONTINUOUSLY_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckContinuousCaptureSupported()) { return; } @@ -272,8 +271,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartCapture_CONTINUOUSLY_THROWS_IF_INVALID_OPERATION() { - if (await CheckCameraSupported(nameof(StartCapture_CONTINUOUSLY_THROWS_IF_INVALID_OPERATION)) || - await CheckContinuousCaptureSupported(nameof(StartCapture_CONTINUOUSLY_THROWS_IF_INVALID_OPERATION))) + if (await CheckCameraSupported() || await CheckContinuousCaptureSupported()) { return; } @@ -325,8 +323,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartFaceDetection_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(StartFaceDetection_CHANGE_STATUS)) || - await CheckFDSupported(nameof(StartFaceDetection_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -375,8 +372,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartFaceDetection_THROWS_IF_INVALID_OPERATION() { - if (await CheckCameraSupported(nameof(StartFaceDetection_THROWS_IF_INVALID_OPERATION)) || - await CheckFDSupported(nameof(StartFaceDetection_THROWS_IF_INVALID_OPERATION))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -427,8 +423,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartFocusing_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(StartFocusing_CHANGE_STATUS)) || - await CheckAutoFocusSupported(nameof(StartFocusing_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckAutoFocusSupported()) { return; } @@ -481,8 +476,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task StartFocusing_THROWS_IF_STATE_IS_INVALID() { - if (await CheckCameraSupported(nameof(StartFocusing_THROWS_IF_STATE_IS_INVALID)) || - await CheckAutoFocusSupported(nameof(StartFocusing_THROWS_IF_STATE_IS_INVALID))) + if (await CheckCameraSupported() || await CheckAutoFocusSupported()) { return; } @@ -530,8 +524,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task FaceDetected_CHECK_EVENT() { - if (await CheckCameraSupported(nameof(FaceDetected_CHECK_EVENT)) || - await CheckFDSupported(nameof(FaceDetected_CHECK_EVENT))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -581,8 +574,7 @@ namespace Tizen.Multimedia.Tests [Step(6, "If camera is able to focus, test will be passed.")] public async Task FocusStateChanged_CHECK_EVENT() { - if (await CheckCameraSupported(nameof(FocusStateChanged_CHECK_EVENT)) || - await CheckAutoFocusSupported(nameof(FocusStateChanged_CHECK_EVENT))) + if (await CheckCameraSupported() || await CheckAutoFocusSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCameraFocusStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCameraFocusStateChangedEventArgs.cs old mode 100644 new mode 100755 index aa25a9e..7b773d6 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCameraFocusStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSCameraFocusStateChangedEventArgs.cs @@ -23,8 +23,7 @@ namespace Tizen.Multimedia.Tests [Step(6, "If camera is able to focus, test will be passed.")] public async Task State_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(State_PROPERTY_READ_ONLY)) || - await CheckAutoFocusSupported(nameof(State_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckAutoFocusSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectedEventArgs.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectedEventArgs.cs old mode 100644 new mode 100755 index b527afe..b708cf2 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectedEventArgs.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectedEventArgs.cs @@ -33,8 +33,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Faces_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Faces_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Faces_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectionData.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectionData.cs old mode 100644 new mode 100755 index 4cab3db..ba0a48d --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectionData.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Camera/TSFaceDetectionData.cs @@ -38,8 +38,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Id_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Id_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Id_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -93,8 +92,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Score_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Score_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Score_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -148,8 +146,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task X_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(X_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(X_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -203,8 +200,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Y_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Y_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Y_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -258,8 +254,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Width_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Width_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Width_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } @@ -313,8 +308,7 @@ namespace Tizen.Multimedia.Tests [Step(5, "If face is detected, test will be passed.")] public async Task Height_PROPERTY_READ_ONLY() { - if (await CheckCameraSupported(nameof(Height_PROPERTY_READ_ONLY)) || - await CheckFDSupported(nameof(Height_PROPERTY_READ_ONLY))) + if (await CheckCameraSupported() || await CheckFDSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDevice.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDevice.cs index 0289466..1fb2852 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDevice.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDevice.cs @@ -52,8 +52,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } @@ -75,8 +74,7 @@ namespace Tizen.Multimedia.Tests { if (_isBluetoothAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Bluetooth"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Bluetooth"); return; } @@ -155,8 +153,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceConnectionChangedEventArgs.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceConnectionChangedEventArgs.cs index f40de8c..4a3727f 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceConnectionChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceConnectionChangedEventArgs.cs @@ -22,8 +22,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } @@ -54,8 +53,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceStateChangedEventArgs.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceStateChangedEventArgs.cs index ea0382e..432d1ae 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioDeviceStateChangedEventArgs.cs @@ -22,8 +22,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } @@ -59,8 +58,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioManager.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioManager.cs index ea5c6f3..79aaf95 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioManager.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Multimedia/TSAudioManager.cs @@ -22,8 +22,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } @@ -54,8 +53,7 @@ namespace Tizen.Multimedia.Tests { if (IsAudioJackAvailable == false) { - TSMultimediaHelper.DisplayNotsupportedWarning("Audio-Jack"); - await ManualTest.WaitForConfirm(); + await NotSupportedHelper.DisplayNotSupportedLabel("Audio-Jack"); return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Radio/TSRadio.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Radio/TSRadio.cs old mode 100644 new mode 100755 index 6f82e81..fb7c35d --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Radio/TSRadio.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Radio/TSRadio.cs @@ -220,7 +220,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(Start_MANUAL_TEST_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } @@ -252,7 +252,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(Stop_MANUAL_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } @@ -285,7 +285,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(SeekUpAsync_MANUAL_TEST_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } @@ -320,7 +320,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(SeekUpAsync_MANUAL_TEST_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } @@ -354,7 +354,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(SeekUpAsync_MANUAL_TEST_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } @@ -387,7 +387,7 @@ namespace Tizen.Multimedia.Tests { if (_isRadioSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(nameof(SeekUpAsync_MANUAL_TEST_CHECK_STATUS)); + await NotSupportedHelper.DisplayNotSupportedLabel("Radio"); return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Recorder/TSRecorder.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Recorder/TSRecorder.cs old mode 100644 new mode 100755 index 954e8a4..2aa93f8 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Recorder/TSRecorder.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/Recorder/TSRecorder.cs @@ -15,11 +15,11 @@ namespace Tizen.Multimedia.Tests private string _filePath; protected bool _isVideoRecordingSupported = true; - private async Task CheckVideoRecordingSupported(string msg) + private async Task CheckVideoRecordingSupported() { if (_isVideoRecordingSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("Video recording"); return true; } @@ -188,8 +188,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task Start_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(Start_CHANGE_STATUS)) || - await CheckVideoRecordingSupported(nameof(Start_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckVideoRecordingSupported()) { return; } @@ -240,8 +239,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task Pause_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(Start_CHANGE_STATUS)) || - await CheckVideoRecordingSupported(nameof(Start_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckVideoRecordingSupported()) { return; } @@ -302,8 +300,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task Commit_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(Start_CHANGE_STATUS)) || - await CheckVideoRecordingSupported(nameof(Start_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckVideoRecordingSupported()) { return; } @@ -359,8 +356,7 @@ namespace Tizen.Multimedia.Tests [Postcondition(1, "NA")] public async Task Cancel_CHANGE_STATUS() { - if (await CheckCameraSupported(nameof(Start_CHANGE_STATUS)) || - await CheckVideoRecordingSupported(nameof(Start_CHANGE_STATUS))) + if (await CheckCameraSupported() || await CheckVideoRecordingSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroring.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroring.cs index 15e36bd..9dc973a 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroring.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroring.cs @@ -32,12 +32,7 @@ namespace Tizen.Multimedia.Tests public async Task ConnectAsync_CHANGE_STATE() { Log.Debug(LogTag, "Start ConnectAsync_CHANGE_STATE"); - if (await CheckScreenMirroringSupported(nameof(ConnectAsync_CHANGE_STATE))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(ConnectAsync_CHANGE_STATE))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringAudioInfo.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringAudioInfo.cs index dd056c4..f147d20 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringAudioInfo.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringAudioInfo.cs @@ -36,12 +36,7 @@ namespace Tizen.Multimedia.Tests public async Task Codec_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start Codec_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(Codec_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(Codec_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } @@ -100,12 +95,7 @@ namespace Tizen.Multimedia.Tests public async Task Channel_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start Channel_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(Channel_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(Channel_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } @@ -164,12 +154,7 @@ namespace Tizen.Multimedia.Tests public async Task BitWidth_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start BitWidth_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(BitWidth_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(BitWidth_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } @@ -230,12 +215,7 @@ namespace Tizen.Multimedia.Tests public async Task SampleRate_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start SampleRate_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(SampleRate_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(SampleRate_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringVideoInfo.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringVideoInfo.cs index 7a6f2d3..c11f1dc 100755 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringVideoInfo.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/ScreenMirroring/TSScreenMirroringVideoInfo.cs @@ -33,12 +33,7 @@ namespace Tizen.Multimedia.Tests public async Task Codec_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start Codec_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(Codec_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(Codec_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } @@ -91,12 +86,7 @@ namespace Tizen.Multimedia.Tests public async Task FrameRate_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start FrameRate_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(FrameRate_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(FrameRate_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } @@ -148,12 +138,7 @@ namespace Tizen.Multimedia.Tests public async Task Resolution_GET_NEGOTIATED_PROPERTY() { Log.Debug(LogTag, "Test Start Resolution_GET_NEGOTIATED_PROPERTY"); - if (await CheckScreenMirroringSupported(nameof(Resolution_GET_NEGOTIATED_PROPERTY))) - { - return; - } - - if (await CheckWifiDirectSupported(nameof(Resolution_GET_NEGOTIATED_PROPERTY))) + if (await CheckScreenMirroringSupported() || await CheckWifiDirectSupported()) { return; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/TSMultimediaHelper.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/TSMultimediaHelper.cs deleted file mode 100755 index 121477f..0000000 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/TSMultimediaHelper.cs +++ /dev/null @@ -1,45 +0,0 @@ -using NUnit.Framework; -using Xamarin.Forms; - -namespace Tizen.Multimedia.Tests -{ - internal class TSMultimediaHelper - { - // below object is using with unsupported message. - private static readonly TestPage _testPage = TestPage.GetInstance(); - private static Label _label; - - // Create message method. - internal static void DisplayNotsupportedWarning(string notSupportedFeature) - { - - _label = new Label() - { - FontSize = Device.GetNamedSize(NamedSize.Medium, typeof(Label)), - VerticalOptions = LayoutOptions.CenterAndExpand, - HorizontalOptions = LayoutOptions.CenterAndExpand, - Text = notSupportedFeature + " is not supported.\n" - + "Please press \'Pass\' .\n", - TextColor = Color.FromHex("#1E90FF"), - }; - - var layout = new StackLayout() - { - HorizontalOptions = LayoutOptions.FillAndExpand, - VerticalOptions = LayoutOptions.FillAndExpand, - MinimumHeightRequest = 120, - Children = { - _label, - }, - Padding = new Thickness() - { - Top = 0, - }, - }; - - _testPage.ExecuteTC(layout); - } - } -} - - diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/CameraTestBase.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/CameraTestBase.cs old mode 100644 new mode 100755 index e8f6eb2..7b53521 --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/CameraTestBase.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/CameraTestBase.cs @@ -54,40 +54,40 @@ namespace Tizen.Multimedia.Tests _button1 = _button2 = _button3 = null; } - protected async Task CheckCameraSupported(string msg) + protected async Task CheckCameraSupported() { if (_isCameraSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("Camera"); return true; } return false; } - protected async Task CheckContinuousCaptureSupported(string msg) + protected async Task CheckContinuousCaptureSupported() { if (TestCamera.Capabilities.IsContinuousCaptureSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("Continuous capture"); return true; } return false; } - protected async Task CheckFDSupported(string msg) + protected async Task CheckFDSupported() { if (TestCamera.Capabilities.IsFaceDetectionSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("FD"); return true; } return false; } - protected async Task CheckAutoFocusSupported(string msg) + protected async Task CheckAutoFocusSupported() { CameraAutoFocusMode supportedAutoFocusMode = CameraAutoFocusMode.None; @@ -103,7 +103,7 @@ namespace Tizen.Multimedia.Tests if (supportedAutoFocusMode == CameraAutoFocusMode.None) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("Auto focus"); return true; } diff --git a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/ScreenMirroringTestBase.cs b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/ScreenMirroringTestBase.cs old mode 100644 new mode 100755 index 900f429..6ccf91a --- a/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/ScreenMirroringTestBase.cs +++ b/tct-suite-vs/Tizen.Multimedia.Manual.Tests/testcase/support/ScreenMirroringTestBase.cs @@ -58,22 +58,22 @@ namespace Tizen.Multimedia.Tests ScreenMirroring?.Dispose(); } - protected async Task CheckScreenMirroringSupported(string msg) + protected async Task CheckScreenMirroringSupported() { if (_isScreenMirroringSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("ScreenMirroring"); return true; } return false; } - protected async Task CheckWifiDirectSupported(string msg) + protected async Task CheckWifiDirectSupported() { if (_isWifiDirectSupported == false) { - await NotSupportedHelper.DisplayNotSupportedLabel(msg); + await NotSupportedHelper.DisplayNotSupportedLabel("Wifi direct"); return true; } -- 2.7.4