From acdf0a2ebd27bf1b28cc06f39da5554f9d2b8737 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Wed, 23 Mar 2022 21:13:23 +0900 Subject: [PATCH] [Non-ACR][NUI][Fix false-fail in VD TV target] Change-Id: I953679612b2718765637ea04922af4c041db0729 --- .../Tizen.NUI.Tests/testcase/TSCameraView.cs | 64 ++++++++++++---------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSCameraView.cs b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSCameraView.cs index 100fc05..99d1b0c 100644 --- a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSCameraView.cs +++ b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSCameraView.cs @@ -52,18 +52,20 @@ namespace Tizen.NUI.Tests public void CameraView_WindowType_INIT() { /* TEST CODE */ - try + if (IsSupported(PrimaryCamera) == false) { - if(IsSupported(PrimaryCamera) == false) - { Assert.Pass("Camera feature is not supported."); - } - Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); - var cameraView = new CameraView(camera.Handle, CameraView.DisplayType.Window); - Assert.IsNotNull(cameraView, "Can't create success object CameraView"); - Assert.IsInstanceOf(cameraView, "Should return CameraView instance."); - camera.Dispose(); - cameraView.Dispose(); + return; + } + + try + { + Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); + var cameraView = new CameraView(camera.Handle, CameraView.DisplayType.Window); + Assert.IsNotNull(cameraView, "Can't create success object CameraView"); + Assert.IsInstanceOf(cameraView, "Should return CameraView instance."); + camera.Dispose(); + cameraView.Dispose(); } catch (Exception e) { @@ -84,18 +86,20 @@ namespace Tizen.NUI.Tests public void CameraView_ImageType_INIT() { /* TEST CODE */ - try + if (IsSupported(PrimaryCamera) == false) { - if(IsSupported(PrimaryCamera) == false) - { Assert.Pass("Camera feature is not supported."); - } - Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); - var cameraView = new CameraView(camera.Handle, CameraView.DisplayType.Image); - Assert.IsNotNull(cameraView, "Can't create success object CameraView"); - Assert.IsInstanceOf(cameraView, "Should return CameraView instance."); - camera.Dispose(); - cameraView.Dispose(); + return; + } + + try + { + Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); + var cameraView = new CameraView(camera.Handle, CameraView.DisplayType.Image); + Assert.IsNotNull(cameraView, "Can't create success object CameraView"); + Assert.IsInstanceOf(cameraView, "Should return CameraView instance."); + camera.Dispose(); + cameraView.Dispose(); } catch (Exception e) { @@ -115,12 +119,14 @@ namespace Tizen.NUI.Tests public void Dispose_TEST() { /* TEST CODE */ + if (IsSupported(PrimaryCamera) == false) + { + Assert.Pass("Camera feature is not supported."); + return; + } + try { - if (IsSupported(PrimaryCamera) == false) - { - Assert.Pass("Camera feature is not supported."); - } Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); CameraView cameraView = new CameraView(camera.Handle); camera.Dispose(); @@ -144,12 +150,14 @@ namespace Tizen.NUI.Tests public void Update_CHECK_STATE() { /* TEST CODE */ + if (IsSupported(PrimaryCamera) == false) + { + Assert.Pass("Camera feature is not supported."); + return; + } + try { - if (IsSupported(PrimaryCamera) == false) - { - Assert.Pass("Camera feature is not supported."); - } Tizen.Multimedia.Camera camera = new Tizen.Multimedia.Camera(Tizen.Multimedia.CameraDevice.Rear); var cameraView = new CameraView(camera.Handle); cameraView.Update(); -- 2.7.4