From cdf2fa5b93cb8a9f1a2c871e4bdfc60729aa9b7a Mon Sep 17 00:00:00 2001 From: guduhanyan Date: Wed, 22 Dec 2021 09:26:39 +0800 Subject: [PATCH] 20211222lts00 Signed-off-by: guduhanyan --- .../test/unittest/include/timer_info_test.h | 3 +++ .../test/unittest/src/time_service_test.cpp | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/services/time_manager/test/unittest/include/timer_info_test.h b/services/time_manager/test/unittest/include/timer_info_test.h index 5a2183c..1d0e99d 100644 --- a/services/time_manager/test/unittest/include/timer_info_test.h +++ b/services/time_manager/test/unittest/include/timer_info_test.h @@ -31,6 +31,9 @@ namespace OHOS { namespace MiscServices { +namespace { + constexpr uint64_t NANO_TO_MILESECOND = 100000; +} class TimerInfoTest : public ITimerInfo { public: TimerInfoTest(); diff --git a/services/time_manager/test/unittest/src/time_service_test.cpp b/services/time_manager/test/unittest/src/time_service_test.cpp index 149d49b..42c3a7b 100644 --- a/services/time_manager/test/unittest/src/time_service_test.cpp +++ b/services/time_manager/test/unittest/src/time_service_test.cpp @@ -14,12 +14,14 @@ */ #include #include +#include #include "timer_info_test.h" #include "time_service_test.h" using namespace testing::ext; using namespace OHOS; using namespace OHOS::MiscServices; +using namespace std::chrono; class TimeServiceTest : public testing::Test { @@ -220,8 +222,9 @@ HWTEST_F(TimeServiceTest, CreateTimer001, TestSize.Level0) timerInfo->SetCallbackInfo(TimeOutCallback1); auto timerId1 = TimeServiceClient::GetInstance()->CreateTimer(timerInfo); EXPECT_TRUE(timerId1 > 0); - - auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, 5); + auto BootTimeNano = system_clock::now().time_since_epoch().count(); + auto BootTimeMilli = BootTimeNano / NANO_TO_MILESECOND; + auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, BootTimeMilli + 5000); std::this_thread::sleep_for(std::chrono::milliseconds(6000)); EXPECT_TRUE(ret); EXPECT_TRUE(g_data1 == 1); @@ -247,8 +250,9 @@ HWTEST_F(TimeServiceTest, CreateTimer002, TestSize.Level0) timerInfo->SetCallbackInfo(TimeOutCallback1); auto timerId1 = TimeServiceClient::GetInstance()->CreateTimer(timerInfo); EXPECT_TRUE(timerId1 > 0); - - auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, 5000); + auto BootTimeNano = system_clock::now().time_since_epoch().count(); + auto BootTimeMilli = BootTimeNano / NANO_TO_MILESECOND; + auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, BootTimeMilli + 5000); std::this_thread::sleep_for(std::chrono::milliseconds(5100)); EXPECT_TRUE(ret); EXPECT_TRUE(g_data1 == 1); @@ -316,8 +320,9 @@ HWTEST_F(TimeServiceTest, CreateTimer005, TestSize.Level0) timerInfo->SetCallbackInfo(TimeOutCallback1); auto timerId1 = TimeServiceClient::GetInstance()->CreateTimer(timerInfo); EXPECT_TRUE(timerId1 > 0); - - auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, 2000); + auto BootTimeNano = system_clock::now().time_since_epoch().count(); + auto BootTimeMilli = BootTimeNano / NANO_TO_MILESECOND; + auto ret = TimeServiceClient::GetInstance()->StartTimer(timerId1, BootTimeMilli + 2000); EXPECT_TRUE(ret); ret = TimeServiceClient::GetInstance()->DestroyTimer(timerId1); EXPECT_TRUE(ret);