[UTC][media-content][Non-ACR] Merge media-bookmark TCs

Change-Id: Ic3c64359494583a6b274b60bdf3c287cf421e2bd
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/utc/media-content/tct-media-content-core_mobile.h b/src/utc/media-content/tct-media-content-core_mobile.h
index d42fc154aeb50bb44554a0218b4c05fe483cb6fc..23d02eddb94e4a304e8d1a92bf8575e4064f5fa9 100755 (executable)
--- a/src/utc/media-content/tct-media-content-core_mobile.h
+++ b/src/utc/media-content/tct-media-content-core_mobile.h
@@ -21,10 +21,6 @@
 
 extern void utc_media_audio_startup(void);
 extern void utc_media_audio_cleanup(void);
-extern void utc_media_bookmark_delete_startup(void);
-extern void utc_media_bookmark_delete_cleanup(void);
-extern void utc_media_bookmark_insert_startup(void);
-extern void utc_media_bookmark_insert_cleanup(void);
 extern void utc_media_bookmark_startup(void);
 extern void utc_media_bookmark_cleanup(void);
 extern void utc_media_book_startup(void);
@@ -542,10 +538,10 @@ testcase tc_array[] = {
        {"utc_media_book_meta_get_publisher_p", utc_media_book_meta_get_publisher_p,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_n", utc_media_book_meta_get_path_with_keyword_n,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_p", utc_media_book_meta_get_path_with_keyword_p,utc_media_book_startup,utc_media_book_cleanup},
-       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
-       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
+       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_n",utc_media_bookmark_get_bookmark_count_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_p",utc_media_bookmark_get_bookmark_count_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_foreach_bookmark_from_db_n",utc_media_bookmark_foreach_bookmark_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},

diff --git a/src/utc/media-content/tct-media-content-core_tizeniot.h b/src/utc/media-content/tct-media-content-core_tizeniot.h
index d42fc154aeb50bb44554a0218b4c05fe483cb6fc..23d02eddb94e4a304e8d1a92bf8575e4064f5fa9 100755 (executable)
--- a/src/utc/media-content/tct-media-content-core_tizeniot.h
+++ b/src/utc/media-content/tct-media-content-core_tizeniot.h
@@ -21,10 +21,6 @@
 
 extern void utc_media_audio_startup(void);
 extern void utc_media_audio_cleanup(void);
-extern void utc_media_bookmark_delete_startup(void);
-extern void utc_media_bookmark_delete_cleanup(void);
-extern void utc_media_bookmark_insert_startup(void);
-extern void utc_media_bookmark_insert_cleanup(void);
 extern void utc_media_bookmark_startup(void);
 extern void utc_media_bookmark_cleanup(void);
 extern void utc_media_book_startup(void);
@@ -542,10 +538,10 @@ testcase tc_array[] = {
        {"utc_media_book_meta_get_publisher_p", utc_media_book_meta_get_publisher_p,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_n", utc_media_book_meta_get_path_with_keyword_n,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_p", utc_media_book_meta_get_path_with_keyword_p,utc_media_book_startup,utc_media_book_cleanup},
-       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
-       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
+       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_n",utc_media_bookmark_get_bookmark_count_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_p",utc_media_bookmark_get_bookmark_count_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_foreach_bookmark_from_db_n",utc_media_bookmark_foreach_bookmark_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},

diff --git a/src/utc/media-content/tct-media-content-core_tv.h b/src/utc/media-content/tct-media-content-core_tv.h
index d42fc154aeb50bb44554a0218b4c05fe483cb6fc..23d02eddb94e4a304e8d1a92bf8575e4064f5fa9 100755 (executable)
--- a/src/utc/media-content/tct-media-content-core_tv.h
+++ b/src/utc/media-content/tct-media-content-core_tv.h
@@ -21,10 +21,6 @@
 
 extern void utc_media_audio_startup(void);
 extern void utc_media_audio_cleanup(void);
-extern void utc_media_bookmark_delete_startup(void);
-extern void utc_media_bookmark_delete_cleanup(void);
-extern void utc_media_bookmark_insert_startup(void);
-extern void utc_media_bookmark_insert_cleanup(void);
 extern void utc_media_bookmark_startup(void);
 extern void utc_media_bookmark_cleanup(void);
 extern void utc_media_book_startup(void);
@@ -542,10 +538,10 @@ testcase tc_array[] = {
        {"utc_media_book_meta_get_publisher_p", utc_media_book_meta_get_publisher_p,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_n", utc_media_book_meta_get_path_with_keyword_n,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_p", utc_media_book_meta_get_path_with_keyword_p,utc_media_book_startup,utc_media_book_cleanup},
-       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
-       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
+       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_n",utc_media_bookmark_get_bookmark_count_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_p",utc_media_bookmark_get_bookmark_count_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_foreach_bookmark_from_db_n",utc_media_bookmark_foreach_bookmark_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},

diff --git a/src/utc/media-content/tct-media-content-core_wearable.h b/src/utc/media-content/tct-media-content-core_wearable.h
index 721c60cc87b0c37f9b8b7bb8d3d38e12a034b91f..df4d82d2790cf0718bd3da6f3393fe0961e13db2 100755 (executable)
--- a/src/utc/media-content/tct-media-content-core_wearable.h
+++ b/src/utc/media-content/tct-media-content-core_wearable.h
@@ -21,10 +21,6 @@
 
 extern void utc_media_audio_startup(void);
 extern void utc_media_audio_cleanup(void);
-extern void utc_media_bookmark_delete_startup(void);
-extern void utc_media_bookmark_delete_cleanup(void);
-extern void utc_media_bookmark_insert_startup(void);
-extern void utc_media_bookmark_insert_cleanup(void);
 extern void utc_media_bookmark_startup(void);
 extern void utc_media_bookmark_cleanup(void);
 extern void utc_media_book_startup(void);
@@ -522,10 +518,10 @@ testcase tc_array[] = {
        {"utc_media_book_meta_get_publisher_p", utc_media_book_meta_get_publisher_p,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_n", utc_media_book_meta_get_path_with_keyword_n,utc_media_book_startup,utc_media_book_cleanup},
        {"utc_media_book_meta_get_path_with_keyword_p", utc_media_book_meta_get_path_with_keyword_p,utc_media_book_startup,utc_media_book_cleanup},
-       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_delete_startup,utc_media_bookmark_delete_cleanup},
-       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
-       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_insert_startup,utc_media_bookmark_insert_cleanup},
+       {"utc_media_bookmark_delete_from_db_n",utc_media_bookmark_delete_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_delete_from_db_p",utc_media_bookmark_delete_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_n",utc_media_bookmark_insert_to_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
+       {"utc_media_bookmark_insert_to_db_p",utc_media_bookmark_insert_to_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_n",utc_media_bookmark_get_bookmark_count_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_get_bookmark_count_from_db_p",utc_media_bookmark_get_bookmark_count_from_db_p,utc_media_bookmark_startup,utc_media_bookmark_cleanup},
        {"utc_media_bookmark_foreach_bookmark_from_db_n",utc_media_bookmark_foreach_bookmark_from_db_n,utc_media_bookmark_startup,utc_media_bookmark_cleanup},

diff --git a/src/utc/media-content/utc-media-bookmark-delete.c b/src/utc/media-content/utc-media-bookmark-delete.c
deleted file mode 100755 (executable)
index 7233036..0000000
--- a/src/utc/media-content/utc-media-bookmark-delete.c
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-#include <media_content.h>
-#include <tct_common.h>
-#include <storage.h>
-
-//& set: MediaBookmarkDelete
-
-static media_bookmark_h g_bookmark;
-static char *g_media_id = NULL;
-static filter_h g_filter;
-static int g_bookmark_id;
-
-static bool del_flag = false;
-
-static char *img_path = NULL;
-static const char *img_file = "image.jpg";
-
-static media_content_error_e startup_ret = MEDIA_CONTENT_ERROR_NONE;
-
-static bool __storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
-{
-       if (type == STORAGE_TYPE_INTERNAL) {
-               img_path = (char *)malloc(strlen(path) + strlen(img_file) + 6);
-               memset(img_path, 0x00, strlen(path) + strlen(img_file) + 6);
-               snprintf(img_path, strlen(path) + strlen(img_file) + 6, "%s/res/%s", path, img_file);
-               return false;
-       }
-       return true;
-}
-
-static bool bookmark_cb(media_bookmark_h bookmark, void *user_data)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_clone(&g_bookmark, bookmark);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_clone failed (code: %d)\n", ret);
-               return false;
-       }
-
-       ret = media_bookmark_get_bookmark_id(bookmark, &g_bookmark_id);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_get_bookmark_id failed (code: %d)\n", ret);
-               return false;
-       }
-
-       return false;
-}
-
-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 false;
-}
-
-/**
- * @function           utc_media_bookmark_delete_startup
- * @description                Called before each test
- * @parameter          NA
- * @return                     NA
- */
-void utc_media_bookmark_delete_startup(void)
-{
-       media_content_error_e ret = MEDIA_CONTENT_ERROR_NONE;
-
-       if (storage_foreach_device_supported(__storage_device_supported_cb, NULL) != STORAGE_ERROR_NONE)
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-
-       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;
-               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);
-       if (g_filter == NULL) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "g_filter is NULL");
-               startup_ret = ret;
-               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;
-               return;
-       }
-
-       time_t stTime = { 0 };
-       time(&stTime);
-       fprintf(stderr, "%s:%d  img_path = %s\n", __FILE__, __LINE__, img_path);
-       ret = media_bookmark_insert_to_db(g_media_id, stTime, img_path);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_insert_to_db failed (code: %d)\n", ret);
-               startup_ret = ret;
-               return;
-       }
-
-       ret = media_info_foreach_bookmark_from_db(g_media_id, NULL, bookmark_cb, NULL);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_info_foreach_bookmark_from_db failed (code: %d)\n", ret);
-               startup_ret = ret;
-               return;
-       }
-}
-
-/**
- * @function           utc_media_bookmark_delete_cleanup
- * @description                Called after each test
- * @parameter          NA
- * @return                     NA
- */
-void utc_media_bookmark_delete_cleanup(void)
-{
-       if (del_flag) {
-               media_bookmark_delete_from_db(g_bookmark_id);
-               del_flag = false;
-       }
-
-       if (g_media_id != NULL) {
-               free(g_media_id);
-               g_media_id = NULL;
-       }
-
-       if (g_filter != NULL) {
-               media_filter_destroy(g_filter);
-               g_filter = NULL;
-       }
-
-       if (g_bookmark != NULL) {
-               media_bookmark_destroy(g_bookmark);
-               g_bookmark = NULL;
-       }
-
-       media_content_disconnect();
-
-       if (img_path != NULL) {
-               free(img_path);
-               img_path = NULL;
-       }
-}
-
-/**
- * @testcase           utc_media_bookmark_delete_from_db_n
- * @since_tizen                2.3
- * @description                Negative test case of media_bookmark_delete_from_db()
- */
-int utc_media_bookmark_delete_from_db_n(void)
-{
-       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
-
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_delete_from_db(-1);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-
-       del_flag = true;
-
-       return 0;
-}
-
-/**
- * @testcase           utc_media_bookmark_delete_from_db_p
- * @since_tizen                2.3
- * @description                Positive test case of media_bookmark_delete_from_db()
- */
-int utc_media_bookmark_delete_from_db_p(void)
-{
-       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
-
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_delete_from_db(g_bookmark_id);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
-
-       return 0;
-}

