From 56648c32159901b6be00d7a85cc4932cbf85547f Mon Sep 17 00:00:00 2001 From: chensi10 Date: Mon, 30 Aug 2021 09:54:19 +0800 Subject: [PATCH] Change test bug and fix xts test Signed-off-by: chensi10 --- .../aafwk/featureAbility/napi_context.cpp | 7 +- .../ability_stack_manager_test.cpp | 6 +- .../ability_mgr_module_test.cpp | 46 ---- .../moduletest/module_test_dump_util/BUILD.gn | 2 +- .../panding_want_manager_test.cpp | 207 +++++++++--------- 5 files changed, 106 insertions(+), 162 deletions(-) diff --git a/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp b/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp index 5a1e7b03fa9..c4aa2b24141 100755 --- a/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp +++ b/interfaces/kits/napi/aafwk/featureAbility/napi_context.cpp @@ -82,6 +82,7 @@ void VerifySelfPermissionExecuteCallbackWork(napi_env env, void *data) return; } + asyncCallbackInfo->native_data.data_type = NVT_INT32; std::string permission(asyncCallbackInfo->param.paramArgs.GetStringValue("permission")); asyncCallbackInfo->native_data.int32_value = asyncCallbackInfo->ability->VerifySelfPermission(permission); } @@ -352,8 +353,7 @@ napi_value NAPI_OnRequestPermissionsFromUserResultWrap( napi_create_reference(env, args[PARAM0], 1, &aceCallbackInfoPermission.callback); NAPI_CALL(env, - napi_create_async_work( - env, + napi_create_async_work(env, nullptr, resourceName, [](napi_env env, void *data) { @@ -431,8 +431,7 @@ void CallOnRequestPermissionsFromUserResult(int requestCode, const std::vectordata = (void *)onRequestPermissionCB; - uv_queue_work( - loop, + uv_queue_work(loop, work, [](uv_work_t *work) {}, [](uv_work_t *work, int status) { diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp index 1e53cfbc192..af4e388acd5 100644 --- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp @@ -2120,14 +2120,14 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_060, TestSize. auto result1 = stackManager_->StartLockMission(99, MisionRecordId, false, true); EXPECT_EQ(LOCK_MISSION_DENY_FAILED, result1); - result1 = stackManager_->StartLockMission(100, MisionRecordId, false, true); + result1 = stackManager_->StartLockMission(1000, MisionRecordId, false, true); EXPECT_EQ(ERR_OK, result1); // unlock defferent uid(99) result1 = stackManager_->StartLockMission(99, MisionRecordId, false, false); - EXPECT_EQ(LOCK_MISSION_DENY_FAILED, result1); + EXPECT_EQ(UNLOCK_MISSION_DENY_FAILED, result1); - result1 = stackManager_->StartLockMission(100, MisionRecordId, false, false); + result1 = stackManager_->StartLockMission(1000, MisionRecordId, false, false); EXPECT_EQ(ERR_OK, result1); } diff --git a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp index c6fffacc61f..0c26e9cf212 100644 --- a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp +++ b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp @@ -563,9 +563,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_003, TestSize.Level1) abilityMgrServ_->RemoveAllServiceRecord(); curMissionStack->RemoveAll(); - - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -676,8 +673,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_006, TestSize.Level1) abilityMgrServ_->handler_ = handler; EXPECT_CALL(*mockAppMgrClient_, UpdateAbilityState(_, _)).Times(1).WillOnce(Return(AppMgrResultCode::RESULT_OK)); abilityMgrServ_->AttachAbilityThread(scheduler, abilityRecord->GetToken()); - - testing::Mock::AllowLeak(scheduler); } /* @@ -780,10 +775,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_008, TestSize.Level1) abilityMgrServ_->RemoveAllServiceRecord(); curMissionStack->RemoveAll(); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -837,10 +828,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_009, TestSize.Level1) abilityMgrServ_->OnAbilityRequestDone( record->GetToken(), (int32_t)OHOS::AppExecFwk::AbilityState::ABILITY_STATE_BACKGROUND); EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->GetServiceMap().size()); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -902,11 +889,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_010, TestSize.Level1) EXPECT_CALL(*stub2, OnAbilityDisconnectDone(_, _)).Times(2); CheckTestRecord(record1, record2, callback1, callback2); - testing::Mock::AllowLeak(stub1); - testing::Mock::AllowLeak(callback1); - testing::Mock::AllowLeak(stub2); - testing::Mock::AllowLeak(callback2); - testing::Mock::AllowLeak(scheduler); } /* @@ -977,7 +959,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_011, TestSize.Level1) } EXPECT_EQ(4, testId); abilityMgrServ_->RemoveAllServiceRecord(); - testing::Mock::AllowLeak(scheduler); } /* * Feature: AaFwk @@ -1049,10 +1030,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_012, TestSize.Level1) EXPECT_EQ(ConnectionState::CONNECTED, connectRecord->GetConnectState()); abilityMgrServ_->RemoveAllServiceRecord(); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1132,8 +1109,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_014, TestSize.Level1) EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->GetServiceMap().size()); abilityMgrServ_->RemoveAllServiceRecord(); - - testing::Mock::AllowLeak(scheduler); } /* @@ -1177,7 +1152,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_015, TestSize.Level1) EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->GetServiceMap().size()); abilityMgrServ_->RemoveAllServiceRecord(); - testing::Mock::AllowLeak(scheduler); } /* @@ -1223,10 +1197,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_016, TestSize.Level1) EXPECT_EQ(TERMINATE_SERVICE_IS_CONNECTED, result); abilityMgrServ_->RemoveAllServiceRecord(); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1272,10 +1242,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_017, TestSize.Level1) EXPECT_EQ(TERMINATE_SERVICE_IS_CONNECTED, result); abilityMgrServ_->RemoveAllServiceRecord(); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1343,9 +1309,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_018, TestSize.Level1) EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->GetServiceMap().size()); abilityMgrServ_->RemoveAllServiceRecord(); - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1408,10 +1371,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_019, TestSize.Level1) abilityMgrServ_->OnAbilityRequestDone( record->GetToken(), (int32_t)OHOS::AppExecFwk::AbilityState::ABILITY_STATE_BACKGROUND); EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->GetServiceMap().size()); - - testing::Mock::AllowLeak(scheduler); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1453,8 +1412,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_020, TestSize.Level3) EXPECT_EQ((std::size_t)0, abilityMgrServ_->connectManager_->connectMap_.size()); abilityMgrServ_->RemoveAllServiceRecord(); - testing::Mock::AllowLeak(stub); - testing::Mock::AllowLeak(callback); } /* @@ -1500,7 +1457,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_021, TestSize.Level1) testAbilityRecord = GetTopAbility(); ASSERT_TRUE(testAbilityRecord); EXPECT_TRUE(testAbilityRecord->GetAbilityInfo().bundleName == bundleName); - testing::Mock::AllowLeak(scheduler); } /* @@ -1545,7 +1501,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_022, TestSize.Level1) testAbilityRecord = GetTopAbility(); ASSERT_TRUE(testAbilityRecord); EXPECT_TRUE(testAbilityRecord->GetAbilityInfo().bundleName == bundleName); - testing::Mock::AllowLeak(scheduler); } /* @@ -1607,7 +1562,6 @@ HWTEST_F(AbilityMgrModuleTest, ability_mgr_service_test_024, TestSize.Level1) SetActive(); auto resultFunction = abilityMgrServ_->MoveMissionToEnd(abilityTv->GetToken(), true); EXPECT_EQ(resultFunction, ERR_OK); - testing::Mock::AllowLeak(scheduler); } /* diff --git a/services/test/moduletest/module_test_dump_util/BUILD.gn b/services/test/moduletest/module_test_dump_util/BUILD.gn index d4a5b196df0..974a65c3c91 100644 --- a/services/test/moduletest/module_test_dump_util/BUILD.gn +++ b/services/test/moduletest/module_test_dump_util/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("module_test_dump_util_lib") { configs = [ ":module_test_dump_util_config" ] - deps = [] + deps = [ "//utils/native/base:utils" ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] diff --git a/services/test/moduletest/panding_want_manager_test/panding_want_manager_test.cpp b/services/test/moduletest/panding_want_manager_test/panding_want_manager_test.cpp index 88466d15305..dd03a1bb924 100644 --- a/services/test/moduletest/panding_want_manager_test/panding_want_manager_test.cpp +++ b/services/test/moduletest/panding_want_manager_test/panding_want_manager_test.cpp @@ -48,7 +48,6 @@ using namespace testing::ext; namespace OHOS { namespace AAFwk { - namespace { static const int FLAG_ONE_SHOT = 1 << 30; // static const int FLAG_NO_CREATE = 1 << 29; @@ -62,8 +61,8 @@ int serviceRequestCode = 3; int foregroundServicesRequestCode = 4; int commonEventRequestCode = 4; -} -class PandingWantMgrTest : public testing::Test{ +} // namespace +class PandingWantMgrTest : public testing::Test { public: static void SetUpTestCase(void); static void TearDownTestCase(void); @@ -84,7 +83,7 @@ public: inline static MockAppMgrClient *appClient = nullptr; inline static std::shared_ptr ams = nullptr; MockAbilityMgrService *amsSerice = new MockAbilityMgrService(); -}; +}; void PandingWantMgrTest::SetUpTestCase(void) { @@ -97,25 +96,24 @@ void PandingWantMgrTest::SetUpTestCase(void) auto appScheduler = DelayedSingleton::GetInstance(); appClient = new MockAppMgrClient(); - if(appClient){ + if (appClient) { appScheduler->appMgrClient_.reset(appClient); GTEST_LOG_(INFO) << "mock appMgrClient_ ok"; } - } void PandingWantMgrTest::TearDownTestCase(void) { OHOS::DelayedSingleton::DestroyInstance(); - if(appClient){ + if (appClient) { delete appClient; appClient = nullptr; } } - + void PandingWantMgrTest::SetUp() { - if(amsSerice == nullptr){ + if (amsSerice == nullptr) { amsSerice = new MockAbilityMgrService(); } AbilityManagerClient::GetInstance(); @@ -127,10 +125,10 @@ void PandingWantMgrTest::TearDown() std::shared_ptr PandingWantMgrTest::GetWant(std::string abilityName, std::string bundleName) { - if(abilityName == ""){ + if (abilityName == "") { abilityName = "hiMusic"; } - if(bundleName == ""){ + if (bundleName == "") { bundleName = "com.ix.hiMusic"; } @@ -144,7 +142,7 @@ std::shared_ptr PandingWantMgrTest::GetWant(std::string abilityName } WantSenderInfo PandingWantMgrTest::GetAbility() -{ +{ int32_t flags = FLAG_ONE_SHOT; WantsInfo wantsInfo; wantsInfo.want = *(GetWant("hiMusic", "com.ix.hiMusic")); @@ -188,7 +186,7 @@ WantSenderInfo PandingWantMgrTest::GetAbilities() } WantSenderInfo PandingWantMgrTest::GetService() -{ +{ int32_t flags = FLAG_ONE_SHOT; WantsInfo wantsInfo; @@ -208,7 +206,7 @@ WantSenderInfo PandingWantMgrTest::GetService() } WantSenderInfo PandingWantMgrTest::GetForegroundService() -{ +{ int32_t flags = FLAG_ONE_SHOT; WantsInfo wantsInfo; @@ -227,7 +225,7 @@ WantSenderInfo PandingWantMgrTest::GetForegroundService() } WantSenderInfo PandingWantMgrTest::GetCommonEvent() -{ +{ int32_t flags = FLAG_ONE_SHOT; WantsInfo wantsInfo; @@ -245,8 +243,6 @@ WantSenderInfo PandingWantMgrTest::GetCommonEvent() return wantSenderInfo; } - - WantAgentInfo PandingWantMgrTest::MakeWantAgentInfo(WantAgentConstant::OperationType &type, int requestCode, std::vector &flags, std::vector> wants) { @@ -278,25 +274,27 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_001, TestSize.Level1) auto abilityWant = GetWant("hiMusic", "com.ix.hiMusic"); std::vector> wants; wants.push_back(abilityWant); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_ABILITY); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo){ - return ams->SendWantSender(target,senderInfo);; + auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo) { + return ams->SendWantSender(target, senderInfo); + ; }; EXPECT_CALL(*amsSerice, SendWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxySendWantSenderReturn)); EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Return(0)); - - //proxy end - //call GetWantAgent + + // proxy end + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); @@ -314,7 +312,7 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_001, TestSize.Level1) EXPECT_CALL(*call, OnSendFinished(_, _, _, _)).Times(1); WantAgentHelper::TriggerWantAgent(context, wantAgent, callback, paramsInfo); - //An ability should be activated + // An ability should be activated auto stackMgr = ams->GetStackManager(); EXPECT_NE(stackMgr, nullptr); auto topAbility = stackMgr->GetCurrentTopAbility(); @@ -322,11 +320,10 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_001, TestSize.Level1) Want topAbilityWant = topAbility->GetWant(); ElementName element = topAbilityWant.GetElement(); - EXPECT_EQ( element.GetAbilityName(), "hiMusic"); - EXPECT_EQ( element.GetBundleName(), "com.ix.hiMusic"); + EXPECT_EQ(element.GetAbilityName(), "hiMusic"); + EXPECT_EQ(element.GetBundleName(), "com.ix.hiMusic"); } - /* * Feature: AaFwk * Function: GetWantSender @@ -350,25 +347,27 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_002, TestSize.Level1) std::vector> wants; wants.push_back(abilityWant); wants.push_back(abilityWant1); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_ABILITIES); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo){ - return ams->SendWantSender(target,senderInfo);; + auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo) { + return ams->SendWantSender(target, senderInfo); + ; }; EXPECT_CALL(*amsSerice, SendWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxySendWantSenderReturn)); EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Return(0)); - //proxy end + // proxy end - //call GetWantAgent + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); @@ -410,25 +409,27 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_003, TestSize.Level1) auto abilityWant = GetWant("hiService", "com.ix.hiService"); std::vector> wants; wants.push_back(abilityWant); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_SERVICE); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo){ - return ams->SendWantSender(target,senderInfo);; + auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo) { + return ams->SendWantSender(target, senderInfo); + ; }; EXPECT_CALL(*amsSerice, SendWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxySendWantSenderReturn)); EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Return(0)); - - //proxy end - //call GetWantAgent + + // proxy end + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); @@ -446,14 +447,13 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_003, TestSize.Level1) EXPECT_CALL(*call, OnSendFinished(_, _, _, _)).Times(1); WantAgentHelper::TriggerWantAgent(context, wantAgent, callback, paramsInfo); - //An ability should be activated + // An ability should be activated auto serviceRecord = ams->connectManager_->GetServiceRecordByElementName(abilityWant->GetElement().GetURI()); EXPECT_TRUE(serviceRecord); Want serviceWant = serviceRecord->GetWant(); ElementName element = serviceWant.GetElement(); - EXPECT_EQ(serviceRecord->GetRequestCode(), requsetCode); - EXPECT_EQ( element.GetAbilityName(), "hiService"); - EXPECT_EQ( element.GetBundleName(), "com.ix.hiService"); + EXPECT_EQ(element.GetAbilityName(), "hiService"); + EXPECT_EQ(element.GetBundleName(), "com.ix.hiService"); } /* @@ -475,25 +475,27 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_004, TestSize.Level1) auto abilityWant = GetWant("hiServiceForground", "com.ix.hiService"); std::vector> wants; wants.push_back(abilityWant); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_FOREGROUND_SERVICE); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo){ - return ams->SendWantSender(target,senderInfo);; + auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo) { + return ams->SendWantSender(target, senderInfo); + ; }; EXPECT_CALL(*amsSerice, SendWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxySendWantSenderReturn)); EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Return(0)); - - //proxy end - //call GetWantAgent + + // proxy end + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); @@ -511,14 +513,13 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_004, TestSize.Level1) EXPECT_CALL(*call, OnSendFinished(_, _, _, _)).Times(1); WantAgentHelper::TriggerWantAgent(context, wantAgent, callback, paramsInfo); - //An ability should be activated + // An ability should be activated auto serviceRecord = ams->connectManager_->GetServiceRecordByElementName(abilityWant->GetElement().GetURI()); EXPECT_TRUE(serviceRecord); Want serviceWant = serviceRecord->GetWant(); ElementName element = serviceWant.GetElement(); - EXPECT_EQ(serviceRecord->GetRequestCode(), requsetCode); - EXPECT_EQ( element.GetAbilityName(), "hiServiceForground"); - EXPECT_EQ( element.GetBundleName(), "com.ix.hiService"); + EXPECT_EQ(element.GetAbilityName(), "hiServiceForground"); + EXPECT_EQ(element.GetBundleName(), "com.ix.hiService"); } /* @@ -540,31 +541,32 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_005, TestSize.Level1) auto abilityWant = GetWant("hiRedio", "com.ix.hiRedio"); std::vector> wants; wants.push_back(abilityWant); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::SEND_COMMON_EVENT); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo){ - return ams->SendWantSender(target,senderInfo);; + auto amsProxySendWantSenderReturn = [&](const sptr &target, const SenderInfo &senderInfo) { + return ams->SendWantSender(target, senderInfo); + ; }; EXPECT_CALL(*amsSerice, SendWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxySendWantSenderReturn)); EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Return(0)); - - //proxy end - //call GetWantAgent + + // proxy end + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); EXPECT_NE(pandingWant, nullptr); - std::shared_ptr callback; MockCompletedCallback *call = new MockCompletedCallback(); callback.reset(call); @@ -575,7 +577,6 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_005, TestSize.Level1) WantAgentHelper::TriggerWantAgent(context, wantAgent, callback, paramsInfo); } - /* * Feature: AaFwk * Function: GetWantSender @@ -599,35 +600,30 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_006, TestSize.Level1) WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_ABILITY); return ams->GetWantSender(wantSenderInfo, callerToken); }; EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(1).WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxyGetPendingWantType = [&](const sptr &target){ - return ams->GetPendingWantType(target); - }; + auto amsProxyGetPendingWantType = [&](const sptr &target) { return ams->GetPendingWantType(target); }; EXPECT_CALL(*amsSerice, GetPendingWantType(_)).Times(1).WillOnce(Invoke(amsProxyGetPendingWantType)); - - auto amsProxyGetPendingWantCode = [&](const sptr &target){ - return ams->GetPendingWantCode(target); - }; + + auto amsProxyGetPendingWantCode = [&](const sptr &target) { return ams->GetPendingWantCode(target); }; EXPECT_CALL(*amsSerice, GetPendingWantCode(_)).Times(1).WillOnce(Invoke(amsProxyGetPendingWantCode)); - auto amsProxyRegisterCancelListener = [&](const sptr &sender, const sptr &recevier){ + auto amsProxyRegisterCancelListener = [&](const sptr &sender, const sptr &recevier) { return ams->RegisterCancelListener(sender, recevier); }; EXPECT_CALL(*amsSerice, RegisterCancelListener(_, _)).Times(1).WillOnce(Invoke(amsProxyRegisterCancelListener)); - auto amsProxyCancelWantSender = [&](const sptr &sender){ - return ams->CancelWantSender(sender); - }; + auto amsProxyCancelWantSender = [&](const sptr &sender) { return ams->CancelWantSender(sender); }; EXPECT_CALL(*amsSerice, CancelWantSender(_)).Times(1).WillOnce(Invoke(amsProxyCancelWantSender)); - //proxy end + // proxy end - //call GetWantAgent + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); EXPECT_NE(wantAgent, nullptr); auto pandingWant = wantAgent->GetPendingWant(); @@ -639,16 +635,13 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_006, TestSize.Level1) int code = WantAgentHelper::GetHashCode(wantAgent); EXPECT_NE(code, -1); - //mock CancelListener - auto cancalCall = [&](int resultCode)->void{ - EXPECT_EQ(resultCode, requsetCode); - }; - + // mock CancelListener + auto cancalCall = [&](int resultCode) -> void { EXPECT_EQ(resultCode, requsetCode); }; + std::shared_ptr listener = std::make_shared(); EXPECT_CALL(*listener, OnCancelled(_)).Times(1).WillOnce(Invoke(cancalCall)); WantAgentHelper::RegisterCancelListener(listener, wantAgent); WantAgentHelper::Cancel(wantAgent); - } /* @@ -670,28 +663,30 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_007, TestSize.Level1) auto abilityWant = GetWant("Netease music", "com.ix.hiMusic"); std::vector> wants; wants.push_back(abilityWant); - + WantAgentInfo info = MakeWantAgentInfo(type, requsetCode, flags, wants); std::shared_ptr context = std::make_shared(); - //proxy start - auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, const sptr &callerToken){ + // proxy start + auto amsProxyGetWantSenderReturn = [&](const WantSenderInfo &wantSenderInfo, + const sptr &callerToken) { EXPECT_EQ(wantSenderInfo.type, (int32_t)WantAgentConstant::OperationType::START_ABILITY); return ams->GetWantSender(wantSenderInfo, callerToken); }; - EXPECT_CALL(*amsSerice, GetWantSender(_, _)).Times(4) + EXPECT_CALL(*amsSerice, GetWantSender(_, _)) + .Times(4) .WillOnce(Invoke(amsProxyGetWantSenderReturn)) .WillOnce(Invoke(amsProxyGetWantSenderReturn)) .WillOnce(Invoke(amsProxyGetWantSenderReturn)) .WillOnce(Invoke(amsProxyGetWantSenderReturn)); - auto amsProxyRegisterCancelListener = [&](const sptr &sender, const sptr &recevier){ + auto amsProxyRegisterCancelListener = [&](const sptr &sender, const sptr &recevier) { return ams->RegisterCancelListener(sender, recevier); }; EXPECT_CALL(*amsSerice, RegisterCancelListener(_, _)).Times(1).WillOnce(Invoke(amsProxyRegisterCancelListener)); - //proxy end + // proxy end - //call GetWantAgent + // call GetWantAgent std::shared_ptr wantAgent = WantAgentHelper::GetWantAgent(context, info); // must be nullptr EXPECT_EQ(wantAgent->GetPendingWant()->GetTarget(), nullptr); @@ -721,7 +716,7 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_007, TestSize.Level1) EXPECT_NE(wantAgent2->GetPendingWant()->GetTarget(), nullptr); auto pandingWant2 = wantAgent2->GetPendingWant(); EXPECT_NE(pandingWant2, nullptr); - + auto target = pandingWant2->GetTarget(); EXPECT_NE(target, nullptr); sptr targetRecord = iface_cast(target->AsObject()); @@ -737,11 +732,9 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_007, TestSize.Level1) info = MakeWantAgentInfo(type, requsetCode, flags, wants); - //mock CancelListener - auto cancalCall = [&](int resultCode)->void{ - EXPECT_EQ(resultCode, requsetCode); - }; - + // mock CancelListener + auto cancalCall = [&](int resultCode) -> void { EXPECT_EQ(resultCode, requsetCode); }; + std::shared_ptr listener = std::make_shared(); EXPECT_CALL(*listener, OnCancelled(_)).Times(1).WillOnce(Invoke(cancalCall)); WantAgentHelper::RegisterCancelListener(listener, wantAgent2); @@ -750,7 +743,5 @@ HWTEST_F(PandingWantMgrTest, pending_want_mgr_test_007, TestSize.Level1) EXPECT_EQ(wantAgent3->GetPendingWant()->GetTarget(), nullptr); } - - -}// END AAFwk -}// END OHOS \ No newline at end of file +} // namespace AAFwk +} // namespace OHOS \ No newline at end of file -- Gitee