From 560d5687ebd28cfaa206926471a4db0d2f746a00 Mon Sep 17 00:00:00 2001 From: wangpggg Date: Wed, 21 Jun 2023 14:17:14 +0800 Subject: [PATCH] modify the default media directory to Download Signed-off-by: wangpeng --- test/unittest/medialibrary_file_access_test.cpp | 16 ++++++++-------- test/unittest/resources/ohos_test.xml | 7 ++++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/test/unittest/medialibrary_file_access_test.cpp b/test/unittest/medialibrary_file_access_test.cpp index a6b2a61b..0c65e748 100644 --- a/test/unittest/medialibrary_file_access_test.cpp +++ b/test/unittest/medialibrary_file_access_test.cpp @@ -2993,10 +2993,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetFileInfoFromRelativeP ASSERT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri fileUri(""); - result = g_fah->CreateFile(newDir, "file1", fileUri); + result = g_fah->CreateFile(newDir, "file1.jpg", fileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDir, "file2", fileUri); + result = g_fah->CreateFile(newDir, "file2.jpg", fileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); relativePath = "Download/DirGetFileInfoFromRelativePath_0004"; @@ -3034,7 +3034,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0000, testi GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0000"; try { FileAccessFwk::FileInfo fileInfo; - std::string relativePath = "Pictures/CreateImageThumbnailTest_001.jpg"; + std::string relativePath = "Download/CreateImageThumbnailTest_001.jpg"; int result = g_fah->GetFileInfoFromRelativePath(relativePath, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri(fileInfo.uri); @@ -3068,7 +3068,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0001, testi GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0001"; try { FileAccessFwk::FileInfo fileInfo; - std::string relativePath = "Videos/CreateVideoThumbnailTest_001.mp4"; + std::string relativePath = "Download/CreateVideoThumbnailTest_001.mp4"; int result = g_fah->GetFileInfoFromRelativePath(relativePath, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri(fileInfo.uri); @@ -3102,7 +3102,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0002, testi GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0002"; try { FileAccessFwk::FileInfo fileInfo; - std::string relativePath = "Audios/CreateAudioThumbnailTest_001.mp3"; + std::string relativePath = "Download/CreateAudioThumbnailTest_001.mp3"; int result = g_fah->GetFileInfoFromRelativePath(relativePath, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri(fileInfo.uri); @@ -3163,7 +3163,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0004, testi { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0004"; try { - Uri uri("//Pictures/CreateImageThumbnailTest_001.jpg"); + Uri uri("//Download/CreateImageThumbnailTest_001.jpg"); std::shared_ptr getPixelMap = nullptr; ThumbnailSize thumbnailSize; thumbnailSize.width = 256; @@ -3253,7 +3253,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0007, testi GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0007"; try { FileAccessFwk::FileInfo fileInfo; - std::string relativePath = "Pictures/CreateImageThumbnailTest_001.jpg"; + std::string relativePath = "Download/CreateImageThumbnailTest_001.jpg"; int result = g_fah->GetFileInfoFromRelativePath(relativePath, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri(fileInfo.uri); @@ -3285,7 +3285,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetThumbnail_0008, testi GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetThumbnail_0008"; try { FileAccessFwk::FileInfo fileInfo; - std::string relativePath = "Pictures/CreateImageThumbnailTest_001.jpg"; + std::string relativePath = "Download/CreateImageThumbnailTest_001.jpg"; int result = g_fah->GetFileInfoFromRelativePath(relativePath, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri(fileInfo.uri); diff --git a/test/unittest/resources/ohos_test.xml b/test/unittest/resources/ohos_test.xml index d94c4f2e..4861f5d8 100644 --- a/test/unittest/resources/ohos_test.xml +++ b/test/unittest/resources/ohos_test.xml @@ -24,10 +24,11 @@