From ff145e8f6c1888a969995654b6596cf8c2b95913 Mon Sep 17 00:00:00 2001 From: gf721 Date: Sat, 3 Sep 2022 10:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../test/file_access_helper_test.cpp | 53 ++++++++++++------- .../test/file_extension_helper_test.cpp | 42 ++++++++++----- 2 files changed, 65 insertions(+), 30 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 9911ab34..5c6fada9 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include #include @@ -163,10 +164,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); if (info.size() > 0) { - parentUri = Uri(info[0].uri); + parentUri = Uri(info[0].uri + "/file"); GTEST_LOG_(INFO) << parentUri.ToString(); } - + result = fah->Mkdir(parentUri, "Download", newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1358,10 +1359,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo; - fah->ListFile(newDirUriTest, fileInfo); - EXPECT_GT(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_GT(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1385,10 +1390,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -1417,10 +1426,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1444,10 +1457,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 1d1dadbb..2d9dc0aa 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1568,9 +1568,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo; - fah->ListFile(newDirUriTest, fileInfo); - EXPECT_GT(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_GT(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1595,9 +1599,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1631,9 +1639,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + Uri sourceFile(fileInfo.uri); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1658,9 +1671,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + Uri sourceFile(fileInfo.uri); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } -- Gitee