diff --git a/frameworks/ans/test/unittest/reminder_request_test.cpp b/frameworks/ans/test/unittest/reminder_request_test.cpp index 772667d1f226789e1f98baec17d82cc457188bc8..bd55c8b828f8588b812c1d12bca8476bb77c6ee2 100644 --- a/frameworks/ans/test/unittest/reminder_request_test.cpp +++ b/frameworks/ans/test/unittest/reminder_request_test.cpp @@ -571,10 +571,10 @@ HWTEST_F(ReminderRequestTest, CanShow_00001, Function | SmallTest | Level1) */ HWTEST_F(ReminderRequestTest, Dump_00001, Function | SmallTest | Level1) { - std::string ret = "Reminder[reminderId=-1, type=3, state='Inactive', nextTriggerTime=1970-01-01 "; + std::string ret = "Reminder[reminderId=-1, type=3, state='Inactive', nextTriggerTime="; auto rrc = std::make_shared(); std::string res = rrc->Dump(); - EXPECT_EQ(res.substr(0, res.size()-9), ret); + EXPECT_EQ(res.substr(0, res.size()-20), ret); } /** @@ -771,7 +771,15 @@ HWTEST_F(ReminderRequestTest, OnTerminate_00001, Function | SmallTest | Level1) HWTEST_F(ReminderRequestTest, OnTimeZoneChange_00001, Function | SmallTest | Level1) { auto rrc = std::make_shared(); - EXPECT_EQ(rrc->OnTimeZoneChange(), false); + uint64_t ret = rrc->GetTriggerTimeInMilli(); + struct tm oriTime; + time_t newZoneTriggerTime = mktime(&oriTime); + uint64_t ret2 = rrc->GetDurationSinceEpochInMilli(newZoneTriggerTime); + if (ret == ret2) { + EXPECT_EQ(rrc->OnTimeZoneChange(), false); + } else { + EXPECT_EQ(rrc->OnTimeZoneChange(), true); + } } /** @@ -980,9 +988,9 @@ HWTEST_F(ReminderRequestTest, GetShowTime_00001, Function | SmallTest | Level1) { uint64_t showTime = 8 * 60 * 1000; auto rrc = std::make_shared(); - std::string ret = ":08"; + std::string ret = "8"; std::string res = rrc->GetShowTime(showTime); - EXPECT_EQ(res.substr(2, res.size()), ret); + EXPECT_EQ(res.substr(4, res.size()), ret); } /** @@ -996,9 +1004,9 @@ HWTEST_F(ReminderRequestTest, GetShowTime_00002, Function | SmallTest | Level1) uint64_t showTime = 8 * 60 * 1000; ReminderRequest reminder = ReminderRequest(ReminderRequest::ReminderType::TIMER); auto rrc = std::make_shared(); - std::string ret = ":08"; + std::string ret = "8"; std::string res = rrc->GetShowTime(showTime); - EXPECT_EQ(res.substr(2, res.size()), ret); + EXPECT_EQ(res.substr(4, res.size()), ret); } /** diff --git a/services/ans/test/unittest/advanced_notification_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test.cpp index e6cd0d8287d98904cbfff9e01ddc29188fbe53d1..ac7d9fba299bd443c2f150272a9c792aa805559f 100644 --- a/services/ans/test/unittest/advanced_notification_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_test.cpp @@ -3470,9 +3470,9 @@ HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_22500, HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_220000, Function | SmallTest | Level1) { int64_t time = 60; - std::string ret = "1970-01-01, "; + int64_t ret = 20; std::string result = advancedNotificationService_->TimeToString(time); - EXPECT_EQ(result.substr(0, result.size() - 8), ret); + EXPECT_EQ(result.size(), ret); } /**