From 7970eef3faef2770ec38eeb3249b5223096f2fad Mon Sep 17 00:00:00 2001 From: wuminjie Date: Wed, 30 Apr 2025 14:50:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuminjie --- .../device_status_collect_manager_test.cpp | 6 +---- .../src/device_timed_collect_test.cpp | 24 +++++++++---------- .../system_ability_manager_dumper_test.cpp | 6 ++--- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp b/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp index 206af003..c93a999f 100644 --- a/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp +++ b/services/samgr/native/test/unittest/src/device_status_collect_manager_test.cpp @@ -947,13 +947,9 @@ HWTEST_F(DeviceStatusCollectManagerTest, StringToTypeAndSaid001, TestSize.Level3 EXPECT_EQ(type, OnDemandPolicyType::STOP_POLICY); EXPECT_EQ(said, 1); - said = 0; collect->StringToTypeAndSaid("test#1#", type, said); - EXPECT_EQ(said, 0); - - said = 0; collect->StringToTypeAndSaid("start#", type, said); - EXPECT_EQ(said, 0); + EXPECT_EQ(type, OnDemandPolicyType::START_POLICY); DTEST_LOG << "StringToTypeAndSaid001 end" << std::endl; } diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index 43d7649d..d8009e47 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -720,11 +720,11 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask001, TestSize.Level3 int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_EQ(disTime, 0); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); disTime = 5; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(disTime, 0); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << "ProcessPersistenceTimedTask001 end" << std::endl; } #endif @@ -741,7 +741,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask001, TestSize.Level3) std::function postTask = [] () {}; deviceTimedCollect->PostPersistenceDelayTask(postTask, interval, disTime); - EXPECT_EQ(disTime, 1); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << "PostPersistenceDelayTask001 end" << std::endl; } #endif @@ -754,7 +754,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked001, TestSize. std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_EQ(timeGap, 0); + EXPECT_NE(deviceTimedCollect, nullptr); DTEST_LOG << "PostNonPersistenceTimedTaskLocked001 end" << std::endl; } @@ -768,11 +768,11 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask003, TestSize.Level3 int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_EQ(disTime, 0); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); disTime = 5; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(disTime, 0); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << " ProcessPersistenceTimedTask003 end" << std::endl; } #endif @@ -789,7 +789,7 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask002, TestSize.Level3) std::function postTask = [] () {}; deviceTimedCollect->PostPersistenceDelayTask(postTask, interVal, disTime); - EXPECT_EQ(disTime, 1); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << " PostPersistenceDelayTask002 end" << std::endl; } #endif @@ -802,7 +802,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked002, TestSize. std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_EQ(timeGap, 0); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << " PostNonPersistenceTimedTaskLocked002 end" << std::endl; } @@ -836,10 +836,10 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceLoopTask001, TestSize.Level3) int triggerTime = 1729909174; std::string strInterval = "1729909174"; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); - EXPECT_EQ(0, disTime); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); disTime = 100; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); - EXPECT_NE(0, disTime); + EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << " ProcessPersistenceLoopTask001 end" << std::endl; } @@ -888,10 +888,10 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked003, TestSize. std::string strTime = "10"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_EQ(0, timeGap); + EXPECT_NE(deviceTimedCollect, nullptr); timeGap = 5; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(0, timeGap); + EXPECT_NE(deviceTimedCollect, nullptr); DTEST_LOG << " PostNonPersistenceTimedTaskLocked003 end" << std::endl; } diff --git a/services/samgr/native/test/unittest/src/system_ability_manager_dumper_test.cpp b/services/samgr/native/test/unittest/src/system_ability_manager_dumper_test.cpp index 856df813..0f28ccb8 100644 --- a/services/samgr/native/test/unittest/src/system_ability_manager_dumper_test.cpp +++ b/services/samgr/native/test/unittest/src/system_ability_manager_dumper_test.cpp @@ -317,8 +317,8 @@ HWTEST_F(SystemAbilityManagerDumperTest, FfrtStatCmdParser004, TestSize.Level3) args.emplace_back("--ffrt"); args.emplace_back("9999"); args.emplace_back("xxxx"); - SystemAbilityManagerDumper::FfrtStatCmdParser(cmd, args); - EXPECT_EQ(cmd, -1); + bool ret = SystemAbilityManagerDumper::FfrtStatCmdParser(cmd, args); + EXPECT_FALSE(ret); DTEST_LOG << "FfrtStatCmdParser004 end" << std::endl; } @@ -868,7 +868,7 @@ HWTEST_F(SystemAbilityManagerDumperTest, IpcDumpCmdParser004, TestSize.Level3) { DTEST_LOG << "IpcDumpCmdParser004 begin" << std::endl; SamMockPermission::MockProcess("hidumper_service"); - int32_t cmd = 0; + int32_t cmd = -1; std::vector args; args.push_back("--ipc"); args.push_back("wifi_manager_service"); -- Gitee From 0db126904663a418de1fc28df040bede4132b2d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 30 Apr 2025 08:53:16 +0000 Subject: [PATCH 2/3] update services/samgr/native/test/unittest/src/device_timed_collect_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- .../native/test/unittest/src/device_timed_collect_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index d8009e47..65541210 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -802,7 +802,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked002, TestSize. std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_NE(deviceTimedCollect, nullptr); DTEST_LOG << " PostNonPersistenceTimedTaskLocked002 end" << std::endl; } -- Gitee From c2227a9c98d6a17a0756826806cdb3fb306f15a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=95=8F=E6=9D=B0?= Date: Wed, 7 May 2025 11:07:55 +0000 Subject: [PATCH 3/3] update services/samgr/native/test/unittest/src/device_timed_collect_test.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴敏杰 --- .../src/device_timed_collect_test.cpp | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp index 65541210..5a5cee5f 100644 --- a/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp +++ b/services/samgr/native/test/unittest/src/device_timed_collect_test.cpp @@ -720,11 +720,10 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask001, TestSize.Level3 int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_EQ(deviceTimedCollect->preferencesUtil_->IsExist(strTime), false); disTime = 5; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << "ProcessPersistenceTimedTask001 end" << std::endl; } #endif @@ -740,8 +739,10 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask001, TestSize.Level3) int32_t disTime = 1; std::function postTask = [] () {}; + int64_t currentTime = TimeUtils::GetTimestamp(); + int64_t upgradeTime = currentTime + static_cast(disTime); deviceTimedCollect->PostPersistenceDelayTask(postTask, interval, disTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_NE(deviceTimedCollect->preferencesUtil_->SaveLong(to_string(interval), upgradeTime), false); DTEST_LOG << "PostPersistenceDelayTask001 end" << std::endl; } #endif @@ -754,7 +755,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked001, TestSize. std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(deviceTimedCollect, nullptr); + EXPECT_EQ(timeGap, 0); DTEST_LOG << "PostNonPersistenceTimedTaskLocked001 end" << std::endl; } @@ -768,11 +769,10 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceTimedTask003, TestSize.Level3 int64_t disTime = 0; std::string strTime = "IntervalTime"; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_EQ(deviceTimedCollect->preferencesUtil_->IsExist(strTime), false); disTime = 5; deviceTimedCollect->ProcessPersistenceTimedTask(disTime, strTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); DTEST_LOG << " ProcessPersistenceTimedTask003 end" << std::endl; } #endif @@ -788,8 +788,10 @@ HWTEST_F(DeviceTimedCollectTest, PostPersistenceDelayTask002, TestSize.Level3) int32_t disTime = 1; std::function postTask = [] () {}; + int64_t currentTime = TimeUtils::GetTimestamp(); + int64_t upgradeTime = currentTime + static_cast(disTime); deviceTimedCollect->PostPersistenceDelayTask(postTask, interVal, disTime); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_NE(deviceTimedCollect->preferencesUtil_->SaveLong(to_string(interVal), upgradeTime), false); DTEST_LOG << " PostPersistenceDelayTask002 end" << std::endl; } #endif @@ -802,7 +804,7 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked002, TestSize. std::string strTime = "timedevent"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(deviceTimedCollect, nullptr); + EXPECT_EQ(timeGap, 0); DTEST_LOG << " PostNonPersistenceTimedTaskLocked002 end" << std::endl; } @@ -836,10 +838,10 @@ HWTEST_F(DeviceTimedCollectTest, ProcessPersistenceLoopTask001, TestSize.Level3) int triggerTime = 1729909174; std::string strInterval = "1729909174"; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_EQ(0, disTime); disTime = 100; deviceTimedCollect->ProcessPersistenceLoopTask(disTime, triggerTime, strInterval); - EXPECT_NE(deviceTimedCollect->preferencesUtil_, nullptr); + EXPECT_NE(0, disTime); DTEST_LOG << " ProcessPersistenceLoopTask001 end" << std::endl; } @@ -888,10 +890,10 @@ HWTEST_F(DeviceTimedCollectTest, PostNonPersistenceTimedTaskLocked003, TestSize. std::string strTime = "10"; int64_t timeGap = 0; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(deviceTimedCollect, nullptr); + EXPECT_EQ(0, timeGap); timeGap = 5; deviceTimedCollect->PostNonPersistenceTimedTaskLocked(strTime, timeGap); - EXPECT_NE(deviceTimedCollect, nullptr); + EXPECT_NE(0, timeGap); DTEST_LOG << " PostNonPersistenceTimedTaskLocked003 end" << std::endl; } -- Gitee