From 526aab758b7a0cb82abd810af8da832e0485d2ee Mon Sep 17 00:00:00 2001 From: songbao1 Date: Wed, 9 Jul 2025 15:03:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?tdd=20=E5=92=8C=20=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songbao1 --- frameworks/ans/src/notification_request.cpp | 5 +++++ .../ans/test/unittest/advanced_notification_service_test.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/frameworks/ans/src/notification_request.cpp b/frameworks/ans/src/notification_request.cpp index 1ec29aa2f..f7415525a 100644 --- a/frameworks/ans/src/notification_request.cpp +++ b/frameworks/ans/src/notification_request.cpp @@ -879,6 +879,11 @@ std::string NotificationRequest::CollaborationToJson() const NotificationRequest *NotificationRequest::CollaborationFromJson(const std::string& basicInfo) { + if (basicInfo.empty() || !nlohmann::json::accept(basicInfo)) { + ANS_LOGE("Invalid JSON string"); + return nullptr; + } + nlohmann::json jsonObject = nlohmann::json::parse(basicInfo, nullptr, false); if (jsonObject.is_null() or !jsonObject.is_object()) { ANS_LOGE("Invalid JSON object"); diff --git a/services/ans/test/unittest/advanced_notification_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test.cpp index 4f6b14e20..b9c048a41 100644 --- a/services/ans/test/unittest/advanced_notification_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_test.cpp @@ -4586,14 +4586,14 @@ HWTEST_F(AdvancedNotificationServiceTest, SetSilentReminderEnabled_00002, Functi ErrCode ret = advancedNotificationService.IsSilentReminderEnabled(bo, enableStatusInt); ASSERT_EQ(ret, ERR_OK); - ASSERT_EQ(enableStatusInt, 0); + ASSERT_EQ(enableStatusInt, 2); ret = advancedNotificationService.SetSilentReminderEnabled(bo, true); ASSERT_EQ(ret, ERR_OK); ret = advancedNotificationService.IsSilentReminderEnabled(bo, enableStatusInt); ASSERT_EQ(ret, ERR_OK); - ASSERT_EQ(enableStatusInt, 2); + ASSERT_EQ(enableStatusInt, 1); } /** -- Gitee From e244d1f23b0f1c61341b1cb542d78ad217c78128 Mon Sep 17 00:00:00 2001 From: songbao1 Date: Wed, 9 Jul 2025 17:27:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?tdd=20=E5=92=8C=20=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songbao1 --- .../ans/test/unittest/advanced_notification_service_test.cpp | 5 +++-- ...dvanced_notification_distributed_manager_service_test.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/ans/test/unittest/advanced_notification_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test.cpp index b9c048a41..ccf70904d 100644 --- a/services/ans/test/unittest/advanced_notification_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_test.cpp @@ -2091,8 +2091,8 @@ HWTEST_F(AdvancedNotificationServiceTest, OnDistributedPublish_0500, Function | } /** - * @tc.number : OnDistributedPublish_0300 - * @tc.name : OnDistributedPublish_0300 + * @tc.number : OnDistributedPublish_0600 + * @tc.name : OnDistributedPublish_0600 * @tc.desc : Test OnDistributedPublish function * @tc.require : #I61RF2 */ @@ -2107,6 +2107,7 @@ HWTEST_F(AdvancedNotificationServiceTest, OnDistributedPublish_0600, Function | request->SetOwnerBundleName("test"); request->SetUpdateOnly(true); advancedNotificationService.OnDistributedPublish(deviceId, bundleName, request); + SleepForFC(); ASSERT_EQ(advancedNotificationService.notificationList_.size(), 0); } diff --git a/services/ans/test/unittest/advanced_notification_service_test/advanced_notification_distributed_manager_service_test.cpp b/services/ans/test/unittest/advanced_notification_service_test/advanced_notification_distributed_manager_service_test.cpp index 399281464..5da479617 100644 --- a/services/ans/test/unittest/advanced_notification_service_test/advanced_notification_distributed_manager_service_test.cpp +++ b/services/ans/test/unittest/advanced_notification_service_test/advanced_notification_distributed_manager_service_test.cpp @@ -265,7 +265,7 @@ HWTEST_F(AdvancedNotificationDistMgrServiceTest, DistributeOperation_300, Functi /** * @tc.name: DistributeOperation_400 - * @tc.desc: Test DistributeOperation when record's NotificationRequestPoint is nullptr. + * @tc.desc: Test DistributeOperation when notification don't support distributed collaboration. * @tc.type: FUNC * @tc.require: issue */ @@ -277,7 +277,7 @@ HWTEST_F(AdvancedNotificationDistMgrServiceTest, DistributeOperation_400, Functi IPCSkeleton::SetCallingTokenID(NATIVE_TOKEN); sptr bundle = new NotificationBundleOption(TEST_DEFUALT_BUNDLE, NON_SYSTEM_APP_UID); sptr request = new (std::nothrow) NotificationRequest(); - request->SetDistributedCollaborate(true); + request->SetDistributedCollaborate(false); auto record = advancedNotificationService_->MakeNotificationRecord(request, bundle); advancedNotificationService_->AddToNotificationList(record); sptr operationInfo = new (std::nothrow) NotificationOperationInfo(); -- Gitee