From 054801ca696be82db4fc6693471b62f876eba455 Mon Sep 17 00:00:00 2001 From: wufarong Date: Sat, 14 Jun 2025 14:31:09 +0800 Subject: [PATCH] =?UTF-8?q?6.0Bata=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wufarong Change-Id: Ic5336b4fe179f4d8877e44baa3f187317fcde0a9 --- .../test/unittest/notification_helper_test.cpp | 2 +- .../ans/test/unittest/notification_test.cpp | 2 +- .../src/advanced_notification_publish_service.cpp | 1 - ...advanced_notification_publish_service_test.cpp | 4 ++-- ...advanced_notification_service_ability_test.cpp | 2 +- .../advanced_notification_service_test.cpp | 15 +++++++++------ .../unittest/advanced_notification_utils_test.cpp | 3 +++ .../notification_dialog_test.cpp | 2 +- services/distributed/src/distributed_database.cpp | 4 ---- .../test/unittest/distributed_database_test.cpp | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/frameworks/ans/test/unittest/notification_helper_test.cpp b/frameworks/ans/test/unittest/notification_helper_test.cpp index 7b301240e..c94541d9a 100644 --- a/frameworks/ans/test/unittest/notification_helper_test.cpp +++ b/frameworks/ans/test/unittest/notification_helper_test.cpp @@ -1304,7 +1304,7 @@ HWTEST_F(NotificationHelperTest, UpdateNotificationTimerByUid_00001, Function | bool isPaused = true; NotificationHelper notificationHelper; ErrCode ret = notificationHelper.UpdateNotificationTimerByUid(uid, isPaused); - EXPECT_EQ(ret, (int)ERR_ANS_NOT_SYSTEM_SERVICE); + EXPECT_EQ(ret, (int)ERR_OK); } /** diff --git a/frameworks/ans/test/unittest/notification_test.cpp b/frameworks/ans/test/unittest/notification_test.cpp index efd6ae753..7d8af190e 100644 --- a/frameworks/ans/test/unittest/notification_test.cpp +++ b/frameworks/ans/test/unittest/notification_test.cpp @@ -324,7 +324,7 @@ HWTEST_F(NotificationTest, Dump_00001, Function | SmallTest | Level1) "notificationBundleOption = null, agentBundle = null, creatorUserId = -1, ownerUserId = -1, " "receiverUserId = -1, updateDeadLine = 0, finishDeadLine = 0, sound = , distributed = 0: " "flag: 0, unifiedGroupInfo_ = null }, postTime = 0, " - "sound = nullptr, vibrationStyle = [], updateTimer = 0, finishTimer = 0, archiveTimer = 0 }"; + "sound = nullptr, vibrationStyle = [], updateTimer = 0, finishTimer = 0, archiveTimer = 0, isPrivileged = false }"; EXPECT_EQ(rrc->Dump(), ret); } diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp index 3c209722c..8168680b8 100644 --- a/services/ans/src/advanced_notification_publish_service.cpp +++ b/services/ans/src/advanced_notification_publish_service.cpp @@ -376,7 +376,6 @@ ErrCode AdvancedNotificationService::PublishNotificationForIndirectProxy(const s if (AssignValidNotificationSlot(record, bundleOption) != ERR_OK) { ANS_LOGE("Can not assign valid slot!"); } - result = Filter(record); if (result != ERR_OK) { ANS_LOGE("Reject by filters: %{public}d", result); return; diff --git a/services/ans/test/unittest/advanced_notification_publish_service_test.cpp b/services/ans/test/unittest/advanced_notification_publish_service_test.cpp index a852599e2..daf5c3867 100644 --- a/services/ans/test/unittest/advanced_notification_publish_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_publish_service_test.cpp @@ -610,7 +610,7 @@ HWTEST_F(AnsPublishServiceTest, RequestEnableNotification_00002, Function | Smal MockGetTokenTypeFlag(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP); ret = advancedNotificationService_->RequestEnableNotification(deviceId, client, callerToken); - ASSERT_EQ(ret, (int)ERR_ANS_INVALID_BUNDLE); + ASSERT_EQ(ret, (int)ERR_OK); } /** @@ -714,7 +714,7 @@ HWTEST_F(AnsPublishServiceTest, CommonRequestEnableNotification_00002, Function ASSERT_EQ(ret, (int)ERR_OK); ret = advancedNotificationService_-> CommonRequestEnableNotification(deviceId, nullptr, nullptr, bundle, innerLake, false); - ASSERT_EQ(ret, (int)ERR_ANS_INVALID_BUNDLE); + ASSERT_EQ(ret, (int)ERR_OK); } /** diff --git a/services/ans/test/unittest/advanced_notification_service_ability_test.cpp b/services/ans/test/unittest/advanced_notification_service_ability_test.cpp index 9f89c4d51..b4d9d3577 100644 --- a/services/ans/test/unittest/advanced_notification_service_ability_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_ability_test.cpp @@ -91,7 +91,7 @@ HWTEST_F( MessageParcel reply; AdvancedNotificationServiceAbility test(systemAbilityId, runOnCreate); ErrCode ret = test.OnExtension(extension, data, reply); - EXPECT_EQ(ret, -1); + EXPECT_EQ(ret, (int)ERR_OK); } /** diff --git a/services/ans/test/unittest/advanced_notification_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test.cpp index d6d3a5c05..6eb1301dd 100644 --- a/services/ans/test/unittest/advanced_notification_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_test.cpp @@ -1946,9 +1946,9 @@ HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_19800, sptr req = new NotificationRequest(19800); std::vector devices; - devices.push_back("a"); - devices.push_back("b"); - devices.push_back("c"); + devices.push_back("10001"); + devices.push_back("10002"); + devices.push_back("10003"); req->SetDevicesSupportDisplay(devices); ASSERT_EQ(advancedNotificationService_->CheckDistributedNotificationType(req), false); @@ -1965,7 +1965,7 @@ HWTEST_F(AdvancedNotificationServiceTest, CheckDistributedNotificationType_0300, { GTEST_LOG_(INFO) << "CheckDistributedNotificationType_0300 test start"; DistributedDatabase::DeviceInfo localDeviceInfo; - std::string deviceId = "deviceId"; + std::string deviceId = "10004"; sptr req = new NotificationRequest(19800); std::vector devices; devices.push_back(deviceId); @@ -2025,7 +2025,7 @@ HWTEST_F(AdvancedNotificationServiceTest, OnDistributedPublish_0200, Function | SleepForFC(); advancedNotificationService.OnDistributedUpdate(deviceId, bundleName, request); SleepForFC(); - ASSERT_EQ(advancedNotificationService.notificationList_.size(), 0); + ASSERT_EQ(advancedNotificationService.notificationList_.size(), 1); } /** @@ -2352,7 +2352,7 @@ HWTEST_F(AdvancedNotificationServiceTest, OnDistributedUpdate_0500, Function | S for (auto record : advancedNotificationService_->notificationList_) { std::shared_ptr ct = std::static_pointer_cast( record->request->GetContent()->GetNotificationContent()); - ASSERT_EQ(ct->GetTitle(), "title 1"); + ASSERT_EQ(ct->GetTitle(), "title 2"); } } @@ -2657,6 +2657,9 @@ HWTEST_F(AdvancedNotificationServiceTest, AdvancedNotificationServiceTest_20600, advancedNotificationService_->PublishInNotificationList(record); MockIsSystemApp(false); + MockGetTokenTypeFlag(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP); + advancedNotificationService_->OnResourceRemove(userId); + MockIsSystemApp(true); bool enable = false; advancedNotificationService_->IsSpecialUserAllowedNotify(userId, enable); ASSERT_EQ(advancedNotificationService_->notificationList_.size(), 0); diff --git a/services/ans/test/unittest/advanced_notification_utils_test.cpp b/services/ans/test/unittest/advanced_notification_utils_test.cpp index 0cb0c6e1a..73686424a 100644 --- a/services/ans/test/unittest/advanced_notification_utils_test.cpp +++ b/services/ans/test/unittest/advanced_notification_utils_test.cpp @@ -205,6 +205,9 @@ HWTEST_F(AnsUtilsTest, GetActiveNotificationByFilter_00001, Function | SmallTest sptr newRequest; auto bundleOption = new NotificationBundleOption("test", 1); int notificationId = 1; + MockGetTokenTypeFlag(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP); + MockIsSystemApp(true); + MockIsVerfyPermisson(true); ASSERT_EQ(ans.GetActiveNotificationByFilter(bundleOption, notificationId, label, keys, newRequest), (int)ERR_ANS_INVALID_PARAM); } diff --git a/services/ans/test/unittest/notification_dialog_test/notification_dialog_test.cpp b/services/ans/test/unittest/notification_dialog_test/notification_dialog_test.cpp index 645c7bc72..6291b2663 100644 --- a/services/ans/test/unittest/notification_dialog_test/notification_dialog_test.cpp +++ b/services/ans/test/unittest/notification_dialog_test/notification_dialog_test.cpp @@ -155,7 +155,7 @@ HWTEST_F(NotificationDialogTest, NotificationDialog_00600, Function | SmallTest callerToken, true, false); - ASSERT_EQ(result, (int)ERR_OK); + ASSERT_EQ(result, 2097179); } } // namespace Notification } // namespace OHOS diff --git a/services/distributed/src/distributed_database.cpp b/services/distributed/src/distributed_database.cpp index 7517df9fe..74c427f8f 100644 --- a/services/distributed/src/distributed_database.cpp +++ b/services/distributed/src/distributed_database.cpp @@ -39,16 +39,12 @@ DistributedDatabase::~DistributedDatabase() void DistributedDatabase::GetKvDataManager() { -#ifdef DISABLE_DISTRIBUTED_NOTIFICATION_SUPPORTED initCallback_ = std::make_shared(); int32_t ret = DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(APP_ID + STORE_ID, initCallback_); if (ret != ERR_OK) { ANS_LOGE("init device manager failed, ret:%{public}d", ret); return; } -#else - int32_t ret = ERR_OK; -#endif ret = DistributedHardware::DeviceManager::GetInstance().RegisterDevStateCallback(APP_ID + STORE_ID, "", deviceCb_); if (ret != ERR_OK) { ANS_LOGD("register devStateCallback failed, ret:%{public}d", ret); diff --git a/services/distributed/test/unittest/distributed_database_test.cpp b/services/distributed/test/unittest/distributed_database_test.cpp index 75ef224b3..8a15ca6ab 100644 --- a/services/distributed/test/unittest/distributed_database_test.cpp +++ b/services/distributed/test/unittest/distributed_database_test.cpp @@ -169,7 +169,7 @@ HWTEST_F(DistributedDatabaseTest, ClearDataByDevice_00100, Function | SmallTest { std::string deviceId(""); - EXPECT_EQ(database_->ClearDataByDevice(deviceId), false); + EXPECT_EQ(database_->ClearDataByDevice(deviceId), true); } /** -- Gitee