From 56cfe8c64848784c4830c127dde95b22f70c22b9 Mon Sep 17 00:00:00 2001 From: wujianlin Date: Fri, 26 Jul 2024 18:11:36 +0800 Subject: [PATCH] synchronizing code Issue:https://gitee.com/openharmony/commonlibrary_c_utils/issues/IAFV22?from=project-issue Signed-off-by: wujianlin --- base/include/file_ex.h | 1 - .../file_benchmark_test.cpp | 64 ++++++++--------- .../unique_fd_benchmark_test.cpp | 38 +++++----- .../refbase_fuzzer/refbase_fuzzer.cpp | 2 +- .../unittest/common/utils_directory_test.cpp | 72 +++++++++---------- 5 files changed, 88 insertions(+), 89 deletions(-) diff --git a/base/include/file_ex.h b/base/include/file_ex.h index 2ee9b50..4ed7aac 100644 --- a/base/include/file_ex.h +++ b/base/include/file_ex.h @@ -144,7 +144,6 @@ bool StringExistsInFile(const std::string& fileName, const std::string& subStr, /** * @ingroup FileReadWrite * @brief Obtains the number of occurrences of the specified string in a file. - * * @param fileName Indicates the path of the target file. * @param subStr Indicates the std::string object to search. diff --git a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp index 8edbd2c..3f3f3ae 100644 --- a/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp +++ b/base/test/benchmarktest/file_benchmark_test/file_benchmark_test.cpp @@ -76,6 +76,38 @@ int RemoveTestFile(const std::string& path) return unlink(path.c_str()); } +void LoadString(string& filename, string& content, benchmark::State& state) +{ + while (state.KeepRunning()) { + string result; + CreateTestFile(filename, content); + int fd = open(filename.c_str(), O_RDONLY); + AssertTrue((LoadStringFromFd(fd, result)), + "LoadStringFromFd(fd, result) did not equal true as expected.", state); + close(fd); + RemoveTestFile(filename); + AssertEqual(result, content, "result == content did not equal true as expected.", state); + } +} + +void SaveString(string& filename, string& content, benchmark::State& state) +{ + while (state.KeepRunning()) { + int fd = open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); + bool ret = SaveStringToFd(fd, content); + close(fd); + AssertEqual(ret, true, "ret did not equal true as expected.", state); + + string loadResult; + fd = open(filename.c_str(), O_RDONLY); + ret = LoadStringFromFd(fd, loadResult); + close(fd); + RemoveTestFile(filename); + AssertEqual(ret, true, "ret did not equal true as expected.", state); + AssertEqual(loadResult, content, "loadResult did not equal content as expected.", state); + } +} + /* * @tc.name: testLoadStringFromFile001 * @tc.desc: Test loading an existed file 'meminfo' @@ -216,20 +248,6 @@ BENCHMARK_F(BenchmarkFileTest, testLoadStringFromFd001)(benchmark::State& state) BENCHMARK_LOGD("FileTest testLoadStringFromFd001 end."); } -void LoadString(string& filename, string& content, benchmark::State& state) -{ - while (state.KeepRunning()) { - string result; - CreateTestFile(filename, content); - int fd = open(filename.c_str(), O_RDONLY); - AssertTrue((LoadStringFromFd(fd, result)), - "LoadStringFromFd(fd, result) did not equal true as expected.", state); - close(fd); - RemoveTestFile(filename); - AssertEqual(result, content, "result == content did not equal true as expected.", state); - } -} - /* * @tc.name: testLoadStringFromFd002 * @tc.desc: Test loading a newly created file without contents by its fd @@ -464,24 +482,6 @@ BENCHMARK_F(BenchmarkFileTest, testSaveStringToFd001)(benchmark::State& state) BENCHMARK_LOGD("FileTest testSaveStringToFd001 end."); } -void SaveString(string& filename, string& content, benchmark::State& state) -{ - while (state.KeepRunning()) { - int fd = open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - bool ret = SaveStringToFd(fd, content); - close(fd); - AssertEqual(ret, true, "ret did not equal true as expected.", state); - - string loadResult; - fd = open(filename.c_str(), O_RDONLY); - ret = LoadStringFromFd(fd, loadResult); - close(fd); - RemoveTestFile(filename); - AssertEqual(ret, true, "ret did not equal true as expected.", state); - AssertEqual(loadResult, content, "loadResult did not equal content as expected.", state); - } -} - /* * @tc.name: testSaveStringToFd002 * @tc.desc: Test writting an empty string to a file specified by its fd diff --git a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp index 7c02399..4fddad3 100644 --- a/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp +++ b/base/test/benchmarktest/unique_fd_benchmark_test/unique_fd_benchmark_test.cpp @@ -27,7 +27,7 @@ using namespace std; namespace OHOS { namespace { -static char const* testfilename = "testfilename.test"; +static const char *TEST_FILE_NAME = "testfilename.test"; class BenchmarkUniqueFd : public benchmark::Fixture { public: @@ -42,7 +42,7 @@ public: void SetUp(const ::benchmark::State& state) override { ofstream outfile; - outfile.open(testfilename, ios::out | ios::trunc); + outfile.open(TEST_FILE_NAME, ios::out | ios::trunc); outfile << "testdata\n" << std::endl; outfile.close(); @@ -51,11 +51,11 @@ public: void TearDown(::benchmark::State& state) override { ifstream inputfile; - inputfile.open(testfilename, ios::in); + inputfile.open(TEST_FILE_NAME, ios::in); std::string testStr; inputfile >> testStr; inputfile.close(); - AssertEqual(remove(testfilename), 0, "remove(testfilename) did not equal 0 as expected.", state); + AssertEqual(remove(TEST_FILE_NAME), 0, "remove(TEST_FILE_NAME) did not equal 0 as expected.", state); } protected: @@ -85,7 +85,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueCtroFromInt)(benchmark::State& sta BENCHMARK_LOGD("UniqueFd testUtilsUniqueCtroFromInt start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd2(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd2(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd2, expectedValue, "ufd2 was not different from expectedValue as expected.", state); } BENCHMARK_LOGD("UniqueFd testUtilsUniqueCtroFromInt end."); @@ -95,7 +95,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompare)(benchmark::State& sta { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompare start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertEqual(fd, ufd2, "fd did not equal ufd2 as expected.", state); AssertEqual(ufd2, fd, "ufd2 did not equal fd as expected.", state); @@ -107,7 +107,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompareNl)(benchmark::State& s { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompareNl start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertGreaterThanOrEqual(ufd2, 0, "ufd2 >= 0 did not equal true as expected.", state); AssertLessThanOrEqual(0, ufd2, "0 <= ufd2 did not equal true as expected.", state); @@ -119,7 +119,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompareBg)(benchmark::State& s { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompareBg start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertGreaterThan(ufd2, MIN_VALID_FD, "ufd2 > MIN_VALID_FD did not equal true as expected.", state); AssertLessThan(MIN_VALID_FD, ufd2, "MIN_VALID_FD < ufd2 did not equal true as expected.", state); @@ -131,7 +131,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompareNb)(benchmark::State& s { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompareNb start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertLessThanOrEqual(ufd2, MAX_VALID_FD, "ufd2 <= MAX_VALID_FD did not equal true as expected.", state); AssertGreaterThanOrEqual(MAX_VALID_FD, ufd2, "MAX_VALID_FD >= ufd2 did not equal true as expected.", state); @@ -143,7 +143,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompareLess)(benchmark::State& { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompareLess start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertLessThan(ufd2, MAX_VALID_FD, "ufd2 < MAX_VALID_FD did not equal true as expected.", state); AssertGreaterThan(MAX_VALID_FD, ufd2, "MAX_VALID_FD > ufd2 did not equal true as expected.", state); @@ -155,7 +155,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdeqcompareNeq)(benchmark::State& { BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdeqcompareNeq start."); while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE); + int fd = open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE); UniqueFd ufd2(fd); AssertUnequal(ufd2, MAX_VALID_FD, "ufd2 != MAX_VALID_FD did not equal true as expected.", state); AssertUnequal(MAX_VALID_FD, ufd2, "MAX_VALID_FD != ufd2 did not equal true as expected.", state); @@ -170,7 +170,7 @@ public: { BENCHMARK_LOGD("UniqueFd static void Close is called."); - iflag = 10; + iflag = 10; // give the expected fd an arbitrary value other than 0. close(fd); } }; @@ -185,7 +185,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdDefineDeletor)(benchmark::State& const int invalidFileDescriptor = -1; while (state.KeepRunning()) { NewDeleter::iflag = 0; - int fd = open(testfilename, O_RDWR); + int fd = open(TEST_FILE_NAME, O_RDWR); { UniqueFdAddDeletor ufd2(fd); @@ -205,7 +205,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdDefineDeletorCloseStatus)(benchm BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdDefineDeletorCloseStatus start."); const int errorReturn = -1; while (state.KeepRunning()) { - int fd = open(testfilename, O_RDWR); + int fd = open(TEST_FILE_NAME, O_RDWR); { UniqueFdAddDeletor ufd2(fd); @@ -223,7 +223,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdRelease)(benchmark::State& state BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdRelease start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd, expectedValue, "ufd was not different from expectedValue as expected.", state); int fd = ufd.Release(); @@ -238,7 +238,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdOperatorInt)(benchmark::State& s BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdOperatorInt start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd, expectedValue, "ufd was not different from expectedValue as expected.", state); int fd = ufd; @@ -252,7 +252,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdGet)(benchmark::State& state) BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdGet start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd, expectedValue, "ufd was not different from expectedValue as expected.", state); int fd = ufd.Get(); @@ -266,7 +266,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdMoveConstructor)(benchmark::Stat BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdMoveConstructor start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd, expectedValue, "ufd was not different from expectedValue as expected.", state); UniqueFd ufd1(std::move(ufd)); @@ -281,7 +281,7 @@ BENCHMARK_F(BenchmarkUniqueFd, testUtilsUniqueFdMoveAssignment)(benchmark::State BENCHMARK_LOGD("UniqueFd testUtilsUniqueFdMoveAssignment start."); const int expectedValue = -1; while (state.KeepRunning()) { - UniqueFd ufd(open(testfilename, O_RDWR, FILE_PERMISSION_READ_WRITE)); + UniqueFd ufd(open(TEST_FILE_NAME, O_RDWR, FILE_PERMISSION_READ_WRITE)); AssertUnequal(ufd, expectedValue, "ufd was not different from expectedValue as expected.", state); UniqueFd ufd1; diff --git a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp index fab7006..8e8b00b 100644 --- a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp +++ b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp @@ -33,7 +33,7 @@ const int SLEEP_NANO_SECONDS = 10; uint32_t GetThreadId() { std::thread::id tid = this_thread::get_id(); - return *(uint32_t*)&tid; + return *reinterpret_cast(&tid); } struct TestRefBase : public RefBase { diff --git a/base/test/unittest/common/utils_directory_test.cpp b/base/test/unittest/common/utils_directory_test.cpp index c806735..928eee2 100644 --- a/base/test/unittest/common/utils_directory_test.cpp +++ b/base/test/unittest/common/utils_directory_test.cpp @@ -156,9 +156,9 @@ HWTEST_F(UtilsDirectoryTest, testIncludeTrailingPathDelimiter002, TestSize.Level */ HWTEST_F(UtilsDirectoryTest, testGetDirFiles001, TestSize.Level0) { - string parent_path = "/data/test_dir"; + string parentPath = "/data/test_dir"; - ForceCreateDirectory(parent_path); + ForceCreateDirectory(parentPath); string dirs[6] = { "/data/test_dir/level1_1", @@ -191,14 +191,14 @@ HWTEST_F(UtilsDirectoryTest, testGetDirFiles001, TestSize.Level0) vector files; - GetDirFiles(parent_path, files); + GetDirFiles(parentPath, files); for (auto &filepath : resultfiles) { auto pos = find(files.begin(), files.end(), filepath); EXPECT_NE(pos, files.end()); } - ForceRemoveDirectory(parent_path); + ForceRemoveDirectory(parentPath); } /* @@ -247,62 +247,62 @@ HWTEST_F(UtilsDirectoryTest, testGetDirFiles002, TestSize.Level0) HWTEST_F(UtilsDirectoryTest, testGetDirFiles003, TestSize.Level0) { // create a test dir - string original_data_path = "/data/original"; - EXPECT_EQ(ForceCreateDirectory(original_data_path), true); + string originalDataPath = "/data/original"; + EXPECT_EQ(ForceCreateDirectory(originalDataPath), true); - string original_file_path = "/data/original/original_file"; - string original_directory_path = "/data/original/original_directory"; + string originalFilePath = "/data/original/original_file"; + string originalDirectoryPath = "/data/original/original_directory"; - ofstream(original_file_path, fstream::out); + ofstream(originalFilePath, fstream::out); - ForceCreateDirectory(original_directory_path); + ForceCreateDirectory(originalDirectoryPath); - string test_data_dir = "/data/test_dir"; + string testDataDir = "/data/test_dir"; - EXPECT_EQ(ForceCreateDirectory(test_data_dir), true); + EXPECT_EQ(ForceCreateDirectory(testDataDir), true); // test symlink to directory outside the target directory - string linktodir = IncludeTrailingPathDelimiter(test_data_dir) + "symlink_dir"; + string linktodir = IncludeTrailingPathDelimiter(testDataDir) + "symlink_dir"; - EXPECT_EQ(symlink(original_directory_path.c_str(), linktodir.c_str()), 0); + EXPECT_EQ(symlink(originalDirectoryPath.c_str(), linktodir.c_str()), 0); - vector dir_result; - GetDirFiles(test_data_dir, dir_result); + vector dirResult; + GetDirFiles(testDataDir, dirResult); - EXPECT_EQ(dir_result.size(), 1); - EXPECT_EQ(dir_result[0], linktodir); + EXPECT_EQ(dirResult.size(), 1); + EXPECT_EQ(dirResult[0], linktodir); EXPECT_EQ(ForceRemoveDirectory(linktodir), true); // test symlink to file outside the target directory - string linktofile = IncludeTrailingPathDelimiter(test_data_dir) + "symlink_file"; - EXPECT_EQ(symlink(original_file_path.c_str(), linktofile.c_str()), 0); + string linktofile = IncludeTrailingPathDelimiter(testDataDir) + "symlink_file"; + EXPECT_EQ(symlink(originalFilePath.c_str(), linktofile.c_str()), 0); - vector file_result; - GetDirFiles(test_data_dir, file_result); - EXPECT_EQ(file_result.size(), 1); - EXPECT_EQ(file_result[0], linktofile); + vector fileResult; + GetDirFiles(testDataDir, fileResult); + EXPECT_EQ(fileResult.size(), 1); + EXPECT_EQ(fileResult[0], linktofile); EXPECT_EQ(RemoveFile(linktofile), true); // test symlink of files in the same directory - string source_file = IncludeTrailingPathDelimiter(test_data_dir) + "source"; - string symlink_file = IncludeTrailingPathDelimiter(test_data_dir) + "symlink_file"; + string sourceFile = IncludeTrailingPathDelimiter(testDataDir) + "source"; + string symlinkFile = IncludeTrailingPathDelimiter(testDataDir) + "symlink_file"; - ofstream(source_file, fstream::out); - EXPECT_EQ(symlink(source_file.c_str(), symlink_file.c_str()), 0); + ofstream(sourceFile, fstream::out); + EXPECT_EQ(symlink(sourceFile.c_str(), symlinkFile.c_str()), 0); - vector internal_files; - GetDirFiles(test_data_dir, internal_files); + vector internalFiles; + GetDirFiles(testDataDir, internalFiles); - EXPECT_NE(find(internal_files.begin(), internal_files.end(), source_file), internal_files.end()); - EXPECT_NE(find(internal_files.begin(), internal_files.end(), symlink_file), internal_files.end()); + EXPECT_NE(find(internalFiles.begin(), internalFiles.end(), sourceFile), internalFiles.end()); + EXPECT_NE(find(internalFiles.begin(), internalFiles.end(), symlinkFile), internalFiles.end()); - EXPECT_EQ(RemoveFile(source_file), true); - EXPECT_EQ(RemoveFile(symlink_file), true); + EXPECT_EQ(RemoveFile(sourceFile), true); + EXPECT_EQ(RemoveFile(symlinkFile), true); - ForceRemoveDirectory(original_data_path); - ForceRemoveDirectory(test_data_dir); + ForceRemoveDirectory(originalDataPath); + ForceRemoveDirectory(testDataDir); } /* -- Gitee