From 1d07558a35ebdb9f8378ae7aa6e940a75fa5f831 Mon Sep 17 00:00:00 2001 From: Sanghoon Lee Date: Wed, 18 Jul 2018 13:51:51 +0900 Subject: [PATCH] [AudioIO][Non-ACR][Removed static keyword] Change-Id: Icf59c5ceeb6fed9f44fefc82af842e004857e896 --- .../testcase/AudioIO/TSAsyncAudioCapture.cs | 12 +-- .../testcase/AudioIO/TSAudioCapture.cs | 52 ++++++------- .../testcase/AudioIO/TSAudioCaptureBase.cs | 54 ++++++------- .../AudioIO/TSAudioDataAvailableEventArgs.cs | 4 +- .../AudioIO/TSAudioIOStateChangedEventArgs.cs | 8 +- .../testcase/AudioIO/TSAudioPlayback.cs | 88 +++++++++++----------- .../TSAudioPlaybackBufferAvailableEventArgs.cs | 4 +- .../testcase/TonePlayer/TSTonePlayer.cs | 24 +++--- .../testcase/WavPlayer/TSWavPlayer.cs | 24 +++--- 9 files changed, 135 insertions(+), 135 deletions(-) diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAsyncAudioCapture.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAsyncAudioCapture.cs index 078e54a..69c0611 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAsyncAudioCapture.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAsyncAudioCapture.cs @@ -7,28 +7,28 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AsyncAudioCapture class")] - public static class AsyncAudioCaptureTests + public class AsyncAudioCaptureTests { public const string LogTag = "TizenTest.Multimedia.AsyncAudioCapture"; private static AsyncAudioCapture AsyncCapture; private static bool _isMicrophoneAvail; [OneTimeSetUp] - public static void OneTimeSetup() + public void OneTimeSetup() { Information.TryGetValue("tizen.org/feature/microphone", out _isMicrophoneAvail); Tizen.Log.Info(LogTag, "Microphone available : " + _isMicrophoneAvail); } [SetUp] - public static void SetUp() + public void SetUp() { if (_isMicrophoneAvail) AsyncCapture = new AsyncAudioCapture(44100, AudioChannel.Mono, AudioSampleType.S16Le); } [TearDown] - public static void TearDown() + public void TearDown() { AsyncCapture?.Dispose(); } @@ -39,7 +39,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AsyncAudioCapture.AsyncAudioCapture C")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] - public static void AsyncAudioCapture_CHECK() + public void AsyncAudioCapture_CHECK() { if (_isMicrophoneAvail == false) return; @@ -54,7 +54,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTX")] [Property("AUTHOR", "Jeongho Mok, jho.mok@samsung.com")] - public static void AsyncAudioCapture_THROWS_IF_MICROPHONE_NOT_SUPPORTED() + public void AsyncAudioCapture_THROWS_IF_MICROPHONE_NOT_SUPPORTED() { if (_isMicrophoneAvail) return; diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCapture.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCapture.cs index 35ef1c4..5ef3e06 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCapture.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCapture.cs @@ -7,28 +7,28 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AudioCapture class")] - public static class AudioCaptureTests + public class AudioCaptureTests { public const string LogTag = "TizenTest.Multimedia.AudioCapture"; private static AudioCapture Capture; private static bool _isMicrophoneAvail; [OneTimeSetUp] - public static void OneTimeSetup() + public void OneTimeSetup() { Information.TryGetValue("tizen.org/feature/microphone", out _isMicrophoneAvail); Tizen.Log.Info(LogTag, "Microphone available : " + _isMicrophoneAvail); } [SetUp] - public static void SetUp() + public void SetUp() { if (_isMicrophoneAvail) Capture = new AudioCapture(44100, AudioChannel.Mono, AudioSampleType.S16Le); } [TearDown] - public static void TearDown() + public void TearDown() { Capture?.Dispose(); } @@ -40,7 +40,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioCapture_CREATE_MONO_U8() + public void AudioCapture_CREATE_MONO_U8() { if (_isMicrophoneAvail == false) return; @@ -55,7 +55,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioCapture_CREATE_MONO_S16Le() + public void AudioCapture_CREATE_MONO_S16Le() { if (_isMicrophoneAvail == false) return; @@ -70,7 +70,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioCapture_CREATE_STEREO_U8() + public void AudioCapture_CREATE_STEREO_U8() { if (_isMicrophoneAvail == false) return; @@ -85,7 +85,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioCapture_CREATE_STEREO_S16Le() + public void AudioCapture_CREATE_STEREO_S16Le() { if (_isMicrophoneAvail == false) return; @@ -100,7 +100,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioCapture_THROWS_IF_SAMPLE_RATE_INVALID() + public void AudioCapture_THROWS_IF_SAMPLE_RATE_INVALID() { if (_isMicrophoneAvail == false) return; @@ -125,7 +125,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Seungbae Shin, seungbae.shin@samsung.com")] - public static void AudioCapture_THROWS_IF_CHANNEL_INVALID() + public void AudioCapture_THROWS_IF_CHANNEL_INVALID() { if (_isMicrophoneAvail == false) return; @@ -144,7 +144,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Seungbae Shin, seungbae.shin@samsung.com")] - public static void AudioCapture_THROWS_IF_SAMPLE_TYPE_INVALID() + public void AudioCapture_THROWS_IF_SAMPLE_TYPE_INVALID() { if (_isMicrophoneAvail == false) return; @@ -163,7 +163,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTX")] [Property("AUTHOR", "Jeongho Mok, jho.mok@samsung.com")] - public static void AudioCapture_THROWS_IF_MICROPHONE_NOT_SUPPORTED() + public void AudioCapture_THROWS_IF_MICROPHONE_NOT_SUPPORTED() { if (_isMicrophoneAvail) return; @@ -179,7 +179,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_CHECK_NO_EXCEPTION() + public void Prepare_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -194,7 +194,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_THROWS_IF_ALREADY_PREPARED() + public void Prepare_THROWS_IF_ALREADY_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -211,7 +211,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_CHECK_NO_EXCEPTION() + public void Unprepare_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -227,7 +227,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_THROWS_IF_NOT_PREPARED() + public void Unprepare_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -242,7 +242,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Read_CHECK_RETURN() + public void Read_CHECK_RETURN() { if (_isMicrophoneAvail == false) return; @@ -262,7 +262,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Read_THROWS_IF_LENGTH_INVALID() + public void Read_THROWS_IF_LENGTH_INVALID() { if (_isMicrophoneAvail == false) return; @@ -280,7 +280,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Read_THROWS_IF_NOT_PREPARED() + public void Read_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -295,7 +295,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Read_THROWS_IF_PAUSED() + public void Read_THROWS_IF_PAUSED() { if (_isMicrophoneAvail == false) return; @@ -312,7 +312,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_CHECK_NO_EXCEPTION() + public void Pause_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -329,7 +329,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_THROWS_IF_NOT_PREPARED() + public void Pause_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -344,7 +344,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_CHECK_NO_EXCEPTION() + public void Resume_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -361,7 +361,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_THROWS_IF_NOT_PREPARED() + public void Resume_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -376,7 +376,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_CHECK_NO_EXCEPTION() + public void Flush_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -393,7 +393,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_THROWS_IF_NOT_PREPARED() + public void Flush_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCaptureBase.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCaptureBase.cs index 8c4689b..3883f1a 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCaptureBase.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioCaptureBase.cs @@ -7,28 +7,28 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AudioCaptureBase class")] - public static class AudioCaptureBaseTests + public class AudioCaptureBaseTests { public const string LogTag = "TizenTest.Multimedia.AudioCaptureBase"; - private static AudioCaptureBase Capture; - private static bool _isMicrophoneAvail; + private AudioCaptureBase Capture; + private bool _isMicrophoneAvail; [OneTimeSetUp] - public static void OneTimeSetup() + public void OneTimeSetup() { Information.TryGetValue("tizen.org/feature/microphone", out _isMicrophoneAvail); Tizen.Log.Info(LogTag, "Microphone available : " + _isMicrophoneAvail); } [SetUp] - public static void SetUp() + public void SetUp() { if (_isMicrophoneAvail) Capture = new AudioCapture(44100, AudioChannel.Mono, AudioSampleType.S16Le); } [TearDown] - public static void TearDown() + public void TearDown() { Capture?.Dispose(); } @@ -40,7 +40,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_CHECK_NO_EXCEPTION() + public void Prepare_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -55,7 +55,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_THROWS_IF_ALREADY_PREPARED() + public void Prepare_THROWS_IF_ALREADY_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -72,7 +72,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_CHECK_NO_EXCEPTION() + public void Unprepare_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -88,7 +88,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_THROWS_IF_NOT_PREPARED() + public void Unprepare_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -103,7 +103,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_CHECK_NO_EXCEPTION() + public void Pause_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -120,7 +120,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_THROWS_IF_NOT_PREPARED() + public void Pause_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -135,7 +135,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_CHECK_NO_EXCEPTION() + public void Resume_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -152,7 +152,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_THROWS_IF_NOT_PREPARED() + public void Resume_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -167,7 +167,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_CHECK_NO_EXCEPTION() + public void Flush_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -184,7 +184,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_THROWS_IF_NOT_PREPARED() + public void Flush_THROWS_IF_NOT_PREPARED() { if (_isMicrophoneAvail == false) return; @@ -201,7 +201,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static async Task StateChanged_CHECK() + public async Task StateChanged_CHECK() { if (_isMicrophoneAvail == false) return; @@ -232,7 +232,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void GetBufferSize_CHECK() + public void GetBufferSize_CHECK() { if (_isMicrophoneAvail == false) return; @@ -246,7 +246,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.Channel A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Channel_READONLY() + public void Channel_READONLY() { if (_isMicrophoneAvail == false) return; @@ -260,7 +260,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.SampleRate A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void SampleRate_READONLY() + public void SampleRate_READONLY() { if (_isMicrophoneAvail == false) return; @@ -274,7 +274,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.SampleType A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void SampleType_READONLY() + public void SampleType_READONLY() { if (_isMicrophoneAvail == false) return; @@ -288,7 +288,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] - public static void ApplyStreamPolicy_CHECK_NO_EXCEPTION() + public void ApplyStreamPolicy_CHECK_NO_EXCEPTION() { if (_isMicrophoneAvail == false) return; @@ -304,7 +304,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_NOT_SUPPORTED() + public void ApplyStreamPolicy_THROWS_IF_NOT_SUPPORTED() { if (_isMicrophoneAvail == false) return; @@ -320,7 +320,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_NULL() + public void ApplyStreamPolicy_THROWS_IF_NULL() { if (_isMicrophoneAvail == false) return; @@ -334,7 +334,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioCaptureBase.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_DISPOSED() + public void ApplyStreamPolicy_THROWS_IF_DISPOSED() { if (_isMicrophoneAvail == false) return; @@ -353,7 +353,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void MinSampleRate_INT_TYPE() + public void MinSampleRate_INT_TYPE() { Assert.That(AudioCaptureBase.MinSampleRate, Is.InstanceOf()); } @@ -365,7 +365,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void MaxSampleRate_INT_TYPE() + public void MaxSampleRate_INT_TYPE() { Assert.That(AudioCaptureBase.MaxSampleRate, Is.InstanceOf()); } diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioDataAvailableEventArgs.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioDataAvailableEventArgs.cs index c7ef925..eb39014 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioDataAvailableEventArgs.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioDataAvailableEventArgs.cs @@ -4,7 +4,7 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AudioDataAvailableEventArgs class")] - public static class AudioDataAvailableEventArgsTests + public class AudioDataAvailableEventArgsTests { [Test] [Category("P1")] @@ -12,7 +12,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioDataAvailableEventArgs.Data A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Data_READONLY() + public void Data_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioDataAvailableEventArgs.Data)); } diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioIOStateChangedEventArgs.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioIOStateChangedEventArgs.cs index 4e953ab..2f26226 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioIOStateChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioIOStateChangedEventArgs.cs @@ -4,7 +4,7 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AudioIOStateChangedEventArgs class")] - public static class AudioIOStateChangedEventArgsTests + public class AudioIOStateChangedEventArgsTests { [Test] [Category("P1")] @@ -12,7 +12,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioIOStateChangedEventArgs.ByPolicy A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void ByPolicy_READONLY() + public void ByPolicy_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioIOStateChangedEventArgs.ByPolicy)); } @@ -23,7 +23,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioIOStateChangedEventArgs.Current A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Current_READONLY() + public void Current_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioIOStateChangedEventArgs.Current)); } @@ -34,7 +34,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioIOStateChangedEventArgs.Previous A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Previous_READONLY() + public void Previous_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioIOStateChangedEventArgs.Previous)); } diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlayback.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlayback.cs index 32d5f50..fd8e83b 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlayback.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlayback.cs @@ -31,15 +31,15 @@ namespace Tizen.Multimedia.Tests [TestFixture] [Description("Testing Tizen.Multimedia.AudioPlayback class")] - public static class AudioPlaybackTests + public class AudioPlaybackTests { private const int TableSize = 200; private const int MaxSize = 131072; private const int HalfAmplitudeSize = 32768; - private static AudioPlayback Playback; + private AudioPlayback Playback; - public static byte[] CreateData(int length) + public byte[] CreateData(int length) { if (length <= 0) { @@ -72,13 +72,13 @@ namespace Tizen.Multimedia.Tests } [SetUp] - public static void SetUp() + public void SetUp() { Playback = new AudioPlayback(44100, AudioChannel.Mono, AudioSampleType.S16Le); } [TearDown] - public static void TearDown() + public void TearDown() { Playback?.Dispose(); } @@ -90,7 +90,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioPlayback_CREATE_MONO_U8() + public void AudioPlayback_CREATE_MONO_U8() { Assert.DoesNotThrow(() => new AudioPlayback(44100, AudioChannel.Mono, AudioSampleType.U8)); } @@ -102,7 +102,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioPlayback_CREATE_MONO_S16Le() + public void AudioPlayback_CREATE_MONO_S16Le() { Assert.DoesNotThrow(() => new AudioPlayback(44100, AudioChannel.Mono, AudioSampleType.S16Le)); } @@ -114,7 +114,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioPlayback_CREATE_STEREO_U8() + public void AudioPlayback_CREATE_STEREO_U8() { Assert.DoesNotThrow(() => new AudioPlayback(44100, AudioChannel.Stereo, AudioSampleType.U8)); } @@ -126,7 +126,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "CONSTR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioPlayback_CREATE_STEREO_S16Le() + public void AudioPlayback_CREATE_STEREO_S16Le() { Assert.DoesNotThrow(() => new AudioPlayback(44100, AudioChannel.Stereo, AudioSampleType.S16Le)); } @@ -138,7 +138,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void AudioPlayback_THROWS_IF_SAMPLE_RATE_INVALID() + public void AudioPlayback_THROWS_IF_SAMPLE_RATE_INVALID() { Assert.DoesNotThrow(() => new AudioPlayback(AudioPlayback.MaxSampleRate, AudioChannel.Stereo, AudioSampleType.S16Le)); @@ -160,7 +160,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Seungbae Shin, seungbae.shin@samsung.com")] - public static void AudioPlayback_THROWS_IF_CHANNEL_INVALID() + public void AudioPlayback_THROWS_IF_CHANNEL_INVALID() { Assert.Throws(() => new AudioPlayback(AudioPlayback.MinSampleRate, AudioChannel.Mono - 1, AudioSampleType.U8)); @@ -176,7 +176,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Seungbae Shin, seungbae.shin@samsung.com")] - public static void AudioPlayback_THROWS_IF_SAMPLE_TYPE_INVALID() + public void AudioPlayback_THROWS_IF_SAMPLE_TYPE_INVALID() { Assert.Throws(() => new AudioPlayback(AudioPlayback.MinSampleRate, AudioChannel.Mono, AudioSampleType.U8 - 1)); @@ -192,7 +192,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_CHECK_NO_EXCEPTION() + public void Prepare_CHECK_NO_EXCEPTION() { Assert.DoesNotThrow(() => Playback.Prepare()); } @@ -204,7 +204,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Prepare_THROWS_IF_ALREADY_PREPARED() + public void Prepare_THROWS_IF_ALREADY_PREPARED() { Playback.Prepare(); @@ -218,7 +218,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_CHECK_NO_EXCEPTION() + public void Unprepare_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -232,7 +232,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Unprepare_THROWS_IF_NOT_PREPARED() + public void Unprepare_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Unprepare()); } @@ -244,7 +244,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_CHECK_NO_EXCEPTION() + public void Write_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -258,7 +258,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_THROWS_IF_BUFFER_IS_NULL() + public void Write_THROWS_IF_BUFFER_IS_NULL() { Playback.Prepare(); @@ -272,7 +272,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_THROWS_IF_BUFFER_LENGTH_IS_ZERO() + public void Write_THROWS_IF_BUFFER_LENGTH_IS_ZERO() { Playback.Prepare(); @@ -286,7 +286,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_THROWS_IF_NOT_PREPARED() + public void Write_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Write(new byte[1])); } @@ -298,7 +298,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_THROWS_IF_PAUSED() + public void Write_THROWS_IF_PAUSED() { Playback.Prepare(); Playback.Pause(); @@ -313,7 +313,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Write_THROWS_IF_DISPOSED() + public void Write_THROWS_IF_DISPOSED() { Playback.Prepare(); Playback.Unprepare(); @@ -329,7 +329,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Drain_CHECK_NO_EXCEPTION() + public void Drain_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -343,7 +343,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Drain_THROWS_IF_NOT_PREPARED() + public void Drain_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Drain()); } @@ -355,7 +355,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_CHECK_NO_EXCEPTION() + public void Pause_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -369,7 +369,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Pause_THROWS_IF_NOT_PREPARED() + public void Pause_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Pause()); } @@ -381,7 +381,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_CHECK_NO_EXCEPTION() + public void Resume_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -395,7 +395,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Resume_THROWS_IF_NOT_PREPARED() + public void Resume_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Resume()); } @@ -407,7 +407,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_CHECK_NO_EXCEPTION() + public void Flush_CHECK_NO_EXCEPTION() { Playback.Prepare(); @@ -421,7 +421,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "Sangchul Lee, sc11.lee@samsung.com")] - public static void Flush_THROWS_IF_NOT_PREPARED() + public void Flush_THROWS_IF_NOT_PREPARED() { Assert.Throws(() => Playback.Flush()); } @@ -435,7 +435,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static async Task StateChanged_CHECK() + public async Task StateChanged_CHECK() { using (var eventAwaiter = EventAwaiter.Create()) { @@ -463,7 +463,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static async Task BufferAvailable_CHECK() + public async Task BufferAvailable_CHECK() { using (var eventAwaiter = EventAwaiter.Create()) { @@ -482,7 +482,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static async Task Pause_THROWS_IF_CALLED_IN_EVENT_HANDLER() + public async Task Pause_THROWS_IF_CALLED_IN_EVENT_HANDLER() { var exCapture = new ExceptionCapture(); @@ -509,7 +509,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.GetBufferSize M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] - public static void GetBufferSize_CHECK() + public void GetBufferSize_CHECK() { Assert.Greater(Playback.GetBufferSize(), 0); } @@ -520,7 +520,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] - public static void ApplyStreamPolicy_CHECK_NO_EXCEPTION() + public void ApplyStreamPolicy_CHECK_NO_EXCEPTION() { AudioStreamPolicy mediaStreamPolicy = new AudioStreamPolicy(AudioStreamType.Media); @@ -533,7 +533,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_NOT_SUPPORTED() + public void ApplyStreamPolicy_THROWS_IF_NOT_SUPPORTED() { AudioStreamPolicy voiceRecognitionStreamPolicy = new AudioStreamPolicy(AudioStreamType.VoiceRecognition); @@ -546,7 +546,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_NULL() + public void ApplyStreamPolicy_THROWS_IF_NULL() { Assert.Throws(() => Playback.ApplyStreamPolicy(null)); } @@ -557,7 +557,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.ApplyStreamPolicy M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] - public static void ApplyStreamPolicy_THROWS_IF_DISPOSED() + public void ApplyStreamPolicy_THROWS_IF_DISPOSED() { AudioStreamPolicy mediaStreamPolicy = new AudioStreamPolicy(AudioStreamType.Media); @@ -572,7 +572,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.Channel A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Channel_READONLY() + public void Channel_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioPlayback.Channel)); } @@ -583,7 +583,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.SampleRate A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void SampleRate_READONLY() + public void SampleRate_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioPlayback.SampleRate)); } @@ -594,7 +594,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.SampleType A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void SampleType_READONLY() + public void SampleType_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioPlayback.SampleType)); } @@ -605,7 +605,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlayback.StreamType A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void StreamType_READONLY() + public void StreamType_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioPlayback.StreamType)); } @@ -617,7 +617,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void MinSampleRate_INT_TYPE() + public void MinSampleRate_INT_TYPE() { Assert.That(AudioPlayback.MinSampleRate, Is.InstanceOf()); } @@ -629,7 +629,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void MaxSampleRate_INT_TYPE() + public void MaxSampleRate_INT_TYPE() { Assert.That(AudioPlayback.MaxSampleRate, Is.InstanceOf()); } diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlaybackBufferAvailableEventArgs.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlaybackBufferAvailableEventArgs.cs index 10336c9..2be69e7 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlaybackBufferAvailableEventArgs.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/AudioIO/TSAudioPlaybackBufferAvailableEventArgs.cs @@ -4,7 +4,7 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.AudioPlaybackBufferAvailableEventArgs class")] - public static class AudioPlaybackBufferAvailableEventArgsTests + public class AudioPlaybackBufferAvailableEventArgsTests { [Test] [Category("P1")] @@ -12,7 +12,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC", "Tizen.Multimedia.AudioPlaybackBufferAvailableEventArgs.Length A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRO")] - public static void Length_READONLY() + public void Length_READONLY() { AssertHelper.PropertyReadOnly(nameof(AudioPlaybackBufferAvailableEventArgs.Length)); } diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/TonePlayer/TSTonePlayer.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/TonePlayer/TSTonePlayer.cs index b80cd54..c07624e 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/TonePlayer/TSTonePlayer.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/TonePlayer/TSTonePlayer.cs @@ -8,20 +8,20 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Tizen.Multimedia.TonePlayer tests")] - public static class TonePlayerTests + public class TonePlayerTests { - public static CancellationTokenSource cts = null; - public static AudioStreamPolicy audioStreamPolicy = null; + public CancellationTokenSource cts = null; + public AudioStreamPolicy audioStreamPolicy = null; [SetUp] - public static void SetUp() + public void SetUp() { cts = new CancellationTokenSource(); audioStreamPolicy = new AudioStreamPolicy(AudioStreamType.Media); } [TearDown] - public static void TearDown() + public void TearDown() { cts?.Dispose(); audioStreamPolicy?.Dispose(); @@ -35,7 +35,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_STREAM_POLICY_IS_NULL() + public void StartAsync_THROWS_IF_STREAM_POLICY_IS_NULL() { Assert.ThrowsAsync( () => TonePlayer.StartAsync(ToneType.Default, null, -1)); @@ -49,7 +49,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_DURATION_IS_NEGATIVE() + public void StartAsync_THROWS_IF_DURATION_IS_NEGATIVE() { Assert.ThrowsAsync( () => TonePlayer.StartAsync(ToneType.Default, audioStreamPolicy, -2)); @@ -63,7 +63,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_TONETYPE_NOT_VALID() + public void StartAsync_THROWS_IF_TONETYPE_NOT_VALID() { int outOfRangeVal = Enum.GetValues(typeof(ToneType)).Cast().Max() + 2; Assert.ThrowsAsync(() => @@ -78,7 +78,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MR")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static async Task StartAsync_PLAY_NO_EXCEPTION() + public async Task StartAsync_PLAY_NO_EXCEPTION() { try { @@ -98,7 +98,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MAE")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static async Task StartAsync_CHECK_TONETYPE_ENUM_ALL() + public async Task StartAsync_CHECK_TONETYPE_ENUM_ALL() { foreach (ToneType type in Enum.GetValues(typeof(ToneType))) { @@ -120,7 +120,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int, CancellationToken")] - public static void StartAsync_CANCELLATION_CHECK() + public void StartAsync_CANCELLATION_CHECK() { using (var task = TonePlayer.StartAsync(ToneType.Default, audioStreamPolicy, 500, cts.Token)) { @@ -137,7 +137,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("COVPARAM", "ToneType, AudioStreamPolicy, int, CancellationToken")] - public static void StartAsync_ALREADY_CANCELLATION_CHECK() + public void StartAsync_ALREADY_CANCELLATION_CHECK() { cts.Cancel(); diff --git a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/WavPlayer/TSWavPlayer.cs b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/WavPlayer/TSWavPlayer.cs index 646cfaa..c57c9ca 100755 --- a/tct-suite-vs/Tizen.AudioIO.Tests/testcase/WavPlayer/TSWavPlayer.cs +++ b/tct-suite-vs/Tizen.AudioIO.Tests/testcase/WavPlayer/TSWavPlayer.cs @@ -8,23 +8,23 @@ namespace Tizen.Multimedia.Tests { [TestFixture] [Description("Tizen.Multimedia.WavPlayer tests")] - public static class WavPlayerTests + public class WavPlayerTests { private const string FilePath = "/opt/usr/home/owner/share/res/test.wav"; private const string InvalidPath = "/opt/usr/home/owner/share/res/test.invalid"; - public static CancellationTokenSource cts = null; - public static AudioStreamPolicy audioStreamPolicy = null; + public CancellationTokenSource cts = null; + public AudioStreamPolicy audioStreamPolicy = null; [SetUp] - public static void SetUp() + public void SetUp() { cts = new CancellationTokenSource(); audioStreamPolicy = new AudioStreamPolicy(AudioStreamType.Media); } [TearDown] - public static void TearDown() + public void TearDown() { cts?.Dispose(); audioStreamPolicy?.Dispose(); @@ -38,7 +38,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "string, AudioStreamPolicy")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_FILEPATH_NULL_OR_EMPTY() + public void StartAsync_THROWS_IF_FILEPATH_NULL_OR_EMPTY() { Assert.ThrowsAsync( () => WavPlayer.StartAsync(null, audioStreamPolicy)); @@ -52,7 +52,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "string, AudioStreamPolicy")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_STREAM_POLICY_IS_NULL() + public void StartAsync_THROWS_IF_STREAM_POLICY_IS_NULL() { Assert.ThrowsAsync( () => WavPlayer.StartAsync(FilePath, null)); @@ -66,7 +66,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MR")] [Property("COVPARAM", "string, AudioStreamPolicy")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static async Task StartAsync_PLAY() + public async Task StartAsync_PLAY() { try { @@ -86,7 +86,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "string, AudioStreamPolicy")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_PATH_INVALID() + public void StartAsync_THROWS_IF_PATH_INVALID() { Assert.ThrowsAsync( () => WavPlayer.StartAsync(InvalidPath, audioStreamPolicy)); @@ -100,7 +100,7 @@ namespace Tizen.Multimedia.Tests [Property("CRITERIA", "MEX")] [Property("COVPARAM", "string, AudioStreamPolicy")] [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] - public static void StartAsync_THROWS_IF_NOT_SUPPORTED() + public void StartAsync_THROWS_IF_NOT_SUPPORTED() { Assert.ThrowsAsync( () => WavPlayer.StartAsync("/opt/usr/home/owner/share/res/test.mp3", audioStreamPolicy)); @@ -113,7 +113,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("COVPARAM", "string, AudioStreamPolicy, CancellationToken")] - public static void StartAsync_CANCELLATION_CHECK() + public void StartAsync_CANCELLATION_CHECK() { using (var task = WavPlayer.StartAsync(FilePath, audioStreamPolicy, cts.Token)) { @@ -130,7 +130,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("COVPARAM", "string, AudioStreamPolicy, CancellationToken")] - public static void StartAsync_ALREADY_CANCELLATION_CHECK() + public void StartAsync_ALREADY_CANCELLATION_CHECK() { cts.Cancel(); -- 2.7.4