From 3c4133404a131b0b3086370ee74a0c0a45ce3d89 Mon Sep 17 00:00:00 2001 From: xuezhongzhu Date: Tue, 15 Feb 2022 11:11:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/unittest/pending_want_test/BUILD.gn | 1 + .../pending_want_test/pending_want_test.cpp | 29 ++++++++++--------- .../unittest/want_agent_helper_test/BUILD.gn | 1 + .../want_agent_helper_test.cpp | 12 ++++---- 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn index 395618932..b4ef80d85 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -23,6 +23,7 @@ ohos_unittest("pending_want_test") { "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", + "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", "//utils/system/safwk/native/include", "//utils/native/base/include", ] diff --git a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp index 4f66a28dc..db315d406 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp +++ b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp @@ -48,6 +48,7 @@ #include "ohos/aafwk/base/long_wrapper.h" #include "ohos/aafwk/base/short_wrapper.h" #include "ohos/aafwk/base/string_wrapper.h" +#include "context_impl.h" using namespace testing::ext; using namespace OHOS::AAFwk; @@ -102,7 +103,9 @@ Want PendingWantTest::MakeWant(std::string deviceId, std::string abilityName, st std::shared_ptr GetAppContext() { - return OHOS::AbilityRuntime::Context::GetApplicationContext(); + // return OHOS::AbilityRuntime::Context::GetApplicationContext(); + std::shared_ptr context = std::make_shared(); + return context; } void PendingWantTest::SetUpTestCase(void) @@ -170,7 +173,7 @@ HWTEST_F(PendingWantTest, PendingWant_0400, Function | MediumTest | Level1) want->SetElement(element); unsigned int flags = 1; flags |= FLAG_NO_CREATE; - std::shared_ptr pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags); + std::shared_ptr pendingWant = PendingWant::GetAbility(nullptr, requestCode, want, flags); EXPECT_EQ(pendingWant, nullptr); } @@ -179,17 +182,17 @@ HWTEST_F(PendingWantTest, PendingWant_0400, Function | MediumTest | Level1) * @tc.name : PendingWant GetAbility * @tc.desc : 1.Get pendingWant (START_ABILITY) */ -HWTEST_F(PendingWantTest, PendingWant_0500, Function | MediumTest | Level1) -{ - int requestCode = 10; - std::shared_ptr want = std::make_shared(); - ElementName element("device", "bundleName", "abilityName"); - want->SetElement(element); - unsigned int flags = 1; - flags |= FLAG_NO_CREATE; - std::shared_ptr pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags); - EXPECT_NE(pendingWant, nullptr); -} +// HWTEST_F(PendingWantTest, PendingWant_0500, Function | MediumTest | Level1) +// { +// int requestCode = 10; +// std::shared_ptr want = std::make_shared(); +// ElementName element("device", "bundleName", "abilityName"); +// want->SetElement(element); +// unsigned int flags = 1; +// flags |= FLAG_NO_CREATE; +// std::shared_ptr pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags); +// EXPECT_NE(pendingWant, nullptr); +// } /* * @tc.number : PendingWant_0600 diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index 12ec08065..543ba241b 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -22,6 +22,7 @@ ohos_unittest("want_agent_helper_test") { include_dirs = [ "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", "//foundation/aafwk/standard/services/abilitymgr/include", + "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", ] sources = [ "want_agent_helper_test.cpp" ] diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp index f555062ad..421512ab1 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp @@ -35,6 +35,7 @@ #include "want_receiver_stub.h" #include "want_sender_stub.h" #include "ohos/aafwk/base/bool_wrapper.h" +#include "context_impl.h" using namespace testing::ext; using namespace OHOS::AAFwk; @@ -249,8 +250,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1100, Function | MediumTest | Leve HWTEST_F(WantAgentHelperTest, WantAgentHelper_1200, Function | MediumTest | Level1) { std::shared_ptr wantAgentHelper = std::make_shared(); - std::shared_ptr context = OHOS::AbilityRuntime::Context::GetApplicationContext(); - std::shared_ptr want = std::make_shared(); + std::shared_ptr context = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); WantAgentInfo wantAgentInfo; @@ -273,7 +273,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1200, Function | MediumTest | Leve HWTEST_F(WantAgentHelperTest, WantAgentHelper_1300, Function | MediumTest | Level1) { std::shared_ptr wantAgentHelper = std::make_shared(); - std::shared_ptr context = OHOS::AbilityRuntime::Context::GetApplicationContext(); + std::shared_ptr context = std::make_shared(); std::shared_ptr want = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); @@ -297,7 +297,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1300, Function | MediumTest | Leve HWTEST_F(WantAgentHelperTest, WantAgentHelper_1400, Function | MediumTest | Level1) { std::shared_ptr wantAgentHelper = std::make_shared(); - std::shared_ptr context = OHOS::AbilityRuntime::Context::GetApplicationContext(); + std::shared_ptr context = std::make_shared(); std::shared_ptr want = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); @@ -321,7 +321,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1400, Function | MediumTest | Leve HWTEST_F(WantAgentHelperTest, WantAgentHelper_1500, Function | MediumTest | Level1) { std::shared_ptr wantAgentHelper = std::make_shared(); - std::shared_ptr context = OHOS::AbilityRuntime::Context::GetApplicationContext(); + std::shared_ptr context = std::make_shared(); std::shared_ptr want = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); @@ -345,7 +345,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1500, Function | MediumTest | Leve HWTEST_F(WantAgentHelperTest, WantAgentHelper_1600, Function | MediumTest | Level1) { std::shared_ptr wantAgentHelper = std::make_shared(); - std::shared_ptr context = OHOS::AbilityRuntime::Context::GetApplicationContext(); + std::shared_ptr context = std::make_shared(); std::shared_ptr want = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); -- Gitee From 719658d21101d67a29f4579be9e228c85a9f042b Mon Sep 17 00:00:00 2001 From: xuezhongzhu Date: Tue, 15 Feb 2022 11:17:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?tdd=E9=80=9A=E7=9F=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unittest/want_agent_helper_test/want_agent_helper_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp index 421512ab1..b92fb2d2b 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp @@ -251,6 +251,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1200, Function | MediumTest | Leve { std::shared_ptr wantAgentHelper = std::make_shared(); std::shared_ptr context = std::make_shared(); + std::shared_ptr want = std::make_shared(); ElementName element("device", "bundleName", "abilityName"); want->SetElement(element); WantAgentInfo wantAgentInfo; -- Gitee From 2b45ffa8ee78dd068583d3f20dde225d6b79a35a Mon Sep 17 00:00:00 2001 From: xuezhongzhu Date: Tue, 15 Feb 2022 15:13:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/unittest/pending_want_test/BUILD.gn | 2 +- .../pending_want_test/pending_want_test.cpp | 24 ++++--------------- .../unittest/want_agent_helper_test/BUILD.gn | 2 +- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn index b4ef80d85..80252d5fd 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn @@ -20,10 +20,10 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("pending_want_test") { module_out_path = module_output_path include_dirs = [ + "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", "//foundation/aafwk/standard/services/abilitymgr/include", "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/", - "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", "//utils/system/safwk/native/include", "//utils/native/base/include", ] diff --git a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp index db315d406..bee296c8e 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp +++ b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp @@ -20,6 +20,7 @@ #include "completed_dispatcher.h" #include "context/context.h" #include "context_container.h" +#include "context_impl.h" #include "element_name.h" #include "event_handler.h" #include "iservice_registry.h" @@ -48,7 +49,7 @@ #include "ohos/aafwk/base/long_wrapper.h" #include "ohos/aafwk/base/short_wrapper.h" #include "ohos/aafwk/base/string_wrapper.h" -#include "context_impl.h" + using namespace testing::ext; using namespace OHOS::AAFwk; @@ -103,9 +104,8 @@ Want PendingWantTest::MakeWant(std::string deviceId, std::string abilityName, st std::shared_ptr GetAppContext() { - // return OHOS::AbilityRuntime::Context::GetApplicationContext(); - std::shared_ptr context = std::make_shared(); - return context; + std::shared_ptr context = std::make_shared(); + return context; } void PendingWantTest::SetUpTestCase(void) @@ -177,22 +177,6 @@ HWTEST_F(PendingWantTest, PendingWant_0400, Function | MediumTest | Level1) EXPECT_EQ(pendingWant, nullptr); } -/* - * @tc.number : PendingWant_0500 - * @tc.name : PendingWant GetAbility - * @tc.desc : 1.Get pendingWant (START_ABILITY) - */ -// HWTEST_F(PendingWantTest, PendingWant_0500, Function | MediumTest | Level1) -// { -// int requestCode = 10; -// std::shared_ptr want = std::make_shared(); -// ElementName element("device", "bundleName", "abilityName"); -// want->SetElement(element); -// unsigned int flags = 1; -// flags |= FLAG_NO_CREATE; -// std::shared_ptr pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags); -// EXPECT_NE(pendingWant, nullptr); -// } /* * @tc.number : PendingWant_0600 diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn index 543ba241b..926b3dcf1 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn @@ -20,9 +20,9 @@ module_output_path = "ans_standard/wantagent" ohos_unittest("want_agent_helper_test") { module_out_path = module_output_path include_dirs = [ + "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime", "//foundation/aafwk/standard/services/abilitymgr/include", - "//aafwk/standard/frameworks/kits/appkit/native/ability_runtime/context/", ] sources = [ "want_agent_helper_test.cpp" ] -- Gitee From 1abd585ff0fc1f8b316fea5bb85932dd12b65a98 Mon Sep 17 00:00:00 2001 From: xuezhongzhu Date: Tue, 15 Feb 2022 15:39:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?tdd=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuezhongzhu --- .../test/unittest/pending_want_test/pending_want_test.cpp | 1 - .../want_agent_helper_test/want_agent_helper_test.cpp | 2 +- services/ans/src/advanced_notification_service.cpp | 7 +------ .../ans/test/unittest/notification_preferences_test.cpp | 3 ++- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp index bee296c8e..ee49efd40 100644 --- a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp +++ b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp @@ -50,7 +50,6 @@ #include "ohos/aafwk/base/short_wrapper.h" #include "ohos/aafwk/base/string_wrapper.h" - using namespace testing::ext; using namespace OHOS::AAFwk; using namespace OHOS; diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp index b92fb2d2b..622c8c8b4 100644 --- a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp +++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp @@ -17,6 +17,7 @@ #include "ability_context.h" #include "completed_callback.h" #include "context_container.h" +#include "context_impl.h" #include "context/context.h" #include "element_name.h" #include "event_handler.h" @@ -35,7 +36,6 @@ #include "want_receiver_stub.h" #include "want_sender_stub.h" #include "ohos/aafwk/base/bool_wrapper.h" -#include "context_impl.h" using namespace testing::ext; using namespace OHOS::AAFwk; diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index ec56db5b7..d6dfc6c6c 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -1295,16 +1295,11 @@ ErrCode AdvancedNotificationService::GetAllActiveNotifications(std::vectorPostSyncTask(std::bind([&]() { notifications.clear(); for (auto record : notificationList_) { - if (record->notification != nullptr && record->notification->GetUserId() == userId) { + if (record->notification != nullptr) { notifications.push_back(record->notification); } } diff --git a/services/ans/test/unittest/notification_preferences_test.cpp b/services/ans/test/unittest/notification_preferences_test.cpp index fa283597a..df7a67ff1 100644 --- a/services/ans/test/unittest/notification_preferences_test.cpp +++ b/services/ans/test/unittest/notification_preferences_test.cpp @@ -1089,7 +1089,8 @@ HWTEST_F(NotificationPreferencesTest, GetNotificationsEnabled_00200, Function | EXPECT_TRUE(enable); enable = false; - EXPECT_EQ((int)NotificationPreferences::GetInstance().GetNotificationsEnabled(101, enable), (int)ERR_OK); + EXPECT_EQ( + (int)NotificationPreferences::GetInstance().GetNotificationsEnabled(101, enable), (int)ERR_ANS_INVALID_PARAM); EXPECT_FALSE(enable); } -- Gitee