[UTC][MediaVison][Non-ACR] fix feature check issues

In face_tracking, roi_tracker, and some of 3d apis, checking features
and their support is wrong so that the apis' tcs return failure.

Change-Id: I3445c568814491c42668b6815e107a3da703b558
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/src/utc/capi-media-vision/utc-mv_3d.c b/src/utc/capi-media-vision/utc-mv_3d.c
index 85fe5f186b2a569ea7a52a4d90b898ccfafe2616..dc9d1754dc02c1176031bce75365cd9db96cddaf 100755 (executable)
--- a/src/utc/capi-media-vision/utc-mv_3d.c
+++ b/src/utc/capi-media-vision/utc-mv_3d.c
@@ -746,9 +746,18 @@ int utc_mediavision_mv_3d_run_p(void)
 {
     printf("mv_3d_run_p\n");
 
+    mv_3d_h mv3d_handle = NULL;
+    int ret = mv_3d_create(&mv3d_handle);
+    if (!gIsMv3dSupported) {
+        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        return 0;
+    }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
+    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
+
     char baseImageFilename[FILE_PATH_SIZE];
     snprintf(baseImageFilename, 1024, "%s/%s", gMv3dExampleDir, MV3D_BASE_IMAGE_FILENAME);
-    int ret = mv_create_source(&gBaseSourceHandle);
+    ret = mv_create_source(&gBaseSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     ret = load_image_to_media_source(baseImageFilename, gBaseSourceHandle);
@@ -762,16 +771,6 @@ int utc_mediavision_mv_3d_run_p(void)
     ret = load_image_to_media_source(extraImageFilename, gExtraSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_3d_h mv3d_handle = NULL;
-    ret = mv_3d_create(&mv3d_handle);
-    if (!gIsMv3dSupported) {
-        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
-    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
-
     assert_eq(set_3d_engine_config(gEngineConfigHandle), MEDIA_VISION_ERROR_NONE);
 
     ret = mv_3d_configure(mv3d_handle, gEngineConfigHandle);
@@ -862,9 +861,18 @@ int utc_mediavision_mv_3d_run_async_p(void)
 {
     printf("mv_3d_run_p\n");
 
+    mv_3d_h mv3d_handle = NULL;
+    int ret = mv_3d_create(&mv3d_handle);
+    if (!gIsMv3dSupported) {
+        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        return 0;
+    }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
+    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
+
     char baseImageFilename[FILE_PATH_SIZE];
     snprintf(baseImageFilename, 1024, "%s/%s", gMv3dExampleDir, MV3D_BASE_IMAGE_FILENAME);
-    int ret = mv_create_source(&gBaseSourceHandle);
+    ret = mv_create_source(&gBaseSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     ret = load_image_to_media_source(baseImageFilename, gBaseSourceHandle);
@@ -878,16 +886,6 @@ int utc_mediavision_mv_3d_run_async_p(void)
     ret = load_image_to_media_source(extraImageFilename, gExtraSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_3d_h mv3d_handle = NULL;
-    ret = mv_3d_create(&mv3d_handle);
-    if (!gIsMv3dSupported) {
-        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
-    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
-
     assert_eq(set_3d_engine_config(gEngineConfigHandle), MEDIA_VISION_ERROR_NONE);
 
     ret = mv_3d_configure(mv3d_handle, gEngineConfigHandle);
@@ -1004,9 +1002,18 @@ int utc_mediavision_mv_3d_pointcloud_write_file_p(void)
 {
     printf("utc_mediavision_mv_3d_pointcloud_write_file_p\n");
 
+    mv_3d_h mv3d_handle = NULL;
+    int ret = mv_3d_create(&mv3d_handle);
+    if (!gIsMv3dSupported) {
+        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        return 0;
+    }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
+    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
+
     char baseImageFilename[FILE_PATH_SIZE];
     snprintf(baseImageFilename, 1024, "%s/%s", gMv3dExampleDir, MV3D_BASE_IMAGE_FILENAME);
-    int ret = mv_create_source(&gBaseSourceHandle);
+    ret = mv_create_source(&gBaseSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     ret = load_image_to_media_source(baseImageFilename, gBaseSourceHandle);
@@ -1020,16 +1027,6 @@ int utc_mediavision_mv_3d_pointcloud_write_file_p(void)
     ret = load_image_to_media_source(extraImageFilename, gExtraSourceHandle);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_3d_h mv3d_handle = NULL;
-    ret = mv_3d_create(&mv3d_handle);
-    if (!gIsMv3dSupported) {
-        assert_eq(ret, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
-    assert_eq(gStartupError, MEDIA_VISION_ERROR_NONE);
-
     assert_eq(set_3d_engine_config(gEngineConfigHandle), MEDIA_VISION_ERROR_NONE);
 
     ret = mv_3d_configure(mv3d_handle, gEngineConfigHandle);

diff --git a/src/utc/capi-media-vision/utc-mv_face.c b/src/utc/capi-media-vision/utc-mv_face.c
index 301e83d7df2e25c155ef6b9242cdb8b68c90e43d..b8961898c160ab714d77e68d7458d1c8ed5c04ce 100755 (executable)
--- a/src/utc/capi-media-vision/utc-mv_face.c
+++ b/src/utc/capi-media-vision/utc-mv_face.c
@@ -31,7 +31,6 @@
 #define API_NAMESPACE "[MediaVision]"
 
 static bool isVisionSupported = false;
-static int gStartupError;
 
 static unsigned int p1_face_examples_n = 5;
 const char *p1_face_examples_dir = NULL;
@@ -363,13 +362,12 @@ int utc_mediavision_mv_face_tracking_model_create_p(void)
 {
     printf("Inside mv_face_tracking_model_create_p\n");
 
+    mv_face_tracking_model_h test_tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&test_tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_tracking_model_h test_tracking_model = NULL;
-    int ret = mv_face_tracking_model_create(&test_tracking_model);
     assert_neq(NULL, test_tracking_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -392,12 +390,11 @@ int utc_mediavision_mv_face_tracking_model_create_n(void)
 {
     printf("Inside mv_face_tracking_model_create_n\n");
 
+    const int ret = mv_face_tracking_model_create(NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    const int ret = mv_face_tracking_model_create(NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     printf("Before return mv_face_tracking_model_create_n\n");
@@ -416,14 +413,14 @@ int utc_mediavision_mv_face_tracking_model_destroy_p(void)
 {
     printf("Inside mv_face_tracking_model_destroy_p\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-    const int ret = mv_face_tracking_model_destroy(tracking_model);
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
+    ret = mv_face_tracking_model_destroy(tracking_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     tracking_model = NULL;
@@ -444,12 +441,11 @@ int utc_mediavision_mv_face_tracking_model_destroy_n(void)
 {
     printf("Inside mv_face_tracking_model_destroy_n\n");
 
+    const int ret = mv_face_tracking_model_destroy(NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    const int ret = mv_face_tracking_model_destroy(NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     printf("Before return mv_face_tracking_model_destroy_n\n");
@@ -468,21 +464,22 @@ int utc_mediavision_mv_face_tracking_model_prepare_p(void)
 {
     printf("Inside mv_face_tracking_model_prepare_p\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
-    int ret = mv_create_source(&source);
+    ret = mv_create_source(&source);
+    
     assert_neq(NULL, source);
 
     ret = load_image_to_media_source(track_prep_frame_path, source);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-
     mv_quadrangle_s roi;
     roi.points[0].x = 440;
     roi.points[0].y = 130;
@@ -516,13 +513,16 @@ int utc_mediavision_mv_face_tracking_model_prepare_n(void)
 {
     printf("Inside mv_face_tracking_model_prepare_n\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
-    int ret = mv_create_source(&source);
+    ret = mv_create_source(&source);
     assert_neq(NULL, source);
 
     mv_quadrangle_s roi;
@@ -535,9 +535,6 @@ int utc_mediavision_mv_face_tracking_model_prepare_n(void)
     roi.points[3].x = 440;
     roi.points[3].y = 240;
 
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-
     ret = mv_face_tracking_model_prepare(tracking_model, NULL, source, &roi);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
@@ -581,13 +578,12 @@ int utc_mediavision_mv_face_tracking_model_clone_p(void)
 {
     printf("Inside mv_face_tracking_model_clone_p\n");
 
+    mv_face_tracking_model_h source_model = NULL;
+    int ret = mv_face_tracking_model_create(&source_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_tracking_model_h source_model = NULL;
-    int ret = mv_face_tracking_model_create(&source_model);
     assert_neq(NULL, source_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -632,15 +628,15 @@ int utc_mediavision_mv_face_tracking_model_clone_n(void)
 {
     printf("Inside mv_face_tracking_model_clone_n\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-
-    int ret = mv_face_tracking_model_clone(tracking_model, NULL);
+    ret = mv_face_tracking_model_clone(tracking_model, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     ret = mv_face_tracking_model_clone(NULL, tracking_model);
@@ -662,18 +658,19 @@ int utc_mediavision_mv_face_tracking_model_save_p(void)
 {
     printf("Inside mv_face_tracking_model_save_p\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     char modelDataPath [FILE_PATH_SIZE];
     snprintf(modelDataPath, strlen(pInternalDataPath) + strlen("/test_trk_model")+1, "%s/test_trk_model", pInternalDataPath);
 
     mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
+    
+    int ret = mv_face_tracking_model_create(&tracking_model);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    int ret = mv_face_tracking_model_save(modelDataPath, tracking_model);
+    ret = mv_face_tracking_model_save(modelDataPath, tracking_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
@@ -720,14 +717,15 @@ int utc_mediavision_mv_face_tracking_model_save_n(void)
 {
     printf("Inside mv_face_tracking_model_save_n\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    int ret = mv_face_tracking_model_save(path_to_trk_model, NULL);
+    ret = mv_face_tracking_model_save(path_to_trk_model, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     ret = mv_face_tracking_model_save(NULL, tracking_model);
@@ -755,13 +753,12 @@ int utc_mediavision_mv_face_tracking_model_load_p(void)
 {
     printf("Inside mv_face_tracking_model_load_p\n");
 
+    mv_face_tracking_model_h source_model = NULL;
+    int ret = mv_face_tracking_model_load(path_to_trk_model, &source_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_tracking_model_h source_model = NULL;
-    int ret = mv_face_tracking_model_load(path_to_trk_model, &source_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     ret = mv_face_tracking_model_destroy(source_model);
@@ -786,12 +783,11 @@ int utc_mediavision_mv_face_tracking_model_load_n(void)
 {
     printf("Inside mv_face_tracking_model_load_n\n");
 
+    int ret = mv_face_tracking_model_load(path_to_trk_model, NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    int ret = mv_face_tracking_model_load(path_to_trk_model, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_face_tracking_model_h source_model = NULL;
@@ -825,21 +821,21 @@ int utc_mediavision_mv_face_track_p(void)
 {
     printf("Inside mv_face_track_p\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
-    int ret = mv_create_source(&source);
+    ret = mv_create_source(&source);
     assert_neq(NULL, source);
 
     ret = load_image_to_media_source(track_prep_frame_path, source);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-
     mv_quadrangle_s roi;
     roi.points[0].x = 440;
     roi.points[0].y = 130;
@@ -904,19 +900,19 @@ int utc_mediavision_mv_face_track_n(void)
 {
     printf("Inside mv_face_track_n\n");
 
+    mv_face_tracking_model_h tracking_model = NULL;
+    int ret = mv_face_tracking_model_create(&tracking_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
-    int ret = mv_create_source(&source);
+    ret = mv_create_source(&source);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
     assert_neq(NULL, source);
 
-    mv_face_tracking_model_h tracking_model = NULL;
-    assert_eq(MEDIA_VISION_ERROR_NONE, mv_face_tracking_model_create(&tracking_model));
-
     ret = mv_face_track(source, tracking_model, NULL, track_cb, true, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
@@ -977,16 +973,14 @@ int utc_mediavision_mv_face_recognize_p(void)
 {
     printf("Inside mv_face_recognize_p\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_face_recognition_model_h recognition_model = NULL;
-
     int ret = mv_face_recognition_model_load(
                   path_to_rec_model,
                   &recognition_model);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
@@ -1025,16 +1019,14 @@ int utc_mediavision_mv_face_recognize_n(void)
 {
     printf("Inside mv_face_recognize_n\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_face_recognition_model_h recognition_model = NULL;
-
     int ret = mv_face_recognition_model_load(
                   path_to_rec_model,
                   &recognition_model);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h source = NULL;
@@ -1167,16 +1159,27 @@ int utc_mediavision_mv_face_eye_condition_recognize_p(void)
 {
     printf("Inside mv_face_eye_condition_recognition_p\n");
 
+    mv_rectangle_s location;
+    mv_face_eye_condition_e eye_condition;
+    location.point.x = 0;
+    location.point.y = 0;
+    location.width = 0;
+    location.height = 0;
+
+    int ret = mv_face_eye_condition_recognize(
+                NULL,
+                NULL,
+                location,
+                eye_condition_cb,
+                NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_rectangle_s location;
-    mv_face_eye_condition_e eye_condition;
+    assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source1 = NULL;
-    int ret = mv_create_source(&source1);
+    ret = mv_create_source(&source1);
     assert_neq(NULL, source1);
 
     mv_source_h source2 = NULL;
@@ -1311,11 +1314,6 @@ int utc_mediavision_mv_face_eye_condition_recognize_n(void)
 {
     printf("Inside mv_face_eye_condition_recognize_n\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_rectangle_s location;
     location.point.x = 0;
     location.point.y = 0;
@@ -1323,6 +1321,10 @@ int utc_mediavision_mv_face_eye_condition_recognize_n(void)
     location.height = 0;
 
     int ret = mv_face_eye_condition_recognize(NULL, NULL, location, NULL, NULL);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source = NULL;
@@ -1386,18 +1388,22 @@ int utc_mediavision_mv_face_facial_expression_recognize_p(void)
 {
     printf("Inside mv_face_facial_expression_recognize_p\n");
 
+    mv_rectangle_s location;
+    mv_face_facial_expression_e face_expression;
+    location.point.x = -1;
+    location.point.y = -1;
+    location.width = 0;
+    location.height = 0;
+
+    int ret = mv_face_facial_expression_recognize(NULL, NULL, location, NULL, NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_rectangle_s location;
-    location.point.x = 0;
-    location.point.y = 0;
-    mv_face_facial_expression_e face_expression;
+    assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source1 = NULL;
-    int ret = mv_create_source(&source1);
+    ret = mv_create_source(&source1);
     assert_neq(NULL, source1);
 
     mv_source_h source2 = NULL;
@@ -1414,6 +1420,8 @@ int utc_mediavision_mv_face_facial_expression_recognize_p(void)
     ret = load_image_to_media_source(pszValue, source2);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
+    location.point.x = 0;
+    location.point.y = 0;
     face_expression = MV_FACE_NEUTRAL;
        is_facial_expression_cb_called = false;
 
@@ -1495,11 +1503,6 @@ int utc_mediavision_mv_face_facial_expression_recognize_n(void)
 {
     printf("Inside mv_face_facial_expression_recognize_n\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_rectangle_s location;
     location.point.x = -1;
     location.point.y = -1;
@@ -1507,6 +1510,10 @@ int utc_mediavision_mv_face_facial_expression_recognize_n(void)
     location.height = 0;
 
     int ret = mv_face_facial_expression_recognize(NULL, NULL, location, NULL, NULL);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source = NULL;
@@ -1544,13 +1551,12 @@ int utc_mediavision_mv_face_recognition_model_create_p(void)
 {
     printf("Inside mv_face_recognition_model_create_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    const int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    const int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1570,12 +1576,11 @@ int utc_mediavision_mv_face_recognition_model_create_n(void)
 {
     printf("Inside mv_face_recognition_model_create_n\n");
 
+    const int ret = mv_face_recognition_model_create(NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    const int ret = mv_face_recognition_model_create(NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     printf("Before return mv_face_recognition_model_create_n\n");
@@ -1593,13 +1598,12 @@ int utc_mediavision_mv_face_recognition_model_destroy_p(void)
 {
     printf("Inside mv_face_recognition_model_destroy_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1622,12 +1626,11 @@ int utc_mediavision_mv_face_recognition_model_destroy_n(void)
 {
     printf("Inside mv_face_recognition_model_destroy_n\n");
 
+    const int ret = mv_face_recognition_model_destroy(NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    const int ret = mv_face_recognition_model_destroy(NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     printf("Before return mv_face_recognition_model_destroy_n\n");
@@ -1645,13 +1648,12 @@ int utc_mediavision_mv_face_recognition_model_clone_p(void)
 {
     printf("Inside mv_face_recognition_model_clone_p\n");
 
+    mv_face_recognition_model_h source_model = NULL;
+    int ret = mv_face_recognition_model_create(&source_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h source_model = NULL;
-    int ret = mv_face_recognition_model_create(&source_model);
     assert_neq(NULL, source_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1711,13 +1713,12 @@ int utc_mediavision_mv_face_recognition_model_clone_n(void)
 {
     printf("Inside mv_face_recognition_model_clone_n\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1748,13 +1749,12 @@ int utc_mediavision_mv_face_recognition_model_save_p(void)
 {
     printf("Inside mv_face_recognition_model_save_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1818,13 +1818,12 @@ int utc_mediavision_mv_face_recognition_model_save_n(void)
 {
     printf("Inside mv_face_recognition_model_save_n\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1856,15 +1855,13 @@ int utc_mediavision_mv_face_recognition_model_load_p(void)
 {
     printf("Inside mv_face_recognition_model_load_p\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_face_recognition_model_h recognition_model = NULL;
-
     int ret = mv_face_recognition_model_load(
             path_to_rec_model, &recognition_model);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     ret = mv_face_recognition_model_destroy(recognition_model);
@@ -1887,16 +1884,15 @@ int utc_mediavision_mv_face_recognition_model_load_n(void)
 {
     printf("Inside mv_face_recognition_model_load_n\n");
 
-    if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
-
     mv_face_recognition_model_h recognition_model = NULL;
 
     // Not existed file
     int ret = mv_face_recognition_model_load(
             "/fake/path/test_rec_model", &recognition_model);
+    if (!isVisionSupported) {
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
+        return 0;
+    }
     assert_eq(ret, MEDIA_VISION_ERROR_INVALID_PATH);
 
     ret = mv_face_recognition_model_load(NULL, &recognition_model);
@@ -1923,13 +1919,12 @@ int utc_mediavision_mv_face_recognition_model_add_p(void)
 {
     printf("Inside mv_face_recognition_model_add_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -1980,13 +1975,12 @@ int utc_mediavision_mv_face_recognition_model_add_n(void)
 {
     printf("Inside mv_face_recognition_model_add_n\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -2063,10 +2057,14 @@ int utc_mediavision_mv_face_recognition_model_reset_p(void)
 {
     printf("Inside mv_face_recognition_model_reset_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_neq(NULL, recognition_model);
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h *p1_face_examples = NULL;
     assert_eq(MEDIA_VISION_ERROR_NONE,
@@ -2076,11 +2074,6 @@ int utc_mediavision_mv_face_recognition_model_reset_p(void)
     assert_eq(MEDIA_VISION_ERROR_NONE,
                 init_examples_by_dir(p2_face_examples_dir, p2_face_examples_n, &p2_face_examples));
 
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
-    assert_neq(NULL, recognition_model);
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
     unsigned int ex_ind = 0;
     for (ex_ind = 0; ex_ind < p1_face_examples_n; ++ex_ind)
     {
@@ -2128,10 +2121,14 @@ int utc_mediavision_mv_face_recognition_model_reset_n(void)
 {
     printf("Inside mv_face_recognition_model_reset_n\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_neq(NULL, recognition_model);
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h *p1_face_examples = NULL;
     assert_eq(MEDIA_VISION_ERROR_NONE,
@@ -2141,11 +2138,6 @@ int utc_mediavision_mv_face_recognition_model_reset_n(void)
     assert_eq(MEDIA_VISION_ERROR_NONE,
                 init_examples_by_dir(p2_face_examples_dir, p2_face_examples_n, &p2_face_examples));
 
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
-    assert_neq(NULL, recognition_model);
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
     unsigned int ex_ind = 0;
     for (ex_ind = 0; ex_ind < p1_face_examples_n; ++ex_ind)
     {
@@ -2196,10 +2188,14 @@ int utc_mediavision_mv_face_recognition_model_learn_p(void)
 {
     printf("Inside mv_face_recognition_model_learn_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_neq(NULL, recognition_model);
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h *p1_face_examples = NULL;
     assert_eq(MEDIA_VISION_ERROR_NONE,
@@ -2209,11 +2205,6 @@ int utc_mediavision_mv_face_recognition_model_learn_p(void)
     assert_eq(MEDIA_VISION_ERROR_NONE,
                 init_examples_by_dir(p2_face_examples_dir, p2_face_examples_n, &p2_face_examples));
 
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
-    assert_neq(NULL, recognition_model);
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
     unsigned int ex_ind = 0;
     for (ex_ind = 0; ex_ind < p1_face_examples_n - 1; ++ex_ind)
     {
@@ -2266,12 +2257,11 @@ int utc_mediavision_mv_face_recognition_model_learn_n(void)
 {
     printf("Inside mv_face_recognition_model_learn_n\n");
 
+    int ret = mv_face_recognition_model_learn(NULL, NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    int ret = mv_face_recognition_model_learn(NULL, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_face_recognition_model_h recognition_model = NULL;
@@ -2301,10 +2291,14 @@ int utc_mediavision_mv_face_recognition_model_query_labels_p(void)
 {
     printf("Inside mv_face_recognition_model_query_labels_p\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_neq(NULL, recognition_model);
+    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
     mv_source_h *p1_face_examples = NULL;
     assert_eq(MEDIA_VISION_ERROR_NONE,
@@ -2314,11 +2308,6 @@ int utc_mediavision_mv_face_recognition_model_query_labels_p(void)
     assert_eq(MEDIA_VISION_ERROR_NONE,
                 init_examples_by_dir(p2_face_examples_dir, p2_face_examples_n, &p2_face_examples));
 
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
-    assert_neq(NULL, recognition_model);
-    assert_eq(MEDIA_VISION_ERROR_NONE, ret);
-
     unsigned int ex_ind = 0;
     for (ex_ind = 0; ex_ind < p1_face_examples_n - 1; ++ex_ind)
     {
@@ -2374,13 +2363,12 @@ int utc_mediavision_mv_face_recognition_model_query_labels_n(void)
 {
     printf("Inside mv_face_recognition_model_query_labels_n\n");
 
+    mv_face_recognition_model_h recognition_model = NULL;
+    int ret = mv_face_recognition_model_create(&recognition_model);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    mv_face_recognition_model_h recognition_model = NULL;
-    int ret = mv_face_recognition_model_create(&recognition_model);
     assert_neq(NULL, recognition_model);
     assert_eq(MEDIA_VISION_ERROR_NONE, ret);
 
@@ -2435,13 +2423,15 @@ int utc_mediavision_mv_face_detect_p(void)
 {
     printf("Inside mv_face_detect_p\n");
 
+    int ret = mv_face_detect(NULL, NULL, face_detected_cb, NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
+    assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source1 = NULL;
-    int ret = mv_create_source(&source1);
+    ret = mv_create_source(&source1);
     assert_neq(NULL, source1);
 
     char pszValue[CONFIG_VALUE_LEN_MAX] = {0,};
@@ -2475,12 +2465,11 @@ int utc_mediavision_mv_face_detect_n(void)
 {
     printf("Inside mv_face_detect_n\n");
 
+    int ret = mv_face_detect(NULL, NULL, face_detected_cb, NULL);
     if (!isVisionSupported) {
-        assert_eq(gStartupError, MEDIA_VISION_ERROR_NOT_SUPPORTED);
+        assert_eq(MEDIA_VISION_ERROR_NOT_SUPPORTED, ret);
         return 0;
     }
-
-    int ret = mv_face_detect(NULL, NULL, face_detected_cb, NULL);
     assert_eq(MEDIA_VISION_ERROR_INVALID_PARAMETER, ret);
 
     mv_source_h source1 = NULL;

diff --git a/src/utc/capi-media-vision/utc-mv_roi_tracker.c b/src/utc/capi-media-vision/utc-mv_roi_tracker.c
index a9e0c826e8b6591ccc73f8bbb4eed772c35bf0b8..ea21f00894ae733eaa3e78b7d028ce998b2ae837 100755 (executable)
--- a/src/utc/capi-media-vision/utc-mv_roi_tracker.c
+++ b/src/utc/capi-media-vision/utc-mv_roi_tracker.c
@@ -113,7 +113,7 @@ void utc_capi_media_vision_roi_tracker_startup(void)
 {
     printf("capi-media-vision mv_inference tests STARTUP is launched\n");
 
-    bool isROITrackerSupported = true;
+    bool isROITrackerSupported = false;
     system_info_get_platform_bool(ROI_TRACKER_FEATURE, &isROITrackerSupported);
 
     if (isROITrackerSupported)