diff --git a/interfaces/inner_api/app_manager/include/appmgr/app_mgr_constants.h b/interfaces/inner_api/app_manager/include/appmgr/app_mgr_constants.h index 6778c22e30..a1d4a5bf27 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/app_mgr_constants.h +++ b/interfaces/inner_api/app_manager/include/appmgr/app_mgr_constants.h @@ -23,8 +23,7 @@ const std::string APP_MGR_SERVICE_NAME = "AppMgrService"; } // namespace Constants enum class ApplicationState { - APP_STATE_BEGIN = 0, - APP_STATE_CREATE = APP_STATE_BEGIN, + APP_STATE_CREATE = 0, APP_STATE_READY, APP_STATE_FOREGROUND, APP_STATE_FOCUS, @@ -34,8 +33,7 @@ enum class ApplicationState { }; enum class AbilityState { - ABILITY_STATE_BEGIN = 0, - ABILITY_STATE_CREATE = ABILITY_STATE_BEGIN, + ABILITY_STATE_CREATE = 0, ABILITY_STATE_READY, ABILITY_STATE_FOREGROUND, ABILITY_STATE_FOCUS, diff --git a/interfaces/inner_api/app_manager/include/appmgr/running_process_info.h b/interfaces/inner_api/app_manager/include/appmgr/running_process_info.h index 23eae0756d..14093a2e1b 100644 --- a/interfaces/inner_api/app_manager/include/appmgr/running_process_info.h +++ b/interfaces/inner_api/app_manager/include/appmgr/running_process_info.h @@ -24,8 +24,7 @@ namespace OHOS { namespace AppExecFwk { enum class AppProcessState { - APP_STATE_BEGIN = 0, - APP_STATE_CREATE = APP_STATE_BEGIN, + APP_STATE_CREATE = 0, APP_STATE_READY, APP_STATE_FOREGROUND, APP_STATE_FOCUS, diff --git a/services/appmgr/include/ability_running_record.h b/services/appmgr/include/ability_running_record.h index 191b3735d2..ee5116e7b0 100644 --- a/services/appmgr/include/ability_running_record.h +++ b/services/appmgr/include/ability_running_record.h @@ -183,7 +183,7 @@ private: int32_t connectionState_ = 0; int64_t eventId_ = 0; bool isTerminating_ = false; - AbilityState state_ = AbilityState::ABILITY_STATE_BEGIN; + AbilityState state_ = AbilityState::ABILITY_STATE_CREATE; bool isFocused_ = false; std::shared_ptr info_; std::shared_ptr want_ = nullptr; diff --git a/test/fuzztest/appmgrserviceinnerfirst_fuzzer/appmgrserviceinnerfirst_fuzzer.cpp b/test/fuzztest/appmgrserviceinnerfirst_fuzzer/appmgrserviceinnerfirst_fuzzer.cpp index 1006e9a7e0..d6bf221d0a 100644 --- a/test/fuzztest/appmgrserviceinnerfirst_fuzzer/appmgrserviceinnerfirst_fuzzer.cpp +++ b/test/fuzztest/appmgrserviceinnerfirst_fuzzer/appmgrserviceinnerfirst_fuzzer.cpp @@ -90,11 +90,11 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appMgrServiceInner->GetAppRunningRecordByAbilityToken(token); appMgrServiceInner->AbilityTerminated(token); appMgrServiceInner->GetAppRunningRecordByAppRecordId(recordId); - ApplicationState state = ApplicationState::APP_STATE_BEGIN; + ApplicationState state = ApplicationState::APP_STATE_CREATE; bool needNotifyApp = *data % ENABLE; appMgrServiceInner->OnAppStateChanged(appRecord, state, needNotifyApp); std::shared_ptr ability; - AppExecFwk::AbilityState abilityState = AppExecFwk::AbilityState::ABILITY_STATE_BEGIN; + AppExecFwk::AbilityState abilityState = AppExecFwk::AbilityState::ABILITY_STATE_CREATE; appMgrServiceInner->OnAbilityStateChanged(ability, abilityState); std::string appName(data, size); uint32_t startFlags = GetU32Data(data); diff --git a/test/fuzztest/apprunningrecordfirst_fuzzer/apprunningrecordfirst_fuzzer.cpp b/test/fuzztest/apprunningrecordfirst_fuzzer/apprunningrecordfirst_fuzzer.cpp index 8fd3e711b5..b51d02ae62 100755 --- a/test/fuzztest/apprunningrecordfirst_fuzzer/apprunningrecordfirst_fuzzer.cpp +++ b/test/fuzztest/apprunningrecordfirst_fuzzer/apprunningrecordfirst_fuzzer.cpp @@ -96,7 +96,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appRecord->SetJointUserId(jointUserId); int32_t uid = static_cast(GetU32Data(data)); appRecord->SetUid(uid); - ApplicationState state = ApplicationState::APP_STATE_BEGIN; + ApplicationState state = ApplicationState::APP_STATE_CREATE; appRecord->SetState(state); std::weak_ptr inner; appRecord->SetAppMgrServiceInner(inner); diff --git a/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp b/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp index ac1522e319..e86ff1366f 100755 --- a/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp +++ b/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp @@ -97,7 +97,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) int32_t level = static_cast(GetU32Data(data)); appRecord->ScheduleMemoryLevel(level); appRecord->LowMemoryWarning(); - AppExecFwk::AbilityState abilityState = AppExecFwk::AbilityState::ABILITY_STATE_BEGIN; + AppExecFwk::AbilityState abilityState = AppExecFwk::AbilityState::ABILITY_STATE_CREATE; bool isAbility = *data % ENABLE; appRecord->StateChangedNotifyObserver(ability, static_cast(abilityState), isAbility); bool isFocus = *data % ENABLE; diff --git a/test/fuzztest/updateabilitystate_fuzzer/updateabilitystate_fuzzer.cpp b/test/fuzztest/updateabilitystate_fuzzer/updateabilitystate_fuzzer.cpp index 7a35d2de8d..82d11c79ab 100755 --- a/test/fuzztest/updateabilitystate_fuzzer/updateabilitystate_fuzzer.cpp +++ b/test/fuzztest/updateabilitystate_fuzzer/updateabilitystate_fuzzer.cpp @@ -58,7 +58,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) std::cout << "Get ability token failed." << std::endl; return false; } - AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_BEGIN; + AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_CREATE; if (appMgrClient->UpdateAbilityState(token, state) != AppMgrResultCode::RESULT_OK) { return false; diff --git a/test/mock/frameworks_kits_appkit_test/include/mock_app_mgr_service.h b/test/mock/frameworks_kits_appkit_test/include/mock_app_mgr_service.h index 357784320d..db42a7cc16 100644 --- a/test/mock/frameworks_kits_appkit_test/include/mock_app_mgr_service.h +++ b/test/mock/frameworks_kits_appkit_test/include/mock_app_mgr_service.h @@ -166,7 +166,7 @@ public: } AppProcessData processData; processData.pid = 1; - processData.appState = ApplicationState::APP_STATE_BEGIN; + processData.appState = ApplicationState::APP_STATE_CREATE; callback_->OnAppStateChanged(processData); } @@ -175,7 +175,7 @@ public: if (!callback_) { return; } - AbilityState st = AbilityState::ABILITY_STATE_BEGIN; + AbilityState st = AbilityState::ABILITY_STATE_CREATE; callback_->OnAbilityRequestDone(token, st); } diff --git a/test/mock/services_appmgr_test/include/mock_app_mgr_service.h b/test/mock/services_appmgr_test/include/mock_app_mgr_service.h index 165937e635..b9ed37a16d 100644 --- a/test/mock/services_appmgr_test/include/mock_app_mgr_service.h +++ b/test/mock/services_appmgr_test/include/mock_app_mgr_service.h @@ -126,7 +126,7 @@ public: } AppProcessData processData; processData.pid = 1; - processData.appState = ApplicationState::APP_STATE_BEGIN; + processData.appState = ApplicationState::APP_STATE_CREATE; callback_->OnAppStateChanged(processData); } @@ -135,7 +135,7 @@ public: if (!callback_) { return; } - AbilityState st = AbilityState::ABILITY_STATE_BEGIN; + AbilityState st = AbilityState::ABILITY_STATE_CREATE; callback_->OnAbilityRequestDone(token, st); } diff --git a/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp b/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp index f1f37d94d8..e9131135be 100644 --- a/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp +++ b/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp @@ -279,7 +279,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, AddAbilityRunningRecord_002, TestSiz EXPECT_TRUE(caseAbilityRunningRecord == nullptr); caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); - EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_BEGIN); + EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); } HILOG_INFO("AddAbilityRunningRecord_002 end"); } @@ -353,7 +353,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, UpdateAbilityRunningRecord_002, Test caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); appRunningRecord->UpdateAbilityState(token, AbilityState::ABILITY_STATE_END); - EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_BEGIN); + EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); } HILOG_INFO("UpdateAbilityRunningRecord_002 end"); } diff --git a/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp b/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp index eaa5119c37..90bd207420 100644 --- a/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp +++ b/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp @@ -199,7 +199,7 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_003, TestSize.Level3) mockMockAppMgr->Wait(); sptr token = new MockAbilityToken(); - AbilityState abilityState = AbilityState::ABILITY_STATE_BEGIN; + AbilityState abilityState = AbilityState::ABILITY_STATE_CREATE; for (int i = 0; i < COUNT; i++) { EXPECT_CALL(*mockAppMgrServiceInner, UpdateAbilityState(_, _)) diff --git a/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp b/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp index b75bd30d06..e30286cd03 100644 --- a/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp +++ b/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp @@ -1560,8 +1560,6 @@ HWTEST_F(AmsAppLifeCycleTest, AbilityStateChanged001, TestSize.Level1) EXPECT_NE(ability, nullptr); serviceInner_->RegisterAppStateCallback(callback); EXPECT_CALL(*mockCallback, OnAbilityRequestDone(_, _)).Times(1); - serviceInner_->OnAbilityStateChanged(ability, AbilityState::ABILITY_STATE_BEGIN); - EXPECT_CALL(*mockCallback, OnAbilityRequestDone(_, _)).Times(1); serviceInner_->OnAbilityStateChanged(ability, AbilityState::ABILITY_STATE_CREATE); EXPECT_CALL(*mockCallback, OnAbilityRequestDone(_, _)).Times(1); serviceInner_->OnAbilityStateChanged(ability, AbilityState::ABILITY_STATE_READY); @@ -1594,8 +1592,6 @@ HWTEST_F(AmsAppLifeCycleTest, AppStateChanged001, TestSize.Level1) EXPECT_NE(appRecord, nullptr); serviceInner_->RegisterAppStateCallback(callback); EXPECT_CALL(*mockCallback, OnAppStateChanged(_)).Times(1); - serviceInner_->OnAppStateChanged(appRecord, ApplicationState::APP_STATE_BEGIN); - EXPECT_CALL(*mockCallback, OnAppStateChanged(_)).Times(1); serviceInner_->OnAppStateChanged(appRecord, ApplicationState::APP_STATE_CREATE); EXPECT_CALL(*mockCallback, OnAppStateChanged(_)).Times(1); serviceInner_->OnAppStateChanged(appRecord, ApplicationState::APP_STATE_READY); diff --git a/test/unittest/ams_app_mgr_client_test/ams_app_mgr_client_test.cpp b/test/unittest/ams_app_mgr_client_test/ams_app_mgr_client_test.cpp index 27945ea90d..bf87b7b08f 100644 --- a/test/unittest/ams_app_mgr_client_test/ams_app_mgr_client_test.cpp +++ b/test/unittest/ams_app_mgr_client_test/ams_app_mgr_client_test.cpp @@ -211,7 +211,7 @@ HWTEST_F(AmsAppMgrClientTest, AppMgrClient_005, TestSize.Level1) .Times(1) .WillOnce(Return(amsMgrScheduler)); - AbilityState state = AbilityState::ABILITY_STATE_BEGIN; + AbilityState state = AbilityState::ABILITY_STATE_CREATE; EXPECT_EQ(AppMgrResultCode::RESULT_OK, client_->UpdateAbilityState(token_, state)); HILOG_INFO("ams_app_mgr_client_test_005 end"); } @@ -227,7 +227,7 @@ HWTEST_F(AmsAppMgrClientTest, AppMgrClient_005, TestSize.Level1) HWTEST_F(AmsAppMgrClientTest, AppMgrClient_006, TestSize.Level1) { HILOG_INFO("ams_app_mgr_client_test_006 start"); - AbilityState state = AbilityState::ABILITY_STATE_BEGIN; + AbilityState state = AbilityState::ABILITY_STATE_CREATE; EXPECT_EQ(AppMgrResultCode::ERROR_SERVICE_NOT_CONNECTED, client_->UpdateAbilityState(token_, state)); HILOG_INFO("ams_app_mgr_client_test_006 end"); } diff --git a/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp b/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp index ff0ce8b394..1c705f6e97 100644 --- a/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp +++ b/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp @@ -607,7 +607,7 @@ HWTEST_F(AmsAppRunningRecordTest, AddModules_001, TestSize.Level1) HWTEST_F(AmsAppRunningRecordTest, UpdateAppRunningRecord_001, TestSize.Level1) { auto record = GetTestAppRunningRecord(); - for (ApplicationState state = ApplicationState::APP_STATE_BEGIN; state < ApplicationState::APP_STATE_END; + for (ApplicationState state = ApplicationState::APP_STATE_CREATE; state < ApplicationState::APP_STATE_END; state = (ApplicationState)(static_cast::type>(state) + 1)) { record->SetState(state); EXPECT_EQ(record->GetState(), state); diff --git a/test/unittest/ams_app_state_callback_test/ams_app_state_callback_test.cpp b/test/unittest/ams_app_state_callback_test/ams_app_state_callback_test.cpp index 06f8e958e9..1583dfafd5 100644 --- a/test/unittest/ams_app_state_callback_test/ams_app_state_callback_test.cpp +++ b/test/unittest/ams_app_state_callback_test/ams_app_state_callback_test.cpp @@ -101,7 +101,7 @@ HWTEST_F(AmsAppStateCallBackTest, OnRemoteRequest_002, TestSize.Level1) HWTEST_F(AmsAppStateCallBackTest, OnAbilityRequestDone_001, TestSize.Level1) { sptr token = nullptr; - AbilityState state = AbilityState::ABILITY_STATE_BEGIN; + AbilityState state = AbilityState::ABILITY_STATE_CREATE; sptr host(new AppStateCallbackHost()); host->OnAbilityRequestDone(token, state); diff --git a/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp b/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp index 7d63777ffb..e00697a3b0 100644 --- a/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp +++ b/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp @@ -176,7 +176,7 @@ HWTEST_F(AmsMgrSchedulerTest, AmsMgrScheduler_003, TestSize.Level1) std::make_unique(mockAppMgrServiceInner, amsEventHandler); sptr token = new MockAbilityToken(); - AbilityState abilityState = AbilityState::ABILITY_STATE_BEGIN; + AbilityState abilityState = AbilityState::ABILITY_STATE_CREATE; EXPECT_CALL(*mockAppMgrServiceInner, UpdateAbilityState(_, _)) .WillOnce(InvokeWithoutArgs(mockAppMgrServiceInner.get(), &MockAppMgrServiceInner::Post)); diff --git a/test/unittest/app_scheduler_test/app_scheduler_test.cpp b/test/unittest/app_scheduler_test/app_scheduler_test.cpp index 71d6382ee7..475dfc2664 100644 --- a/test/unittest/app_scheduler_test/app_scheduler_test.cpp +++ b/test/unittest/app_scheduler_test/app_scheduler_test.cpp @@ -431,7 +431,7 @@ HWTEST_F(AppSchedulerTest, AppScheduler_oprator_012, TestSize.Level1) EXPECT_EQ(AppAbilityState::ABILITY_STATE_UNDEFINED, DelayedSingleton::GetInstance()->ConvertToAppAbilityState( - static_cast(AppExecFwk::AbilityState::ABILITY_STATE_BEGIN))); + static_cast(AppExecFwk::AbilityState::ABILITY_STATE_CREATE))); } /* @@ -576,7 +576,7 @@ HWTEST_F(AppSchedulerTest, AppScheduler_UpdateAbilityState_001, TestSize.Level1) { DelayedSingleton::GetInstance()->appMgrClient_ = std::make_unique(); sptr token = nullptr; - AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_BEGIN; + AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_CREATE; DelayedSingleton::GetInstance()->UpdateAbilityState(token, state); } @@ -624,7 +624,7 @@ HWTEST_F(AppSchedulerTest, AppScheduler_KillProcessesByUserId_001, TestSize.Leve HWTEST_F(AppSchedulerTest, AppScheduler_OnAbilityRequestDone_001, TestSize.Level1) { sptr token = nullptr; - AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_BEGIN; + AppExecFwk::AbilityState state = AppExecFwk::AbilityState::ABILITY_STATE_CREATE; DelayedSingleton::GetInstance()->callback_ = appStateMock_; DelayedSingleton::GetInstance()->OnAbilityRequestDone(token, state); }