[MediaVision][TCSACR-563] Change feature key of inference face recognition

Change-Id: I33d178b002c2c6a1e6038f70d84baab81f7e3521

diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSDeepLearningFaceRecognizer.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSDeepLearningFaceRecognizer.cs
index d8529c6..05296d8 100644 (file)
--- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSDeepLearningFaceRecognizer.cs
+++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/TSDeepLearningFaceRecognizer.cs
@@ -27,7 +27,8 @@ namespace Tizen.Multimedia.Vision.Tests
         [SetUp]
         public void Init()
         {
-            if (FeatureChecker.IsSupported(Features.InferenceFace) == false)
+            if (!FeatureChecker.AreSupported(Features.Inference, Features.InferenceFaceRecognition,
+                    Features.Training, Features.TrainingFaceRecognition))
             {
                 Assert.Pass("Inference face recognition is not supported");
             }

diff --git a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/Features.cs b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/Features.cs
index b0d961e..dd453cb 100644 (file)
--- a/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/Features.cs
+++ b/tct-suite-vs/Tizen.MediaVision.Tests/testcase/support/Features.cs
@@ -1,11 +1,19 @@
 internal static class Features
 {
-    public const string BarcodeDetection = "http://tizen.org/feature/vision.barcode_detection";
-    public const string BarcodeGeneration = "http://tizen.org/feature/vision.barcode_generation";
+    public const string RoiTracking     = "http://tizen.org/feature/vision.roi_tracking";
     public const string FaceRecognition = "http://tizen.org/feature/vision.face_recognition";
-    public const string ImageRecognition = "http://tizen.org/feature/vision.image_recognition";
-    public const string Inference = "http://tizen.org/feature/vision.inference";
-    public const string InferenceFace = "http://tizen.org/feature/vision.inference.face";
+
+    public const string Inference                   = "http://tizen.org/feature/vision.inference";
+    public const string InferenceFace               = "http://tizen.org/feature/vision.inference.face";
+    public const string InferenceFaceRecognition    = "http://tizen.org/feature/vision.inference.face_recognition";
+    public const string InferenceImage              = "http://tizen.org/feature/vision.inference.image";
+
+    public const string Training                  = "http://tizen.org/feature/vision.training";
+    public const string TrainingFaceRecognition   = "http://tizen.org/feature/vision.training.face_recognition";
+
+    public const string ImageRecognition    = "http://tizen.org/feature/vision.image_recognition";
     public const string ImageClassification = "http://tizen.org/feature/vision.inference.image";
-    public const string RoiTracking = "http://tizen.org/feature/vision.roi_tracking";
+
+    public const string BarcodeDetection    = "http://tizen.org/feature/vision.barcode_detection";
+    public const string BarcodeGeneration   = "http://tizen.org/feature/vision.barcode_generation";
 }

diff --git a/tct-suite-vs/Tizen.Multimedia.Support.Library/Features.cs b/tct-suite-vs/Tizen.Multimedia.Support.Library/Features.cs
index a7f1865..67a30a0 100755 (executable)
--- a/tct-suite-vs/Tizen.Multimedia.Support.Library/Features.cs
+++ b/tct-suite-vs/Tizen.Multimedia.Support.Library/Features.cs
@@ -5,13 +5,24 @@ public static class FeatureChecker
 {
     public static bool IsSupported(string featureKey)
     {
-        bool supported;
-        if (Information.TryGetValue(featureKey, out supported))
+        if (Information.TryGetValue(featureKey, out bool supported))
         {
             return supported;
         }
         return false;
     }
+
+    public static bool AreSupported(params string[] featureKeys)
+    {
+        foreach (var featureKey in featureKeys)
+        {
+            if (!IsSupported(featureKey))
+            {
+                return false;
+            }
+        }
+        return true;
+    }
 }
 
 public static class FeatureInfo