From: Minje Ahn Date: Wed, 23 Feb 2022 05:24:53 +0000 (+0900) Subject: [UTC][media-content][Non-ACR] media-tag code cleanup X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebbdc29dff65cc9c7030c21514a7315f0dc6a451;p=test%2Ftct%2Fnative%2Fapi.git [UTC][media-content][Non-ACR] media-tag code cleanup Change-Id: I6303f71aac797c39ec6d88976f1fc7ff3e13db9b Signed-off-by: Minje Ahn --- diff --git a/src/utc/media-content/utc-media-tag.c b/src/utc/media-content/utc-media-tag.c index f97be13fb..62ebc7437 100755 --- a/src/utc/media-content/utc-media-tag.c +++ b/src/utc/media-content/utc-media-tag.c @@ -15,32 +15,15 @@ // #include #include +#include +#include //& set: MediaTag static media_tag_h g_tag = NULL; -static media_tag_h g_tag_dst = NULL; -static filter_h g_filter; -static int g_tag_id; +static int g_tag_id = 0; static char *g_media_id = NULL; -static char *tag_name = "tag_test_12"; -static media_content_error_e cb_name_cmp_result = MEDIA_CONTENT_ERROR_NONE; - -static media_content_error_e startup_ret = MEDIA_CONTENT_ERROR_NONE; - -static bool media_item_cb(media_info_h media, void *user_data) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_info_get_media_id(media, &g_media_id); - if ((ret != MEDIA_CONTENT_ERROR_NONE) || (g_media_id == NULL)) { - fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "media_info_get_media_id failed (code: %d)\n", ret); - return false; - } - - return true; -} +static int startup_ret = MEDIA_CONTENT_ERROR_NONE; /** * @function utc_media_tag_startup @@ -50,53 +33,46 @@ static bool media_item_cb(media_info_h media, void *user_data) */ void utc_media_tag_startup(void) { - g_filter = NULL; - g_tag = NULL; - g_tag_dst = NULL; + char video_path[PATH_MAX + 1] = { 0, }; + char *root_path = NULL; + media_info_h media = NULL; - media_content_error_e ret = MEDIA_CONTENT_ERROR_NONE; + if (storage_get_root_directory(0, &root_path) == STORAGE_ERROR_NONE) { + snprintf(video_path, PATH_MAX, "%s/res/movie.mp4", root_path); + FREE_MEMORY(root_path); + } - ret = media_content_connect(); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "media_content_connect failed (code: %d)\n", ret); - startup_ret = ret; + startup_ret = media_content_connect(); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + FPRINTF("[Line : %d] media_content_connect failed.\\n", __LINE__); return; } - char *condition = "MEDIA_TYPE=1 AND MEDIA_STORAGE_TYPE=0"; //Video - - media_filter_create(&g_filter); - media_filter_set_condition(g_filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT); - media_filter_set_order(g_filter, MEDIA_CONTENT_ORDER_ASC, MEDIA_TITLE, MEDIA_CONTENT_COLLATE_DEFAULT); - if (g_filter == NULL) { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "filter is NULL"); - startup_ret = ret; - return; + startup_ret = media_info_get_media_from_db_by_path(video_path, &media); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + startup_ret = media_info_insert_to_db(video_path, &media); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + FPRINTF("[Line : %d] media_info_insert_to_db failed.\\n", __LINE__); + return; + } } - ret = media_info_foreach_media_from_db(g_filter, media_item_cb, NULL); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "media_info_foreach_media_from_db failed (code: %d)\n", ret); - startup_ret = ret; + startup_ret = media_info_get_media_id(media, &g_media_id); + media_info_destroy(media); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + FPRINTF("[Line : %d] media_info_get_media_id failed.\\n", __LINE__); return; } - // test if the same data already has been inserted - ret = media_tag_insert_to_db(tag_name, &g_tag); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "media_tag_insert_to_db failed (code: %d)\n", ret); - startup_ret = ret; + + startup_ret = media_tag_insert_to_db("TEST", &g_tag); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + FPRINTF("[Line : %d] media_tag_insert_to_db failed.\\n", __LINE__); return; } - ret = media_tag_get_tag_id(g_tag, &g_tag_id); - if (ret != MEDIA_CONTENT_ERROR_NONE) { - fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__); - fprintf(stderr, "media_tag_get_tag_id failed (code: %d)\n", ret); - startup_ret = ret; + startup_ret = media_tag_get_tag_id(g_tag, &g_tag_id); + if (startup_ret != MEDIA_CONTENT_ERROR_NONE) { + FPRINTF("[Line : %d] media_tag_get_tag_id failed.\\n", __LINE__); return; } } @@ -115,10 +91,7 @@ void utc_media_tag_cleanup(void) g_tag = NULL; } - if (g_filter) { - media_filter_destroy(g_filter); - g_filter = NULL; - } + FREE_MEMORY(g_media_id); media_content_disconnect(); @@ -126,17 +99,11 @@ void utc_media_tag_cleanup(void) static bool tag_cb(media_tag_h tag, void *user_data) { - char *name = NULL; - - if (tag != NULL) { - media_tag_get_name(tag, &name); - - if (name != NULL && strcmp(name, tag_name) == 0) { - fprintf(stderr, " tag name : %s \n", name); - FREE_MEMORY(name); - } - } + return true; +} +static bool media_cb(media_info_h media, void *user_data) +{ return true; } @@ -149,10 +116,9 @@ int utc_media_tag_insert_to_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_insert_to_db(NULL, &g_tag), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_insert_to_db(NULL, &g_tag); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_insert_to_db("TEST", NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -166,24 +132,13 @@ int utc_media_tag_insert_to_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_delete_from_db(g_tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - - /* precondition */ - if (g_tag) { - ret = media_tag_destroy(g_tag); - g_tag = NULL; - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - } + assert_eq(media_tag_delete_from_db(g_tag_id), MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_destroy(g_tag), MEDIA_CONTENT_ERROR_NONE); + g_tag = NULL; - /* actual test */ - ret = media_tag_insert_to_db(tag_name, &g_tag); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_insert_to_db("TEST", &g_tag), MEDIA_CONTENT_ERROR_NONE); - ret = media_tag_get_tag_id(g_tag, &g_tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_get_tag_id(g_tag, &g_tag_id), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -197,10 +152,7 @@ int utc_media_tag_delete_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_delete_from_db(-1); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_delete_from_db(-1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -214,10 +166,7 @@ int utc_media_tag_delete_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_delete_from_db(g_tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_delete_from_db(g_tag_id), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -231,10 +180,7 @@ int utc_media_tag_get_tag_count_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_get_tag_count_from_db(NULL, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_get_tag_count_from_db(NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -248,11 +194,9 @@ int utc_media_tag_get_tag_count_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; int tag_count = 0; - ret = media_tag_get_tag_count_from_db(NULL, &tag_count); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_get_tag_count_from_db(NULL, &tag_count), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -266,10 +210,7 @@ int utc_media_tag_foreach_tag_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_foreach_tag_from_db(NULL, NULL, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_foreach_tag_from_db(NULL, NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -283,28 +224,19 @@ int utc_media_tag_foreach_tag_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - cb_name_cmp_result = MEDIA_CONTENT_ERROR_NONE; - filter_h filter1; + const char *condition = "TAG_NAME=\"TEST\""; + filter_h filter = NULL; - char *g_condition = "TAG_NAME like \"%%tag%%\""; + assert_eq(media_filter_create(&filter), MEDIA_CONTENT_ERROR_NONE); - ret = media_filter_create(&filter1); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT), MEDIA_CONTENT_ERROR_NONE); - ret = media_filter_set_condition(filter1, g_condition, MEDIA_CONTENT_COLLATE_DEFAULT); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_filter_set_order(filter, MEDIA_CONTENT_ORDER_DESC, TAG_NAME, MEDIA_CONTENT_COLLATE_RTRIM), MEDIA_CONTENT_ERROR_NONE); - ret = media_filter_set_order(filter1, MEDIA_CONTENT_ORDER_DESC, TAG_NAME, MEDIA_CONTENT_COLLATE_DEFAULT); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_foreach_tag_from_db(filter, tag_cb, NULL), MEDIA_CONTENT_ERROR_NONE); - ret = media_tag_foreach_tag_from_db(filter1, tag_cb, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - - if (filter1) { - media_filter_destroy(filter1); - filter1 = NULL; - } + if (filter) + media_filter_destroy(filter); return 0; } @@ -318,10 +250,11 @@ int utc_media_tag_get_media_count_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + int count = 0; - ret = media_tag_get_media_count_from_db(g_tag_id, NULL, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_get_media_count_from_db(g_tag_id, NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + + assert_eq(media_tag_get_media_count_from_db(-1, NULL, &count), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -335,11 +268,9 @@ int utc_media_tag_get_media_count_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - int media_count = 0; + int count = 0; - ret = media_tag_get_media_count_from_db(g_tag_id, NULL, &media_count); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_get_media_count_from_db(g_tag_id, NULL, &count), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -353,10 +284,9 @@ int utc_media_tag_foreach_media_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_foreach_media_from_db(g_tag_id, NULL, NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_foreach_media_from_db(g_tag_id, NULL, NULL, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_foreach_media_from_db(-1, NULL, NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -370,10 +300,7 @@ int utc_media_tag_foreach_media_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_foreach_media_from_db(g_tag_id, NULL, media_item_cb, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_foreach_media_from_db(g_tag_id, NULL, media_cb, NULL), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -387,10 +314,11 @@ int utc_media_tag_clone_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + media_tag_h cloned = NULL; + + assert_eq(media_tag_clone(&cloned, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_clone(&g_tag_dst, NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_clone(NULL, g_tag), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -404,15 +332,11 @@ int utc_media_tag_clone_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + media_tag_h cloned = NULL; - ret = media_tag_clone(&g_tag_dst, g_tag); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_clone(&cloned, g_tag), MEDIA_CONTENT_ERROR_NONE); - if (g_tag_dst) { - media_tag_destroy(g_tag_dst); - g_tag_dst = NULL; - } + assert_eq(media_tag_destroy(cloned), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -426,10 +350,7 @@ int utc_media_tag_update_to_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_update_to_db(NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_update_to_db(NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -443,10 +364,13 @@ int utc_media_tag_update_to_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_add_media(g_tag, g_media_id), MEDIA_CONTENT_ERROR_NONE); - ret = media_tag_update_to_db(g_tag); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_update_to_db(g_tag), MEDIA_CONTENT_ERROR_NONE); + + assert_eq(media_tag_remove_media(g_tag, g_media_id), MEDIA_CONTENT_ERROR_NONE); + + assert_eq(media_tag_update_to_db(g_tag), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -460,10 +384,9 @@ int utc_media_tag_add_media_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_add_media(NULL, g_media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_add_media(NULL, g_media_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_add_media(g_tag, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -477,12 +400,7 @@ int utc_media_tag_add_media_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_add_media(g_tag, g_media_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - - ret = media_tag_update_to_db(g_tag); + assert_eq(media_tag_add_media(g_tag, g_media_id), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -496,10 +414,9 @@ int utc_media_tag_remove_media_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_remove_media(NULL, g_media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_remove_media(NULL, g_media_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_remove_media(g_tag, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -513,12 +430,7 @@ int utc_media_tag_remove_media_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_remove_media(g_tag, g_media_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - - ret = media_tag_update_to_db(g_tag); + assert_eq(media_tag_remove_media(g_tag, g_media_id), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -532,36 +444,13 @@ int utc_media_tag_set_name_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; + assert_eq(media_tag_set_name(NULL, "myTag"), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_set_name(NULL, "myTag"); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_set_name(g_tag, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } -static bool _set_name_cb(media_tag_h tag, void *user_data) -{ - int ret = MEDIA_CONTENT_ERROR_NONE; - char *name = NULL; - int tag_id = 0; - - ret = media_tag_get_tag_id(tag, &tag_id); - - if (tag_id == g_tag_id) { - ret = media_tag_get_name(tag, &name); - - if (strcmp(name, "myTag") != 0) - ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER; - } - - FREE_MEMORY(name); - - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); - - return true; -} - /** * @testcase utc_media_tag_set_name_p * @since_tizen 2.3 @@ -571,15 +460,9 @@ int utc_media_tag_set_name_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_set_name(g_tag, "myTag"); - - ret = media_tag_update_to_db(g_tag); + assert_eq(media_tag_set_name(g_tag, "myTag"), MEDIA_CONTENT_ERROR_NONE); - ret = media_tag_foreach_tag_from_db(g_filter, _set_name_cb, NULL); - - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_update_to_db(g_tag), MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -593,11 +476,11 @@ int utc_media_tag_get_tag_id_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; int tag_id = 0; - ret = media_tag_get_tag_id(NULL, &tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_get_tag_id(NULL, &tag_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + + assert_eq(media_tag_get_tag_id(g_tag, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -611,11 +494,10 @@ int utc_media_tag_get_tag_id_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; int tag_id = 0; - ret = media_tag_get_tag_id(g_tag, &tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_get_tag_id(g_tag, &tag_id), MEDIA_CONTENT_ERROR_NONE); + assert_eq(tag_id, g_tag_id); return 0; } @@ -629,11 +511,11 @@ int utc_media_tag_get_name_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; char *name = NULL; - ret = media_tag_get_name(NULL, &name); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_get_name(NULL, &name), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + + assert_eq(media_tag_get_name(g_tag, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -647,12 +529,10 @@ int utc_media_tag_get_name_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; char *name = NULL; - ret = media_tag_get_name(g_tag, &name); + assert_eq(media_tag_get_name(g_tag, &name), MEDIA_CONTENT_ERROR_NONE); FREE_MEMORY(name); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -666,11 +546,11 @@ int utc_media_tag_get_tag_from_db_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - media_tag_h tag; + media_tag_h tag = NULL; + + assert_eq(media_tag_get_tag_from_db(-1, &tag), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); - ret = media_tag_get_tag_from_db(0, &tag); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_get_tag_from_db(g_tag_id, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -684,17 +564,12 @@ int utc_media_tag_get_tag_from_db_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; media_tag_h tag = NULL; - ret = media_tag_get_tag_from_db(g_tag_id, &tag); + assert_eq(media_tag_get_tag_from_db(g_tag_id, &tag), MEDIA_CONTENT_ERROR_NONE); - if (tag) { + if (tag) media_tag_destroy(tag); - tag = NULL; - } - - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); return 0; } @@ -708,10 +583,7 @@ int utc_media_tag_destroy_n(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_destroy(NULL); - assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER); + assert_eq(media_tag_destroy(NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER); return 0; } @@ -725,13 +597,10 @@ int utc_media_tag_destroy_p(void) { assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE); - int ret = MEDIA_CONTENT_ERROR_NONE; - - ret = media_tag_destroy(g_tag); + assert_eq(media_tag_destroy(g_tag), MEDIA_CONTENT_ERROR_NONE); g_tag = NULL; - media_tag_delete_from_db(g_tag_id); - assert_eq(ret, MEDIA_CONTENT_ERROR_NONE); + assert_eq(media_tag_delete_from_db(g_tag_id), MEDIA_CONTENT_ERROR_NONE); return 0; }