diff --git a/src/utc/media-content/utc-media-bookmark-insert.c b/src/utc/media-content/utc-media-bookmark-insert.c
deleted file mode 100755 (executable)
index 685b70d..0000000
--- a/src/utc/media-content/utc-media-bookmark-insert.c
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-#include <media_content.h>
-#include <tct_common.h>
-#include <storage.h>
-
-//& set: MediaBookmarkInsert
-
-static media_bookmark_h g_bookmark;
-static char *g_media_id = NULL;
-static filter_h g_filter;
-static int g_bookmark_id;
-
-static char *img_path = NULL;
-static const char *img_file = "image.jpg";
-
-static media_content_error_e startup_ret = MEDIA_CONTENT_ERROR_NONE;
-
-static bool __storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
-{
-       if (type == STORAGE_TYPE_INTERNAL) {
-               img_path = (char *)malloc(strlen(path) + strlen(img_file) + 6);
-               memset(img_path, 0x00, strlen(path) + strlen(img_file) + 6);
-               snprintf(img_path, strlen(path) + strlen(img_file) + 6, "%s/res/%s", path, img_file);
-               return false;
-       }
-       return true;
-}
-
-static bool bookmark_cb(media_bookmark_h bookmark, void *user_data)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_clone(&g_bookmark, bookmark);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_clone failed (code: %d)\n", ret);
-               return false;
-       }
-
-       ret = media_bookmark_get_bookmark_id(bookmark, &g_bookmark_id);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_get_bookmark_id failed (code: %d)\n", ret);
-               return false;
-       }
-
-       return false;
-}
-
-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 false;
-}
-
-/**
- * @function           utc_media_bookmark_insert_startup
- * @description                Called before each test
- * @parameter          NA
- * @return                     NA
- */
-void utc_media_bookmark_insert_startup(void)
-{
-       media_content_error_e ret = MEDIA_CONTENT_ERROR_NONE;
-
-       if (storage_foreach_device_supported(__storage_device_supported_cb, NULL) != STORAGE_ERROR_NONE)
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-
-       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;
-               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);
-       if (g_filter == NULL) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "g_filter is NULL");
-               startup_ret = ret;
-               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;
-               return;
-       }
-}
-
-/**
- * @function           utc_media_bookmark_insert_cleanup
- * @description                Called after each test
- * @parameter          NA
- * @return                     NA
- */
-void utc_media_bookmark_insert_cleanup(void)
-{
-
-       if (g_media_id != NULL) {
-               free(g_media_id);
-               g_media_id = NULL;
-       }
-
-       if (g_filter != NULL) {
-               media_filter_destroy(g_filter);
-               g_filter = NULL;
-       }
-
-       if (g_bookmark != NULL) {
-               media_bookmark_delete_from_db(g_bookmark_id);
-               media_bookmark_destroy(g_bookmark);
-               g_bookmark = NULL;
-       }
-
-       media_content_disconnect();
-
-       if (img_path != NULL) {
-               free(img_path);
-               img_path = NULL;
-       }
-}
-
-/**
- * @testcase           utc_media_bookmark_insert_to_db_n
- * @since_tizen                2.3
- * @description                Negative test case of media_bookmark_insert_to_db()
- */
-int utc_media_bookmark_insert_to_db_n(void)
-{
-       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
-
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_insert_to_db(NULL, 0, img_file);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-
-       return 0;
-}
-
-/**
- * @testcase           utc_media_bookmark_insert_to_db_p
- * @since_tizen                2.3
- * @description                Positive test case of media_bookmark_insert_to_db()
- */
-int utc_media_bookmark_insert_to_db_p(void)
-{
-       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
-
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       time_t stTime = { 0 };
-       time(&stTime);
-       fprintf(stderr, "%s:%d  img_path = %s\n", __FILE__, __LINE__, img_path);
-       ret = media_bookmark_insert_to_db(g_media_id, stTime, img_path);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
-
-       ret = media_info_foreach_bookmark_from_db(g_media_id, NULL, bookmark_cb, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
-
-       return 0;
-}

diff --git a/src/utc/media-content/utc-media-bookmark.c b/src/utc/media-content/utc-media-bookmark.c
index e8c291e11c7f19328224470cf3507c801ef699ec..302035cbedd9b7417c1742310be968203dfcce3c 100755 (executable)
--- a/src/utc/media-content/utc-media-bookmark.c
+++ b/src/utc/media-content/utc-media-bookmark.c
@@ -16,75 +16,32 @@
 #include <media_content.h>
 #include <tct_common.h>
 #include <storage.h>
+#include <limits.h>
 
 //& set: MediaBookmark
 
 static media_bookmark_h g_bookmark = NULL;
-static media_bookmark_h g_bookmark_dst = NULL;
 static char *g_media_id = NULL;
-static filter_h g_filter = NULL;
 static int g_bookmark_id = 0;
-
-static char *img_path = NULL;
-static const char *img_file = "image.jpg";
-
-static media_content_error_e startup_ret = MEDIA_CONTENT_ERROR_NONE;
-
-static bool __storage_device_supported_cb(int storage_id, storage_type_e type, storage_state_e state, const char *path, void *user_data)
-{
-       if (type == STORAGE_TYPE_INTERNAL) {
-               img_path = (char *)malloc(strlen(path) + strlen(img_file) + 6);
-               memset(img_path, 0x00, strlen(path) + strlen(img_file) + 6);
-               snprintf(img_path, strlen(path) + strlen(img_file) + 6, "%s/res/%s", path, img_file);
-               return false;
-       }
-       return true;
-}
+static char g_image_path[PATH_MAX + 1];
+static char g_video_path[PATH_MAX + 1];
+static int startup_ret = MEDIA_CONTENT_ERROR_NONE;
 
 static bool bookmark_cb(media_bookmark_h bookmark, void *user_data)
 {
-       media_content_error_e ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_clone(&g_bookmark, bookmark);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_clone failed (code: %d)\n", ret);
-               startup_ret = ret;
-               return false;
-       }
-
-       ret = media_bookmark_get_bookmark_id(bookmark, &g_bookmark_id);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "CB error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_get_bookmark_id failed (code: %d)\n", ret);
-               startup_ret = ret;
+       if (media_bookmark_clone(&g_bookmark, bookmark) != MEDIA_CONTENT_ERROR_NONE) {
+               FPRINTF("[Line : %d] media_bookmark_clone failed.\\n", __LINE__);
                return false;
        }
 
