From f42d1d5d7714548f6a49d6937fcd6c0bc4e5dfe0 Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Mon, 14 Oct 2019 11:27:22 +0900 Subject: [PATCH] [MediaVision][Non-ACR] Fix NullReference bug Change-Id: I2939795a465cf535286d00fcc8addd45f36539af --- .../testcase/TSFaceDetector.cs | 54 ++++++++++++---------- .../testcase/support/InferenceFaceTestBase.cs | 20 ++++---- .../testcase/support/InferenceImageTestBase.cs | 20 ++++---- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSFaceDetector.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSFaceDetector.cs index bfe6262..ae90307 100644 --- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSFaceDetector.cs +++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSFaceDetector.cs @@ -38,33 +38,19 @@ namespace Tizen.Multimedia.Vision.Tests try { _fdConfig = new InferenceModelConfiguration(); - } - catch (NotSupportedException) when (FeatureChecker.IsSupported(Features.Inference) == false || - FeatureChecker.IsSupported(Features.InferenceFaceDetection) == false) - { - _isInferenceSupported = false; - } - if (_fdConfig.SupportedBackend.Any()) - { - _fdConfig.WeightFilePath = TestHelper.TFLitePath + "face_detector/fd_tflite_model1.tflite"; - _fdConfig.MeanValue = 127.5; - _fdConfig.StdValue = 127.5; - _fdConfig.ConfidenceThreshold = 0.3; - _fdConfig.Backend = InferenceBackendType.TFLite; - _fdConfig.Target = InferenceTargetType.CPU; - _fdConfig.TensorSize = new Size(300, 300); - _fdConfig.TensorChannels = 3; - _fdConfig.InputNodeName = "normalized_input_image_tensor"; - _fdConfig.OutputNodeName = new string[] + if (_fdConfig.SupportedBackend.Any() && + _fdConfig.SupportedBackend.Contains(InferenceBackendType.TFLite)) { - "TFLite_Detection_PostProcess", - "TFLite_Detection_PostProcess:1", - "TFLite_Detection_PostProcess:2", - "TFLite_Detection_PostProcess:3" - }; + Configure(); + } + else + { + _isInferenceSupported = false; + } } - else + catch (NotSupportedException) when (FeatureChecker.IsSupported(Features.Inference) == false || + FeatureChecker.IsSupported(Features.InferenceFaceDetection) == false) { _isInferenceSupported = false; } @@ -80,6 +66,26 @@ namespace Tizen.Multimedia.Vision.Tests _fdConfig?.Dispose(); } + private void Configure() + { + _fdConfig.WeightFilePath = TestHelper.TFLitePath + "face_detector/fd_tflite_model1.tflite"; + _fdConfig.MeanValue = 127.5; + _fdConfig.StdValue = 127.5; + _fdConfig.ConfidenceThreshold = 0.3; + _fdConfig.Backend = InferenceBackendType.TFLite; + _fdConfig.Target = InferenceTargetType.CPU; + _fdConfig.TensorSize = new Size(300, 300); + _fdConfig.TensorChannels = 3; + _fdConfig.InputNodeName = "normalized_input_image_tensor"; + _fdConfig.OutputNodeName = new string[] + { + "TFLite_Detection_PostProcess", + "TFLite_Detection_PostProcess:1", + "TFLite_Detection_PostProcess:2", + "TFLite_Detection_PostProcess:3" + }; + } + [Test] [Category("P1")] [Description("Tests face detection")] diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceFaceTestBase.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceFaceTestBase.cs index 2682975..cf064b3 100644 --- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceFaceTestBase.cs +++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceFaceTestBase.cs @@ -17,6 +17,16 @@ namespace Tizen.Multimedia.Vision.Tests { _fdConfig = new InferenceModelConfiguration(); _fldConfig = new InferenceModelConfiguration(); + + if (_fdConfig.SupportedBackend.Any() && + _fdConfig.SupportedBackend.Contains(InferenceBackendType.TFLite)) + { + Configure(); + } + else + { + Assert.Pass("Backend engine is not supported."); + } } catch (NotSupportedException) when (FeatureChecker.IsSupported(Features.Inference) == false || FeatureChecker.IsSupported(Features.InferenceFaceDetection) == false) @@ -28,16 +38,6 @@ namespace Tizen.Multimedia.Vision.Tests { Log.Info("Tizen.MediaVision.Tests", $"Supported engine : {iter}"); } - - if (_fdConfig.SupportedBackend.Any() && - _fdConfig.SupportedBackend.Contains(InferenceBackendType.TFLite)) - { - Configure(); - } - else - { - Assert.Pass("Backend engine is not supported."); - } } [TearDown] diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceImageTestBase.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceImageTestBase.cs index df7c86b..770fe6b 100644 --- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceImageTestBase.cs +++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/InferenceImageTestBase.cs @@ -17,22 +17,22 @@ namespace Tizen.Multimedia.Vision.Tests { _odConfig = new InferenceModelConfiguration(); _icConfig = new InferenceModelConfiguration(); + + if (_odConfig.SupportedBackend.Any() && + _odConfig.SupportedBackend.Contains(InferenceBackendType.TFLite)) + { + Configure(); + } + else + { + Assert.Pass("Backend engine is not supported."); + } } catch (NotSupportedException) when (FeatureChecker.IsSupported(Features.Inference) == false || FeatureChecker.IsSupported(Features.ImageClassification) == false) { Assert.Pass("object detection is not supported"); } - - if (_odConfig.SupportedBackend.Any() && - _odConfig.SupportedBackend.Contains(InferenceBackendType.TFLite)) - { - Configure(); - } - else - { - Assert.Pass("Backend engine is not supported."); - } } [TearDown] -- 2.7.4