From 0cb69c15bdef3d6ab3941e642773e84bda0c79c3 Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Thu, 18 Apr 2019 16:03:29 +0900 Subject: [PATCH] [Camera][Non-ACR] Unregister event handler Change-Id: I4f1d9aa64381715c593df443a9504ef60e04ca16 --- .../Tizen.Camera.Tests/testcase/TSDepthPlane.cs | 15 +- .../Tizen.Camera.Tests/testcase/TSDoublePlane.cs | 30 ++-- .../Tizen.Camera.Tests/testcase/TSEncodedPlane.cs | 15 +- .../testcase/TSPreviewEventArgs.cs | 13 +- .../Tizen.Camera.Tests/testcase/TSPreviewFrame.cs | 152 +++++++++++++++------ .../Tizen.Camera.Tests/testcase/TSRgbPlane.cs | 15 +- .../Tizen.Camera.Tests/testcase/TSSinglePlane.cs | 15 +- .../Tizen.Camera.Tests/testcase/TSTriplePlane.cs | 45 ++++-- 8 files changed, 220 insertions(+), 80 deletions(-) mode change 100755 => 100644 tct-suite-vs/Tizen.Camera.Tests/testcase/TSDoublePlane.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Camera.Tests/testcase/TSEncodedPlane.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewEventArgs.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Camera.Tests/testcase/TSSinglePlane.cs mode change 100755 => 100644 tct-suite-vs/Tizen.Camera.Tests/testcase/TSTriplePlane.cs diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDepthPlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDepthPlane.cs index 6d66105..46d9bb5 100644 --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDepthPlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDepthPlane.cs @@ -44,11 +44,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as DepthPlane).Data.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as DepthPlane).Data.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDoublePlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDoublePlane.cs old mode 100755 new mode 100644 index 4ff79c3..3f70eec --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDoublePlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSDoublePlane.cs @@ -44,11 +44,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as DoublePlane).Y.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as DoublePlane).Y.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -65,11 +72,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as DoublePlane).UV.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as DoublePlane).UV.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSEncodedPlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSEncodedPlane.cs old mode 100755 new mode 100644 index f818c19..ec1dd2e --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSEncodedPlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSEncodedPlane.cs @@ -44,11 +44,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as EncodedPlane).Data.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as EncodedPlane).Data.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewEventArgs.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewEventArgs.cs old mode 100755 new mode 100644 index 09ebe6b..90d570f --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewEventArgs.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewEventArgs.cs @@ -28,10 +28,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsNotNull(eventArgs.Preview); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsNotNull(eventArgs.Preview); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs index a4ddd2d..846605f 100644 --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSPreviewFrame.cs @@ -30,10 +30,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.Format, Is.EqualTo(TestCamera.Settings.PreviewPixelFormat)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.Format, Is.EqualTo(TestCamera.Settings.PreviewPixelFormat)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -50,11 +57,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.Resolution.Width, Is.GreaterThan(0)); - Assert.That(eventArgs.Preview.Resolution.Height, Is.GreaterThan(0)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.Resolution.Width, Is.GreaterThan(0)); + Assert.That(eventArgs.Preview.Resolution.Height, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -71,10 +85,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.TimeStamp, Is.GreaterThan(0)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.TimeStamp, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -91,10 +112,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsNotNull(eventArgs.Preview.Plane); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsNotNull(eventArgs.Preview.Plane); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -120,10 +148,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.SinglePlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.SinglePlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -149,10 +184,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.DoublePlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.DoublePlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -178,10 +220,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.TriplePlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.TriplePlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -207,10 +256,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.EncodedPlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.EncodedPlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -236,10 +292,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.DepthPlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.DepthPlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -266,10 +329,17 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); - - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.RgbPlane)); + try + { + TestCamera.StartPreview(); + + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.That(eventArgs.Preview.PlaneType, Is.EqualTo(PlaneType.RgbPlane)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs index ef92535..365ae1d 100644 --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSRgbPlane.cs @@ -45,11 +45,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as RgbPlane).Data.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as RgbPlane).Data.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSSinglePlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSSinglePlane.cs old mode 100755 new mode 100644 index 32836aa..9edc1c8 --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSSinglePlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSSinglePlane.cs @@ -44,11 +44,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as SinglePlane).Data.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as SinglePlane).Data.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } diff --git a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSTriplePlane.cs b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSTriplePlane.cs old mode 100755 new mode 100644 index c548ece..516569f --- a/tct-suite-vs/Tizen.Camera.Tests/testcase/TSTriplePlane.cs +++ b/tct-suite-vs/Tizen.Camera.Tests/testcase/TSTriplePlane.cs @@ -46,11 +46,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as TriplePlane).Y.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as TriplePlane).Y.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -67,11 +74,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as TriplePlane).U.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as TriplePlane).U.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } @@ -88,11 +102,18 @@ namespace Tizen.Multimedia.Tests { TestCamera.Preview += eventWaiter; - TestCamera.StartPreview(); + try + { + TestCamera.StartPreview(); - var eventArgs = await eventWaiter.GetResultAsync(); - Assert.IsInstanceOf(eventArgs.Preview.Plane); - Assert.That((eventArgs.Preview.Plane as TriplePlane).V.Length, Is.GreaterThan(0)); + var eventArgs = await eventWaiter.GetResultAsync(); + Assert.IsInstanceOf(eventArgs.Preview.Plane); + Assert.That((eventArgs.Preview.Plane as TriplePlane).V.Length, Is.GreaterThan(0)); + } + finally + { + TestCamera.Preview -= eventWaiter; + } } } } -- 2.7.4