From: Nibha Sharma Date: Fri, 15 Feb 2019 10:32:27 +0000 (+0530) Subject: [ITC][media-content][NonACR][Initialized path variables before usage] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c55494fc9c8e38627ecb32be3d77d2bb4e9bf88d;p=test%2Ftct%2Fnative%2Fapi.git [ITC][media-content][NonACR][Initialized path variables before usage] Change-Id: I21c8dcf7335e183824bca67dca6b93c0c77de189 Signed-off-by: Nibha Sharma (cherry picked from commit 423f59dc3cf71fdbdfbf33bb611834a174744b89) --- diff --git a/src/itc/media-content/ITs-media-content-bookmark.c b/src/itc/media-content/ITs-media-content-bookmark.c index 37c2b7e42..51baaf33f 100755 --- a/src/itc/media-content/ITs-media-content-bookmark.c +++ b/src/itc/media-content/ITs-media-content-bookmark.c @@ -102,8 +102,7 @@ void ITs_media_content_bookmark_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("video"); - CopyFileInfo("image"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); @@ -126,6 +125,8 @@ void ITs_media_content_bookmark_startup(void) nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("image"); + AppendPaths(g_szImageFolder, BOOKMARKIMAGE, g_szImagePath); nRet = media_content_scan_file(g_szImagePath); @@ -133,6 +134,7 @@ void ITs_media_content_bookmark_startup(void) nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("video"); AppendPaths(g_szVideoFolder, TESTVIDEO, g_szVideoPath); nRet = media_content_scan_file(g_szVideoPath); diff --git a/src/itc/media-content/ITs-media-content-face.c b/src/itc/media-content/ITs-media-content-face.c index 42e2e3464..71d3f9a4b 100755 --- a/src/itc/media-content/ITs-media-content-face.c +++ b/src/itc/media-content/ITs-media-content-face.c @@ -76,7 +76,7 @@ struct stat stBuff; g_bScanFeatureMismatch= false; g_bIsScanFeatureSupported = TCTCheckSystemInfoFeatureSupported(SCAN_FEATURE, API_NAMESPACE); - CopyFileInfo("image"); + int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); @@ -85,6 +85,7 @@ struct stat stBuff; nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("image"); AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo); diff --git a/src/itc/media-content/ITs-media-content-group.c b/src/itc/media-content/ITs-media-content-group.c index 8ef454503..b8a20a973 100755 --- a/src/itc/media-content/ITs-media-content-group.c +++ b/src/itc/media-content/ITs-media-content-group.c @@ -119,10 +119,14 @@ void ITs_media_content_group_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("audio"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); + nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder); + PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("audio"); + AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); nRet = media_content_scan_file(g_szTextPath); diff --git a/src/itc/media-content/ITs-media-content-image-meta.c b/src/itc/media-content/ITs-media-content-image-meta.c index 615f9d87c..1f92fb6f8 100755 --- a/src/itc/media-content/ITs-media-content-image-meta.c +++ b/src/itc/media-content/ITs-media-content-image-meta.c @@ -61,12 +61,14 @@ void ITs_media_content_image_meta_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("image"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("image"); + AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo); if ( !g_bIsScanFeatureSupported ) diff --git a/src/itc/media-content/ITs-media-content-info.c b/src/itc/media-content/ITs-media-content-info.c index 53a5bb809..92387b86a 100755 --- a/src/itc/media-content/ITs-media-content-info.c +++ b/src/itc/media-content/ITs-media-content-info.c @@ -474,9 +474,7 @@ void ITs_media_content_info_startup(void) g_bScanFeatureMismatch= false; g_bIsScanFeatureSupported = TCTCheckSystemInfoFeatureSupported(SCAN_FEATURE, API_NAMESPACE); - CopyFileInfo("audio"); - CopyFileInfo("video"); - CopyFileInfo("image"); + int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); @@ -485,6 +483,7 @@ void ITs_media_content_info_startup(void) nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("audio"); AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo); @@ -515,6 +514,8 @@ void ITs_media_content_info_startup(void) nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("image"); + AppendPaths(g_szImageFolder, TESTIMAGE, g_szImagePath); nRet = media_info_insert_to_db(g_szImagePath, &g_hImageInfo); PRINT_RESULTNONE_CLEANUP(MEDIA_CONTENT_ERROR_NONE, nRet, "media_info_insert_to_db", MediaContentGetError(nRet), media_content_disconnect()); @@ -526,6 +527,8 @@ void ITs_media_content_info_startup(void) nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("video"); + AppendPaths(g_szVideoFolder, TESTVIDEO, g_szVideoPath); nRet = media_info_insert_to_db(g_szVideoPath, &g_hVideoInfo); PRINT_RESULTNONE_CLEANUP(MEDIA_CONTENT_ERROR_NONE, nRet, "media_info_insert_to_db", MediaContentGetError(nRet), media_content_disconnect()); diff --git a/src/itc/media-content/ITs-media-content-playlist.c b/src/itc/media-content/ITs-media-content-playlist.c index 385de6bc4..969500dd4 100755 --- a/src/itc/media-content/ITs-media-content-playlist.c +++ b/src/itc/media-content/ITs-media-content-playlist.c @@ -131,12 +131,13 @@ void ITs_media_content_playlist_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("audio"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); nRet = GetFolderPath(STORAGE_DIRECTORY_MUSIC, g_szAudioFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("audio"); AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); diff --git a/src/itc/media-content/ITs-media-content-tag.c b/src/itc/media-content/ITs-media-content-tag.c index 867a5c528..4635936e8 100755 --- a/src/itc/media-content/ITs-media-content-tag.c +++ b/src/itc/media-content/ITs-media-content-tag.c @@ -99,12 +99,13 @@ void ITs_media_content_tag_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("image"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); nRet = GetFolderPath(STORAGE_DIRECTORY_IMAGES, g_szImageFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("image"); AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); diff --git a/src/itc/media-content/ITs-media-content-video-meta.c b/src/itc/media-content/ITs-media-content-video-meta.c index b1c11f6ab..742551d8f 100755 --- a/src/itc/media-content/ITs-media-content-video-meta.c +++ b/src/itc/media-content/ITs-media-content-video-meta.c @@ -46,12 +46,13 @@ void ITs_media_content_video_meta_startup(void) int nRet = media_content_connect(); PRINT_RESULTNONE(MEDIA_CONTENT_ERROR_NONE, nRet, "media_content_connect", MediaContentGetError(nRet)); - CopyFileInfo("video"); + nRet = GetInternalStorageIdandPath(); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetInternalStorageId", "Return Value Not Correct", media_content_disconnect()); nRet = GetFolderPath(STORAGE_DIRECTORY_VIDEOS, g_szVideoFolder); PRINT_RESULTNONE_CLEANUP(0, nRet, "GetFolderPath", "Return Value Not Correct", media_content_disconnect()); + CopyFileInfo("video"); AppendPaths(g_szInternalStoragePath, TESTTEXT, g_szTextPath); nRet = media_info_insert_to_db(g_szTextPath, &g_hTextInfo);