From 5c2529616cb611a0cee03eebb4da6837b3216baf Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Mon, 5 Aug 2019 17:04:07 +0900 Subject: [PATCH] [MediaCodec][TCSACR-256] Modify feature description and tag in EventArgs class Change-Id: Iadcf9389a36c5afefea3164d0100c0b0dba2fd18 --- .../testcase/TSBufferStatusChangedEventArgs.cs | 36 ++-------------------- .../testcase/TSInputProcessedEventArgs.cs | 8 +---- .../testcase/TSMediaCodec.cs | 26 ++-------------- .../testcase/TSMediaCodecErrorOccurredEventArgs.cs | 36 ++-------------------- .../testcase/TSOutputAvailableEventArgs.cs | 8 +---- .../testcase/support/TestBase.cs | 29 +++++++++++++++++ 6 files changed, 40 insertions(+), 103 deletions(-) mode change 100755 => 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSBufferStatusChangedEventArgs.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSInputProcessedEventArgs.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodecErrorOccurredEventArgs.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSOutputAvailableEventArgs.cs create mode 100644 tct-suite-vs/Tizen.MediaCodec.Tests/testcase/support/TestBase.cs diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSBufferStatusChangedEventArgs.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSBufferStatusChangedEventArgs.cs old mode 100755 new mode 100644 index 2383b14..15cf0ac --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSBufferStatusChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSBufferStatusChangedEventArgs.cs @@ -5,7 +5,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests { [TestFixture] [Description("Tizen.Multimedia.MediaCodec.BufferStatusChangedEventArgs Tests")] - public class BufferStatusChangedEventArgsTests + public class BufferStatusChangedEventArgsTests : TestBase { [Test] [Category("P1")] @@ -16,35 +16,12 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void BufferStatusChangedEventArgs_CHECK() { - if (FeatureChecker.IsSupported(Constants.Feature) == false) - { - Assert.Pass("The MediaCodec is not supported."); - } - Assert.That(() => new BufferStatusChangedEventArgs(MediaCodecStatus.EnoughData), Throws.Nothing); } [Test] [Category("P1")] - [Description("Constructor test")] - [Property("SPEC", "Tizen.Multimedia.MediaCodec.BufferStatusChangedEventArgs.BufferStatusChangedEventArgs C")] - [Property("SPEC_URL", "-")] - [Property("CRITERIA", "CONSTX")] - [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public void BufferStatusChangedEventArgs_NOT_SUPPORTED() - { - if (FeatureChecker.IsSupported(Constants.Feature)) - { - Assert.Pass("The MediaCodec is supported. This TC can be tested only if MediaCodec is not supported."); - } - - Assert.That(() => new BufferStatusChangedEventArgs(MediaCodecStatus.EnoughData), - Throws.InstanceOf()); - } - - [Test] - [Category("P1")] [Description("Status test")] [Property("SPEC", "Tizen.Multimedia.MediaCodec.BufferStatusChangedEventArgs.Status A")] [Property("SPEC_URL", "-")] @@ -52,16 +29,9 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Status_CHECK() { - if (FeatureChecker.IsSupported(Constants.Feature)) - { - const MediaCodecStatus status = MediaCodecStatus.LackOfData; + const MediaCodecStatus status = MediaCodecStatus.LackOfData; - Assert.That(new BufferStatusChangedEventArgs(status).Status, Is.EqualTo(status)); - } - else - { - Assert.Pass("The MediaCodec is not supported."); - } + Assert.That(new BufferStatusChangedEventArgs(status).Status, Is.EqualTo(status)); } } } diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSInputProcessedEventArgs.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSInputProcessedEventArgs.cs old mode 100755 new mode 100644 index da171c9..6376564 --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSInputProcessedEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSInputProcessedEventArgs.cs @@ -5,7 +5,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests [TestFixture] [Description("Tizen.Multimedia.MediaCodec.InputProcessedEventArgs Tests")] - public class InputProcessedEventArgsTests + public class InputProcessedEventArgsTests : TestBase { [Test] [Category("P1")] @@ -16,13 +16,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Packet_CHECK() { - if (FeatureChecker.IsSupported(Constants.Feature) == false) - { - Assert.Pass("The MediaCodec is not supported."); - } - AssertHelper.PropertyReadOnly(nameof(InputProcessedEventArgs.Packet)); } - } } diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs old mode 100755 new mode 100644 index 53082a0..329b361 --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs @@ -7,34 +7,13 @@ namespace Tizen.Multimedia.MediaCodec.Tests { [TestFixture] [Description("Testing Tizen.Multimedia.MediaCodec.MediaCodec class")] - public class MediaCodecTests + public class MediaCodecTests : TestBase { private const string VideoFilePath = "/opt/usr/home/owner/share/res/test.h264"; private readonly MediaFormat SimpleFormat = new VideoMediaFormat(MediaFormatVideoMimeType.Mpeg4SP, 640, 480); - private MediaCodec _codec; - - [SetUp] - public void SetUp() - { - try - { - _codec = new MediaCodec(); - } - catch (NotSupportedException) when (FeatureChecker.IsSupported(Constants.Feature) == false) - { - Assert.Pass("The MediaCodec is not supported."); - } - } - - [TearDown] - public void TearDown() - { - _codec?.Dispose(); - } - [Test] [Category("P1")] [Description("Check if the MediaCodec constructor can be invoked without any exception")] @@ -142,9 +121,10 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Test] [Category("P1")] [Description("GetCodecType returns zero if the specified type is not supported")] - [Property("SPEC", "Tizen.Multimedia.MediaCodec.MediaCodec.Prepare M")] + [Property("SPEC", "Tizen.Multimedia.MediaCodec.MediaCodec.GetCodecType M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] + [Property("COVPARAM", "bool, MediaFormatVideoMimeType")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void GetCodecType_ERROR_IF_NOT_SUPPORTED() { diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodecErrorOccurredEventArgs.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodecErrorOccurredEventArgs.cs old mode 100755 new mode 100644 index c5c31af..bd01c84 --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodecErrorOccurredEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodecErrorOccurredEventArgs.cs @@ -5,7 +5,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests { [TestFixture] [Description("Tizen.Multimedia.MediaCodec.MediaCodecErrorOccurredEventArgs Tests")] - public class MediaCodecErrorOccurredEventArgsTests + public class MediaCodecErrorOccurredEventArgsTests : TestBase { [Test] [Category("P1")] @@ -16,35 +16,12 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void MediaCodecErrorOccurredEventArgs_CHECK() { - if (FeatureChecker.IsSupported(Constants.Feature) == false) - { - Assert.Pass("The MediaCodec is not supported."); - } - Assert.That(() => new MediaCodecErrorOccurredEventArgs(MediaCodecError.InternalError), Throws.Nothing); } [Test] [Category("P1")] - [Description("Constructor test")] - [Property("SPEC", "Tizen.Multimedia.MediaCodec.MediaCodecErrorOccurredEventArgs.MediaCodecErrorOccurredEventArgs C")] - [Property("SPEC_URL", "-")] - [Property("CRITERIA", "CONSTX")] - [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public void MediaCodecErrorOccurredEventArgs_NOT_SUPPORTED() - { - if (FeatureChecker.IsSupported(Constants.Feature)) - { - Assert.Pass("The MediaCodec is supported. This TC can be tested only if MediaCodec is not supported."); - } - - Assert.That(() => new MediaCodecErrorOccurredEventArgs(MediaCodecError.InternalError), - Throws.InstanceOf()); - } - - [Test] - [Category("P1")] [Description("Error test")] [Property("SPEC", "Tizen.Multimedia.MediaCodec.MediaCodecErrorOccurredEventArgs.Error A")] [Property("SPEC_URL", "-")] @@ -52,16 +29,9 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Error_CHECK() { - if (FeatureChecker.IsSupported(Constants.Feature)) - { - const MediaCodecError error = MediaCodecError.InvalidStream; + const MediaCodecError error = MediaCodecError.InvalidStream; - Assert.That(new MediaCodecErrorOccurredEventArgs(error).Error, Is.EqualTo(error)); - } - else - { - Assert.Pass("The MediaCodec is not supported."); - } + Assert.That(new MediaCodecErrorOccurredEventArgs(error).Error, Is.EqualTo(error)); } } } diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSOutputAvailableEventArgs.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSOutputAvailableEventArgs.cs old mode 100755 new mode 100644 index 8d05eba..2866f0d --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSOutputAvailableEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSOutputAvailableEventArgs.cs @@ -5,7 +5,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests [TestFixture] [Description("Tizen.Multimedia.MediaCodec.OutputAvailableEventArgs Tests")] - public class OutputAvailableEventArgsTests + public class OutputAvailableEventArgsTests : TestBase { [Test] [Category("P1")] @@ -16,13 +16,7 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Packet_READONLY() { - if (FeatureChecker.IsSupported(Constants.Feature) == false) - { - Assert.Pass("The MediaCodec is not supported."); - } - AssertHelper.PropertyReadOnly(nameof(OutputAvailableEventArgs.Packet)); } - } } diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/support/TestBase.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/support/TestBase.cs new file mode 100644 index 0000000..d1ea241 --- /dev/null +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/support/TestBase.cs @@ -0,0 +1,29 @@ +using NUnit.Framework; +using System; + +namespace Tizen.Multimedia.MediaCodec.Tests +{ + public class TestBase + { + protected MediaCodec _codec; + + [SetUp] + public void SetUpBase() + { + try + { + _codec = new MediaCodec(); + } + catch (NotSupportedException) when (FeatureChecker.IsSupported(Constants.Feature) == false) + { + Assert.Pass("The MediaCodec is not supported."); + } + } + + [TearDown] + public void TearDownBase() + { + _codec?.Dispose(); + } + } +} -- 2.7.4