From 3ae9f271af3cd1f2493bd45bfcf2b62c26a961b8 Mon Sep 17 00:00:00 2001 From: let_it_rot Date: Wed, 13 Aug 2025 13:57:07 +0800 Subject: [PATCH] adjust TimeInterval from 300 -> 30 Signed-off-by: let_it_rot --- frameworks/reminder/src/reminder_request.cpp | 2 +- .../test/unittest/reminder_request_alarm_test.cpp | 10 +++++----- .../test/unittest/reminder_request_calendar_test.cpp | 12 ++++++------ .../reminder/test/unittest/reminder_request_test.cpp | 4 ++-- .../test/unittest/reminder_data_manager_test.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frameworks/reminder/src/reminder_request.cpp b/frameworks/reminder/src/reminder_request.cpp index 0fbafe7a0..3d9357a4c 100644 --- a/frameworks/reminder/src/reminder_request.cpp +++ b/frameworks/reminder/src/reminder_request.cpp @@ -53,7 +53,7 @@ const uint64_t ReminderRequest::INVALID_LONG_LONG_VALUE = 0; const uint16_t ReminderRequest::INVALID_U16_VALUE = 0; const uint16_t ReminderRequest::MILLI_SECONDS = 1000; const uint16_t ReminderRequest::SAME_TIME_DISTINGUISH_MILLISECONDS = 1000; -const uint32_t ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI = 5 * 60 * 1000; +const uint32_t ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI = 30 * 1000; const uint8_t ReminderRequest::INVALID_U8_VALUE = 0; const uint8_t ReminderRequest::REMINDER_STATUS_INACTIVE = 0; const uint8_t ReminderRequest::REMINDER_STATUS_ACTIVE = 1; diff --git a/frameworks/reminder/test/unittest/reminder_request_alarm_test.cpp b/frameworks/reminder/test/unittest/reminder_request_alarm_test.cpp index c6202307e..c1fccac5b 100644 --- a/frameworks/reminder/test/unittest/reminder_request_alarm_test.cpp +++ b/frameworks/reminder/test/unittest/reminder_request_alarm_test.cpp @@ -179,7 +179,7 @@ HWTEST_F(ReminderRequestAlarmTest, IsRepeatReminder_00300, Function | SmallTest ret->SetSnoozeTimes(1); EXPECT_EQ(ret->GetSnoozeTimes(), 1); - uint32_t minTimeIntervalInSecond = 300; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; ret->SetTimeInterval(1); EXPECT_EQ(ret->GetTimeInterval(), minTimeIntervalInSecond); EXPECT_EQ(rrc->IsRepeatReminder(), true); @@ -201,7 +201,7 @@ HWTEST_F(ReminderRequestAlarmTest, IsRepeatReminder_00400, Function | SmallTest ret->SetSnoozeTimes(0); EXPECT_EQ(ret->GetSnoozeTimes(), 0); - uint32_t minTimeIntervalInSecond = 300; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; ret->SetTimeInterval(1); EXPECT_EQ(ret->GetTimeInterval(), minTimeIntervalInSecond); EXPECT_EQ(rrc->IsRepeatReminder(), true); @@ -245,7 +245,7 @@ HWTEST_F(ReminderRequestAlarmTest, IsRepeatReminder_00600, Function | SmallTest ret->SetSnoozeTimes(1); EXPECT_EQ(ret->GetSnoozeTimes(), 1); - uint32_t minTimeIntervalInSecond = 300; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); EXPECT_EQ(rrc->IsRepeatReminder(), true); @@ -488,7 +488,7 @@ HWTEST_F(ReminderRequestAlarmTest, UpdateNextReminder_00100, Function | SmallTes auto ret = std::make_shared(); ret->SetSnoozeTimesDynamic(1); EXPECT_EQ(ret->GetSnoozeTimesDynamic(), 1); - uint32_t minTimeIntervalInSecond = 300; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; ret->SetTimeInterval(1); EXPECT_EQ(ret->GetTimeInterval(), minTimeIntervalInSecond); EXPECT_EQ(rrc->UpdateNextReminder(), true); @@ -510,7 +510,7 @@ HWTEST_F(ReminderRequestAlarmTest, UpdateNextReminder_00200, Function | SmallTes ret->SetSnoozeTimes(1); EXPECT_EQ(ret->GetSnoozeTimes(), 1); - uint32_t minTimeIntervalInSecond = 300; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; reminderRequestAlarm->SetTimeInterval(1); EXPECT_EQ(reminderRequestAlarm->GetTimeInterval(), minTimeIntervalInSecond); diff --git a/frameworks/reminder/test/unittest/reminder_request_calendar_test.cpp b/frameworks/reminder/test/unittest/reminder_request_calendar_test.cpp index f09a71ef7..6a2a94990 100644 --- a/frameworks/reminder/test/unittest/reminder_request_calendar_test.cpp +++ b/frameworks/reminder/test/unittest/reminder_request_calendar_test.cpp @@ -722,7 +722,7 @@ HWTEST_F(ReminderRequestCalendarTest, UpdateNextReminder_00002, Function | Small EXPECT_EQ(rrc->GetSnoozeTimes(), 1) << "Get snoozeTimes not 1"; EXPECT_EQ(rrc->GetSnoozeTimesDynamic(), 1) << "Get snoozeTimesDynamic not 1"; - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); @@ -760,7 +760,7 @@ HWTEST_F(ReminderRequestCalendarTest, UpdateNextReminder_00003, Function | Small rrc->SetSnoozeTimes(1); EXPECT_EQ(rrc->GetSnoozeTimes(), 1); - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); @@ -810,9 +810,9 @@ HWTEST_F(ReminderRequestCalendarTest, UpdateNextReminder_00004, Function | Small reminderRequest->SetSnoozeTimesDynamic(0); EXPECT_EQ(reminderRequest->GetSnoozeTimesDynamic(), 0) << "Get snoozeTimesDynamic not 1"; - uint32_t minTimeIntervalInSeconds = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; reminderRequest->SetTimeInterval(1); - EXPECT_EQ(reminderRequest->GetTimeInterval(), minTimeIntervalInSeconds); + EXPECT_EQ(reminderRequest->GetTimeInterval(), minTimeIntervalInSecond); bool result6 = calendar->UpdateNextReminder(); EXPECT_EQ(result6, false); @@ -853,7 +853,7 @@ HWTEST_F(ReminderRequestCalendarTest, UpdateNextReminder_00005, Function | Small rrc->SetSnoozeTimesDynamic(0); EXPECT_EQ(rrc->GetSnoozeTimesDynamic(), 0) << "Get snoozeTimesDynamic not 1"; - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); @@ -904,7 +904,7 @@ HWTEST_F(ReminderRequestCalendarTest, UpdateNextReminder_00006, Function | Small EXPECT_EQ(rrc->GetSnoozeTimes(), 1) << "Get snoozeTimes not 1"; EXPECT_EQ(rrc->GetSnoozeTimesDynamic(), 1) << "Get snoozeTimesDynamic not 1"; - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); diff --git a/frameworks/reminder/test/unittest/reminder_request_test.cpp b/frameworks/reminder/test/unittest/reminder_request_test.cpp index 5267d3418..eb6b1e2ef 100644 --- a/frameworks/reminder/test/unittest/reminder_request_test.cpp +++ b/frameworks/reminder/test/unittest/reminder_request_test.cpp @@ -339,7 +339,7 @@ HWTEST_F(ReminderRequestTest, setSnoozeTimes_00100, Function | SmallTest | Level */ HWTEST_F(ReminderRequestTest, setTimeInterval_00100, Function | SmallTest | Level1) { - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; auto rrc = std::make_shared(); rrc->SetTimeInterval(-1); EXPECT_EQ(rrc->GetTimeInterval(), 0) << "timeInterval should be 0 when set with value less than 0"; @@ -1504,7 +1504,7 @@ HWTEST_F(ReminderRequestTest, UpdateNotificationContent_00300, Function | SmallT { auto rrc = std::make_shared(); NotificationRequest notificationRequest(rrc->GetNotificationId()); - uint32_t minTimeIntervalInSecond = 5 * 60; + uint32_t minTimeIntervalInSecond = ReminderRequest::MIN_TIME_INTERVAL_IN_MILLI / ReminderRequest::MILLI_SECONDS; rrc->SetTimeInterval(1); EXPECT_EQ(rrc->GetTimeInterval(), minTimeIntervalInSecond); diff --git a/services/reminder/test/unittest/reminder_data_manager_test.cpp b/services/reminder/test/unittest/reminder_data_manager_test.cpp index cf6e80a34..1d8874922 100644 --- a/services/reminder/test/unittest/reminder_data_manager_test.cpp +++ b/services/reminder/test/unittest/reminder_data_manager_test.cpp @@ -1390,7 +1390,7 @@ HWTEST_F(ReminderDataManagerTest, ReminderDataManagerTest_030, Level1) DataShare::DataShareObserver::ChangeInfo::Value timeInterval5 = static_cast(testValue); info[ReminderCalendarShareTable::TIME_INTERVAL] = timeInterval5; ReminderDataShareHelper::GetInstance().BuildReminderV1(info, timer); - EXPECT_TRUE(timer->GetTimeInterval() == 300); + EXPECT_TRUE(timer->GetTimeInterval() == 30); ReminderDataShareHelper::GetInstance().isNewRdbVer_ = false; } -- Gitee