-       return false;
-}
-
-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;
-       }
+       if (media_bookmark_get_bookmark_id(bookmark, &g_bookmark_id) != MEDIA_CONTENT_ERROR_NONE)
+               FPRINTF("[Line : %d] media_bookmark_get_bookmark_id failed.\\n", __LINE__);
 
        return false;
 }
 
 static bool sub_bookmark_cb(media_bookmark_h bookmark, void *user_data)
 {
-       int bm_id = 0;
-
-       if (bookmark)
-               media_bookmark_get_bookmark_id(bookmark, &bm_id);
-
        return false;
 }
 
@@ -96,56 +53,46 @@ static bool sub_bookmark_cb(media_bookmark_h bookmark, void *user_data)
  */
 void utc_media_bookmark_startup(void)
 {
-       media_content_error_e ret = MEDIA_CONTENT_ERROR_NONE;
-       g_bookmark = NULL;
-       g_bookmark_dst = NULL;
+       char *root_path = NULL;
+       media_info_h media = NULL;
 
-       if (storage_foreach_device_supported(__storage_device_supported_cb, NULL) != STORAGE_ERROR_NONE)
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
+       if (storage_get_root_directory(0, &root_path) == STORAGE_ERROR_NONE) {
+               snprintf(g_image_path, PATH_MAX, "%s/res/image.jpg", root_path);
+               snprintf(g_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);
-       if (g_filter == NULL) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "g_filter is NULL");
-               startup_ret = ret;
-               return;
+       startup_ret = media_info_get_media_from_db_by_path(g_video_path, &media);
+       if (startup_ret != MEDIA_CONTENT_ERROR_NONE) {
+               startup_ret = media_info_insert_to_db(g_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;
        }
 
-       time_t stTime = { 0 };
-       time(&stTime);
-       fprintf(stderr, "%s:%d  img_path = %s\n", __FILE__, __LINE__, img_path);
-       ret = media_bookmark_insert_to_db(g_media_id, stTime, img_path);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_bookmark_insert_to_db failed (code: %d)\n", ret);
-               startup_ret = ret;
+       startup_ret = media_bookmark_insert_to_db(g_media_id, 0, g_image_path);
+       if (startup_ret != MEDIA_CONTENT_ERROR_NONE) {
+               FPRINTF("[Line : %d] media_bookmark_insert_to_db failed.\\n", __LINE__);
                return;
        }
 
-       ret = media_info_foreach_bookmark_from_db(g_media_id, NULL, bookmark_cb, NULL);
-       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-               fprintf(stderr, "Startup error at %s:%d\n", __FILE__, __LINE__);
-               fprintf(stderr, "media_info_foreach_bookmark_from_db failed (code: %d)\n", ret);
-               startup_ret = ret;
+       startup_ret = media_info_foreach_bookmark_from_db(g_media_id, NULL, bookmark_cb, NULL);
+       if (startup_ret != MEDIA_CONTENT_ERROR_NONE) {
+               FPRINTF("[Line : %d] media_info_foreach_bookmark_from_db failed.\\n", __LINE__);
                return;
        }
 }
@@ -160,31 +107,75 @@ void utc_media_bookmark_cleanup(void)
 {
        media_bookmark_delete_from_db(g_bookmark_id);
 
-       if (g_media_id != NULL) {
-               free(g_media_id);
-               g_media_id = NULL;
-       }
-
-       if (g_filter != NULL) {
-               media_filter_destroy(g_filter);
-               g_filter = NULL;
-       }
+       FREE_MEMORY(g_media_id);
+       memset(&g_image_path, 0, PATH_MAX + 1);
+       memset(&g_video_path, 0, PATH_MAX + 1);
 
-       if (g_bookmark != NULL) {
+       if (g_bookmark) {
                media_bookmark_destroy(g_bookmark);
                g_bookmark = NULL;
        }
-       if (g_bookmark_dst != NULL) {
-               media_bookmark_destroy(g_bookmark_dst);
-               g_bookmark_dst = NULL;
-       }
 
        media_content_disconnect();
+}
 
-       if (img_path != NULL) {
-               free(img_path);
-               img_path = NULL;
-       }
+/**
+ * @testcase           utc_media_bookmark_delete_from_db_n
+ * @since_tizen                2.3
+ * @description                Negative test case of media_bookmark_delete_from_db()
+ */
+int utc_media_bookmark_delete_from_db_n(void)
+{
+       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
+
+       assert_eq(media_bookmark_delete_from_db(-1), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+
+       return 0;
+}
+
+/**
+ * @testcase           utc_media_bookmark_delete_from_db_p
+ * @since_tizen                2.3
+ * @description                Positive test case of media_bookmark_delete_from_db()
+ */
+int utc_media_bookmark_delete_from_db_p(void)
+{
+       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
+
+       assert_eq(media_bookmark_delete_from_db(g_bookmark_id), MEDIA_CONTENT_ERROR_NONE);
+
+       return 0;
+}
+
+/**
+ * @testcase           utc_media_bookmark_insert_to_db_n
+ * @since_tizen                2.3
+ * @description                Negative test case of media_bookmark_insert_to_db()
+ */
+int utc_media_bookmark_insert_to_db_n(void)
+{
+       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
+
+       assert_eq(media_bookmark_insert_to_db(NULL, 0, g_image_path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+
+       return 0;
+}
+
+/**
+ * @testcase           utc_media_bookmark_insert_to_db_p
+ * @since_tizen                2.3
+ * @description                Positive test case of media_bookmark_insert_to_db()
+ */
+int utc_media_bookmark_insert_to_db_p(void)
+{
+       assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
+
+       time_t stTime = { 0 };
+       time(&stTime);
+
+       assert_eq(media_bookmark_insert_to_db(g_media_id, stTime, g_image_path), MEDIA_CONTENT_ERROR_NONE);
+
+       return 0;
 }
 
 /**
@@ -196,10 +187,7 @@ int utc_media_bookmark_get_bookmark_count_from_db_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_get_bookmark_count_from_db(g_filter, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_get_bookmark_count_from_db(NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -213,11 +201,9 @@ int utc_media_bookmark_get_bookmark_count_from_db_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       int bookmark_count = 0;
+       int value = 0;
 
-       ret = media_bookmark_get_bookmark_count_from_db(g_filter, &bookmark_count);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_get_bookmark_count_from_db(NULL, &value), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -231,10 +217,7 @@ int utc_media_bookmark_foreach_bookmark_from_db_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_foreach_bookmark_from_db(NULL, NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_foreach_bookmark_from_db(NULL, NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -248,10 +231,7 @@ int utc_media_bookmark_foreach_bookmark_from_db_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_foreach_bookmark_from_db(g_filter, sub_bookmark_cb, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_foreach_bookmark_from_db(NULL, sub_bookmark_cb, NULL), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -265,10 +245,11 @@ int utc_media_bookmark_clone_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_bookmark_h bookmark = NULL;
+
+       assert_eq(media_bookmark_clone(&bookmark, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
-       ret = media_bookmark_clone(&g_bookmark_dst, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_clone(NULL, g_bookmark), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -282,10 +263,11 @@ int utc_media_bookmark_clone_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       media_bookmark_h bookmark = NULL;
 
-       ret = media_bookmark_clone(&g_bookmark_dst, g_bookmark);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_clone(&bookmark, g_bookmark), MEDIA_CONTENT_ERROR_NONE);
+
+       assert_eq(media_bookmark_destroy(bookmark), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -299,10 +281,7 @@ int utc_media_bookmark_destroy_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_destroy(NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_destroy(NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -316,15 +295,8 @@ int utc_media_bookmark_destroy_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_clone(&g_bookmark_dst, g_bookmark);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
-
-       ret = media_bookmark_destroy(g_bookmark_dst);
-       g_bookmark_dst = NULL;
-
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_destroy(g_bookmark), MEDIA_CONTENT_ERROR_NONE);
+       g_bookmark = NULL;
 
        return 0;
 }
@@ -338,10 +310,11 @@ int utc_media_bookmark_get_bookmark_id_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       int bookmark_id = 0;
 
-       ret = media_bookmark_get_bookmark_id(NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_get_bookmark_id(g_bookmark, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+
+       assert_eq(media_bookmark_get_bookmark_id(NULL, &bookmark_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -355,11 +328,9 @@ int utc_media_bookmark_get_bookmark_id_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        int bookmark_id = 0;
 
-       ret = media_bookmark_get_bookmark_id(g_bookmark, &bookmark_id);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_get_bookmark_id(g_bookmark, &bookmark_id), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -373,10 +344,11 @@ int utc_media_bookmark_get_marked_time_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       time_t bookmark_time = 0;
+
+       assert_eq(media_bookmark_get_marked_time(g_bookmark, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
-       ret = media_bookmark_get_marked_time(NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_get_marked_time(NULL, &bookmark_time), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -390,11 +362,9 @@ int utc_media_bookmark_get_marked_time_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        time_t bookmark_time = 0;
 
-       ret = media_bookmark_get_marked_time(g_bookmark, &bookmark_time);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_get_marked_time(g_bookmark, &bookmark_time), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -408,10 +378,11 @@ int utc_media_bookmark_get_thumbnail_path_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
+       char *path = NULL;
+
+       assert_eq(media_bookmark_get_thumbnail_path(g_bookmark, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
-       ret = media_bookmark_get_thumbnail_path(NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_get_thumbnail_path(NULL, &path), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -425,17 +396,10 @@ int utc_media_bookmark_get_thumbnail_path_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        char *path = NULL;
 
-       ret = media_bookmark_get_thumbnail_path(g_bookmark, &path);
-
-       if (path) {
-               free(path);
-               path = NULL;
-       }
-
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_get_thumbnail_path(g_bookmark, &path), MEDIA_CONTENT_ERROR_NONE);
+       FREE_MEMORY(path);
 
        return 0;
 }
@@ -449,10 +413,7 @@ int utc_media_bookmark_get_name_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_get_name(NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_get_name(NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -466,20 +427,12 @@ int utc_media_bookmark_get_name_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
        char *name = NULL;
 
-       ret = media_bookmark_set_name(g_bookmark, "test_name");
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
-
-       ret = media_bookmark_get_name(g_bookmark, &name);
-
-       if (name) {
-               free(name);
-               name = NULL;
-       }
+       assert_eq(media_bookmark_set_name(g_bookmark, "test_name"), MEDIA_CONTENT_ERROR_NONE);
 
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_get_name(g_bookmark, &name), MEDIA_CONTENT_ERROR_NONE);
+       FREE_MEMORY(name);
 
        return 0;
 }
@@ -493,10 +446,7 @@ int utc_media_bookmark_set_name_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_set_name(NULL, NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_set_name(NULL, NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -510,11 +460,7 @@ int utc_media_bookmark_set_name_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_set_name(g_bookmark, "test_name");
-
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_set_name(g_bookmark, "test_name"), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }
@@ -528,10 +474,7 @@ int utc_media_bookmark_update_to_db_n(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_update_to_db(NULL);
-       assert_eq(ret, MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+       assert_eq(media_bookmark_update_to_db(NULL), MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
@@ -545,11 +488,7 @@ int utc_media_bookmark_update_to_db_p(void)
 {
        assert_eq(startup_ret, MEDIA_CONTENT_ERROR_NONE);
 
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = media_bookmark_update_to_db(g_bookmark);
-
-       assert_eq(ret, MEDIA_CONTENT_ERROR_NONE);
+       assert_eq(media_bookmark_update_to_db(g_bookmark), MEDIA_CONTENT_ERROR_NONE);
 
        return 0;
 }