diff --git a/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp b/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp index a6c7632e4905e53f78c6e62a626ffab8ec57387d..0a3300c9cad8d5758efbab46a0ab4113ddede1fe 100644 --- a/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp +++ b/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp @@ -40,6 +40,7 @@ using OHOS::AppExecFwk::AbilityType; using OHOS::AppExecFwk::ExtensionAbilityType; constexpr char DEVELOPER_MODE_STATE[] = "const.security.developermode.state"; +constexpr char PRODUCT_APPBOOT_SETTING_ENABLED[] = "const.product.appboot.setting.enabled"; constexpr const char* DEBUG_APP = "debugApp"; constexpr const char* START_ABILITY_TYPE = "ABILITY_INNER_START_WITH_ACCOUNT"; constexpr int32_t ONE = 1; @@ -1004,15 +1005,17 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, UpdateKioskApplicationList_Success, T IPCSkeleton::SetCallingUid(BASE_USER_RANGE); IPCSkeleton::SetCallingTokenID(ONE); auto abilityManagerService = std::make_shared(); - abilityManagerService->Init(); std::vector bundleNames; bundleNames.emplace_back("com.test.demo"); bundleNames.emplace_back("com.test.demo1"); bundleNames.emplace_back("com.test.demo2"); MyFlag::flag_ = true; - auto result = - abilityManagerService->UpdateKioskApplicationList(bundleNames); - ASSERT_EQ(result, ERR_OK); + auto result = abilityManagerService->UpdateKioskApplicationList(bundleNames); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_OK); + } } /* @@ -1025,15 +1028,17 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, UpdateKioskApplicationList_Fail, Test IPCSkeleton::SetCallingUid(BASE_USER_RANGE); IPCSkeleton::SetCallingTokenID(ONE); auto abilityManagerService = std::make_shared(); - abilityManagerService->Init(); std::vector bundleNames; bundleNames.emplace_back("com.test.demo"); bundleNames.emplace_back("com.test.demo1"); bundleNames.emplace_back("com.test.demo2"); MyFlag::flag_ = false; - auto result = - abilityManagerService->UpdateKioskApplicationList(bundleNames); - ASSERT_EQ(result, CHECK_PERMISSION_FAILED); + auto result = abilityManagerService->UpdateKioskApplicationList(bundleNames); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, CHECK_PERMISSION_FAILED); + } } /* @@ -1046,15 +1051,17 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, EnterKioskMode_Fail, TestSize.Level1) IPCSkeleton::SetCallingUid(BASE_USER_RANGE); IPCSkeleton::SetCallingTokenID(ONE); auto abilityManagerService = std::make_shared(); - abilityManagerService->Init(); std::vector bundleNames; bundleNames.emplace_back("com.test.demo"); MyFlag::flag_ = true; auto result = abilityManagerService->UpdateKioskApplicationList(bundleNames); auto callerToken = MockToken(AbilityType::PAGE); - result = - abilityManagerService->EnterKioskMode(callerToken); - ASSERT_EQ(result, ERR_APP_NOT_IN_FOCUS); + result = abilityManagerService->EnterKioskMode(callerToken); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_APP_NOT_IN_FOCUS); + } } /* @@ -1067,10 +1074,13 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, ExitKioskMode_Fail, TestSize.Level1) IPCSkeleton::SetCallingUid(BASE_USER_RANGE); IPCSkeleton::SetCallingTokenID(ONE); auto abilityManagerService = std::make_shared(); - abilityManagerService->Init(); auto callerToken = MockToken(AbilityType::PAGE); auto result = abilityManagerService->ExitKioskMode(callerToken); - ASSERT_EQ(result, ERR_KIOSK_MODE_NOT_IN_WHITELIST); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_KIOSK_MODE_NOT_IN_WHITELIST); + } } /* @@ -1083,11 +1093,14 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, GetKioskStatus, TestSize.Level1) { IPCSkeleton::SetCallingUid(BASE_USER_RANGE); IPCSkeleton::SetCallingTokenID(ONE); auto abilityManagerService = std::make_shared(); - abilityManagerService->Init(); KioskStatus kioskStatus; MyFlag::flag_ = true; auto result = abilityManagerService->GetKioskStatus(kioskStatus); - ASSERT_EQ(result, ERR_OK); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_OK); + } } /* @@ -1105,7 +1118,11 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_UpdateKioskApplicationLi bundleNames.emplace_back("com.test.demo2"); bundleNames.emplace_back("com.test.demo3"); auto result = KioskManager::GetInstance().UpdateKioskApplicationList(bundleNames); - ASSERT_EQ(result, ERR_OK); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_OK); + } } /* @@ -1117,7 +1134,11 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_UpdateKioskApplicationLi HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_EnterKioskMode_Fail_01, TestSize.Level1) { auto callerToken = MockToken(AbilityType::PAGE); auto result = KioskManager::GetInstance().EnterKioskMode(callerToken); - ASSERT_EQ(result, ERR_APP_NOT_IN_FOCUS); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_APP_NOT_IN_FOCUS); + } } /* @@ -1129,7 +1150,11 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_EnterKioskMode_Fail_01, HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_ExitKioskMode_Fail_01, TestSize.Level1) { auto callerToken = MockToken(AbilityType::PAGE); auto result = KioskManager::GetInstance().ExitKioskMode(callerToken); - ASSERT_EQ(result, ERR_KIOSK_MODE_NOT_IN_WHITELIST); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_KIOSK_MODE_NOT_IN_WHITELIST); + } } /* @@ -1144,7 +1169,11 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, KioskManager_GetKioskStatus_Success, MyFlag::flag_ = true; KioskStatus kioskStatus; auto result = KioskManager::GetInstance().GetKioskStatus(kioskStatus); - ASSERT_EQ(result, ERR_OK); + if (!system::GetBoolParameter(PRODUCT_APPBOOT_SETTING_ENABLED, false)) { + ASSERT_EQ(result, ERR_NOT_SUPPORTED_PRODUCT_TYPE); + } else { + ASSERT_EQ(result, ERR_OK); + } }