Fix compiler warning

.h:
typo

test:
InstantiateTestCase_P_IsDeprecated' is deprecated:
INSTANTIATE_TEST_CASE_P is deprecated, please use
INSTANTIATE_TEST_SUITE_P [-Wdeprecated-declarations]

Change-Id: I7579ea9a63c3029109fcfbaaca1af6c46ac6b910
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/mv_machine_learning/common/meta/include/Postprocess.h b/mv_machine_learning/common/meta/include/Postprocess.h
index 0fdd6a8..e0a19bf 100644 (file)
--- a/mv_machine_learning/common/meta/include/Postprocess.h
+++ b/mv_machine_learning/common/meta/include/Postprocess.h
@@ -15,7 +15,7 @@
  */
 
 #ifndef __POSTPROCESS_H__
-#define __POSTPORCESS_H__
+#define __POSTPROCESS_H__
 
 #include "types.h"
 

diff --git a/mv_machine_learning/inference/include/PreProcess.h b/mv_machine_learning/inference/include/PreProcess.h
index bdb6376..979c4ba 100644 (file)
--- a/mv_machine_learning/inference/include/PreProcess.h
+++ b/mv_machine_learning/inference/include/PreProcess.h
@@ -15,7 +15,7 @@
  */
 
 #ifndef __MEDIA_VISION_PREPROCESS_H__
-#define __MEDIA_VISION_PREPORCESS_H__
+#define __MEDIA_VISION_PREPROCESS_H__
 
 #include <string>
 #include <map>

diff --git a/test/testsuites/barcode/test_barcode.cpp b/test/testsuites/barcode/test_barcode.cpp
index bc0be09..2c05686 100644 (file)
--- a/test/testsuites/barcode/test_barcode.cpp
+++ b/test/testsuites/barcode/test_barcode.cpp
@@ -98,7 +98,7 @@ TEST_P(TestBarcode, Detection)
                          MEDIA_VISION_ERROR_NONE);
 }
 
-INSTANTIATE_TEST_CASE_P(GeneralAndSpecial, TestBarcode, testing::ValuesIn(ReadDetPositive1()));
+INSTANTIATE_TEST_SUITE_P(GeneralAndSpecial, TestBarcode, testing::ValuesIn(ReadDetPositive1()));
 
 class TestBarcodeGen : public ::testing::Test
 {

diff --git a/test/testsuites/barcode/test_designqr.cpp b/test/testsuites/barcode/test_designqr.cpp
index 8d08da9..e8a34a1 100644 (file)
--- a/test/testsuites/barcode/test_designqr.cpp
+++ b/test/testsuites/barcode/test_designqr.cpp
@@ -63,7 +63,7 @@ TEST_P(CombinationsTest, DesignQR)
                                                                                qr_version, test_file.c_str(), image_format),
                          MEDIA_VISION_ERROR_NONE);
 }
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
                Combinations, CombinationsTest,
                testing::Combine(testing::ValuesIn(vector<string> {
                                                                 "smalletextHttps://",

diff --git a/test/testsuites/machine_learning/inference/test_face_detection.cpp b/test/testsuites/machine_learning/inference/test_face_detection.cpp
index db2f034..8329dfa 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_face_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_face_detection.cpp
@@ -79,6 +79,6 @@ TEST_P(TestFaceDetectionTflite, MobilenetV1_SSD)
        inferenceFace();
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestFaceDetectionTflite,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file
+INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceDetectionTflite,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file

diff --git a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
index 88262d6..600f54c 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_face_landmark_detection.cpp
@@ -91,9 +91,9 @@ TEST_P(TestFaceLandmarkDetectionOpenCV, CAFFE_CNNCASCADE)
        inferenceFaceLandmark();
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestFaceLandmarkDetectionOpenCV,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
+INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceLandmarkDetectionOpenCV,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
 
 class TestFaceLandmarkDetectionTflite : public TestInference
 {
@@ -118,5 +118,5 @@ TEST_P(TestFaceLandmarkDetectionTflite, TweakCNN)
        }
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestFaceLandmarkDetectionTflite,
-                                               ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file
+INSTANTIATE_TEST_SUITE_P(Prefix, TestFaceLandmarkDetectionTflite,
+                                                ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file

diff --git a/test/testsuites/machine_learning/inference/test_image_classification.cpp b/test/testsuites/machine_learning/inference/test_image_classification.cpp
index 13f2668..b97f65e 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_image_classification.cpp
+++ b/test/testsuites/machine_learning/inference/test_image_classification.cpp
@@ -363,14 +363,14 @@ TEST_P(TestImageClassificationSnpe, DISABLED_InceptionV3_Quantized)
        inferenceBanana();
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestImageClassificationTflite,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
-
-INSTANTIATE_TEST_CASE_P(Prefix, TestImageClassificationSnpe,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_GPU),
-                                                                                 ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CUSTOM),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_GPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file
+INSTANTIATE_TEST_SUITE_P(Prefix, TestImageClassificationTflite,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
+
+INSTANTIATE_TEST_SUITE_P(Prefix, TestImageClassificationSnpe,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_GPU),
+                                                                                  ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CUSTOM),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_GPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file

diff --git a/test/testsuites/machine_learning/inference/test_object_detection.cpp b/test/testsuites/machine_learning/inference/test_object_detection.cpp
index 791e30f..203e36b 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_object_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_object_detection.cpp
@@ -118,9 +118,9 @@ TEST_P(TestObjectDetectionTflite, MobilenetV2_SSD)
        }
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionTflite,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
+INSTANTIATE_TEST_SUITE_P(Prefix, TestObjectDetectionTflite,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
 
 class TestObjectDetectionSnpe : public TestInference
 {
@@ -155,5 +155,5 @@ TEST_P(TestObjectDetectionSnpe, DISABLED_YoloV5MultiAnchor)
        inferenceDog(answer);
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionSnpe,
-                                               ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file
+INSTANTIATE_TEST_SUITE_P(Prefix, TestObjectDetectionSnpe,
+                                                ::testing::Values(ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CUSTOM)));
\ No newline at end of file

diff --git a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
index 80bc744..707d92b 100644 (file)
--- a/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
+++ b/test/testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
@@ -232,6 +232,6 @@ TEST_P(TestPoseLandmarkDetectionTflite, MoveNetLightning4Quant)
        }
 }
 
-INSTANTIATE_TEST_CASE_P(Prefix, TestPoseLandmarkDetectionTflite,
-                                               ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
-                                                                                 ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file
+INSTANTIATE_TEST_SUITE_P(Prefix, TestPoseLandmarkDetectionTflite,
+                                                ::testing::Values(ParamTypes(false, MV_INFERENCE_TARGET_DEVICE_CPU),
+                                                                                  ParamTypes(true, MV_INFERENCE_TARGET_DEVICE_CPU)));
\ No newline at end of file