From 0aded4348d3a462e23bbabbbc672ae2bbbecc0f6 Mon Sep 17 00:00:00 2001 From: ruble Date: Tue, 8 Oct 2019 15:24:32 +0900 Subject: [PATCH] [MediaPlayer][TCSACR-284] change the error code Change-Id: I548246970a30fbca9935fc0b4526b86a9a4f1773 --- .../testcase/TSAudioEffect.cs | 21 ++++----------------- .../testcase/TSEqualizerBand.cs | 6 +++--- .../Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs | 16 ++++++++-------- .../testcase/TSPlayerTrackInfo.cs | 6 +++--- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs index 828e635..8a9d9be 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs @@ -154,7 +154,7 @@ namespace Tizen.Multimedia.Tests public void Clear_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _audioEffect.Clear(), Throws.InvalidOperationException); + Assert.That(() => _audioEffect.Clear(), Throws.TypeOf()); } [Test] @@ -180,7 +180,7 @@ namespace Tizen.Multimedia.Tests public void this_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _audioEffect[0], Throws.InvalidOperationException); + Assert.That(() => _audioEffect[0], Throws.TypeOf()); } [Test] @@ -193,7 +193,7 @@ namespace Tizen.Multimedia.Tests public void Count_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _audioEffect.Count, Throws.InvalidOperationException); + Assert.That(() => _audioEffect.Count, Throws.TypeOf()); } [Test] @@ -206,20 +206,7 @@ namespace Tizen.Multimedia.Tests public void BandLevelRange_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _audioEffect.BandLevelRange, Throws.InvalidOperationException); - } - - [Test] - [Category("P2")] - [Description("IsAvailable throws exception if an audio offload is enabled")] - [Property("SPEC", "Tizen.Multimedia.AudioEffect.IsAvailable A")] - [Property("SPEC_URL", "-")] - [Property("CRITERIA", "PEX")] - [Property("AUTHOR", "Jeongyoon Nam, just.nam@samsung.com")] - public void IsAvailable_THROWS_IF_AUDIOOFFLOAD_ENABLED() - { - SetAudioOffload(); - Assert.That(() => _audioEffect.IsAvailable, Throws.InvalidOperationException); + Assert.That(() => _audioEffect.BandLevelRange, Throws.TypeOf()); } [Test] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSEqualizerBand.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSEqualizerBand.cs index 6da6e40..3f9ba20 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSEqualizerBand.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSEqualizerBand.cs @@ -175,7 +175,7 @@ namespace Tizen.Multimedia.Tests public void Frequency_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _band.Frequency, Throws.InvalidOperationException); + Assert.That(() => _band.Frequency, Throws.TypeOf()); } [Test] @@ -188,7 +188,7 @@ namespace Tizen.Multimedia.Tests public void FrequencyRange_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _band.FrequencyRange, Throws.InvalidOperationException); + Assert.That(() => _band.FrequencyRange, Throws.TypeOf()); } [Test] @@ -201,7 +201,7 @@ namespace Tizen.Multimedia.Tests public void Level_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => _band.Level, Throws.InvalidOperationException); + Assert.That(() => _band.Level, Throws.TypeOf()); } } } diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs index 2bb26b6..4589c28 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs @@ -553,7 +553,7 @@ namespace Tizen.Multimedia.Tests public void ReplayGain_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => TestPlayer.ReplayGain = true, Throws.InvalidOperationException); + Assert.That(() => TestPlayer.ReplayGain = true, Throws.TypeOf()); } #endregion @@ -661,9 +661,9 @@ namespace Tizen.Multimedia.Tests public void AudioLatencyMode_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.Low, Throws.InvalidOperationException); - Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.Mid, Throws.InvalidOperationException); - Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.High, Throws.InvalidOperationException); + Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.Low, Throws.TypeOf()); + Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.Mid, Throws.TypeOf()); + Assert.That(() => TestPlayer.AudioLatencyMode = AudioLatencyMode.High, Throws.TypeOf()); } #endregion @@ -1729,7 +1729,7 @@ namespace Tizen.Multimedia.Tests public void SetPlaybackRate_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => TestPlayer.SetPlaybackRate(0.1F), Throws.InvalidOperationException); + Assert.That(() => TestPlayer.SetPlaybackRate(0.1F), Throws.TypeOf()); } #endregion @@ -2436,7 +2436,7 @@ namespace Tizen.Multimedia.Tests public void AudioPitchEnabled_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => TestPlayer.AudioPitchEnabled = true, Throws.InvalidOperationException); + Assert.That(() => TestPlayer.AudioPitchEnabled = true, Throws.TypeOf()); } [Test] @@ -2603,7 +2603,7 @@ namespace Tizen.Multimedia.Tests public void AudioPitch_THROWS_IF_AUDIOOFFLOAD_ENABLED() { SetAudioOffload(); - Assert.That(() => TestPlayer.AudioPitch = 1.0F, Throws.InvalidOperationException); + Assert.That(() => TestPlayer.AudioPitch = 1.0F, Throws.TypeOf()); } #endregion @@ -2795,7 +2795,7 @@ namespace Tizen.Multimedia.Tests { SetAudioOffload(); Assert.That(() => TestPlayer.EnableExportingAudioData(_audioFormat, PlayerAudioExtractOption.NoSyncAndDeinterleave), - Throws.InvalidOperationException); + Throws.TypeOf()); } [Test] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerTrackInfo.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerTrackInfo.cs index c3855f9..190c669 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerTrackInfo.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerTrackInfo.cs @@ -213,7 +213,7 @@ namespace Tizen.Multimedia.Tests { SetAudioOffload(); var audioTrackInfo = await GetAudioTrackInfo(); - Assert.That(() => audioTrackInfo.GetCount(), Throws.InvalidOperationException); + Assert.That(() => audioTrackInfo.GetCount(), Throws.TypeOf()); } [Test] @@ -227,7 +227,7 @@ namespace Tizen.Multimedia.Tests { SetAudioOffload(); var audioTrackInfo = await GetAudioTrackInfo(); - Assert.That(() => audioTrackInfo.GetLanguageCode(0), Throws.InvalidOperationException); + Assert.That(() => audioTrackInfo.GetLanguageCode(0), Throws.TypeOf()); } [Test] @@ -241,7 +241,7 @@ namespace Tizen.Multimedia.Tests { SetAudioOffload(); var audioTrackInfo = await GetAudioTrackInfo(); - Assert.That(() => audioTrackInfo.Selected, Throws.InvalidOperationException); + Assert.That(() => audioTrackInfo.Selected, Throws.TypeOf()); } } } -- 2.7.4