From: Haesu Gwon Date: Wed, 19 Sep 2018 10:55:06 +0000 (+0900) Subject: [Camera][TCSACR-185][Add new preview format for RGB] X-Git-Tag: tct5.0_m2~55^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7ab5b0f7906503ec882b678d7f731d79ad4587d;p=test%2Ftct%2Fcsharp%2Fapi.git [Camera][TCSACR-185][Add new preview format for RGB] Change-Id: Ic63062ac9e6d83c4ecd423c36f4f227a9a89a3e0 --- diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs old mode 100755 new mode 100644 index f13cce884..56fd8814e --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSCamera.cs @@ -77,9 +77,9 @@ namespace Tizen.Multimedia.Tests * DeviceState is internally translated from NotOpened state to Working state after calling StartPreview method. */ - using (var eventWaiter = EventAwaiter.Create()) + using (var eventWaiter = EventAwaiter.Create()) { - TestCamera.Preview += eventWaiter; + TestCamera.StateChanged += eventWaiter; TestCamera.StartPreview(); @@ -164,9 +164,9 @@ namespace Tizen.Multimedia.Tests [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] public async Task StopPreview_CHECK_STATE() { - using (var eventWaiter = EventAwaiter.Create()) + using (var eventWaiter = EventAwaiter.Create()) { - TestCamera.Preview += eventWaiter; + TestCamera.StateChanged += eventWaiter; TestCamera.StartPreview(); @@ -392,9 +392,9 @@ namespace Tizen.Multimedia.Tests [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] public async Task DisplayReuseHint_PROPERTY_READ_WRITE() { - using (var eventWaiter = EventAwaiter.Create()) + using (var eventWaiter = EventAwaiter.Create()) { - TestCamera.Preview += eventWaiter; + TestCamera.StateChanged += eventWaiter; TestCamera.StartPreview(); @@ -723,9 +723,9 @@ namespace Tizen.Multimedia.Tests [Property("AUTHOR", "Vivek Ellur, vivek.ellur@samsung.com")] public async Task Preview_CHECK_EVENT() { - using (var eventWaiter = EventAwaiter.Create()) + using (var eventWaiter = EventAwaiter.Create()) { - TestCamera.Preview += eventWaiter; + TestCamera.StateChanged += eventWaiter; TestCamera.StartPreview(); diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs index 0dac3a609..a4ddd2d10 100644 --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs @@ -223,9 +223,9 @@ namespace Tizen.Multimedia.Tests [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")] public async Task PlaneType_PROPERTY_GET_ENUM_PLANETYPE_DEPTHPLANE() { - bool isSupportEncodedPlane = TestCamera.Capabilities.SupportedPreviewPixelFormats + bool isSupportDepthPlane = TestCamera.Capabilities.SupportedPreviewPixelFormats .Contains(CameraPixelFormat.Invz); - if (isSupportEncodedPlane == false) + if (isSupportDepthPlane == false) { Assert.Pass("DepthPlane format is not supported."); } @@ -242,5 +242,35 @@ namespace Tizen.Multimedia.Tests Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.DepthPlane)); } } + + [Test] + [Category("P1")] + [Description("Test Type property for Rgb plane.")] + [Property("SPEC", "Tizen.Multimedia.PreviewFrame.PlaneType A")] + [Property("SPEC_URL", "-")] + [Property("CRITERIA", "PRE")] + [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")] + public async Task PlaneType_PROPERTY_GET_ENUM_PLANETYPE_RGBPLANE() + { + bool isSupportRgbPlane = TestCamera.Capabilities.SupportedPreviewPixelFormats + .Contains(CameraPixelFormat.Rgba) || + TestCamera.Capabilities.SupportedPreviewPixelFormats.Contains(CameraPixelFormat.Argb); + if (isSupportRgbPlane == false) + { + Assert.Pass("RgbPlane format is not supported."); + } + + TestCamera.Settings.PreviewPixelFormat = CameraPixelFormat.Rgba; + + using (var eventWaiter = EventAwaiter.Create()) + { + TestCamera.Preview += eventWaiter; + + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.RgbPlane)); + } + } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs new file mode 100644 index 000000000..ef9253505 --- /dev/null +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs @@ -0,0 +1,56 @@ +// Copyright 2018 by Samsung Electronics, Inc., +// +// This software is the confidential and proprietary information +// of Samsung Electronics, Inc. ("Confidential Information"). You +// shall not disclose such Confidential Information and shall use +// it only in accordance with the terms of the license agreement +// you entered into with Samsung. + +using NUnit.Framework; +using System.Linq; +using System.Threading.Tasks; + +namespace Tizen.Multimedia.Tests +{ + [TestFixture] + [Description("Tests Tizen.Multimedia.RgbPlane class")] + public class RgbPlaneTests : TestBase + { + public bool _isSupportRgbPlane; + + [SetUp] + public void SetUp() + { + _isSupportRgbPlane = TestCamera.Capabilities.SupportedPreviewPixelFormats + .Contains(CameraPixelFormat.Rgba) || + TestCamera.Capabilities.SupportedPreviewPixelFormats.Contains(CameraPixelFormat.Argb); + if (_isSupportRgbPlane == false) + { + Assert.Pass("RgbPlane format is not supported."); + } + + TestCamera.Settings.PreviewPixelFormat = CameraPixelFormat.Rgba; + } + + [Test] + [Category("P1")] + [Description("Test Data property.")] + [Property("SPEC", "Tizen.Multimedia.RgbPlane.Data A")] + [Property("SPEC_URL", "-")] + [Property("CRITERIA", "PRO")] + [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")] + public async Task Data_PROPERTY_READ_ONLY() + { + using (var eventWaiter = EventAwaiter.Create()) + { + TestCamera.Preview += eventWaiter; + + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as RgbPlane).Data.Length, Is.GreaterThan(0)); + } + } + } +} diff --git a/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/AudioRecorderTestBase.cs b/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/AudioRecorderTestBase.cs old mode 100755 new mode 100644 index 03024b0ce..b4ba4aee1 --- a/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/AudioRecorderTestBase.cs +++ b/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/AudioRecorderTestBase.cs @@ -19,6 +19,11 @@ namespace Tizen.Multimedia.Tests AudioCodec = Recorder.GetSupportedAudioCodecs().First(); FileFormat = AudioCodec.GetSupportedFileFormats().First(); AudioRecorder = new AudioRecorder(AudioCodec, FileFormat); + + AudioRecorder.ErrorOccurred += (s, e) => + { + Log.Info("Tizen.Recorder.Tests", $"Error occurred. {e.Error}"); + }; } catch (NotSupportedException) { diff --git a/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/VideoRecorderTestBase.cs b/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/VideoRecorderTestBase.cs old mode 100755 new mode 100644 index 1371d4055..d1fff7b77 --- a/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/VideoRecorderTestBase.cs +++ b/tct-suite-vs/Tizen.Recorder.Tests/testcase/support/VideoRecorderTestBase.cs @@ -37,6 +37,11 @@ namespace Tizen.Multimedia.Tests } } } + + VideoRecorder.ErrorOccurred += (s, e) => + { + Log.Info("Tizen.Recorder.Tests", $"Error occurred. {e.Error}"); + }; } catch (NotSupportedException) {