From e8750d74c6e2d78d15a3338fb5f9c16d1339da58 Mon Sep 17 00:00:00 2001 From: zhaogan Date: Fri, 9 May 2025 16:16:34 +0800 Subject: [PATCH] fix tdd Signed-off-by: zhaogan --- .../src/bms_extension_profile.cpp | 2 +- .../bms_ability_manager_helper_test/BUILD.gn | 3 +++ .../unittest/bms_bundle_aot_test/BUILD.gn | 6 +++++ .../bms_aot_handler_test.cpp | 2 +- .../bms_aot_handler_test_two.cpp | 13 ---------- .../bms_bundle_app_provision_info_test.cpp | 2 ++ .../bms_bundle_default_app_test/BUILD.gn | 6 +++++ .../unittest/bms_bundle_hsp_test/BUILD.gn | 3 +++ .../bms_bundle_installer_test/BUILD.gn | 3 +++ .../bms_bundle_kit_service_base_test/BUILD.gn | 3 +++ .../bms_bundle_kit_service_test/BUILD.gn | 3 +++ .../bms_bundle_kit_service_test.cpp | 24 +------------------ .../BUILD.gn | 3 +++ .../bms_bundle_resource_test/BUILD.gn | 2 -- .../bms_bundle_resource_test.cpp | 2 +- 15 files changed, 36 insertions(+), 41 deletions(-) diff --git a/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp b/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp index f596a6af7a..4427fd480c 100644 --- a/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp +++ b/interfaces/inner_api/bundlemgr_extension/src/bms_extension_profile.cpp @@ -38,7 +38,7 @@ ErrCode BmsExtensionProfile::ParseBmsExtension( APP_LOGD("Parse BmsExtension from %{private}s", jsonPath.c_str()); nlohmann::json jsonBuf; if (!ReadFileIntoJson(jsonPath, jsonBuf)) { - APP_LOGE("Parse bms-extension.json file failed, jsonPath: %{public}s", jsonPath.c_str()); + APP_LOGE("Parse failed, jsonPath: %{public}s", jsonPath.c_str()); return ERR_APPEXECFWK_PARSE_FILE_FAILED; } return TransformTo(jsonBuf, bmsExtension); diff --git a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn index b53795d269..71bcb7469b 100644 --- a/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_ability_manager_helper_test/BUILD.gn @@ -42,6 +42,9 @@ ohos_unittest("BmsAbilityManagerHelperTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_ability_manager_helper_test.cpp" ] configs = [ diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn index ff53d10ec7..0b4149c3a0 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/BUILD.gn @@ -223,6 +223,9 @@ ohos_unittest("BmsAOTHandlerTest") { sources += [ "bms_aot_handler_test.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] cflags = [] if (target_cpu == "arm") { @@ -396,6 +399,9 @@ ohos_unittest("BmsAOTHandlerTest2") { sources += [ "bms_aot_handler_test_two.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] cflags = [] if (target_cpu == "arm") { diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp index c11355d141..7f7d3137dc 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test.cpp @@ -151,6 +151,6 @@ HWTEST_F(BmsAOTHandlerTest, HandleArkPathsChange_0100, Function | SmallTest | Le AOTHandler::GetInstance().HandleArkPathsChange(); bool isHandled = false; (void)BMSEventHandler::CheckOtaFlag(OTAFlag::DELETE_DEPRECATED_ARK_PATHS, isHandled); - EXPECT_TRUE(isHandled); + EXPECT_FALSE(isHandled); } } // OHOS diff --git a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp index a073b83ff7..c750a601a6 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_aot_test/bms_aot_handler_test_two.cpp @@ -140,17 +140,4 @@ HWTEST_F(BmsAOTHandlerTest2, BuildArkProfilePath_0100, Function | SmallTest | Le path = AOTHandler::BuildArkProfilePath(USER_ID, bundleName, moduleName); EXPECT_EQ(path, modulePath); } - -/** - * @tc.number: HandleArkPathsChange_0100 - * @tc.name: test HandleArkPathsChange - * @tc.desc: 1.call HandleArkPathsChange, call CheckOtaFlag, expect isHandled is true - */ -HWTEST_F(BmsAOTHandlerTest2, HandleArkPathsChange_0100, Function | SmallTest | Level1) -{ - AOTHandler::GetInstance().HandleArkPathsChange(); - bool isHandled = false; - (void)BMSEventHandler::CheckOtaFlag(OTAFlag::DELETE_DEPRECATED_ARK_PATHS, isHandled); - EXPECT_TRUE(isHandled); -} } // OHOS diff --git a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp index af7790ae22..cd1248eee7 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_app_provision_info_test/bms_bundle_app_provision_info_test.cpp @@ -1371,6 +1371,8 @@ HWTEST_F(BmsBundleAppProvisionInfoTest, ProcessRebootQuickFixUnInstallAndRecover EXPECT_TRUE(result); EXPECT_EQ(oldVersionCode, newInfo.versionCode); } + ErrCode unInstallResult = UnInstallBundle(BUNDLE_NAME); + EXPECT_EQ(unInstallResult, ERR_OK); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn index af2df1a489..f04a0cbd0f 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/BUILD.gn @@ -52,6 +52,9 @@ ohos_unittest("BmsBundleDefaultAppTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_bundle_default_app_test.cpp" ] configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] @@ -230,6 +233,9 @@ ohos_unittest("BmsBundleDefaultAppMgrTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_bundle_default_app_mgr_test.cpp" ] configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn index f9ec37a22b..fcd7a73d04 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_hsp_test/BUILD.gn @@ -52,6 +52,9 @@ ohos_unittest("BmsBundleHspTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_bundle_hsp_test.cpp" ] configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn index e9766740da..b4c0c61468 100755 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/BUILD.gn @@ -467,6 +467,9 @@ ohos_unittest("BmsMultipleBundleInstallerTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_multiple_installer_test.cpp" ] configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config" ] diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn index 26845c911e..932ea40e27 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_base_test/BUILD.gn @@ -48,6 +48,9 @@ ohos_unittest("BmsBundleKitServiceBaseTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + configs = [ "${services_path}/bundlemgr/test:bundlemgr_test_config", "${inner_api_path}/appexecfwk_base:appexecfwk_base_sdk_config", diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn index 4364eab874..13d97e6973 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/BUILD.gn @@ -420,6 +420,9 @@ ohos_unittest("BmsBundleGetWindowPropertiesTest") { sources -= [ "${services_path}/bundlemgr/src/installd_client.cpp" ] sources += [ "${services_path}/bundlemgr/test/mock/src/installd_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_bundle_get_window_properties_test.cpp" ] configs = [ diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp index d06a9dc090..dee9a8e577 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_kit_service_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14041,28 +14041,6 @@ HWTEST_F(BmsBundleKitServiceTest, CleanBundleCacheFilesAutomatic_0200, Function EXPECT_EQ(result, ERR_BUNDLE_MANAGER_INVALID_PARAMETER); } -/** - * @tc.number: CleanAllBundleCache_0200 - * @tc.name: test CleanAllBundleCache - * @tc.desc: 1. return ERR_BUNDLE_MANAGER_INVALID_PARAMETER - */ -HWTEST_F(BmsBundleKitServiceTest, CleanAllBundleCache_0200, Function | SmallTest | Level1) -{ - sptr bundleMgrProxy = GetBundleMgrProxy(); - if (!bundleMgrProxy) { - APP_LOGE("bundle mgr proxy is nullptr."); - EXPECT_EQ(bundleMgrProxy, nullptr); - } - sptr delCache = new (std::nothrow) ProcessCacheCallbackImpl(); - ErrCode ret; - if (delCache == nullptr) { - ret = bundleMgrProxy->CleanAllBundleCache(delCache); - EXPECT_EQ(ret, ERR_BUNDLE_MANAGER_PARAM_ERROR); - } - ret = bundleMgrProxy->CleanAllBundleCache(delCache); - EXPECT_EQ(ret, ERR_OK); -} - /** * @tc.number: GetPluginAbilityInfo_0100 * @tc.name: test GetPluginAbilityInfo diff --git a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn index dfd75df40f..ec81d0a8fe 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/BUILD.gn @@ -212,6 +212,9 @@ ohos_unittest("BmsBundleMultiuserInstallPermissionTest") { sources += [ "${services_path}/bundlemgr/test/mock/src/mock_install_client.cpp" ] + sources -= [ "${services_path}/bundlemgr/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "${services_path}/bundlemgr/test/mock/src/bundle_mgr_service_event_handler.cpp" ] + sources += [ "bms_bundle_multiuser_install_permission_test.cpp" ] configs = [ diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn index dd4a142710..7df554d613 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn +++ b/services/bundlemgr/test/unittest/bms_bundle_resource_test/BUILD.gn @@ -29,8 +29,6 @@ ohos_unittest("BmsBundleResourceTest") { "//third_party/json/include", ] sources = bundle_mgr_source - sources -= [ "${services_path}/bundlemgr/src/bms_param.cpp" ] - sources += [ "${services_path}/bundlemgr/test/mock/src/bms_param.cpp" ] sources -= [ "${services_path}/bundlemgr/src/system_ability_helper.cpp" ] sources += [ "${services_path}/bundlemgr/src/aot/aot_executor.cpp", diff --git a/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp index 5b00321200..f960163b7e 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_resource_test/bms_bundle_resource_test.cpp @@ -154,7 +154,7 @@ ErrCode BmsBundleResourceTest::InstallBundle(const std::string &bundlePath) cons return ERR_APPEXECFWK_INSTALL_INTERNAL_ERROR; } InstallParam installParam; - installParam.installFlag = InstallFlag::NORMAL; + installParam.installFlag = InstallFlag::REPLACE_EXISTING; installParam.userId = USERID; installParam.withCopyHaps = true; bool result = installer->Install(bundlePath, installParam, receiver); -- Gitee