From: Tae-Young Chung Date: Fri, 18 Oct 2019 02:52:11 +0000 (+0900) Subject: [UTC][capi-media-vision][Non-ACR][Fix TC fails and Add missed TC list] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f2394291d22b6db48f6f86352dec9adf67ed653;p=test%2Ftct%2Fnative%2Fapi.git [UTC][capi-media-vision][Non-ACR][Fix TC fails and Add missed TC list] Change-Id: I078f7accf38e0d49471cca4ffa3b000c17e78db4 Signed-off-by: Tae-Young Chung --- diff --git a/src/utc/capi-media-vision/tct-capi-media-vision-core_mobile.h b/src/utc/capi-media-vision/tct-capi-media-vision-core_mobile.h index b3184eef6..79493c282 100755 --- a/src/utc/capi-media-vision/tct-capi-media-vision-core_mobile.h +++ b/src/utc/capi-media-vision/tct-capi-media-vision-core_mobile.h @@ -199,6 +199,7 @@ extern int utc_mediavision_mv_surveillance_get_result_value_n(void); extern int utc_mediavision_mv_surveillance_get_result_value_p1(void); extern int utc_mediavision_mv_surveillance_get_result_value_p2(void); extern int utc_mediavision_mv_surveillance_get_result_value_p3(void); +extern int utc_mediavision_mv_inference_foreach_supported_engine(void); extern int utc_mediavision_mv_inference_create_p(void); extern int utc_mediavision_mv_inference_create_n(void); extern int utc_mediavision_mv_inference_destroy_p(void); @@ -384,6 +385,7 @@ testcase tc_array[] = { {"utc_mediavision_mv_surveillance_get_result_value_p1",utc_mediavision_mv_surveillance_get_result_value_p1,utc_capi_media_vision_surveillance_cb1_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p2",utc_mediavision_mv_surveillance_get_result_value_p2,utc_capi_media_vision_surveillance_cb2_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p3",utc_mediavision_mv_surveillance_get_result_value_p3,utc_capi_media_vision_surveillance_cb3_startup,utc_capi_media_vision_surveillance_cleanup}, + {"utc_mediavision_mv_inference_foreach_supported_engine",utc_mediavision_mv_inference_foreach_supported_engine,utc_capi_media_vision_inference_startup2,utc_capi_media_vision_inference_cleanup2}, {"utc_mediavision_mv_inference_create_p",utc_mediavision_mv_inference_create_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_create_n",utc_mediavision_mv_inference_create_n,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_destroy_p",utc_mediavision_mv_inference_destroy_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, diff --git a/src/utc/capi-media-vision/tct-capi-media-vision-core_tizeniot.h b/src/utc/capi-media-vision/tct-capi-media-vision-core_tizeniot.h index b3184eef6..79493c282 100755 --- a/src/utc/capi-media-vision/tct-capi-media-vision-core_tizeniot.h +++ b/src/utc/capi-media-vision/tct-capi-media-vision-core_tizeniot.h @@ -199,6 +199,7 @@ extern int utc_mediavision_mv_surveillance_get_result_value_n(void); extern int utc_mediavision_mv_surveillance_get_result_value_p1(void); extern int utc_mediavision_mv_surveillance_get_result_value_p2(void); extern int utc_mediavision_mv_surveillance_get_result_value_p3(void); +extern int utc_mediavision_mv_inference_foreach_supported_engine(void); extern int utc_mediavision_mv_inference_create_p(void); extern int utc_mediavision_mv_inference_create_n(void); extern int utc_mediavision_mv_inference_destroy_p(void); @@ -384,6 +385,7 @@ testcase tc_array[] = { {"utc_mediavision_mv_surveillance_get_result_value_p1",utc_mediavision_mv_surveillance_get_result_value_p1,utc_capi_media_vision_surveillance_cb1_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p2",utc_mediavision_mv_surveillance_get_result_value_p2,utc_capi_media_vision_surveillance_cb2_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p3",utc_mediavision_mv_surveillance_get_result_value_p3,utc_capi_media_vision_surveillance_cb3_startup,utc_capi_media_vision_surveillance_cleanup}, + {"utc_mediavision_mv_inference_foreach_supported_engine",utc_mediavision_mv_inference_foreach_supported_engine,utc_capi_media_vision_inference_startup2,utc_capi_media_vision_inference_cleanup2}, {"utc_mediavision_mv_inference_create_p",utc_mediavision_mv_inference_create_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_create_n",utc_mediavision_mv_inference_create_n,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_destroy_p",utc_mediavision_mv_inference_destroy_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, diff --git a/src/utc/capi-media-vision/tct-capi-media-vision-core_wearable.h b/src/utc/capi-media-vision/tct-capi-media-vision-core_wearable.h index b3184eef6..79493c282 100755 --- a/src/utc/capi-media-vision/tct-capi-media-vision-core_wearable.h +++ b/src/utc/capi-media-vision/tct-capi-media-vision-core_wearable.h @@ -199,6 +199,7 @@ extern int utc_mediavision_mv_surveillance_get_result_value_n(void); extern int utc_mediavision_mv_surveillance_get_result_value_p1(void); extern int utc_mediavision_mv_surveillance_get_result_value_p2(void); extern int utc_mediavision_mv_surveillance_get_result_value_p3(void); +extern int utc_mediavision_mv_inference_foreach_supported_engine(void); extern int utc_mediavision_mv_inference_create_p(void); extern int utc_mediavision_mv_inference_create_n(void); extern int utc_mediavision_mv_inference_destroy_p(void); @@ -384,6 +385,7 @@ testcase tc_array[] = { {"utc_mediavision_mv_surveillance_get_result_value_p1",utc_mediavision_mv_surveillance_get_result_value_p1,utc_capi_media_vision_surveillance_cb1_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p2",utc_mediavision_mv_surveillance_get_result_value_p2,utc_capi_media_vision_surveillance_cb2_startup,utc_capi_media_vision_surveillance_cleanup}, {"utc_mediavision_mv_surveillance_get_result_value_p3",utc_mediavision_mv_surveillance_get_result_value_p3,utc_capi_media_vision_surveillance_cb3_startup,utc_capi_media_vision_surveillance_cleanup}, + {"utc_mediavision_mv_inference_foreach_supported_engine",utc_mediavision_mv_inference_foreach_supported_engine,utc_capi_media_vision_inference_startup2,utc_capi_media_vision_inference_cleanup2}, {"utc_mediavision_mv_inference_create_p",utc_mediavision_mv_inference_create_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_create_n",utc_mediavision_mv_inference_create_n,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, {"utc_mediavision_mv_inference_destroy_p",utc_mediavision_mv_inference_destroy_p,utc_capi_media_vision_inference_startup1,utc_capi_media_vision_inference_cleanup1}, diff --git a/src/utc/capi-media-vision/utc-mv_common.c b/src/utc/capi-media-vision/utc-mv_common.c index f5afb5b4e..106e8d535 100755 --- a/src/utc/capi-media-vision/utc-mv_common.c +++ b/src/utc/capi-media-vision/utc-mv_common.c @@ -26,7 +26,6 @@ #define DICT_KEY_SIZE 255 #define DICT_STR_VALUE_SIZE 1024 -#define DICT_ARRAY_STR_SIZE 10 static bool isVisionSupported = false; static int gStartupError; @@ -58,13 +57,6 @@ struct attr_str_entry char value[DICT_STR_VALUE_SIZE]; }; -struct attr_array_str_entry -{ - char key[DICT_KEY_SIZE]; - char value[DICT_ARRAY_STR_SIZE][DICT_STR_VALUE_SIZE]; - int size; -}; - static mv_engine_config_h engine_config = NULL; static bool _is_broken_config = false; @@ -76,8 +68,6 @@ static struct attr_bool_entry *dict_bool = NULL; static int dict_bool_n = 0; static struct attr_str_entry *dict_str = NULL; static int dict_str_n = 0; -static struct attr_array_str_entry *dict_array_str = NULL; -static int dict_array_str_n = 0; bool _parse_attr_dictionaries(const char *conf_file) { @@ -183,20 +173,6 @@ bool _parse_attr_dictionaries(const char *conf_file) assert_geq(DICT_STR_VALUE_SIZE, strlen(str_value)); snprintf(dict_str[dict_str_n-1].value, DICT_STR_VALUE_SIZE, "%s", str_value); } - else if (0 == strcmp("array", str_type)) - { - dict_array_str = (struct attr_array_str_entry*)realloc(dict_array_str, ++dict_array_str_n * sizeof(struct attr_array_str_entry)); - snprintf(dict_array_str[dict_array_str_n-1].key, DICT_KEY_SIZE, "%s", str_name); - JsonArray *attr_array = json_object_get_array_member(attr_obj, "value"); - assert_geq(DICT_ARRAY_STR_SIZE, json_array_get_length(attr_array)); - for (unsigned int item = 0; item < json_array_get_length(attr_array); ++item) - { - const char *str_value = (const char*)json_array_get_string_element(attr_array, item); - assert_geq(DICT_STR_VALUE_SIZE, strlen(str_value)); - snprintf(dict_array_str[dict_array_str_n].value[item], DICT_STR_VALUE_SIZE, "%s", str_value); - } - dict_array_str[dict_array_str_n].size = json_array_get_length(attr_array); - } else { printf("Attribute %s wasn't parsed from json file. Type isn't supported.", str_name); @@ -281,24 +257,6 @@ bool _is_supported_str_attr(const char *key, char *value) return false; } -bool _is_supported_array_str_attr(const char *key, char **value) -{ - int ind = 0; - for(; ind < dict_array_str_n; ++ind) - { - if (0 == strcmp(dict_array_str[ind].key, key)) - { - if (value != NULL) - { - snprintf(value, 1024, "%s", dict_str[ind].value); - } - return true; - } - } - - return false; -} - /** * @function utc_capi_media_vision_common_startup * @description Called before each test @@ -446,9 +404,6 @@ bool _attribute_supported_callback( bool real_bool_value = true; char str_value[DICT_STR_VALUE_SIZE] = "a"; char *real_str_value; - char array_str_value[DICT_ARRAY_STR_SIZE][DICT_STR_VALUE_SIZE] = {"a",}; - int real_array_size; - char **real_array_str_value; bool is_supported = false; bool are_exp_act_equal = false;