From: Haesu Gwon Date: Wed, 19 Feb 2020 06:57:51 +0000 (+0900) Subject: [Multimedia][Non-ACR] Add missing Assert statement X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F36%2F225336%2F1;p=test%2Ftct%2Fcsharp%2Fapi.git [Multimedia][Non-ACR] Add missing Assert statement Change-Id: I7f65b240db5c344818f4356de1c6f08f707ed645 --- diff --git a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs index 329b361..f72c48d 100644 --- a/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs +++ b/tct-suite-vs/Tizen.MediaCodec.Tests/testcase/TSMediaCodec.cs @@ -186,23 +186,26 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public void InputProcessed_CHECK() + public async Task InputProcessed_CHECK() { - CountdownEvent countdownEvent = new CountdownEvent(PacketParser.NumberOfFeed - 2); - _codec.Configure(VideoDecoderParser.Format, false, MediaCodecTypes.Software); - _codec.InputProcessed += (object sender, InputProcessedEventArgs e) => + using (var eventAwaiter = EventAwaiter.Create()) { - e.Packet.Dispose(); - countdownEvent.Signal(); - }; + _codec.InputProcessed += eventAwaiter; - _codec.Prepare(); + _codec.Prepare(); + + new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); - new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); + Log.Info("Tizen.MediaCodec.Tests", "Assert before"); - countdownEvent.Wait(4000); + Assert.That(await eventAwaiter.IsRaisedAsync()); + + Log.Info("Tizen.MediaCodec.Tests", "Assert after"); + + _codec.InputProcessed -= eventAwaiter; + } _codec.Unprepare(); } @@ -214,19 +217,26 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public void EosReached_CHECK() + public async Task EosReached_CHECK() { - CountdownEvent countdownEvent = new CountdownEvent(1); - _codec.Configure(VideoDecoderParser.Format, false, MediaCodecTypes.Software); - _codec.EosReached += (object sender, EventArgs e) => countdownEvent.Signal(); - _codec.Prepare(); - new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); + using (var eventAwaiter = EventAwaiter.Create()) + { + _codec.EosReached += eventAwaiter; + + new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); + + Log.Info("Tizen.MediaCodec.Tests", "Assert before"); + + Assert.That(await eventAwaiter.IsRaisedAsync(10000)); - countdownEvent.Wait(4000); + Log.Info("Tizen.MediaCodec.Tests", "Assert after"); + + _codec.EosReached -= eventAwaiter; + } _codec.Unprepare(); } @@ -240,15 +250,17 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public async Task BufferStatusChanged_CHECK() { - using (var eventAawaiter = EventAwaiter.Create()) + using (var eventAwaiter = EventAwaiter.Create()) { _codec.Configure(VideoDecoderParser.Format, false, MediaCodecTypes.Software); - _codec.BufferStatusChanged += eventAawaiter; + _codec.BufferStatusChanged += eventAwaiter; _codec.Prepare(); - var result = await eventAawaiter.GetResultAsync(); + Assert.That(await eventAwaiter.IsRaisedAsync()); + + _codec.BufferStatusChanged -= eventAwaiter; } } @@ -259,20 +271,23 @@ namespace Tizen.Multimedia.MediaCodec.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public void ErrorOccurred_CHECK() + public async Task ErrorOccurred_CHECK() { - CountdownEvent countdownEvent = new CountdownEvent(PacketParser.NumberOfFeed - 2); - _codec.Configure(new VideoMediaFormat(MediaFormatVideoMimeType.Mpeg4SP, 640, 480), false, MediaCodecTypes.Software); - _codec.ErrorOccurred += (object sender, MediaCodecErrorOccurredEventArgs e) => countdownEvent.Signal(); - _codec.Prepare(); - new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); + using (var eventAwaiter = EventAwaiter.Create()) + { + _codec.ErrorOccurred += eventAwaiter; + + new VideoDecoderParser(VideoFilePath).Feed(packet => _codec.ProcessInput(packet)); + + Assert.That(await eventAwaiter.IsRaisedAsync()); - countdownEvent.Wait(4000); + _codec.ErrorOccurred -= eventAwaiter; + } _codec.Unprepare(); } diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSBufferingProgressChangedEventArgs.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSBufferingProgressChangedEventArgs.cs old mode 100755 new mode 100644 index 421aa9a..766e000 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSBufferingProgressChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSBufferingProgressChangedEventArgs.cs @@ -19,7 +19,10 @@ namespace Tizen.Multimedia.Tests public void BufferingProgressChangedEventArgs_CHECK() { Log.Info(LogTag, "[Enter] BufferingProgressChangedEventArgsTests"); - new BufferingProgressChangedEventArgs(0); + var eventArgs = new BufferingProgressChangedEventArgs(0); + + Assert.IsNotNull(eventArgs, "Object should not be null after initializing."); + Assert.IsInstanceOf(eventArgs, "Should return BufferingProgressChangedEventArgs instance."); } [Test] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamBufferStatusChangedEventArgs.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamBufferStatusChangedEventArgs.cs old mode 100755 new mode 100644 index b3b7fdc..b453cc9 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamBufferStatusChangedEventArgs.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamBufferStatusChangedEventArgs.cs @@ -19,7 +19,11 @@ namespace Tizen.Multimedia.Tests public void MediaStreamBufferStatusChangedEventArgs_CHECK() { Log.Info(LogTag, "[Enter] MediaStreamBufferStatusChangedEventArgsTests"); - new MediaStreamBufferStatusChangedEventArgs(MediaStreamBufferStatus.Overflow); + var eventArgs = new MediaStreamBufferStatusChangedEventArgs(MediaStreamBufferStatus.Overflow); + + Assert.IsNotNull(eventArgs, "Object should not be null after initializing."); + Assert.IsInstanceOf(eventArgs, + "Should return MediaStreamBufferStatusChangedEventArgs instance."); } [Test] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaUriSource.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaUriSource.cs old mode 100755 new mode 100644 index 551ccd5..c904b1f --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaUriSource.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaUriSource.cs @@ -19,7 +19,10 @@ namespace Tizen.Multimedia.Tests public void MediaUriSource_CHECK() { Log.Info(LogTag, "[Enter]"); - new MediaUriSource(""); + var meduaUriSource = new MediaUriSource(""); + + Assert.IsNotNull(meduaUriSource, "Object should not be null after initializing."); + Assert.IsInstanceOf(meduaUriSource, "Should return MediaUriSource instance."); } [Test] diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSImageRecognitionResult.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSImageRecognitionResult.cs old mode 100755 new mode 100644 index 2f31ca9..a8f5461 --- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSImageRecognitionResult.cs +++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSImageRecognitionResult.cs @@ -57,10 +57,7 @@ namespace Tizen.Multimedia.Vision.Tests foreach (ImageRecognitionResult imageResult in objLists) { - if (imageResult.Success) - Log.Info(LogUtils.TAG, imageResult.Region.ToString()); - else - Log.Info(LogUtils.TAG, "ImageRecognition:" + imageResult.Success.ToString()); + Assert.IsTrue(imageResult.Success, "Image recognition should be succeeded."); } } } @@ -84,10 +81,8 @@ namespace Tizen.Multimedia.Vision.Tests foreach (ImageRecognitionResult imageResult in objLists) { - if (imageResult.Success) - Log.Info(LogUtils.TAG, imageResult.Region.ToString()); - else - Log.Info(LogUtils.TAG, "ImageRecognition:" + imageResult.Success.ToString()); + Assert.IsTrue(imageResult.Success, "Image recognition should be succeeded."); + Assert.IsNotNull(imageResult.Region, "Region should not be null."); } } }