From a23bb7293bf5d524343a54d2c105cd851d481889 Mon Sep 17 00:00:00 2001 From: dongqingran Date: Fri, 17 Nov 2023 15:54:40 +0800 Subject: [PATCH] fix conflict Signed-off-by: dongqingran --- .../test/moduletest/ans_innerkits_module_publish_test.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp b/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp index e2313a3fe..00532fb22 100644 --- a/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp +++ b/frameworks/test/moduletest/ans_innerkits_module_publish_test.cpp @@ -64,6 +64,7 @@ const int32_t CASE_SIXTEEN = 16; const int32_t CASE_SEVENTEEN = 17; const int32_t CASE_EIGHTEEN = 18; const int32_t CASE_NINETEEN = 19; +const int32_t CASE_TWENTY = 20; const int32_t PIXEL_MAP_TEST_WIDTH = 32; const int32_t PIXEL_MAP_TEST_HEIGHT = 32; @@ -1709,7 +1710,7 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_Publish_10002, Function EXPECT_NE(content, nullptr); NotificationRequest req; - int32_t notificationId = CASE_NINETEEN; + int32_t notificationId = CASE_TWENTY; req.SetContent(content); req.SetSlotType(NotificationConstant::LIVE_VIEW); req.SetNotificationId(notificationId); @@ -1726,7 +1727,7 @@ HWTEST_F(AnsInnerKitsModulePublishTest, ANS_Interface_MT_Publish_10002, Function buttonOption.SetButtonName(buttonName); g_system_live_view_subscribe_response_mtx.lock(); EXPECT_EQ(0, NotificationHelper::TriggerLocalLiveView(bundleOption, notificationId, buttonOption)); - WaitOnResponse(CASE_NINETEEN, buttonName); + WaitOnResponse(notificationId, buttonName); g_unsubscribe_mtx.lock(); EXPECT_EQ(0, NotificationHelper::UnSubscribeNotification(subscriber)); -- Gitee