diff --git a/frameworks/ans/test/unittest/BUILD.gn b/frameworks/ans/test/unittest/BUILD.gn index b63703964035e35e6c64f24c198330c86758774b..5d24e6edb459dd50769b0e0995b891505f6768ed 100644 --- a/frameworks/ans/test/unittest/BUILD.gn +++ b/frameworks/ans/test/unittest/BUILD.gn @@ -52,9 +52,7 @@ ohos_unittest("ans_reminder_unit_test") { "${frameworks_module_ans_path}/test/unittest/notification_user_input_test.cpp", "${frameworks_module_ans_path}/test/unittest/reminder_helper_test.cpp", "${frameworks_module_ans_path}/test/unittest/reminder_request_alarm_test.cpp", - "${frameworks_module_ans_path}/test/unittest/reminder_request_branch_test/mock_reminder_request.cpp", "${frameworks_module_ans_path}/test/unittest/reminder_request_calendar_test.cpp", - "${frameworks_module_ans_path}/test/unittest/reminder_request_test.cpp", "${frameworks_module_ans_path}/test/unittest/reminder_request_timer_test.cpp", "${frameworks_module_ans_path}/test/unittest/reminder_store_test.cpp", ] @@ -90,6 +88,38 @@ ohos_unittest("ans_reminder_unit_test") { part_name = "${component_name}" } +ohos_unittest("reminder_request_test") { + module_out_path = module_output_path + + include_dirs = [ + ".", + "include", + "/${services_path}/ans/include", + "${services_path}/ans/test/unittest/mock/include", + ] + + sources = [ + "${frameworks_module_ans_path}/test/unittest/reminder_request_branch_test/mock_reminder_request.cpp", + "${frameworks_module_ans_path}/test/unittest/reminder_request_test.cpp", + ] + + deps = [ + "${core_path}:ans_core", + "${frameworks_module_ans_path}:ans_innerkits", + "//third_party/googletest:gtest_main", + ] + + external_deps = [ + "ability_base:want", + "ability_base:zuri", + "c_utils:utils", + "relational_store:native_rdb", + ] + + subsystem_name = "${subsystem_name}" + part_name = "${component_name}" +} + ohos_unittest("reminder_request_branch_test") { module_out_path = module_output_path @@ -114,22 +144,8 @@ ohos_unittest("reminder_request_branch_test") { external_deps = [ "ability_base:want", "ability_base:zuri", - "ability_runtime:wantagent_innerkits", - "access_token:libnativetoken", - "access_token:libtoken_setproc", - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", "c_utils:utils", - "common_event_service:cesfwk_innerkits", - "eventhandler:libeventhandler", - "hilog:libhilog", - "hitrace:hitrace_meter", - "image_framework:image_native", - "ipc:ipc_core", - "kv_store:distributeddata_inner", "relational_store:native_rdb", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] subsystem_name = "${subsystem_name}" @@ -138,9 +154,9 @@ ohos_unittest("reminder_request_branch_test") { group("unittest") { testonly = true - deps = [] - - deps += [ ":ans_reminder_unit_test" ] - - deps += [ ":reminder_request_branch_test" ] + deps = [ + ":ans_reminder_unit_test", + ":reminder_request_branch_test", + ":reminder_request_test", + ] } diff --git a/frameworks/ans/test/unittest/reminder_request_test.cpp b/frameworks/ans/test/unittest/reminder_request_test.cpp index 09ab3524511d0425c20dda046e11a1fd55eedddd..772667d1f226789e1f98baec17d82cc457188bc8 100644 --- a/frameworks/ans/test/unittest/reminder_request_test.cpp +++ b/frameworks/ans/test/unittest/reminder_request_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -406,9 +406,8 @@ HWTEST_F(ReminderRequestTest, IsShowing_00200, Function | SmallTest | Level1) */ HWTEST_F(ReminderRequestTest, OnDateTimeChange_00100, Function | SmallTest | Level1) { - MockNowInstantMilli(true); auto rrc = std::make_shared(); - rrc->isExpired_ = true; + rrc->SetExpired(true); EXPECT_EQ(rrc->OnDateTimeChange(), false); }