diff --git a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp index 0570adc004f774366cb963c0fae59887140712cf..9ee3ee06712f26a6b4fdd7ef51f2ba17a18b6702 100644 --- a/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_benchmark_test/safe_block_queue_benchmark_test.cpp @@ -137,10 +137,10 @@ auto GetTimeOfSleepTwentyMillisecond() return timeT; } -static void QueuePushFullEquivalent(const int Equivalent, benchmark::State& state) +static void QueuePushFullEquivalent(const int equivalent, benchmark::State& state) { for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { - DemoThreadData::shareQueue.Push(Equivalent); + DemoThreadData::shareQueue.Push(equivalent); } AssertTrue((DemoThreadData::shareQueue.IsFull()), "shareQueue.IsFull() did not equal true.", state); } diff --git a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp index 5fd9acfdaea7290083b09178fe53bb9174a70d6d..f84a48ae9e5101f3f2ce155019cc579a00b00808 100644 --- a/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_block_queue_tracking_benchmark_test/safe_block_queue_tracking_benchmark_test.cpp @@ -157,7 +157,7 @@ void StartThreads(std::thread (&threads)[THREAD_NUM], } template -void joinAllThreads(std::thread (&threads)[N]) +void JoinAllThreads(std::thread (&threads)[N]) { for (auto& t : threads) { if (t.joinable()) { @@ -166,7 +166,7 @@ void joinAllThreads(std::thread (&threads)[N]) } } -void processSharedQueueTasks(DemoThreadData& data) +void ProcessSharedQueueTasks(DemoThreadData& data) { while (!DemoThreadData::shareQueue.IsEmpty()) { data.GetAndOneTaskDone(); @@ -267,10 +267,10 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, testMutilthreadPutAndBlock001)(benc AssertTrue((demoDatas[0].joinStatus), "step 7: demoDatas[0].joinStatus did not equal true.", state); // recover state - joinAllThreads(threads); + JoinAllThreads(threads); joinThread.join(); - processSharedQueueTasks(demoDatas[0]); + ProcessSharedQueueTasks(demoDatas[0]); demoDatas[0].joinStatus = false; } BENCHMARK_LOGD("SafeBlockQueueTracking testMutilthreadPutAndBlock001 end."); @@ -318,8 +318,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, PutAndBlockInblankqueue001)(benchma AssertEqual(pushedIn, THREAD_NUM, "pushedIn did not equal THREAD_NUM as expected.", state); AssertEqual(getedOut, THREAD_NUM - QUEUE_SLOTS, "getedOut did not equal THREAD_NUM - QUEUE_SLOTS as expected.", state); - joinAllThreads(threads); - processSharedQueueTasks(demoDatas[0]); + JoinAllThreads(threads); + ProcessSharedQueueTasks(demoDatas[0]); std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_FOR_HUNDRED_MILLISECOND)); AssertTrue((demoDatas[0].joinStatus), "step 3: demoDatas[0].joinStatus did not equal true.", state); demoDatas[0].joinStatus = false; @@ -371,8 +371,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, testPutAndBlockInFullQueue001)(benc AssertEqual(unpushedIn, THREAD_NUM - (i + 1), "unpushedIn did not equal THREAD_NUM - (i + 1) as expected.", state); } - joinAllThreads(threads); - processSharedQueueTasks(demoDatas[0]); + JoinAllThreads(threads); + ProcessSharedQueueTasks(demoDatas[0]); demoDatas[0].joinStatus = false; joinThread.join(); } @@ -418,8 +418,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, GetAndBlockInblankqueue001)(benchma AssertEqual(ungetedOut, THREAD_NUM - (i + 1), "ungetedOut did not equal THREAD_NUM - (i + 1) as expected.", state); } - joinAllThreads(threads); - processSharedQueueTasks(demoDatas[0]); + JoinAllThreads(threads); + ProcessSharedQueueTasks(demoDatas[0]); AssertTrue((demoDatas[0].joinStatus), "demoDatas[0].joinStatus did not equal true as expected.", state); demoDatas[0].joinStatus = false; joinThread.join(); @@ -427,10 +427,10 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, GetAndBlockInblankqueue001)(benchma BENCHMARK_LOGD("SafeBlockQueueTracking GetAndBlockInblankqueue001 end."); } -static void QueuePushFullEquivalent(const int Equivalent, benchmark::State& state) +static void QueuePushFullEquivalent(const int equivalent, benchmark::State& state) { for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { - DemoThreadData::shareQueue.Push(Equivalent); + DemoThreadData::shareQueue.Push(equivalent); } AssertTrue((DemoThreadData::shareQueue.IsFull()), "shareQueue.IsFull() did not equal true.", state); } @@ -485,8 +485,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, GetAndBlockInfullqueue001)(benchmar AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertEqual(ungetedOut, static_cast(0), "ungetedOut did not equal static_cast(0) as expected.", state); - joinAllThreads(threads); - processSharedQueueTasks(demoDatas[0]); + JoinAllThreads(threads); + ProcessSharedQueueTasks(demoDatas[0]); demoDatas[0].joinStatus = false; joinThread.join(); joinThread2.join(); @@ -536,7 +536,7 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, GetAndBlockInnotfullqueue001)(bench AssertEqual(getedOut, THREAD_NUM, "getedOut did not equal THREAD_NUM as expected.", state); AssertEqual(ungetedOut, static_cast(0), "ungetedOut did not equal static_cast(0) as expected.", state); - joinAllThreads(threads); + JoinAllThreads(threads); AssertTrue((demoDatas[0].joinStatus), "step 3: demoDatas[0].joinStatus did not equal true.", state); demoDatas[0].joinStatus = false; joinThread.join(); @@ -586,8 +586,8 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, PutAndBlockInnotfullqueue001)(bench AssertEqual(unputedin, static_cast(0), "unputedin did not equal static_cast(0) as expected.", state); AssertFalse((demoDatas[0].joinStatus), "step 4: demoDatas[0].joinStatus did not equal false.", state); - joinAllThreads(threads); - processSharedQueueTasks(demoDatas[0]); + JoinAllThreads(threads); + ProcessSharedQueueTasks(demoDatas[0]); std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_FOR_HUNDRED_MILLISECOND)); AssertTrue((demoDatas[0].joinStatus), "step 5: demoDatas[0].joinStatus did not equal true.", state); joinThread.join(); @@ -637,7 +637,7 @@ BENCHMARK_F(BenchmarkSafeBlockQueueTracking, testMutilthreadConcurrentGetAndPopI for (auto& inThread : threadsin) { inThread.join(); } - processSharedQueueTasks(demoDatas[0]); + ProcessSharedQueueTasks(demoDatas[0]); joinThread.join(); AssertTrue((demoDatas[0].joinStatus), "step 3: demoDatas[0].joinStatus did not equal true.", state); demoDatas[0].joinStatus = false; diff --git a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp index fb6fcace39a2163bcd7a9c615be60f5f7004e41d..7bf28505242d180433f46b6f55566c71b681d1d1 100644 --- a/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp +++ b/base/test/benchmarktest/safe_map_benchmark_test/safe_map_benchmark_test.cpp @@ -278,7 +278,7 @@ BENCHMARK_F(BenchmarkSafeMap, testUtilsNormalFeatureEraseAndClear001)(benchmark: * @tc.name: testUtilsNormalFeatureIterate001 * @tc.desc: Using Iterate to change the second parameter of SafeMap */ -void callback(const std::string str, int& value) +void Callback(const std::string str, int& value) { value++; } @@ -294,7 +294,7 @@ BENCHMARK_F(BenchmarkSafeMap, testUtilsNormalFeatureIterate001)(benchmark::State demoData.Insert("B", INSERT_TWO); demoData.Insert("C", INSERT_THREE); demoData.Insert("D", INSERT_FOUR); - demoData.Iterate(callback); + demoData.Iterate(Callback); AssertEqual(demoData.Size(), INSERT_FOUR, "demoData.Size() did not equal INSERT_FOUR as expected.", state); diff --git a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp index 6157d59faf601810bacf8d6dc3bcaea247284310..52f48f09522ee85d8ea0d830d4764cda822184dc 100644 --- a/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp +++ b/base/test/fuzztest/refbase_fuzzer/refbase_fuzzer.cpp @@ -354,7 +354,7 @@ public: void OnLastWeakRef(const void *objectIda) override { - FUZZ_LOGI("OnLastWeakRef is called"); + FUZZ_LOGI("OnLastWeakRef is called"); } }; diff --git a/base/test/unittest/common/utils_safe_block_queue_tracking.cpp b/base/test/unittest/common/utils_safe_block_queue_tracking.cpp index 25103a0ae20540e0a89450722075561685cc5b92..09e5f49486cff8617f98bf0fe23c0d5995e42145 100644 --- a/base/test/unittest/common/utils_safe_block_queue_tracking.cpp +++ b/base/test/unittest/common/utils_safe_block_queue_tracking.cpp @@ -418,10 +418,10 @@ HWTEST_F(UtilsSafeBlockQueueTracking, testMutilthreadConcurrentGetAndBlockInblan joinThread.join(); } -static void QueuePushFullEquivalent(const int Equivalent) +static void QueuePushFullEquivalent(const int equivalent) { for (unsigned int i = 0; i < QUEUE_SLOTS; i++) { - DemoThreadData::shareQueue.Push(Equivalent); + DemoThreadData::shareQueue.Push(equivalent); } ASSERT_TRUE(DemoThreadData::shareQueue.IsFull()); } @@ -488,8 +488,8 @@ HWTEST_F(UtilsSafeBlockQueueTracking, testMutilthreadConcurrentGetAndBlockInfull ASSERT_EQ(getedOut, THREAD_NUM); ASSERT_EQ(ungetedOut, static_cast(0)); - for (auto& t : threads) { - t.join(); + for (auto& thd : threads) { + thd.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { @@ -680,12 +680,12 @@ HWTEST_F(UtilsSafeBlockQueueTracking, testMutilthreadConcurrentGetAndPopInfullqu ASSERT_FALSE(demoDatas[0].joinStatus); demoDatas[0].joinStatus = false; - for (auto& t : threadsout) { - t.join(); + for (auto& thdout : threadsout) { + thdout.join(); } - for (auto& t : threadsin) { - t.join(); + for (auto& thdin : threadsin) { + thdin.join(); } while (!DemoThreadData::shareQueue.IsEmpty()) { diff --git a/base/test/unittest/common/utils_safe_map_test.cpp b/base/test/unittest/common/utils_safe_map_test.cpp index 9c78dbfb778d35370384ff70ce55c6a44dfb1666..d628016899c4e4cee99fa90b663d75bff054b06e 100644 --- a/base/test/unittest/common/utils_safe_map_test.cpp +++ b/base/test/unittest/common/utils_safe_map_test.cpp @@ -199,7 +199,7 @@ HWTEST_F(UtilsSafeMap, testUtilsNormalFeatureEraseAndClear001, TestSize.Level0) * @tc.name: testUtilsNormalFeatureIterate001 * @tc.desc: Using Iterate to change the second parameter of SafeMap */ -void callback(const std::string str, int& value) +void Callback(const std::string str, int& value) { value++; } @@ -213,7 +213,7 @@ HWTEST_F(UtilsSafeMap, testUtilsNormalFeatureIterate001, TestSize.Level0) demoData.Insert("B", 2); demoData.Insert("C", 3); demoData.Insert("D", 4); - demoData.Iterate(callback); + demoData.Iterate(Callback); ASSERT_EQ(demoData.Size(), 4); ASSERT_EQ(demoData.ReadVal("A"), 2);