From 8b4924475d75c820a4576a1ce958dda96d15ce3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Sun, 7 Apr 2024 11:26:06 +0000 Subject: [PATCH 1/7] =?UTF-8?q?issue:https://gitee.com/openharmony/commonl?= =?UTF-8?q?ibrary=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signe?= =?UTF-8?q?d-off-by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/test/unittest/common/utils_safe_map_test.cpp | 2 +- base/test/unittest/common/utils_singleton_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index 0b90909..757df85 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -17,8 +17,8 @@ #include #include #include -#include #include +#include #include // std::chrono::seconds using namespace testing::ext; using namespace std; diff --git a/base/test/unittest/common/utils_singleton_test.cpp b/base/test/unittest/common/utils_singleton_test.cpp index 8461612..d572b1c 100644 --- a/base/test/unittest/common/utils_singleton_test.cpp +++ b/base/test/unittest/common/utils_singleton_test.cpp @@ -31,8 +31,8 @@ public: } }; -DelayedSingletonDeclearTest::~DelayedSingletonDeclearTest() {}; DelayedSingletonDeclearTest::DelayedSingletonDeclearTest() {}; +DelayedSingletonDeclearTest::~DelayedSingletonDeclearTest() {}; class SingletonDeclearTest { DECLARE_SINGLETON(SingletonDeclearTest); -- Gitee From 52e479fb224918b162a5308bf29c0dbe61631df6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Sun, 7 Apr 2024 12:52:23 +0000 Subject: [PATCH 2/7] =?UTF-8?q?issue:https://gitee.com/openharmony/commonl?= =?UTF-8?q?ibrary=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signe?= =?UTF-8?q?d-off-by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/test/unittest/common/utils_file_test.cpp | 39 +++++------- .../common/utils_sorted_vector_test.cpp | 63 ++++++------------- .../unittest/common/utils_thread_test.cpp | 57 ++++++----------- 3 files changed, 56 insertions(+), 103 deletions(-) diff --git a/base/test/unittest/common/utils_file_test.cpp b/base/test/unittest/common/utils_file_test.cpp index 21c9c73..0ac9d60 100644 --- a/base/test/unittest/common/utils_file_test.cpp +++ b/base/test/unittest/common/utils_file_test.cpp @@ -73,6 +73,21 @@ int RemoveTestFile(const std::string& path) return unlink(path.c_str()); } +void OpenAndLoadFileContent(string& content, string& loadResult) +{ + string filename = UtilsFileTest::FILE_PATH; + 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); + EXPECT_EQ(ret, true); + + fd = open(filename.c_str(), O_RDONLY); + ret = LoadStringFromFd(fd, loadResult); + close(fd); + RemoveTestFile(filename); + EXPECT_EQ(ret, true); +} + /* * @tc.name: testLoadStringFromFile001 * @tc.desc: Test loading an existed file 'meminfo' @@ -389,18 +404,8 @@ HWTEST_F(UtilsFileTest, testSaveStringToFd001, TestSize.Level0) HWTEST_F(UtilsFileTest, testSaveStringToFd002, TestSize.Level0) { string content; - string filename = FILE_PATH; - 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); - EXPECT_EQ(ret, true); - string loadResult; - fd = open(filename.c_str(), O_RDONLY); - ret = LoadStringFromFd(fd, loadResult); - close(fd); - RemoveTestFile(filename); - EXPECT_EQ(ret, true); + OpenAndLoadFileContent(content, loadResult); EXPECT_EQ(loadResult, ""); } @@ -411,18 +416,8 @@ HWTEST_F(UtilsFileTest, testSaveStringToFd002, TestSize.Level0) HWTEST_F(UtilsFileTest, testSaveStringToFd003, TestSize.Level0) { string content = CONTENT_STR; - string filename = FILE_PATH; - 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); - EXPECT_EQ(ret, true); - string loadResult; - fd = open(filename.c_str(), O_RDONLY); - ret = LoadStringFromFd(fd, loadResult); - close(fd); - RemoveTestFile(filename); - EXPECT_EQ(ret, true); + OpenAndLoadFileContent(content, loadResult); EXPECT_EQ(loadResult, content); } diff --git a/base/test/unittest/common/utils_sorted_vector_test.cpp b/base/test/unittest/common/utils_sorted_vector_test.cpp index 8316b54..c9f2db5 100644 --- a/base/test/unittest/common/utils_sorted_vector_test.cpp +++ b/base/test/unittest/common/utils_sorted_vector_test.cpp @@ -24,6 +24,21 @@ namespace { class UtilsSortedVector : public testing::Test { }; +template +void PushItem(SortedVector& svec, std::vector& vec) { + for (int i = 0; i < 20; i++) { + vec.push_back(i); + } + + for (int i = 9; i >= 0; i--) { + svec.Add(i); + } + + for (int i = 0; i < 20; i++) { + svec.Add(i); + } +} + HWTEST_F(UtilsSortedVector, testDefaultConsAndAddAndSort, TestSize.Level0) { SortedVector svec; @@ -73,17 +88,7 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowDuplicate, TestSize.Level0 SortedVector svec; std::vector vec; - for (int i = 0; i < 20; i++) { - vec.push_back(i); - } - - for (int i = 9; i >= 0; i--) { - svec.Add(i); - } - - for (int i = 0; i < 20; i++) { - svec.Add(i); - } + PushItem(svec, vec); ASSERT_EQ(static_cast(30), svec.Size()); @@ -101,17 +106,7 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowToAlloworNotAllow, TestSiz SortedVector svec; std::vector vec; - for (int i = 0; i < 20; i++) { - vec.push_back(i); - } - - for (int i = 9; i >= 0; i--) { - svec.Add(i); - } - - for (int i = 0; i < 20; i++) { - svec.Add(i); - } + PushItem(svec, vec); ASSERT_EQ(static_cast(20), svec.Size()); @@ -159,17 +154,7 @@ HWTEST_F(UtilsSortedVector, testOperatorEqAllowToNotAllow, TestSize.Level0) SortedVector svec; std::vector vec; - for (int i = 0; i < 20; i++) { - vec.push_back(i); - } - - for (int i = 9; i >= 0; i--) { - svec.Add(i); - } - - for (int i = 0; i < 20; i++) { - svec.Add(i); - } + PushItem(svec, vec); ASSERT_EQ(static_cast(30), svec.Size()); SortedVector newSvec = svec; @@ -186,17 +171,7 @@ HWTEST_F(UtilsSortedVector, testOperatorEqNotAllowToAllowOrNotAllow, TestSize.Le SortedVector svec; std::vector vec; - for (int i = 0; i < 20; i++) { - vec.push_back(i); - } - - for (int i = 9; i >= 0; i--) { - svec.Add(i); - } - - for (int i = 0; i < 20; i++) { - svec.Add(i); - } + PushItem(svec, vec); ASSERT_EQ(static_cast(20), svec.Size()); SortedVector newSvecFalse = svec; diff --git a/base/test/unittest/common/utils_thread_test.cpp b/base/test/unittest/common/utils_thread_test.cpp index 7da8ede..07b35ac 100644 --- a/base/test/unittest/common/utils_thread_test.cpp +++ b/base/test/unittest/common/utils_thread_test.cpp @@ -115,11 +115,24 @@ bool TestThread::Run() prctl(PR_GET_NAME, threadName, 0, 0); name_ = threadName; - if (runFunc_ != nullptr) { - return (*runFunc_)(data_); - } + return (runFunc_ != nullptr) ? (*runFunc_)(data_) : false; +} - return false; +void TestThreadRun(std::unique_ptr &test, int times) { + pthread_t thread = test->GetThread(); + + // pthread_equal return non-zero if equal + EXPECT_EQ(pthread_equal(thread , -1) != 0, (test->IsRunning() ? false : true)); + + // ReadyToWork return false, RUN will not be called! + EXPECT_EQ(test->priority_, DEFAULT_PRIO); + EXPECT_EQ(test->name_, DEFAULT_THREAD_NAME); + + EXPECT_EQ(test->data_, 0); + EXPECT_EQ(times, 0); + test->NotifyExitSync(); + sleep(1); + EXPECT_EQ(pthread_equal(test->GetThread(), -1) != 0, (test->IsRunning() ? false : true)); } /* @@ -189,20 +202,7 @@ HWTEST_F(UtilsThreadTest, testThread003, TestSize.Level0) ThreadStatus status = test->Start("test_thread_03", THREAD_PROI_LOW, 1024); EXPECT_EQ(status == ThreadStatus::OK, true); - pthread_t thread = test->GetThread(); - - // pthread_equal return non-zero if equal - EXPECT_EQ(pthread_equal(thread , -1) != 0, (test->IsRunning() ? false : true)); - - // ReadyToWork return false, RUN will not be called! - EXPECT_EQ(test->priority_, DEFAULT_PRIO); - EXPECT_EQ(test->name_, DEFAULT_THREAD_NAME); - - EXPECT_EQ(test->data_, 0); - EXPECT_EQ(times, 0); - test->NotifyExitSync(); - sleep(1); - EXPECT_EQ(pthread_equal(test->GetThread(), -1) != 0, (test->IsRunning() ? false : true)); + TestThreadRun(test, times); } /* @@ -244,20 +244,7 @@ HWTEST_F(UtilsThreadTest, testThread005, TestSize.Level0) ThreadStatus status = test->Start("test_thread_05", THREAD_PROI_LOW, 1024); EXPECT_EQ(status == ThreadStatus::OK, true); - pthread_t thread = test->GetThread(); - - // pthread_equal return non-zero if equal - EXPECT_EQ(pthread_equal(thread , -1) != 0, (test->IsRunning() ? false : true)); - - // ReadyToWork return false, RUN will not be called! - EXPECT_EQ(test->priority_, DEFAULT_PRIO); - EXPECT_EQ(test->name_, DEFAULT_THREAD_NAME); - - EXPECT_EQ(test->data_, 0); - EXPECT_EQ(times, 0); - test->NotifyExitSync(); - sleep(1); - EXPECT_EQ(pthread_equal(test->GetThread(), -1) != 0, (test->IsRunning() ? false : true)); + TestThreadRun(test, times); } /* @@ -365,11 +352,7 @@ bool TestThread2::Run() prctl(PR_GET_NAME, threadName, 0, 0); name_ = threadName; - if (runFunc_ != nullptr) { - return (*runFunc_)(data_); - } - - return false; + return (runFunc_ != nullptr) ? (*runFunc_)(data_) : false; } /* -- Gitee From 8738e412a755d822e87fd121207ba5114feff318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Mon, 8 Apr 2024 13:25:44 +0000 Subject: [PATCH 3/7] =?UTF-8?q?issue:https://gitee.com/openharmony/commonl?= =?UTF-8?q?ibrary=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signe?= =?UTF-8?q?d-off-by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/common/utils_safe_map_test.cpp | 65 +++++++++---------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index 757df85..92ff9f8 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -28,6 +28,28 @@ namespace { class UtilsSafeMap : public testing::Test { }; +const int THREAD_NUM = 100; +const int DATA_NUM = 10; +void TestThreadRunResult(std::thread (&threads)[THREAD_NUM], + vector &result, + std::vector> &vcfi) +{ + std::this_thread::sleep_for(std::chrono::seconds(4)); + for (auto& t : threads) { + t.join(); + } + + for (auto& t : vcfi) { + result.push_back(t.get()); + } + + std::sort(result.begin(), result.end()); + + for (int i = 0; i < THREAD_NUM; ++i) { + ASSERT_EQ(i, result[i]); + } +} + /* * @tc.name: testUtilsCopyAndAssign001 * @tc.desc: single thread test the normal feature insert and erase and EnsureInsert @@ -226,8 +248,6 @@ HWTEST_F(UtilsSafeMap, testUtilsNormalFeatureIterate001, TestSize.Level0) * @tc.name: testUtilsConcurrentIterate001 * @tc.desc: 100 threads test in iterate operation to rewrite a SafeMap. */ -const int THREAD_NUM = 100; -const int DATA_NUM = 10; HWTEST_F(UtilsSafeMap, testUtilsConcurrentIterate001, TestSize.Level0) { SafeMap demoData; @@ -323,12 +343,6 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFind001, TestSize.Level0) std::vector> vcfi; ASSERT_NO_THROW({ - auto lamfuncInsert = [](SafeMap& data, const string& key, - const int& value, const std::chrono::system_clock::time_point& absTime) { - std::this_thread::sleep_until(absTime); - data.EnsureInsert(key, value); - }; - auto lamfuncCheckLoop = [](SafeMap& data, const string& key, std::chrono::system_clock::time_point absTime) { std::this_thread::sleep_until(absTime); @@ -339,6 +353,12 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFind001, TestSize.Level0) return i; }; + auto lamfuncInsert = [](SafeMap& data, const string& key, + const int& value, const std::chrono::system_clock::time_point& absTime) { + std::this_thread::sleep_until(absTime); + data.EnsureInsert(key, value); + }; + using std::chrono::system_clock; std::time_t timeT = system_clock::to_time_t(system_clock::now()); @@ -352,22 +372,9 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFind001, TestSize.Level0) std::ref(demoData), key + std::to_string(i), system_clock::from_time_t(timeT))); } - std::this_thread::sleep_for(std::chrono::seconds(4)); - for (auto& t : threads) { - t.join(); - } - vector result; - for (auto& t : vcfi) { - result.push_back(t.get()); - } - - std::sort(result.begin(), result.end()); - - for (int i = 0; i < THREAD_NUM; ++i) { - ASSERT_EQ(i, result[i]); - } + TestThreadRunResult(threads, result, vcfi); }); } @@ -412,21 +419,9 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFindAndSet001, TestSize.Level0 std::ref(demoData), key + std::to_string(i), i + 1, system_clock::from_time_t(timeT))); } - std::this_thread::sleep_for(std::chrono::seconds(4)); - for (auto& t : threads) { - t.join(); - } - vector result; - for (auto& t : vcfi) { - result.push_back(t.get()); - } - - std::sort(result.begin(), result.end()); - for (int i = 0; i < THREAD_NUM; ++i) { - ASSERT_EQ(i, result[i]); - } + TestThreadRunResult(threads, result, vcfi); int t = 0; result.clear(); -- Gitee From 93661453127a0f5af390f472916b7283bd15c8f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Thu, 11 Apr 2024 07:57:19 +0000 Subject: [PATCH 4/7] =?UTF-8?q?issue:https://gitee.com/openharmony/commonl?= =?UTF-8?q?ibrary=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signe?= =?UTF-8?q?d-off-by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/common/utils_safe_map_test.cpp | 13 +- .../common/utils_sorted_vector_test.cpp | 215 +++++++++--------- .../unittest/common/utils_thread_test.cpp | 5 +- 3 files changed, 123 insertions(+), 110 deletions(-) diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index 92ff9f8..9024550 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -30,11 +30,14 @@ class UtilsSafeMap : public testing::Test { const int THREAD_NUM = 100; const int DATA_NUM = 10; +const int SLEEP_SECOND_3 = 3; +const int SLEEP_SECOND_4 = 4; +const int SLEEP_SECOND_10 = 10; void TestThreadRunResult(std::thread (&threads)[THREAD_NUM], vector &result, std::vector> &vcfi) { - std::this_thread::sleep_for(std::chrono::seconds(4)); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_SECOND)); for (auto& t : threads) { t.join(); } @@ -275,7 +278,7 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentIterate001, TestSize.Level0) threads[i] = std::thread(lamfuncIterate, std::ref(demoData), i, system_clock::from_time_t(timeT)); } - std::this_thread::sleep_for(std::chrono::seconds(3)); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_SECOND_3)); for (auto& t : threads) { t.join(); } @@ -320,7 +323,7 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndRead001, TestSize.Level0) checkThread[i] = std::thread(lamfuncCheck, std::ref(demoData), key, system_clock::from_time_t(timeT)); } - std::this_thread::sleep_for(std::chrono::seconds(3)); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_SECOND_3)); for (auto& t : threads) { t.join(); } @@ -348,7 +351,7 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFind001, TestSize.Level0) std::this_thread::sleep_until(absTime); thread_local int i = -1; while (!data.Find(key, i)) { - std::this_thread::sleep_for(std::chrono::microseconds(10)); + std::this_thread::sleep_for(std::chrono::microseconds(SLEEP_SECOND_10)); } return i; }; @@ -401,7 +404,7 @@ HWTEST_F(UtilsSafeMap, testUtilsConcurrentWriteAndFindAndSet001, TestSize.Level0 std::this_thread::sleep_until(absTime); thread_local int i = -1; while (!data.FindOldAndSetNew(key, i, newvalue)) { - std::this_thread::sleep_for(std::chrono::microseconds(10)); + std::this_thread::sleep_for(std::chrono::microseconds(SLEEP_SECOND_10)); } return i; }; diff --git a/base/test/unittest/common/utils_sorted_vector_test.cpp b/base/test/unittest/common/utils_sorted_vector_test.cpp index c9f2db5..c63519b 100644 --- a/base/test/unittest/common/utils_sorted_vector_test.cpp +++ b/base/test/unittest/common/utils_sorted_vector_test.cpp @@ -25,16 +25,18 @@ class UtilsSortedVector : public testing::Test { }; template -void PushItem(SortedVector& svec, std::vector& vec) { - for (int i = 0; i < 20; i++) { +void PushItem(SortedVector& svec, std::vector& vec) +{ + int num = 20; + for (int i = 0; i < num; i++) { vec.push_back(i); } - for (int i = 9; i >= 0; i--) { + for (int i = (num / 2) - 1; i >= 0; i--) { svec.Add(i); } - for (int i = 0; i < 20; i++) { + for (int i = 0; i < num; i++) { svec.Add(i); } } @@ -43,12 +45,12 @@ HWTEST_F(UtilsSortedVector, testDefaultConsAndAddAndSort, TestSize.Level0) { SortedVector svec; std::vector vec; - - for (int i = 0; i < 10; i++) { + int num = 10; + for (int i = 0; i < num; i++) { vec.push_back(i); } - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -64,12 +66,12 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedAllowDup, TestSize.Level0) { SortedVector svec; std::vector vec; - - for (int i = 0; i < 10; i++) { + int num = 10; + for (int i = 0; i < num; i++) { vec.push_back(i); } - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -87,16 +89,18 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowDuplicate, TestSize.Level0 { SortedVector svec; std::vector vec; + int sVectorSize = 30; + int vectorSize = 20; PushItem(svec, vec); - ASSERT_EQ(static_cast(30), svec.Size()); + ASSERT_EQ(static_cast(sVectorSize), svec.Size()); SortedVector newSvec(svec); - ASSERT_EQ(static_cast(20), newSvec.Size()); + ASSERT_EQ(static_cast(vectorSize), newSvec.Size()); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < vectorSize; i++) { ASSERT_EQ(vec[i], newSvec[i]); } } @@ -105,23 +109,23 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowToAlloworNotAllow, TestSiz { SortedVector svec; std::vector vec; - + int vectorSize = 20; PushItem(svec, vec); - ASSERT_EQ(static_cast(20), svec.Size()); + ASSERT_EQ(static_cast(vectorSize), svec.Size()); SortedVector newSvecTrue(svec); - ASSERT_EQ(static_cast(20), newSvecTrue.Size()); + ASSERT_EQ(static_cast(vectorSize), newSvecTrue.Size()); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < vectorSize; i++) { ASSERT_EQ(vec[i], newSvecTrue[i]); } SortedVector newSvecFalse(svec); - ASSERT_EQ(static_cast(20), newSvecFalse.Size()); + ASSERT_EQ(static_cast(vectorSize), newSvecFalse.Size()); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < vectorSize; i++) { ASSERT_EQ(vec[i], newSvecFalse[i]); } } @@ -130,12 +134,12 @@ HWTEST_F(UtilsSortedVector, testoperatoreq, TestSize.Level0) { SortedVector svec; std::vector vec; - - for (int i = 0; i < 10; i++) { + int num = 10; + for (int i = 0; i < num; i++) { vec.push_back(i); } - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -153,15 +157,16 @@ HWTEST_F(UtilsSortedVector, testOperatorEqAllowToNotAllow, TestSize.Level0) { SortedVector svec; std::vector vec; - + int sVectorSize = 30; + int vectorSize = 20; PushItem(svec, vec); - ASSERT_EQ(static_cast(30), svec.Size()); + ASSERT_EQ(static_cast(sVectorSize), svec.Size()); SortedVector newSvec = svec; - ASSERT_EQ(static_cast(20), newSvec.Size()); + ASSERT_EQ(static_cast(vectorSize), newSvec.Size()); - for (int i = 0; i < 20; i++) { + for (int i = 0; i < vectorSize; i++) { ASSERT_EQ(vec[i], newSvec[i]); } } @@ -170,15 +175,15 @@ HWTEST_F(UtilsSortedVector, testOperatorEqNotAllowToAllowOrNotAllow, TestSize.Le { SortedVector svec; std::vector vec; - + int vectorSize = 20; PushItem(svec, vec); - ASSERT_EQ(static_cast(20), svec.Size()); + ASSERT_EQ(static_cast(vectorSize), svec.Size()); SortedVector newSvecFalse = svec; SortedVector newSvecTrue = svec; - ASSERT_EQ(static_cast(20), newSvecFalse.Size()); - ASSERT_EQ(static_cast(20), newSvecTrue.Size()); - for (int i = 0; i < 20; i++) { + ASSERT_EQ(static_cast(vectorSize), newSvecFalse.Size()); + ASSERT_EQ(static_cast(vectorSize), newSvecTrue.Size()); + for (int i = 0; i < vectorSize; i++) { ASSERT_EQ(vec[i], newSvecFalse[i]); ASSERT_EQ(vec[i], newSvecTrue[i]); } @@ -187,26 +192,27 @@ HWTEST_F(UtilsSortedVector, testOperatorEqNotAllowToAllowOrNotAllow, TestSize.Le HWTEST_F(UtilsSortedVector, testOperatorEqAssignmentTwice, TestSize.Level0) { SortedVector svec; - + int sVectorSize = 30; + int vectorSize = 20; std::vector vec; - for (int i = 20; i < 30; i++) { + for (int i = vectorSize; i < sVectorSize; i++) { vec.push_back(i); } - for (int i = 0; i < 20; i++) { + for (int i = 0; i < vectorSize; i++) { svec.Add(i); } SortedVector newSvecFalse; - for (int i = 20; i < 30; i++) { + for (int i = vectorSize; i < sVectorSize; i++) { newSvecFalse.Add(i); } svec = newSvecFalse; - ASSERT_EQ(static_cast(10), svec.Size()); - for (int i = 0; i < 10; i++) { + ASSERT_EQ(static_cast(vectorSize / 2), svec.Size()); + for (int i = 0; i < vectorSize / 2; i++) { ASSERT_EQ(vec[i], svec[i]); } } @@ -215,12 +221,12 @@ HWTEST_F(UtilsSortedVector, testoperatorconsteq, TestSize.Level0) { SortedVector svec; std::vector vec; - - for (int i = 0; i < 10; i++) { + int num = 10; + for (int i = 0; i < num; i++) { vec.push_back(i); } - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -237,15 +243,15 @@ HWTEST_F(UtilsSortedVector, testoperatorconsteq, TestSize.Level0) HWTEST_F(UtilsSortedVector, testsizeclearIsEmpty, TestSize.Level0) { SortedVector svec; - + int num = 10; ASSERT_TRUE(svec.IsEmpty()); ASSERT_EQ(svec.Size(), static_cast(0)); - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - ASSERT_EQ(svec.Size(), static_cast(10)); + ASSERT_EQ(svec.Size(), static_cast(num)); ASSERT_FALSE(svec.IsEmpty()); @@ -258,24 +264,25 @@ HWTEST_F(UtilsSortedVector, testsizeclearIsEmpty, TestSize.Level0) HWTEST_F(UtilsSortedVector, testCapasityandSetcapasity, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + int maxCapcity = 1000; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - svec.SetCapcity(1000); + svec.SetCapcity(maxCapcity); - ASSERT_EQ(svec.Capacity(), static_cast(1000)); + ASSERT_EQ(svec.Capacity(), static_cast(maxCapcity)); - ASSERT_LT(svec.SetCapcity(500), static_cast(0)); - ASSERT_EQ(svec.Capacity(), static_cast(1000)); + ASSERT_LT(svec.SetCapcity(maxCapcity / 2), static_cast(0)); + ASSERT_EQ(svec.Capacity(), static_cast(maxCapcity)); } HWTEST_F(UtilsSortedVector, testconstArray, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -295,8 +302,8 @@ HWTEST_F(UtilsSortedVector, testconstArray, TestSize.Level0) HWTEST_F(UtilsSortedVector, testeditArray, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -341,8 +348,8 @@ HWTEST_F(UtilsSortedVector, testeditArray, TestSize.Level0) HWTEST_F(UtilsSortedVector, testIndexOf, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -354,14 +361,14 @@ HWTEST_F(UtilsSortedVector, testIndexOf, TestSize.Level0) ASSERT_EQ(i, svec.IndexOf(i)); } - ASSERT_EQ(-1, svec.IndexOf(10)); + ASSERT_EQ(-1, svec.IndexOf(num)); } HWTEST_F(UtilsSortedVector, testOrderof, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } @@ -374,19 +381,19 @@ HWTEST_F(UtilsSortedVector, testOrderof, TestSize.Level0) ASSERT_EQ(static_cast(0), svec.OrderOf(-2)); ASSERT_EQ(static_cast(0), svec.OrderOf(-1)); - ASSERT_EQ(static_cast(10), svec.OrderOf(9)); - ASSERT_EQ(static_cast(10), svec.OrderOf(10)); + ASSERT_EQ(static_cast(num), svec.OrderOf(num - 1)); + ASSERT_EQ(static_cast(num), svec.OrderOf(num)); } HWTEST_F(UtilsSortedVector, testoperatorAccess, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - for (int i = 0; i <= 9; i++) { + for (int i = 0; i <= num - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -394,27 +401,27 @@ HWTEST_F(UtilsSortedVector, testoperatorAccess, TestSize.Level0) HWTEST_F(UtilsSortedVector, testBack, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - ASSERT_EQ(9, svec.Back()); + ASSERT_EQ(num - 1, svec.Back()); } HWTEST_F(UtilsSortedVector, testMirrorItemAt, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - for (ssize_t i = -1; i >= -10; i--) { - ASSERT_EQ(i + 10, svec.MirrorItemAt(i)); + for (ssize_t i = -1; i >= -num; i--) { + ASSERT_EQ(i + num, svec.MirrorItemAt(i)); } - for (ssize_t i = 0; i <= 9; i++) { + for (ssize_t i = 0; i <= num - 1; i++) { ASSERT_EQ(i, svec.MirrorItemAt(i)); } } @@ -422,12 +429,12 @@ HWTEST_F(UtilsSortedVector, testMirrorItemAt, TestSize.Level0) HWTEST_F(UtilsSortedVector, testEditItemAt, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } - for (ssize_t i = 0; i <= 9; i++) { + for (ssize_t i = 0; i <= num - 1; i++) { svec.EditItemAt(i) += 1; ASSERT_EQ(i + 1, svec.EditItemAt(i)); } @@ -436,14 +443,14 @@ HWTEST_F(UtilsSortedVector, testEditItemAt, TestSize.Level0) HWTEST_F(UtilsSortedVector, testCopyCtorFromVector, TestSize.Level0) { std::vector vec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { vec.push_back(i); } SortedVector svec(vec); - for (ssize_t i = 0; i <= 9; i++) { + for (ssize_t i = 0; i <= num - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -451,21 +458,21 @@ HWTEST_F(UtilsSortedVector, testCopyCtorFromVector, TestSize.Level0) HWTEST_F(UtilsSortedVector, testConsFromVectorToNotAllowDuplicate, TestSize.Level0) { std::vector vec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { vec.push_back(i); } - for (int i = 19; i >= 0; i--) { + for (int i = (num * 2) - 1; i >= 0; i--) { vec.push_back(i); } - ASSERT_EQ(static_cast(30), vec.size()); + ASSERT_EQ(static_cast(num * 3), vec.size()); SortedVector svec(vec); - ASSERT_EQ(static_cast(20), svec.Size()); + ASSERT_EQ(static_cast(num * 2), svec.Size()); - for (ssize_t i = 0; i <= 19; i++) { + for (ssize_t i = 0; i <= (num * 2) - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -473,19 +480,19 @@ HWTEST_F(UtilsSortedVector, testConsFromVectorToNotAllowDuplicate, TestSize.Leve HWTEST_F(UtilsSortedVector, testMergevector, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } std::vector vec; - for (int i = 10; i < 20; i++) { + for (int i = num; i < num * 2; i++) { vec.push_back(i); } svec.Merge(vec); - for (ssize_t i = 0; i < 20; i++) { + for (ssize_t i = 0; i < num * 2; i++) { ASSERT_EQ(i, svec[i]); } } @@ -494,24 +501,24 @@ HWTEST_F(UtilsSortedVector, testMergevectorNoduplicate, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); } std::vector vec; - for (int i = 0; i < 20; i++) { + for (int i = 0; i < num * 2; i++) { vec.push_back(i); } - for (int i = 10; i < 30; i++) { + for (int i = num; i < num * 3; i++) { vec.push_back(i); } svec.Merge(vec); - ASSERT_EQ(svec.Size(), static_cast(30)); + ASSERT_EQ(svec.Size(), static_cast(num * 3)); - for (ssize_t i = 0; i < 30; i++) { + for (ssize_t i = 0; i < num * 3; i++) { ASSERT_EQ(i, svec[i]); } } @@ -520,15 +527,16 @@ HWTEST_F(UtilsSortedVector, testMergesortedvectorNoduplicate, TestSize.Level0) { SortedVector svec; SortedVector svec2; - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); svec2.Add(i); } svec.Merge(svec2); - ASSERT_EQ(static_cast(10), svec.Size()); + ASSERT_EQ(static_cast(num), svec.Size()); // 0,1,2,3,4,5,6,7,8,9 - for (ssize_t i = 0; i < 10; i++) { + for (ssize_t i = 0; i < num; i++) { ASSERT_EQ(i, svec[i]); } } @@ -537,7 +545,8 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) { SortedVector svec; SortedVector svec2; - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { svec.Add(i); svec2.Add(i); } @@ -545,7 +554,7 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) svec.Merge(svec2); // 0,0,1,1,2,2,3,3... - for (ssize_t i = 0; i < 20; i++) { + for (ssize_t i = 0; i < num * 2; i++) { ASSERT_EQ(i / 2, svec[i]); } } @@ -553,20 +562,20 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) HWTEST_F(UtilsSortedVector, testAddNotAllowDuplicate, TestSize.Level0) { SortedVector svec; - - for (int i = 9; i >= 0; i--) { + int num = 10; + for (int i = num - 1; i >= 0; i--) { ASSERT_NE(svec.Add(i), static_cast(-1)); } ASSERT_EQ(static_cast(10), svec.Size()); // duplicate - for (int i = 9; i >= 0; i--) { + for (int i = num - 1; i >= 0; i--) { ASSERT_EQ(svec.Add(i), static_cast(-1)); - ASSERT_EQ(static_cast(10), svec.Size()); + ASSERT_EQ(static_cast(num), svec.Size()); } - for (ssize_t i = 0; i < 10; i++) { + for (ssize_t i = 0; i < num; i++) { ASSERT_EQ(i, svec[i]); } } diff --git a/base/test/unittest/common/utils_thread_test.cpp b/base/test/unittest/common/utils_thread_test.cpp index 07b35ac..6ab485e 100644 --- a/base/test/unittest/common/utils_thread_test.cpp +++ b/base/test/unittest/common/utils_thread_test.cpp @@ -118,11 +118,12 @@ bool TestThread::Run() return (runFunc_ != nullptr) ? (*runFunc_)(data_) : false; } -void TestThreadRun(std::unique_ptr &test, int times) { +void TestThreadRun(std::unique_ptr &test, int times) +{ pthread_t thread = test->GetThread(); // pthread_equal return non-zero if equal - EXPECT_EQ(pthread_equal(thread , -1) != 0, (test->IsRunning() ? false : true)); + EXPECT_EQ(pthread_equal(thread, -1) != 0, (test->IsRunning() ? false : true)); // ReadyToWork return false, RUN will not be called! EXPECT_EQ(test->priority_, DEFAULT_PRIO); -- Gitee From 6a6d912ae04926a7c17b0f8b6851cbb91f9c2a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Thu, 11 Apr 2024 08:22:40 +0000 Subject: [PATCH 5/7] =?UTF-8?q?issue:https://gitee.com/openharmony/commonl?= =?UTF-8?q?ibrary=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signe?= =?UTF-8?q?d-off-by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/test/unittest/common/utils_safe_map_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index 9024550..cf37cc4 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -37,7 +37,7 @@ void TestThreadRunResult(std::thread (&threads)[THREAD_NUM], vector &result, std::vector> &vcfi) { - std::this_thread::sleep_for(std::chrono::seconds(SLEEP_SECOND)); + std::this_thread::sleep_for(std::chrono::seconds(SLEEP_SECOND_4)); for (auto& t : threads) { t.join(); } -- Gitee From 8b4d55a6977f5f369c73f37051b31cf1e174e1f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Fri, 12 Apr 2024 10:02:11 +0000 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=8E=87=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20issue:https://gitee.com/openharmony/commonlibrary?= =?UTF-8?q?=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signed-off-?= =?UTF-8?q?by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/common/utils_safe_map_test.cpp | 5 + .../common/utils_sorted_vector_test.cpp | 261 ++++++++++-------- 2 files changed, 155 insertions(+), 111 deletions(-) diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index cf37cc4..ff308a2 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -28,10 +28,15 @@ namespace { class UtilsSafeMap : public testing::Test { }; +//线程数 const int THREAD_NUM = 100; +//数据长度 const int DATA_NUM = 10; +//线程休眠秒数3 const int SLEEP_SECOND_3 = 3; +//线程休眠秒数4 const int SLEEP_SECOND_4 = 4; +//线程休眠秒数10 const int SLEEP_SECOND_10 = 10; void TestThreadRunResult(std::thread (&threads)[THREAD_NUM], vector &result, diff --git a/base/test/unittest/common/utils_sorted_vector_test.cpp b/base/test/unittest/common/utils_sorted_vector_test.cpp index c63519b..584976b 100644 --- a/base/test/unittest/common/utils_sorted_vector_test.cpp +++ b/base/test/unittest/common/utils_sorted_vector_test.cpp @@ -25,18 +25,17 @@ class UtilsSortedVector : public testing::Test { }; template -void PushItem(SortedVector& svec, std::vector& vec) +void PushItem(SortedVector& svec, std::vector& vec, int pushTimes) { - int num = 20; - for (int i = 0; i < num; i++) { + for (int i = 0; i < pushTimes; i++) { vec.push_back(i); } - for (int i = (num / 2) - 1; i >= 0; i--) { + for (int i = (pushTimes / 2) - 1; i >= 0; i--) { svec.Add(i); } - for (int i = 0; i < num; i++) { + for (int i = 0; i < pushTimes; i++) { svec.Add(i); } } @@ -45,12 +44,13 @@ HWTEST_F(UtilsSortedVector, testDefaultConsAndAddAndSort, TestSize.Level0) { SortedVector svec; std::vector vec; - int num = 10; - for (int i = 0; i < num; i++) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = 0; i < defaultPushTimes; i++) { vec.push_back(i); } - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -66,12 +66,13 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedAllowDup, TestSize.Level0) { SortedVector svec; std::vector vec; - int num = 10; - for (int i = 0; i < num; i++) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = 0; i < defaultPushTimes; i++) { vec.push_back(i); } - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -89,18 +90,20 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowDuplicate, TestSize.Level0 { SortedVector svec; std::vector vec; - int sVectorSize = 30; - int vectorSize = 20; + //默认添加次数 + int defaultPushTimes = 20; + //期望的SortedVector的大小 + int exceptSortedVectorSize = 30; - PushItem(svec, vec); + PushItem(svec, vec, defaultPushTimes); - ASSERT_EQ(static_cast(sVectorSize), svec.Size()); + ASSERT_EQ(static_cast(exceptSortedVectorSize), svec.Size()); SortedVector newSvec(svec); - ASSERT_EQ(static_cast(vectorSize), newSvec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), newSvec.Size()); - for (int i = 0; i < vectorSize; i++) { + for (int i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(vec[i], newSvec[i]); } } @@ -109,23 +112,24 @@ HWTEST_F(UtilsSortedVector, testConsFromSortedNotAllowToAlloworNotAllow, TestSiz { SortedVector svec; std::vector vec; - int vectorSize = 20; - PushItem(svec, vec); + //默认添加次数 + int defaultPushTimes = 20; + PushItem(svec, vec, defaultPushTimes); - ASSERT_EQ(static_cast(vectorSize), svec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), svec.Size()); SortedVector newSvecTrue(svec); - ASSERT_EQ(static_cast(vectorSize), newSvecTrue.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), newSvecTrue.Size()); - for (int i = 0; i < vectorSize; i++) { + for (int i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(vec[i], newSvecTrue[i]); } SortedVector newSvecFalse(svec); - ASSERT_EQ(static_cast(vectorSize), newSvecFalse.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), newSvecFalse.Size()); - for (int i = 0; i < vectorSize; i++) { + for (int i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(vec[i], newSvecFalse[i]); } } @@ -134,12 +138,13 @@ HWTEST_F(UtilsSortedVector, testoperatoreq, TestSize.Level0) { SortedVector svec; std::vector vec; - int num = 10; - for (int i = 0; i < num; i++) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = 0; i < defaultPushTimes; i++) { vec.push_back(i); } - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -157,16 +162,18 @@ HWTEST_F(UtilsSortedVector, testOperatorEqAllowToNotAllow, TestSize.Level0) { SortedVector svec; std::vector vec; - int sVectorSize = 30; - int vectorSize = 20; - PushItem(svec, vec); + //默认添加次数 + int defaultPushTimes = 20; + //期望的SortedVector的大小 + int exceptSortedVectorSize = 30; + PushItem(svec, vec, defaultPushTimes); - ASSERT_EQ(static_cast(sVectorSize), svec.Size()); + ASSERT_EQ(static_cast(exceptSortedVectorSize), svec.Size()); SortedVector newSvec = svec; - ASSERT_EQ(static_cast(vectorSize), newSvec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), newSvec.Size()); - for (int i = 0; i < vectorSize; i++) { + for (int i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(vec[i], newSvec[i]); } } @@ -175,15 +182,16 @@ HWTEST_F(UtilsSortedVector, testOperatorEqNotAllowToAllowOrNotAllow, TestSize.Le { SortedVector svec; std::vector vec; - int vectorSize = 20; - PushItem(svec, vec); + //默认添加次数 + int defaultPushTimes = 20; + PushItem(svec, vec, defaultPushTimes); - ASSERT_EQ(static_cast(vectorSize), svec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), svec.Size()); SortedVector newSvecFalse = svec; SortedVector newSvecTrue = svec; - ASSERT_EQ(static_cast(vectorSize), newSvecFalse.Size()); - ASSERT_EQ(static_cast(vectorSize), newSvecTrue.Size()); - for (int i = 0; i < vectorSize; i++) { + ASSERT_EQ(static_cast(defaultPushTimes), newSvecFalse.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), newSvecTrue.Size()); + for (int i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(vec[i], newSvecFalse[i]); ASSERT_EQ(vec[i], newSvecTrue[i]); } @@ -192,27 +200,29 @@ HWTEST_F(UtilsSortedVector, testOperatorEqNotAllowToAllowOrNotAllow, TestSize.Le HWTEST_F(UtilsSortedVector, testOperatorEqAssignmentTwice, TestSize.Level0) { SortedVector svec; - int sVectorSize = 30; - int vectorSize = 20; + //默认添加次数 + int defaultPushTimes = 20; + //期望的SortedVector的大小 + int exceptSortedVectorSize = 30; std::vector vec; - for (int i = vectorSize; i < sVectorSize; i++) { + for (int i = defaultPushTimes; i < exceptSortedVectorSize; i++) { vec.push_back(i); } - for (int i = 0; i < vectorSize; i++) { + for (int i = 0; i < defaultPushTimes; i++) { svec.Add(i); } SortedVector newSvecFalse; - for (int i = vectorSize; i < sVectorSize; i++) { + for (int i = defaultPushTimes; i < exceptSortedVectorSize; i++) { newSvecFalse.Add(i); } svec = newSvecFalse; - ASSERT_EQ(static_cast(vectorSize / 2), svec.Size()); - for (int i = 0; i < vectorSize / 2; i++) { + ASSERT_EQ(static_cast(defaultPushTimes / 2), svec.Size()); + for (int i = 0; i < defaultPushTimes / 2; i++) { ASSERT_EQ(vec[i], svec[i]); } } @@ -221,12 +231,13 @@ HWTEST_F(UtilsSortedVector, testoperatorconsteq, TestSize.Level0) { SortedVector svec; std::vector vec; - int num = 10; - for (int i = 0; i < num; i++) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = 0; i < defaultPushTimes; i++) { vec.push_back(i); } - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -243,15 +254,16 @@ HWTEST_F(UtilsSortedVector, testoperatorconsteq, TestSize.Level0) HWTEST_F(UtilsSortedVector, testsizeclearIsEmpty, TestSize.Level0) { SortedVector svec; - int num = 10; + //默认添加次数 + int defaultPushTimes = 10; ASSERT_TRUE(svec.IsEmpty()); ASSERT_EQ(svec.Size(), static_cast(0)); - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } - ASSERT_EQ(svec.Size(), static_cast(num)); + ASSERT_EQ(svec.Size(), static_cast(defaultPushTimes)); ASSERT_FALSE(svec.IsEmpty()); @@ -264,9 +276,11 @@ HWTEST_F(UtilsSortedVector, testsizeclearIsEmpty, TestSize.Level0) HWTEST_F(UtilsSortedVector, testCapasityandSetcapasity, TestSize.Level0) { SortedVector svec; - int num = 10; + //默认添加次数 + int defaultPushTimes = 10; + //最大容量 int maxCapcity = 1000; - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -281,8 +295,9 @@ HWTEST_F(UtilsSortedVector, testCapasityandSetcapasity, TestSize.Level0) HWTEST_F(UtilsSortedVector, testconstArray, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -302,8 +317,9 @@ HWTEST_F(UtilsSortedVector, testconstArray, TestSize.Level0) HWTEST_F(UtilsSortedVector, testeditArray, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -348,8 +364,9 @@ HWTEST_F(UtilsSortedVector, testeditArray, TestSize.Level0) HWTEST_F(UtilsSortedVector, testIndexOf, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -361,14 +378,15 @@ HWTEST_F(UtilsSortedVector, testIndexOf, TestSize.Level0) ASSERT_EQ(i, svec.IndexOf(i)); } - ASSERT_EQ(-1, svec.IndexOf(num)); + ASSERT_EQ(-1, svec.IndexOf(defaultPushTimes)); } HWTEST_F(UtilsSortedVector, testOrderof, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -381,19 +399,20 @@ HWTEST_F(UtilsSortedVector, testOrderof, TestSize.Level0) ASSERT_EQ(static_cast(0), svec.OrderOf(-2)); ASSERT_EQ(static_cast(0), svec.OrderOf(-1)); - ASSERT_EQ(static_cast(num), svec.OrderOf(num - 1)); - ASSERT_EQ(static_cast(num), svec.OrderOf(num)); + ASSERT_EQ(static_cast(defaultPushTimes), svec.OrderOf(defaultPushTimes - 1)); + ASSERT_EQ(static_cast(defaultPushTimes), svec.OrderOf(defaultPushTimes)); } HWTEST_F(UtilsSortedVector, testoperatorAccess, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } - for (int i = 0; i <= num - 1; i++) { + for (int i = 0; i <= defaultPushTimes - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -401,27 +420,29 @@ HWTEST_F(UtilsSortedVector, testoperatorAccess, TestSize.Level0) HWTEST_F(UtilsSortedVector, testBack, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } - ASSERT_EQ(num - 1, svec.Back()); + ASSERT_EQ(defaultPushTimes - 1, svec.Back()); } HWTEST_F(UtilsSortedVector, testMirrorItemAt, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } - for (ssize_t i = -1; i >= -num; i--) { - ASSERT_EQ(i + num, svec.MirrorItemAt(i)); + for (ssize_t i = -1; i >= -defaultPushTimes; i--) { + ASSERT_EQ(i + defaultPushTimes, svec.MirrorItemAt(i)); } - for (ssize_t i = 0; i <= num - 1; i++) { + for (ssize_t i = 0; i <= defaultPushTimes - 1; i++) { ASSERT_EQ(i, svec.MirrorItemAt(i)); } } @@ -429,12 +450,13 @@ HWTEST_F(UtilsSortedVector, testMirrorItemAt, TestSize.Level0) HWTEST_F(UtilsSortedVector, testEditItemAt, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } - for (ssize_t i = 0; i <= num - 1; i++) { + for (ssize_t i = 0; i <= defaultPushTimes - 1; i++) { svec.EditItemAt(i) += 1; ASSERT_EQ(i + 1, svec.EditItemAt(i)); } @@ -443,14 +465,15 @@ HWTEST_F(UtilsSortedVector, testEditItemAt, TestSize.Level0) HWTEST_F(UtilsSortedVector, testCopyCtorFromVector, TestSize.Level0) { std::vector vec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { vec.push_back(i); } SortedVector svec(vec); - for (ssize_t i = 0; i <= num - 1; i++) { + for (ssize_t i = 0; i <= defaultPushTimes - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -458,21 +481,26 @@ HWTEST_F(UtilsSortedVector, testCopyCtorFromVector, TestSize.Level0) HWTEST_F(UtilsSortedVector, testConsFromVectorToNotAllowDuplicate, TestSize.Level0) { std::vector vec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //第一次添加次数10 + int firstPushTimes = 10; + //第二次添加次数20 + int secondPushTimes = 20; + //期望的SortedVector的大小 + int exceptSortedVectorSize = 30; + for (int i = firstPushTimes - 1; i >= 0; i--) { vec.push_back(i); } - for (int i = (num * 2) - 1; i >= 0; i--) { + for (int i = secondPushTimes - 1; i >= 0; i--) { vec.push_back(i); } - ASSERT_EQ(static_cast(num * 3), vec.size()); + ASSERT_EQ(static_cast(exceptSortedVectorSize), vec.size()); SortedVector svec(vec); - ASSERT_EQ(static_cast(num * 2), svec.Size()); + ASSERT_EQ(static_cast(secondPushTimes), svec.Size()); - for (ssize_t i = 0; i <= (num * 2) - 1; i++) { + for (ssize_t i = 0; i <= secondPushTimes - 1; i++) { ASSERT_EQ(i, svec[i]); } } @@ -480,19 +508,21 @@ HWTEST_F(UtilsSortedVector, testConsFromVectorToNotAllowDuplicate, TestSize.Leve HWTEST_F(UtilsSortedVector, testMergevector, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } std::vector vec; - for (int i = num; i < num * 2; i++) { + for (int i = defaultPushTimes; i < defaultPushTimes * 2; i++) { vec.push_back(i); } svec.Merge(vec); - for (ssize_t i = 0; i < num * 2; i++) { + for (ssize_t i = 0; i < defaultPushTimes * 2; i++) { ASSERT_EQ(i, svec[i]); } } @@ -501,24 +531,30 @@ HWTEST_F(UtilsSortedVector, testMergevectorNoduplicate, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //第一次添加次数10 + int firstPushTimes = 10; + //第二次添加次数 + int secondPushTimes = 20; + //期望的SortedVector的大小 + int exceptSortedVectorSize = 30; + + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); } std::vector vec; - for (int i = 0; i < num * 2; i++) { + for (int i = 0; i < secondPushTimes; i++) { vec.push_back(i); } - for (int i = num; i < num * 3; i++) { + for (int i = defaultPushTimes; i < exceptSortedVectorSize; i++) { vec.push_back(i); } svec.Merge(vec); - ASSERT_EQ(svec.Size(), static_cast(num * 3)); + ASSERT_EQ(svec.Size(), static_cast(exceptSortedVectorSize)); - for (ssize_t i = 0; i < num * 3; i++) { + for (ssize_t i = 0; i < exceptSortedVectorSize; i++) { ASSERT_EQ(i, svec[i]); } } @@ -527,16 +563,17 @@ HWTEST_F(UtilsSortedVector, testMergesortedvectorNoduplicate, TestSize.Level0) { SortedVector svec; SortedVector svec2; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); svec2.Add(i); } svec.Merge(svec2); - ASSERT_EQ(static_cast(num), svec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), svec.Size()); // 0,1,2,3,4,5,6,7,8,9 - for (ssize_t i = 0; i < num; i++) { + for (ssize_t i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(i, svec[i]); } } @@ -545,8 +582,9 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) { SortedVector svec; SortedVector svec2; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { svec.Add(i); svec2.Add(i); } @@ -554,7 +592,7 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) svec.Merge(svec2); // 0,0,1,1,2,2,3,3... - for (ssize_t i = 0; i < num * 2; i++) { + for (ssize_t i = 0; i < defaultPushTimes * 2; i++) { ASSERT_EQ(i / 2, svec[i]); } } @@ -562,20 +600,21 @@ HWTEST_F(UtilsSortedVector, testMergesortedvector, TestSize.Level0) HWTEST_F(UtilsSortedVector, testAddNotAllowDuplicate, TestSize.Level0) { SortedVector svec; - int num = 10; - for (int i = num - 1; i >= 0; i--) { + //默认添加次数 + int defaultPushTimes = 10; + for (int i = defaultPushTimes - 1; i >= 0; i--) { ASSERT_NE(svec.Add(i), static_cast(-1)); } - ASSERT_EQ(static_cast(10), svec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), svec.Size()); // duplicate - for (int i = num - 1; i >= 0; i--) { + for (int i = defaultPushTimes - 1; i >= 0; i--) { ASSERT_EQ(svec.Add(i), static_cast(-1)); - ASSERT_EQ(static_cast(num), svec.Size()); + ASSERT_EQ(static_cast(defaultPushTimes), svec.Size()); } - for (ssize_t i = 0; i < num; i++) { + for (ssize_t i = 0; i < defaultPushTimes; i++) { ASSERT_EQ(i, svec[i]); } } -- Gitee From 560b355d2a99a87cf96217123012d8da86cd0430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E5=AE=9D=E7=9B=B8?= Date: Fri, 12 Apr 2024 11:12:22 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=8E=87=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20issue:https://gitee.com/openharmony/commonlibrary?= =?UTF-8?q?=5Fc=5Futils/issues/I9CWVH=3Ffrom=3Dproject-issue=20Signed-off-?= =?UTF-8?q?by:=20=E9=9F=A6=E5=AE=9D=E7=9B=B8=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/test/unittest/common/utils_sorted_vector_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/test/unittest/common/utils_sorted_vector_test.cpp b/base/test/unittest/common/utils_sorted_vector_test.cpp index 584976b..86404b4 100644 --- a/base/test/unittest/common/utils_sorted_vector_test.cpp +++ b/base/test/unittest/common/utils_sorted_vector_test.cpp @@ -538,7 +538,7 @@ HWTEST_F(UtilsSortedVector, testMergevectorNoduplicate, TestSize.Level0) //期望的SortedVector的大小 int exceptSortedVectorSize = 30; - for (int i = defaultPushTimes - 1; i >= 0; i--) { + for (int i = firstPushTimes - 1; i >= 0; i--) { svec.Add(i); } @@ -547,7 +547,7 @@ HWTEST_F(UtilsSortedVector, testMergevectorNoduplicate, TestSize.Level0) vec.push_back(i); } - for (int i = defaultPushTimes; i < exceptSortedVectorSize; i++) { + for (int i = firstPushTimes; i < exceptSortedVectorSize; i++) { vec.push_back(i); } -- Gitee