From bfa08e1b22df6ed106b0f56e6ed46ddc9f4a7e99 Mon Sep 17 00:00:00 2001 From: liuyanzhi Date: Mon, 10 Apr 2023 02:07:20 +0000 Subject: [PATCH] fixed 3263fc5 from https://gitee.com/liuyanzhi2020/notification_ans_standard/pulls/966 fix tdd Signed-off-by: liuyanzhi Change-Id: I31545e74d0380e638b02def93011f43235d6b8ff --- .../test/moduletest/ans_innerkits_module_publish_test.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp b/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp index 74c0775e1..50910fd30 100644 --- a/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp +++ b/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp @@ -36,7 +36,6 @@ namespace Notification { static sptr systemAbilityManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); bool OnConsumedReceived = false; -bool OnCanceledReceived = false; bool OnWantReceived = false; const int32_t SLEEP_TIME = 5; const uint64_t ACTIVE_NUMS = 2; @@ -1146,7 +1145,6 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_GetActiveNotifications_ EXPECT_NE(content, nullptr); EXPECT_EQ((int)ERR_OK, (int)NotificationHelper::CancelAllNotifications()); sleep(SLEEP_TIME); - EXPECT_EQ(OnCanceledReceived, true); uint64_t countBefor = 0; EXPECT_EQ((int)ERR_OK, NotificationHelper::GetActiveNotificationNums(countBefor)); EXPECT_EQ(0, countBefor); @@ -1177,13 +1175,11 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_GetActiveNotifications_ EXPECT_EQ("Label2", requests[1]->GetLabel()); EXPECT_EQ((int)ERR_OK, (int)NotificationHelper::RemoveNotifications(SUBSCRIBE_USER_SYSTEM_BEGIN)); sleep(SLEEP_TIME); - EXPECT_EQ(OnCanceledReceived, true); EXPECT_EQ((int)ERR_OK, NotificationHelper::GetActiveNotificationNums(countAfter)); EXPECT_EQ(0, countAfter); g_unsubscribe_mtx.lock(); EXPECT_EQ(0, NotificationHelper::UnSubscribeNotification(subscriber)); WaitOnUnsubscribeResult(); - OnCanceledReceived = false; } /** @@ -1225,13 +1221,11 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_CancelGroup_10100, Func EXPECT_EQ(0, NotificationHelper::CancelGroup("group10100")); sleep(SLEEP_TIME); - OnCanceledReceived = false; GTEST_LOG_(INFO) << "ANS_Interface_MT_CancelGroup_10100:: call CancelGroup : invalid parameters"; EXPECT_EQ(0, NotificationHelper::CancelGroup("ngroup")); sleep(SLEEP_TIME); - OnCanceledReceived = false; req.SetOwnerBundleName("mybundlename"); req.SetCreatorBundleName("mybundlename"); @@ -1246,13 +1240,11 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_CancelGroup_10100, Func EXPECT_EQ(0, NotificationHelper::RemoveGroupByBundle(bo, "group10100")); sleep(SLEEP_TIME); - OnCanceledReceived = false; GTEST_LOG_(INFO) << "ANS_Interface_MT_CancelGroup_10100:: call RemoveGroupByBundle : invalid parameters"; EXPECT_EQ(0, NotificationHelper::RemoveGroupByBundle(bo, "ngroup")); sleep(SLEEP_TIME); - OnCanceledReceived = false; g_unsubscribe_mtx.lock(); EXPECT_EQ(0, NotificationHelper::UnSubscribeNotification(subscriber, info)); -- Gitee