From 02df64c683f8f9f2beb89bfad669252055cdd560 Mon Sep 17 00:00:00 2001 From: ming-yue-liu1 Date: Wed, 30 Jul 2025 16:33:40 +0800 Subject: [PATCH] test Signed-off-by: ming-yue-liu1 --- .../bundlemgr/include/base_bundle_installer.h | 1 - .../include/bundle_service_constants.h | 1 - .../bundlemgr/src/base_bundle_installer.cpp | 17 ------ .../bms_bundle_data_group_test.cpp | 60 ------------------- 4 files changed, 79 deletions(-) diff --git a/services/bundlemgr/include/base_bundle_installer.h b/services/bundlemgr/include/base_bundle_installer.h index 63c64937e8..5f4da903cd 100644 --- a/services/bundlemgr/include/base_bundle_installer.h +++ b/services/bundlemgr/include/base_bundle_installer.h @@ -852,7 +852,6 @@ private: const InstallParam &installParam, int32_t &uid); void PrintStartWindowIconId(const InnerBundleInfo &info); bool ProcessExtProfile(const InstallParam &installParam); - void SetHybridSpawn(); bool IsBundleCrossAppSharedConfig(const std::unordered_map &newInfos); ErrCode ProcessDynamicIconFileWhenUpdate(const InnerBundleInfo &oldInfo, const std::string &oldPath, const std::string &newPath); diff --git a/services/bundlemgr/include/bundle_service_constants.h b/services/bundlemgr/include/bundle_service_constants.h index c69c826c65..cd9f9d9c75 100644 --- a/services/bundlemgr/include/bundle_service_constants.h +++ b/services/bundlemgr/include/bundle_service_constants.h @@ -184,7 +184,6 @@ constexpr const char* BMS_DATA_PRELOAD = "persist.bms.data.preload"; constexpr const char* IS_SUPPORT_PLUGIN = "const.bms.support_plugin"; constexpr const char* IS_DRIVER_FOR_ALL_USERS = "const.bms.driverForAllUsers"; constexpr const char* ARK_WHITE_LIST = "persist.ark.enable.static.runtime.whitelist"; -constexpr const char* HYBRID_SPAWN_ENABLE = "persist.appspawn.hybridspawn.enable"; //extResource constexpr const char* EXT_RESOURCE_FILE_PATH = "ext_resource"; // hmdfs and sharefs config diff --git a/services/bundlemgr/src/base_bundle_installer.cpp b/services/bundlemgr/src/base_bundle_installer.cpp index 46cbdb2629..8987e76ff3 100644 --- a/services/bundlemgr/src/base_bundle_installer.cpp +++ b/services/bundlemgr/src/base_bundle_installer.cpp @@ -1502,7 +1502,6 @@ ErrCode BaseBundleInstaller::ProcessBundleInstall(const std::vector if (!ProcessExtProfile(installParam)) { LOG_W(BMS_TAG_INSTALLER, "ProcessExtProfile failed"); } - SetHybridSpawn(); LOG_I(BMS_TAG_INSTALLER, "finish install %{public}s", bundleName_.c_str()); UtdHandler::InstallUtdAsync(bundleName_, userId_); return result; @@ -2269,7 +2268,6 @@ ErrCode BaseBundleInstaller::InnerProcessInstallByPreInstallInfo( return ERR_APPEXECFWK_UPDATE_BUNDLE_ERROR; } } - SetHybridSpawn(); UtdHandler::InstallUtdAsync(bundleName, userId_); GenerateNewUserDataGroupInfos(oldInfo); isBundleCrossAppSharedConfig_ = oldInfo.IsBundleCrossAppSharedConfig(); @@ -7839,21 +7837,6 @@ bool BaseBundleInstaller::ProcessExtProfile(const InstallParam &installParam) return true; } -void BaseBundleInstaller::SetHybridSpawn() -{ - InnerBundleInfo info; - bool isExist = false; - if (!GetInnerBundleInfoWithDisable(info, isExist) || !isExist) { - LOG_E(BMS_TAG_INSTALLER, "Get innerBundleInfo failed when set hybrid spawn"); - return; - } - std::string arkTSMode = info.GetApplicationArkTSMode(); - if (arkTSMode == Constants::ARKTS_MODE_STATIC || arkTSMode == Constants::ARKTS_MODE_HYBRID) { - LOG_I(BMS_TAG_INSTALLER, "set persist.bms.data.preload true"); - OHOS::system::SetParameter(ServiceConstants::HYBRID_SPAWN_ENABLE, BMS_TRUE); - } -} - bool BaseBundleInstaller::IsBundleCrossAppSharedConfig(const std::unordered_map &newInfos) { for (const auto &item : newInfos) { diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_group_test/bms_bundle_data_group_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_data_group_test/bms_bundle_data_group_test.cpp index 119fe659b0..1bb77fb268 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_group_test/bms_bundle_data_group_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_data_group_test/bms_bundle_data_group_test.cpp @@ -2103,64 +2103,4 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0026, Function | SmallTest auto result5 = installer.CheckShellCanInstallPreApp(newInfos); EXPECT_EQ(result5, ERR_OK); } - -/** - * @tc.number: SetHybridSpawn_0001 - * @tc.name: test SetHybridSpawn - * @tc.desc: 1.Test SetHybridSpawn -*/ -HWTEST_F(BmsBundleDataGroupTest, SetHybridSpawn_0001, Function | MediumTest | Level1) -{ - BaseBundleInstaller installer; - installer.bundleName_ = "test"; - installer.SetHybridSpawn(); - InnerBundleInfo info; - bool isExist = false; - bool res = installer.GetInnerBundleInfoWithDisable(info, isExist); - EXPECT_TRUE(res); -} - -/** - * @tc.number: SetHybridSpawn_0002 - * @tc.name: test SetHybridSpawn - * @tc.desc: 1.Test SetHybridSpawn -*/ -HWTEST_F(BmsBundleDataGroupTest, SetHybridSpawn_0002, Function | MediumTest | Level1) -{ - BaseBundleInstaller installer; - installer.bundleName_ = "test"; - InnerBundleInfo info; - info.baseApplicationInfo_->bundleName = "test"; - InnerModuleInfo innerModuleInfo; - innerModuleInfo.moduleArkTSMode = Constants::ARKTS_MODE_DYNAMIC; - info.innerModuleInfos_.try_emplace("entry", innerModuleInfo); - auto dataMgr = GetBundleDataMgr(); - ASSERT_NE(dataMgr, nullptr); - dataMgr->bundleInfos_.emplace("test", info); - installer.SetHybridSpawn(); - EXPECT_EQ(info.GetApplicationArkTSMode(), Constants::ARKTS_MODE_DYNAMIC); - dataMgr->bundleInfos_.erase("test"); -} - -/** - * @tc.number: SetHybridSpawn_0003 - * @tc.name: test SetHybridSpawn - * @tc.desc: 1.Test SetHybridSpawn -*/ -HWTEST_F(BmsBundleDataGroupTest, SetHybridSpawn_0003, Function | MediumTest | Level1) -{ - BaseBundleInstaller installer; - installer.bundleName_ = "test"; - InnerBundleInfo info; - info.baseApplicationInfo_->bundleName = "test"; - InnerModuleInfo innerModuleInfo; - innerModuleInfo.moduleArkTSMode = Constants::ARKTS_MODE_STATIC; - info.innerModuleInfos_.try_emplace("entry", innerModuleInfo); - auto dataMgr = GetBundleDataMgr(); - ASSERT_NE(dataMgr, nullptr); - dataMgr->bundleInfos_.emplace("test", info); - installer.SetHybridSpawn(); - EXPECT_EQ(info.GetApplicationArkTSMode(), Constants::ARKTS_MODE_STATIC); - dataMgr->bundleInfos_.erase("test"); -} } // OHOS \ No newline at end of file -- Gitee