diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index 64117f120eaf23cd47fffc1cf372e90d68478390..ff387b09fab0db8404a0be5390be524478891fb5 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -244,6 +244,7 @@ group("fuzztest") { "appmanager_fuzzer:fuzztest", "appmgrclientrest_fuzzer:fuzztest", "appmgrrest_fuzzer:fuzztest", + "appmgrservicefirst_fuzzer:fuzztest", "appmgrstub_fuzzer:fuzztest", "apprunningstatusproxy_fuzzer:fuzztest", "appstateobservermanager_fuzzer:fuzztest", diff --git a/test/fuzztest/appmgrservicefirst_fuzzer/BUILD.gn b/test/fuzztest/appmgrservicefirst_fuzzer/BUILD.gn index 28adb930cbfb5f1bf2ab4c31826891228de1421d..87d37d07925f5f05f7d6a920a1efd0fa07df9b62 100755 --- a/test/fuzztest/appmgrservicefirst_fuzzer/BUILD.gn +++ b/test/fuzztest/appmgrservicefirst_fuzzer/BUILD.gn @@ -58,6 +58,7 @@ ohos_fuzztest("AppMgrServiceFirstFuzzTest") { "napi:ace_napi", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "hisysevent:libhisysevent", ] if (ability_runtime_graphics) { diff --git a/test/fuzztest/appmgrservicefirst_fuzzer/appmgrservicefirst_fuzzer.cpp b/test/fuzztest/appmgrservicefirst_fuzzer/appmgrservicefirst_fuzzer.cpp index 4dbfd06897dc309fc82b787f293252da313b90ca..08be4ed21a9099417efa5623cba1062114ba19da 100644 --- a/test/fuzztest/appmgrservicefirst_fuzzer/appmgrservicefirst_fuzzer.cpp +++ b/test/fuzztest/appmgrservicefirst_fuzzer/appmgrservicefirst_fuzzer.cpp @@ -77,7 +77,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appMgrService->RegisterNativeChildExitNotify(nativeChildNotify); appMgrService->UnregisterNativeChildExitNotify(nativeChildNotify); pid_t pid = static_cast(GetU32Data(data)); - appMgrService->AddAppDeathRecipient(pid); + //appMgrService->AddAppDeathRecipient(pid); appMgrService->QueryServiceState(); sptr app = nullptr; appMgrService->AttachApplication(app); @@ -128,6 +128,14 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appMgrService->GetConfiguration(config); std::string bundleName(data, size); appMgrService->GetAppRunningStateByBundleName(bundleName); + std::vector appInfos; + BackgroundAppInfo appInfo; + appInfo.bandleName = bundleName; + appInfos.push_back(appInfo); + AppExecFwk::ConfigurationPolicy policy; + policy.maxCountPerBatch = static_cast(GetU32Data(data)); + policy.intervalTime = static_cast(GetU32Data(data)); + appMgrService->UpdateConfigurationForBackgroundApp(appInfos, policy); sptr callback; appMgrService->NotifyLoadRepairPatch(bundleName, callback); appMgrService->NotifyHotReloadPage(bundleName, callback); diff --git a/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp b/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp index 2c006bc345c01498882d4112c5ebde40845256d6..904cf08145eb5a6983781dd1f2434cc95cc3603f 100644 --- a/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp +++ b/test/unittest/app_mgr_proxy_test/app_mgr_proxy_test.cpp @@ -954,9 +954,8 @@ HWTEST_F(AppMgrProxyTest, UpdateConfigurationForBackgroundApp_001, TestSize.Leve std::vector appInfos; ConfigurationPolicy policy; int32_t userId = -1; - auto ret = appMgrProxy_->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); - EXPECT_EQ(ret, ERR_FLATTEN_OBJECT); + EXPECT_EQ(ret, ERR_INVALID_DATA); BackgroundAppInfo info; appInfos.push_back(info); appMgrProxy_->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); diff --git a/test/unittest/app_mgr_service_inner_sixth_test/app_mgr_service_inner_sixth_test.cpp b/test/unittest/app_mgr_service_inner_sixth_test/app_mgr_service_inner_sixth_test.cpp index 485752e2506abc3a597103f09b709a615c3ace5d..a4e8c350c68ab401ad246da75504dc2b47c0f36b 100644 --- a/test/unittest/app_mgr_service_inner_sixth_test/app_mgr_service_inner_sixth_test.cpp +++ b/test/unittest/app_mgr_service_inner_sixth_test/app_mgr_service_inner_sixth_test.cpp @@ -558,7 +558,11 @@ HWTEST_F(AppMgrServiceInnerSixthTest, UpdateConfigurationForBackgroundApp_001, T appMgrServiceInner->appRunningManager_ = nullptr; ret = appMgrServiceInner->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); - EXPECT_EQ(ret, ERR_INVALID_VALUE); + EXPECT_EQ(ret, ERR_NO_INIT); + + appMgrServiceInner->appRunningManager_ = std::make_shared(); + ret = appMgrServiceInner->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); + EXPECT_EQ(ret, ERR_PERMISSION_DENIED); TAG_LOGI(AAFwkTag::TEST, "UpdateConfiguration_001 end"); } diff --git a/test/unittest/app_mgr_service_third_test/app_mgr_service_third_test.cpp b/test/unittest/app_mgr_service_third_test/app_mgr_service_third_test.cpp index d0a0cc1f651aebb7e624924d58a1cdbcd061a77d..10137b50f9af1c16d5161bfa8b0544020cc495b8 100644 --- a/test/unittest/app_mgr_service_third_test/app_mgr_service_third_test.cpp +++ b/test/unittest/app_mgr_service_third_test/app_mgr_service_third_test.cpp @@ -305,18 +305,16 @@ HWTEST_F(AppMgrServiceThirdTest, LaunchAbility_001, TestSize.Level1) HWTEST_F(AppMgrServiceThirdTest, UpdateConfigurationForBackgroundApp_001, TestSize.Level2) { auto appMgrService = std::make_shared(); - auto appMgrServiceInner = std::make_shared(); - appMgrService->SetInnerService(appMgrServiceInner); std::vector appInfos; AppExecFwk::ConfigurationPolicy policy; int32_t userId = -1; appMgrService->SetInnerService(nullptr); AAFwk::MyFlag::flag_ = 0; int32_t res = appMgrService->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); - EXPECT_EQ(res, 22); + EXPECT_EQ(res, ERR_PERMISSION_DENIED); AAFwk::MyFlag::flag_ = 1; res = appMgrService->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); - EXPECT_EQ(res, 38); + EXPECT_EQ(res, ERR_INVALID_OPERATION); } /* @@ -330,8 +328,6 @@ HWTEST_F(AppMgrServiceThirdTest, UpdateConfigurationForBackgroundApp_001, TestSi HWTEST_F(AppMgrServiceThirdTest, UpdateConfigurationForBackgroundApp_002, TestSize.Level2) { auto appMgrService = std::make_shared(); - auto appMgrServiceInner = std::make_shared(); - appMgrService->SetInnerService(appMgrServiceInner); std::vector appInfos; AppExecFwk::ConfigurationPolicy policy; int32_t userId = -1; @@ -340,7 +336,7 @@ HWTEST_F(AppMgrServiceThirdTest, UpdateConfigurationForBackgroundApp_002, TestSi appMgrService->taskHandler_ = taskHandler_; appMgrService->eventHandler_ = std::make_shared(taskHandler_, appMgrService->appMgrServiceInner_); int32_t res = appMgrService->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); - EXPECT_EQ(res, 1); + EXPECT_EQ(res, ERR_PERMISSION_DENIED); } } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/app_running_manager_fourth_test/app_running_manager_fourth_test.cpp b/test/unittest/app_running_manager_fourth_test/app_running_manager_fourth_test.cpp index 97c71632e07a30c172a9e5b7f8df07a7400dce06..77a86fb26ab7899b20eddf0e8db19e167a5f1975 100644 --- a/test/unittest/app_running_manager_fourth_test/app_running_manager_fourth_test.cpp +++ b/test/unittest/app_running_manager_fourth_test/app_running_manager_fourth_test.cpp @@ -972,13 +972,18 @@ HWTEST_F(AppRunningManagerFourthTest, UpdateConfigurationForBackgroundApp_0100, policy.maxCountPerBatch = -1; auto ret = appRunningManager->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); EXPECT_EQ(ret, ERR_INVALID_VALUE); - + + policy.maxCountPerBatch = 1; policy.intervalTime = -1; ret = appRunningManager->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); EXPECT_EQ(ret, ERR_INVALID_VALUE); policy.maxCountPerBatch = 1; policy.intervalTime = 1; + BackgroundAppInfo info; + info.bandleName = "com.example.mytest"; + info.appIndex = 0; + appInfos.push_back(info); ret = appRunningManager->UpdateConfigurationForBackgroundApp(appInfos, policy, userId); EXPECT_EQ(ret, 0); } @@ -1000,8 +1005,11 @@ HWTEST_F(AppRunningManagerFourthTest, UpdateConfiguration_0100, TestSize.Level1) auto app = std::make_shared(appInfo); std::shared_ptr appRecord = std::make_shared(app, 111, "KeepAliveApplication"); + auto ret = appRunningManager->UpdateConfiguration(appRecord, Rosen::ConfigMode::FONT_SCALE); + EXPECT_FALSE(ret); + appRecord->delayConfiguration_ = nullptr; - auto ret = appRunningManager->UpdateConfiguration(appRecord, Rosen::ConfigMode::COLOR_MODE); + ret = appRunningManager->UpdateConfiguration(appRecord, Rosen::ConfigMode::COLOR_MODE); EXPECT_FALSE(ret); appRecord->delayConfiguration_ = std::make_shared(); @@ -1038,45 +1046,29 @@ HWTEST_F(AppRunningManagerFourthTest, ExecuteConfigurationTask_0100, TestSize.Le appInfo.uid = 2100; auto app = std::make_shared(appInfo); std::shared_ptr appRecord = std::make_shared(app, 111, "KeepAliveApplication"); + appRunningManager->updateConfigurationDelayedMap_.emplace(0, true); + appRunningManager->updateConfigurationDelayedMap_.emplace(1, true); appRecord->appRecordId_ = 0; - appRunningManager->appRunningRecordMap_.emplace(1, appRecord); - appRunningManager->ExecuteConfigurationTask(info, userId); - EXPECT_TRUE(appRunningManager->updateConfigurationDelayedMap_[0]); - - appRunningManager->ExecuteConfigurationTask(info, userId); - + appRecord->appIndex_ = 0; + appRecord->curState_ = ApplicationState::APP_STATE_BACKGROUND; appRunningManager->appRunningRecordMap_.emplace(0, appRecord); - userId = 123; - appRunningManager->ExecuteConfigurationTask(info, userId); - - appRecord->mainUid_ = 200001; + appRunningManager->appRunningRecordMap_.emplace(1, nullptr); + info.bandleName = "KeepAliveApplication"; + info.appIndex = 0; + userId = 1; appRunningManager->ExecuteConfigurationTask(info, userId); - appRecord->mainUid_ = 200111; + userId = -1; + appRecord->delayConfiguration_ = nullptr; appRunningManager->ExecuteConfigurationTask(info, userId); - userId = -1; - appRecord->mainUid_ = 200000; - info.bandleName = appRecord->mainBundleName_ = "test.123.456"; - info.appIndex = 0; - appRecord->SetAppIndex(0); - appRecord->curState_ = ApplicationState::APP_STATE_BACKGROUND; appRecord->delayConfiguration_ = std::make_shared(); appRecord->delayConfiguration_->AddItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE, ConfigurationInner::COLOR_MODE_DARK); appRunningManager->ExecuteConfigurationTask(info, userId); - EXPECT_FALSE(appRunningManager->updateConfigurationDelayedMap_[0]); - - appRecord->delayConfiguration_ = nullptr; - appRunningManager->ExecuteConfigurationTask(info, userId); - - info.bandleName = "test.789.0"; - info.appIndex = 1; - appRunningManager->updateConfigurationDelayedMap_[0] = false; - appRecord->curState_ = ApplicationState::APP_STATE_FOREGROUND; - appRunningManager->ExecuteConfigurationTask(info, userId); - EXPECT_FALSE(appRunningManager->updateConfigurationDelayedMap_[0]); + std::string value = appRecord->delayConfiguration_->GetItem(AAFwk::GlobalConfigurationKey::SYSTEM_COLORMODE); + EXPECT_TRUE(value == ConfigurationInner::EMPTY_STRING); } } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file