From 74c7779f98da636f962e823f14f396781d10068c Mon Sep 17 00:00:00 2001 From: lyq Date: Wed, 27 Aug 2025 10:54:58 +0800 Subject: [PATCH] Correct false use cases Signed-off-by: lyq Change-Id: I9a2727ea4266acefbc7209d6191dc8b15f61a5f0 --- .vscode/settings.json | 68 ++++++++++++++++ .../include/appexecfwk_errors.h | 1 - .../bundle_resource_host_test.cpp | 81 +++++-------------- ...bms_bundle_clone_app_bundle_logic_test.cpp | 5 -- .../bms_bundle_clone_app_ipc_test.cpp | 81 +++---------------- .../bms_bundle_data_group_test.cpp | 10 +-- .../bms_bundle_data_mgr_nullptr_test.cpp | 8 +- .../bms_bundle_data_storage_database_test.cpp | 4 +- .../bms_bundle_default_app_test.cpp | 2 +- .../bms_bundle_exception_handler_test.cpp | 1 - .../bms_bundle_free_install_test.cpp | 1 - .../bms_bundle_installer_test.cpp | 2 +- .../bms_bundle_installers_test.cpp | 56 ++++--------- .../bms_bundle_data_mgr_test.cpp | 2 +- .../bms_bundle_manager_test.cpp | 4 +- .../bms_bundle_manager_test_three.cpp | 8 +- ...ndle_multiuser_install_permission_test.cpp | 16 +--- .../bms_bundle_overlay_checker_test.cpp | 12 +-- .../bms_bundle_permission_false_test.cpp | 1 - .../bms_bundle_permission_system_app_test.cpp | 1 - .../bms_bundle_quick_fix_mgr_rdb_test.cpp | 8 -- .../bms_bundle_quick_fix_test.cpp | 5 +- .../bms_bundle_resource_test.cpp | 5 +- .../bms_data_mgr_test/bms_data_mgr_test.cpp | 4 +- .../bms_extend_resource_manager_test.cpp | 8 +- .../bms_install_daemon_host_impl_test.cpp | 11 ++- .../bms_service_startup_test.cpp | 28 ++----- .../acts_bms_kit_system_test.cpp | 10 +-- 28 files changed, 168 insertions(+), 275 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..a71ce1a00f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,68 @@ +{ + "files.associations": { + "string": "cpp", + "regex": "cpp", + "functional": "cpp", + "any": "cpp", + "array": "cpp", + "atomic": "cpp", + "bit": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "charconv": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "ostream": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeinfo": "cpp" + } +} \ No newline at end of file diff --git a/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h b/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h index 71232db2d1..416840f39f 100644 --- a/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h +++ b/interfaces/inner_api/appexecfwk_base/include/appexecfwk_errors.h @@ -589,7 +589,6 @@ enum { ERR_APPEXECFWK_DB_CONFIG_CHANGED = 8522335, ERR_APPEXECFWK_DB_CAPABILITY_NOT_SUPPORT = 8522336, - // CODE SIGNATURE ERR ERR_BUNDLEMANAGER_INSTALL_CODE_SIGNATURE_PARAM_INVALID = 8522350, ERR_BUNDLEMANAGER_INSTALL_CODE_SIGNATURE_FILE_PATH_INVALID = 8522351, diff --git a/interfaces/inner_api/test/unittest/bundle_resource_host_test/bundle_resource_host_test.cpp b/interfaces/inner_api/test/unittest/bundle_resource_host_test/bundle_resource_host_test.cpp index c9d3ae8c07..63a3926a11 100644 --- a/interfaces/inner_api/test/unittest/bundle_resource_host_test/bundle_resource_host_test.cpp +++ b/interfaces/inner_api/test/unittest/bundle_resource_host_test/bundle_resource_host_test.cpp @@ -550,8 +550,10 @@ HWTEST_F(BundleResourceHostTest, ReadFromParcel_0001, Function | SmallTest | Lev HWTEST_F(BundleResourceHostTest, Unmarshalling_0001, Function | SmallTest | Level1) { AbilityInfo localAbilityInfo; + std::string prefix = "localPrefix"; + int fd = 2; + localAbilityInfo.Dump(prefix, fd); Parcel parcel{}; - auto ret = localAbilityInfo.Unmarshalling(parcel); EXPECT_EQ(ret, nullptr); } @@ -562,31 +564,14 @@ HWTEST_F(BundleResourceHostTest, Unmarshalling_0001, Function | SmallTest | Leve * @tc.desc: test Marshalling */ HWTEST_F(BundleResourceHostTest, Marshalling_0001, Function | SmallTest | Level1) -{ - AbilityInfo localAbilityInfo; - Parcel parcel{}; - - auto ret = localAbilityInfo.Marshalling(parcel); - EXPECT_TRUE(ret); -} - -/** - * @tc.number: Dump_0001 - * @tc.name: Dump_0001 - * @tc.desc: test Dump - */ -HWTEST_F(BundleResourceHostTest, Dump_0001, Function | SmallTest | Level1) { AbilityInfo localAbilityInfo; std::string prefix = "localPrefix"; int fd = -1; - localAbilityInfo.Dump(prefix, fd); - EXPECT_EQ(fd, -1); - - fd = 2; - localAbilityInfo.Dump(prefix, fd); - EXPECT_EQ(prefix, "localPrefix"); + Parcel parcel{}; + auto ret = localAbilityInfo.Marshalling(parcel); + EXPECT_TRUE(ret); } /** @@ -892,8 +877,10 @@ HWTEST_F(BundleResourceHostTest, ApplicationInfo_ReadFromParcel_0001, Function | HWTEST_F(BundleResourceHostTest, ApplicationInfo_Unmarshalling_0001, Function | SmallTest | Level1) { ApplicationInfo localMetadata; + std::string prefix = "localPrefix"; + int fd = 2; + localMetadata.Dump(prefix, fd); Parcel parcel {}; - auto ret = localMetadata.Unmarshalling(parcel); EXPECT_EQ(ret, nullptr); } @@ -906,31 +893,14 @@ HWTEST_F(BundleResourceHostTest, ApplicationInfo_Unmarshalling_0001, Function | HWTEST_F(BundleResourceHostTest, ApplicationInfo_Marshalling_0001, Function | SmallTest | Level1) { ApplicationInfo localApplicationInfo; + std::string prefix = "localPrefix"; + int fd = -1; + localApplicationInfo.Dump(prefix, fd); Parcel parcel {}; - auto ret = localApplicationInfo.Marshalling(parcel); EXPECT_TRUE(ret); } -/** - * @tc.number: ApplicationInfo_Dump_0001 - * @tc.name: ApplicationInfo_Dump_0001 - * @tc.desc: test Dump - */ -HWTEST_F(BundleResourceHostTest, ApplicationInfo_Dump_0001, Function | SmallTest | Level1) -{ - ApplicationInfo localMetadata; - std::string prefix = "localPrefix"; - int fd = -1; - - localMetadata.Dump(prefix, fd); - EXPECT_EQ(fd, -1); - - fd = 2; - localMetadata.Dump(prefix, fd); - EXPECT_EQ(prefix, "localPrefix"); -} - /** * @tc.number: ApplicationInfo_ConvertToCompatibleApplicationInfo_0001 * @tc.name: ApplicationInfo_ConvertToCompatibleApplicationInfo_0001 @@ -1108,8 +1078,10 @@ HWTEST_F(BundleResourceHostTest, BundleUserInfo_ReadFromParcel_0001, Function | HWTEST_F(BundleResourceHostTest, BundleUserInfo_Unmarshalling_0001, Function | SmallTest | Level1) { BundleUserInfo localBundleUserInfo; + std::string prefix = "loclaPrefix"; + int fd = 2; + localBundleUserInfo.Dump(prefix, fd); Parcel parcel {}; - auto ret = localBundleUserInfo.Unmarshalling(parcel); EXPECT_EQ(ret, nullptr); } @@ -1120,31 +1092,14 @@ HWTEST_F(BundleResourceHostTest, BundleUserInfo_Unmarshalling_0001, Function | S * @tc.desc: test Marshalling */ HWTEST_F(BundleResourceHostTest, BundleUserInfo_Marshalling_0001, Function | SmallTest | Level1) -{ - BundleUserInfo localBundleUserInfo; - Parcel parcel {}; - - auto ret = localBundleUserInfo.Marshalling(parcel); - EXPECT_TRUE(ret); -} - -/** - * @tc.number: BundleUserInfo_Dump_0001 - * @tc.name: BundleUserInfo_Dump_0001 - * @tc.desc: test Dump - */ -HWTEST_F(BundleResourceHostTest, BundleUserInfo_Dump_0001, Function | SmallTest | Level1) { BundleUserInfo localBundleUserInfo; std::string prefix = "loclaPrefix"; int fd = -1; - - localBundleUserInfo.Dump(prefix, fd); - EXPECT_EQ(fd, -1); - - fd = 2; localBundleUserInfo.Dump(prefix, fd); - EXPECT_EQ(prefix, "loclaPrefix"); + Parcel parcel {}; + auto ret = localBundleUserInfo.Marshalling(parcel); + EXPECT_TRUE(ret); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_bundle_logic_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_bundle_logic_test.cpp index 6e28a6e464..c135c8d0f3 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_bundle_logic_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_bundle_logic_test.cpp @@ -422,7 +422,6 @@ HWTEST_F(BmsBundleCloneAppBundleLogicTest, VerifyAndAckCloneAppIndex_0002, Funct int32_t appIndex = 2; auto res = innerBundleInfo.VerifyAndAckCloneAppIndex(userId, appIndex); EXPECT_EQ(res, ERR_OK); - EXPECT_EQ(appIndex, 2); InnerBundleCloneInfo cloneInfo2; cloneInfo2.userId = userId; cloneInfo2.appIndex = appIndex; @@ -433,7 +432,6 @@ HWTEST_F(BmsBundleCloneAppBundleLogicTest, VerifyAndAckCloneAppIndex_0002, Funct int32_t appIndex = 1; auto res = innerBundleInfo.VerifyAndAckCloneAppIndex(userId, appIndex); EXPECT_EQ(res, ERR_OK); - EXPECT_EQ(appIndex, 1); InnerBundleCloneInfo cloneInfo1; cloneInfo1.userId = userId; cloneInfo1.appIndex = appIndex; @@ -444,7 +442,6 @@ HWTEST_F(BmsBundleCloneAppBundleLogicTest, VerifyAndAckCloneAppIndex_0002, Funct int32_t appIndex = 3; auto res = innerBundleInfo.VerifyAndAckCloneAppIndex(userId, appIndex); EXPECT_EQ(res, ERR_OK); - EXPECT_EQ(appIndex, 3); } } @@ -500,7 +497,6 @@ HWTEST_F(BmsBundleCloneAppBundleLogicTest, VerifyAndAckCloneAppIndex_0004, Funct int32_t appIndex = 2; auto res = innerBundleInfo.VerifyAndAckCloneAppIndex(userId, appIndex); EXPECT_EQ(res, ERR_OK); - EXPECT_EQ(appIndex, 2); InnerBundleCloneInfo cloneInfo2; cloneInfo2.userId = userId; @@ -535,7 +531,6 @@ HWTEST_F(BmsBundleCloneAppBundleLogicTest, VerifyAndAckCloneAppIndex_0005, Funct int32_t appIndex = 3; auto res = innerBundleInfo.VerifyAndAckCloneAppIndex(userId, appIndex); EXPECT_EQ(res, ERR_OK); - EXPECT_EQ(appIndex, 3); InnerBundleCloneInfo cloneInfo3; cloneInfo3.userId = userId; diff --git a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_ipc_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_ipc_test.cpp index 0738cd98b4..f78f02f862 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_ipc_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_clone_app_test/bms_bundle_clone_app_ipc_test.cpp @@ -113,11 +113,7 @@ sptr BmsBundleCloneAppIPCTest::GetInstallerProxy() HWTEST_F(BmsBundleCloneAppIPCTest, InstallCloneAppTest003_AppIndexNotValid, Function | SmallTest | Level0) { sptr installerProxy = GetInstallerProxy(); - EXPECT_NE(installerProxy, nullptr); - if (!installerProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(installerProxy, nullptr); const std::string bundleName = "com.example.myapplication"; const int32_t userId = 100; int32_t appIndex = 0; @@ -128,11 +124,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, InstallCloneAppTest003_AppIndexNotValid, Func HWTEST_F(BmsBundleCloneAppIPCTest, InstallCloneAppTest003_BundleNameEmpty, Function | SmallTest | Level0) { sptr installerProxy = GetInstallerProxy(); - EXPECT_NE(installerProxy, nullptr); - if (!installerProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(installerProxy, nullptr); const std::string bundleName = ""; const int32_t userId = 100; int32_t appIndex = 0; @@ -143,12 +135,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, InstallCloneAppTest003_BundleNameEmpty, Funct HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest001_UserNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } - + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const std::string abilityName = "MainAbility"; const int32_t userId = 200; @@ -167,12 +154,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest001_UserNotFound, Fun HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest002_AppNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } - + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.appnotfound"; const std::string abilityName = "MainAbility"; const int32_t userId = 100; @@ -191,12 +173,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest002_AppNotFound, Func HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest003_AppIndexNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } - + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.notfoundapp"; const std::string abilityName = "MainAbility"; const int32_t userId = 100; @@ -215,11 +192,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, QueryCloneAppAbilityTest003_AppIndexNotFound, HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest001_AppNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.appnotfound"; const int32_t userId = 100; int32_t appIndex = 1; @@ -231,11 +204,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest001_AppNotFound, Functi HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest002_UserNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const int32_t userId = 201; int32_t appIndex = 1; @@ -247,11 +216,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest002_UserNotFound, Funct HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest003_AppIndexNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const int32_t userId = 100; int32_t appIndex = 10; @@ -264,11 +229,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoTest003_AppIndexNotFound, F HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest001_AppNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.appnotfound"; const int32_t userId = 100; int32_t appIndex = 1; @@ -283,11 +244,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest001_AppNotFound, Fun HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest002_UserNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const int32_t userId = 200; int32_t appIndex = 1; @@ -302,11 +259,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest002_UserNotFound, Fu HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest003_AppIndexNotFound, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const int32_t userId = 100; int32_t appIndex = 10; @@ -322,11 +275,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, GetCloneBundleInfoExtTest003_AppIndexNotFound HWTEST_F(BmsBundleCloneAppIPCTest, UninstallCloneAppTest001_AppNotExist, Function | SmallTest | Level0) { sptr installerProxy = GetInstallerProxy(); - EXPECT_NE(installerProxy, nullptr); - if (!installerProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(installerProxy, nullptr); const std::string bundleName = ""; const int32_t userId = 100; int32_t appIndex = 1; @@ -338,11 +287,7 @@ HWTEST_F(BmsBundleCloneAppIPCTest, UninstallCloneAppTest001_AppNotExist, Functio HWTEST_F(BmsBundleCloneAppIPCTest, QueryExtensionAbility_001, Function | SmallTest | Level0) { sptr bundleMgrProxy = GetBundleMgrProxy(); - EXPECT_NE(bundleMgrProxy, nullptr); - if (!bundleMgrProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_NE(bundleMgrProxy, nullptr); const std::string abilityName = "MainAbility"; const std::string bundleName = "ohos.samples.etsclock"; { 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 211f0189b8..d5757e5259 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 @@ -1683,7 +1683,7 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0011, Function | SmallTest newInfos["test"] = innerBundleInfo; InnerBundleInfo oldInfo; installer.RollBack(newInfos, oldInfo); - EXPECT_EQ(installer.isAppExist_, false); + EXPECT_NE(newInfos.begin(), newInfos.end()); } /** @@ -1704,7 +1704,7 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0012, Function | SmallTest newInfos["test"] = innerBundleInfo; InnerBundleInfo oldInfo; installer.RollBack(newInfos, oldInfo); - EXPECT_EQ(installer.isAppExist_, false); + EXPECT_NE(newInfos.begin(), newInfos.end()); } /** @@ -1731,7 +1731,7 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0013, Function | SmallTest newInfos["test"] = innerBundleInfo; InnerBundleInfo oldInfo; installer.RollBack(newInfos, oldInfo); - EXPECT_EQ(installer.isAppExist_, false); + EXPECT_NE(newInfos.begin(), newInfos.end()); } /** @@ -1758,7 +1758,7 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0014, Function | SmallTest newInfos["test"] = innerBundleInfo; InnerBundleInfo oldInfo; installer.RollBack(newInfos, oldInfo); - EXPECT_EQ(installer.isAppExist_, false); + EXPECT_NE(newInfos.begin(), newInfos.end()); } /** @@ -1774,7 +1774,7 @@ HWTEST_F(BmsBundleDataGroupTest, BaseBundleInstaller_0015, Function | SmallTest std::string bundleName; std::string packageName = "test"; installer.RemoveInfo(bundleName, packageName); - EXPECT_EQ(installer.bundleName_, "test"); + EXPECT_EQ(installer.isAppExist_, false); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp index ea8e42eac2..eb824fec73 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_data_mgr_nullptr_test/bms_bundle_data_mgr_nullptr_test.cpp @@ -278,6 +278,8 @@ HWTEST_F(BmsBundleDataMgrNullptrTest, BundleCacheMgr_0004, Function | MediumTest uint64_t cacheStat = 0; bundleCacheMgr.GetBundleCacheSize(validBundles, userId, cacheStat); EXPECT_EQ(cacheStat, 0); + bundleCacheMgr.GetBundleCacheSize(validBundles, userId, cacheStat); + EXPECT_EQ(cacheStat, 1); } /** @@ -705,7 +707,7 @@ HWTEST_F(BmsBundleDataMgrNullptrTest, BaseBundleInstaller_0025, Function | Mediu installer.singletonState_ = AppExecFwk::BaseBundleInstaller::SingletonState::SINGLETON_TO_NON; installer.OnSingletonChange(false); - EXPECT_EQ(installer.singletonState_, AppExecFwk::BaseBundleInstaller::SingletonState::SINGLETON_TO_NON); + EXPECT_EQ(installer.isAppExist_, false); } /** @@ -989,7 +991,7 @@ HWTEST_F(BmsBundleDataMgrNullptrTest, BaseBundleInstaller_0042, Function | Small InnerBundleInfo innerBundleInfo; innerBundleInfo.baseApplicationInfo_->appProvisionType = Constants::APP_PROVISION_TYPE_DEBUG; installer.UninstallDebugAppSandbox(bundleName, uid, innerBundleInfo); - EXPECT_EQ(installer.bundleName_, "test"); + EXPECT_FALSE(installer.isContainEntry_); } /** @@ -1011,7 +1013,7 @@ HWTEST_F(BmsBundleDataMgrNullptrTest, BaseBundleInstaller_0043, Function | Small installer.UninstallDebugAppSandbox(bundleName, uid, innerBundleInfo); installer.MarkPreInstallState("test", false); - EXPECT_EQ(installer.bundleName_, "test"); + EXPECT_FALSE(installer.isContainEntry_); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp index f87c0d6d5b..87deeca74e 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_data_storage_test/bms_bundle_data_storage_database_test.cpp @@ -2722,7 +2722,7 @@ HWTEST_F(BmsBundleDataStorageDatabaseTest, InnerBundleInfo_0400, Function | Smal info.SetBaseApplicationInfo(applicationInfo); nlohmann::json jsonObject; info.FromJson(jsonObject); - EXPECT_EQ(applicationInfo.bundleName, NAME); + EXPECT_EQ(info.baseApplicationInfo_->bundleName, NAME); } /** @@ -2819,7 +2819,7 @@ HWTEST_F(BmsBundleDataStorageDatabaseTest, InnerBundleInfo_0900, Function | Smal hapModuleInfo.name = NAME; const int32_t flags = 0; info.GetModuleWithHashValue(flags, "", hapModuleInfo); - EXPECT_EQ(hapModuleInfo.name, NAME); + EXPECT_FALSE(hapModuleInfo.isLibIsolated); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_test.cpp index 6d0dfc46f3..310d4fb11c 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_default_app_test/bms_bundle_default_app_test.cpp @@ -1907,7 +1907,7 @@ HWTEST_F(BmsBundleDefaultAppTest, GetBrokerBundleInfo_0100, Function | SmallTest HWTEST_F(BmsBundleDefaultAppTest, IsDefaultApplication_0100, Function | SmallTest | Level1) { DefaultAppHostImpl impl; - bool isDefaultApp = false; + bool isDefaultApp = true; ClearDataMgr(); auto res = impl.IsDefaultApplication(DEFAULT_FILE_TYPE_VIDEO_MP4, isDefaultApp); EXPECT_EQ(isDefaultApp, false); diff --git a/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/bms_bundle_exception_handler_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/bms_bundle_exception_handler_test.cpp index 92630b8f2a..b08601f076 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/bms_bundle_exception_handler_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_exception_handler_test/bms_bundle_exception_handler_test.cpp @@ -247,7 +247,6 @@ HWTEST_F(BmsBundleExceptionHandlerTest, HandleInvalidBundleTest_0700, TestSize.L EXPECT_EQ(result, true); info.SetInstallMark(BUNDLE_NAME, Package_NAME, InstallExceptionStatus::UNINSTALL_BUNDLE_START); bundleExceptionHandler_->HandleInvalidBundle(info, isBundleValid); - EXPECT_EQ(isBundleValid, true); GTEST_LOG_(INFO) << "HandleInvalidBundleTest_0700 end"; } diff --git a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp index b42b4d3346..46f8d5d3ef 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_free_install_test/bms_bundle_free_install_test.cpp @@ -1205,7 +1205,6 @@ HWTEST_F(BmsBundleFreeInstallTest, BundleConnectAbilityMgr_0009, Function | Smal 0, targetAbilityInfo, want, USERID, freeInstallParams); bundleMgr->SendCallBack( targetAbilityInfo.targetInfo.transactId, freeInstallParams); - EXPECT_EQ(freeInstallParams.callback, nullptr); EXPECT_EQ(targetAbilityInfo.targetInfo.transactId, ""); } diff --git a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp index 853df9294e..ebbe830da4 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_installer_test/bms_bundle_installer_test.cpp @@ -11219,7 +11219,7 @@ HWTEST_F(BmsBundleInstallerTest, PluginInstaller_0057, Function | MediumTest | L NotifyType type = NotifyType::START_INSTALL; int32_t uid = 1; installer.NotifyPluginEvents(type, uid); - EXPECT_EQ(installer.isPluginExist_, true); + EXPECT_EQ(installer.isEnterpriseBundle_, false); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_installers_test/bms_bundle_installers_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_installers_test/bms_bundle_installers_test.cpp index 9c5c7c47d8..ef4bc09c68 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_installers_test/bms_bundle_installers_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_installers_test/bms_bundle_installers_test.cpp @@ -87,9 +87,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0100, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); std::set ret = bundleInstaller_->GetExistsCommonUserIds(); EXPECT_TRUE(ret.size() > ZERO_NUM); @@ -138,9 +136,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0400, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Install(BUNDLE_PATH, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -162,9 +158,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0500, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Install(EMPTY_STRING, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -186,9 +180,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0600, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); bundleInstaller_->Install(BUNDLE_PATH, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ == nullptr); @@ -206,9 +198,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0700, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); InstallParam installParam; installParam.userId = Constants::ALL_USERID; @@ -233,9 +223,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0800, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); std::vector bundleFilePaths; bundleFilePaths.push_back(BUNDLE_PATHS); @@ -259,9 +247,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_0900, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); std::vector bundleFilePaths; bundleFilePaths.push_back(EMPTY_STRING); @@ -298,9 +284,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1100, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Uninstall(BUNDLE_PATH, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -322,9 +306,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1200, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Uninstall(EMPTY_STRING, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -346,9 +328,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1300, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); bundleInstaller_->Uninstall(BUNDLE_PATH, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ == nullptr); @@ -369,9 +349,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1400, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Uninstall(BUNDLE_PATH, PACKAGE_NAME, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -393,9 +371,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1500, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); bundleInstaller_->Uninstall(BUNDLE_PATH, PACKAGE_NAME, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ == nullptr); @@ -416,9 +392,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1600, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Uninstall(EMPTY_STRING, PACKAGE_NAME, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; @@ -440,9 +414,7 @@ HWTEST_F(BmsBundleInstallersTest, BmsBundleInstallersTest_1700, TestSize.Level1) DelayedSingleton::GetInstance()->dataMgr_ = std::make_shared(); EXPECT_TRUE(DelayedSingleton::GetInstance()->dataMgr_ != nullptr); auto dataMgr = DelayedSingleton::GetInstance()->GetDataMgr(); - if (dataMgr == nullptr) { - return; - } + ASSERT_NE(dataMgr, nullptr); dataMgr->AddUserId(Constants::START_USERID); bundleInstaller_->Uninstall(BUNDLE_PATH, EMPTY_STRING, installParam); DelayedSingleton::GetInstance()->dataMgr_ = nullptr; diff --git a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp index e7b012fd59..3743a39d1e 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_kit_service_test/bms_bundle_data_mgr_test.cpp @@ -3575,7 +3575,7 @@ HWTEST_F(BmsBundleDataMgrTest, ImplicitQueryInfos_0100, Function | MediumTest | want.SetElementName("", BUNDLE_NAME_TEST, ABILITY_NAME_TEST, MODULE_NAME_TEST); std::vector abilityInfo; std::vector extensionInfo; - bool findDefaultApp = false; + bool findDefaultApp = true; bool ret = bundleMgrHostImpl_->ImplicitQueryInfos(want, 0, USERID, USERID, abilityInfo, extensionInfo, findDefaultApp); EXPECT_EQ(ret, false); diff --git a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test.cpp index 1675ceaf89..f636297faf 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test.cpp @@ -2015,9 +2015,9 @@ HWTEST_F(BmsBundleManagerTest, SkillFalse_0008, Function | SmallTest | Level1) SkillUri skillUri; skillUri.type = "image/*"; skill.uris.emplace_back(skillUri); - size_t matchUriIndex = 0; + size_t matchUriIndex = 1; bool ret = skill.MatchMimeType(".jpg", matchUriIndex); - EXPECT_EQ(true, ret); + EXPECT_EQ(ret, true); EXPECT_EQ(matchUriIndex, 0); } diff --git a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_three.cpp b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_three.cpp index 37103d14d7..01fe740dd1 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_three.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_manager_test/bms_bundle_manager_test_three.cpp @@ -640,10 +640,10 @@ HWTEST_F(BmsBundleManagerTest3, SharedModuleInfoTest_002, Function | SmallTest | SharedModuleInfo sharedModuleInfo; sharedModuleInfo.name = MODULE_NAME; Parcel parcel; - sharedModuleInfo.Marshalling(parcel); + auto res = sharedModuleInfo.Marshalling(parcel); + EXPECT_EQ(res, true); auto ret = sharedModuleInfo.Unmarshalling(parcel); EXPECT_NE(ret, nullptr); - EXPECT_EQ(sharedModuleInfo.name, MODULE_NAME); } /** @@ -673,10 +673,10 @@ HWTEST_F(BmsBundleManagerTest3, InstallParamTest_002, Function | SmallTest | Lev InstallParam installParam; Parcel parcel; installParam.userId = USERID; - installParam.Marshalling(parcel); + auto res = installParam.Marshalling(parcel); + EXPECT_EQ(res, true); auto ret = installParam.Unmarshalling(parcel); EXPECT_NE(ret, nullptr); - EXPECT_EQ(installParam.userId, USERID); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/bms_bundle_multiuser_install_permission_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/bms_bundle_multiuser_install_permission_test.cpp index 6f21ee9d01..3572eaecc8 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/bms_bundle_multiuser_install_permission_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_multiuser_install_test/bms_bundle_multiuser_install_permission_test.cpp @@ -280,22 +280,14 @@ HWTEST_F(BmsBundleMultiuserInstallPermissionTest, PluginInstaller_0009, Function HWTEST_F(BmsBundleMultiuserInstallPermissionTest, PluginInstaller_0011, Function | MediumTest | Level1) { PluginInstaller installer; + std::string hostBundleName; + std::string pluginDir; installer.isPluginExist_ = false; installer.RemoveOldInstallDir(); - EXPECT_EQ(installer.isPluginExist_, false); -} - -/** - * @tc.number: PluginInstaller_0012 - * @tc.name: test RemoveOldInstallDir - * @tc.desc: 1.Test RemoveOldInstallDir the PluginInstaller -*/ -HWTEST_F(BmsBundleMultiuserInstallPermissionTest, PluginInstaller_0012, Function | MediumTest | Level1) -{ - PluginInstaller installer; installer.isPluginExist_ = true; installer.RemoveOldInstallDir(); - EXPECT_EQ(installer.isPluginExist_, true); + auto ret = installer.CreatePluginDir(hostBundleName, pluginDir); + EXPECT_EQ(ret, ERR_OK); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_overlay_test/bms_bundle_overlay_checker_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_overlay_test/bms_bundle_overlay_checker_test.cpp index dd117550bb..7a84f4787c 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_overlay_test/bms_bundle_overlay_checker_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_overlay_test/bms_bundle_overlay_checker_test.cpp @@ -1293,7 +1293,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, OverlayDataMgr_2300, Function | SmallTest userInfo.bundleUserInfo.userId = USERID; innerBundleInfo.SetOverlayType(OverlayType::OVERLAY_EXTERNAL_BUNDLE); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_EQ(innerBundleInfo.overlayType_, OverlayType::OVERLAY_EXTERNAL_BUNDLE); } /** @@ -1315,7 +1315,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, OverlayDataMgr_2400, Function | SmallTest innerBundleInfo.SetOverlayType(OverlayType::OVERLAY_INTERNAL_BUNDLE); innerBundleInfo.SetTargetBundleName(TEST_BUNDLE_NAME); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_EQ(innerBundleInfo.overlayType_, OverlayType::OVERLAY_EXTERNAL_BUNDLE); UninstallBundleInfo(); } @@ -3048,7 +3048,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, AddOverlayModuleStates_0100, Function | Sm userInfo.bundleUserInfo.userId = USERID; innerBundleInfo.innerBundleUserInfos_.emplace(TEST_BUNDLE_NAME, userInfo); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_NE(innerBundleInfo.innerBundleUserInfos_.begin(), innerBundleInfo.innerBundleUserInfos_.end()); dataMgr->RemoveUserId(userIdNew); } @@ -3073,7 +3073,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, AddOverlayModuleStates_0200, Function | Sm userInfo.bundleUserInfo.overlayModulesState.push_back(item); innerBundleInfo.innerBundleUserInfos_.emplace(TEST_BUNDLE_NAME, userInfo); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_NE(innerBundleInfo.innerBundleUserInfos_.begin(), innerBundleInfo.innerBundleUserInfos_.end()); dataMgr->RemoveUserId(userIdNew); } @@ -3103,7 +3103,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, AddOverlayModuleStates_0300, Function | Sm innerBundleInfo.SetOverlayType(OverlayType::OVERLAY_INTERNAL_BUNDLE); innerBundleInfo.SetTargetBundleName(TEST_BUNDLE_NAME); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_EQ(innerBundleInfo.baseApplicationInfo_->targetBundleName, TEST_BUNDLE_NAME); dataMgr->RemoveUserId(userIdNew); } @@ -3133,7 +3133,7 @@ HWTEST_F(BmsBundleOverlayCheckerTest, AddOverlayModuleStates_0400, Function | Sm innerBundleInfo.SetOverlayType(OverlayType::OVERLAY_EXTERNAL_BUNDLE); innerBundleInfo.SetTargetBundleName(TEST_BUNDLE_NAME); overlayDataMgr.AddOverlayModuleStates(innerBundleInfo, userInfo); - EXPECT_EQ(userInfo.bundleUserInfo.userId, USERID); + EXPECT_EQ(innerBundleInfo.baseApplicationInfo_->targetBundleName, TEST_BUNDLE_NAME); dataMgr->RemoveUserId(userIdNew); } diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_false_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_false_test.cpp index e087e9845a..2489ec3188 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_false_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_false_test.cpp @@ -875,7 +875,6 @@ HWTEST_F(BmsBundlePermissionFalseTest, BmsBundlePermissionFalseTest_5600, Functi bool ret = bundleMgrHostImpl_->ImplicitQueryInfos(want, FLAGS, USERID, true, abilityInfos, extensionInfos, findDefaultApp); EXPECT_EQ(ret, false); - EXPECT_EQ(findDefaultApp, false); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_system_app_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_system_app_test.cpp index 900d0c034d..7e801efe6d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_system_app_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_permission_grant_test/bms_bundle_permission_system_app_test.cpp @@ -670,7 +670,6 @@ HWTEST_F(BmsBundlePermissionSyetemAppFalseTest, BmsBundleSyetemAppFalseTest_4000 bool ret = bundleMgrHostImpl_->ImplicitQueryInfos(want, FLAGS, USERID, true, abilityInfos, extensionInfos, findDefaultApp); EXPECT_EQ(ret, true); - EXPECT_EQ(findDefaultApp, false); } /** diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/bms_bundle_quick_fix_mgr_rdb_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/bms_bundle_quick_fix_mgr_rdb_test.cpp index 48bda6aefd..27374fe01d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/bms_bundle_quick_fix_mgr_rdb_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_mgr_rdb_test/bms_bundle_quick_fix_mgr_rdb_test.cpp @@ -996,7 +996,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixMgrRdbTest_0013, Function { auto rdb = std::make_shared(); rdb->rdbDataManager_ = nullptr; - EXPECT_TRUE(rdb->rdbDataManager_ == nullptr); InnerAppQuickFix innerAppQuickFix; bool result = rdb->SaveInnerAppQuickFix(innerAppQuickFix); EXPECT_FALSE(result); @@ -1024,7 +1023,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixMgrRdbTest_0015, Function { auto rdb = std::make_shared(); rdb->rdbDataManager_ = nullptr; - EXPECT_TRUE(rdb->rdbDataManager_ == nullptr); std::map innerAppQuickFixes; auto result = rdb->GetAllDataFromDb(innerAppQuickFixes); EXPECT_FALSE(result); @@ -1039,7 +1037,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixMgrRdbTest_0016, Function { auto rdb = std::make_shared(); rdb->rdbDataManager_ = nullptr; - EXPECT_TRUE(rdb->rdbDataManager_ == nullptr); InnerAppQuickFix innerAppQuickFix; auto result = rdb->SaveDataToDb(innerAppQuickFix); EXPECT_FALSE(result); @@ -1054,7 +1051,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixMgrRdbTest_0017, Function { auto rdb = std::make_shared(); rdb->rdbDataManager_ = nullptr; - EXPECT_TRUE(rdb->rdbDataManager_ == nullptr); auto result = rdb->DeleteDataFromDb(BUNDLE_NAME); EXPECT_FALSE(result); } @@ -1068,7 +1064,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixMgrRdbTest_0018, Function { auto rdb = std::make_shared(); rdb->rdbDataManager_ = nullptr; - EXPECT_TRUE(rdb->rdbDataManager_ == nullptr); InnerAppQuickFix innerAppQuickFix; auto result = rdb->GetDataFromDb(BUNDLE_NAME, innerAppQuickFix); EXPECT_FALSE(result); @@ -1083,7 +1078,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixDataMgrTest_0019, Functio { QuickFixDataMgr dataMgr; dataMgr.quickFixManagerDb_ = nullptr; - EXPECT_TRUE(dataMgr.quickFixManagerDb_ == nullptr); InnerAppQuickFix fixInfo; auto result = dataMgr.QueryInnerAppQuickFix(BUNDLE_NAME, fixInfo); EXPECT_FALSE(result); @@ -1098,7 +1092,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixDataMgrTest_0020, Functio { QuickFixDataMgr dataMgr; dataMgr.quickFixManagerDb_ = nullptr; - EXPECT_TRUE(dataMgr.quickFixManagerDb_ == nullptr); InnerAppQuickFix innerAppQuickFix; auto result = dataMgr.SaveInnerAppQuickFix(innerAppQuickFix); EXPECT_FALSE(result); @@ -1113,7 +1106,6 @@ HWTEST_F(BmsBundleQuickFixMgrRdbTest, BmsBundleQuickFixDataMgrTest_0021, Functio { QuickFixDataMgr dataMgr; dataMgr.quickFixManagerDb_ = nullptr; - EXPECT_TRUE(dataMgr.quickFixManagerDb_ == nullptr); auto result = dataMgr.DeleteInnerAppQuickFix(BUNDLE_NAME); EXPECT_FALSE(result); } diff --git a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp index a7d6ce3a57..878ad5ba5d 100644 --- a/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp +++ b/services/bundlemgr/test/unittest/bms_bundle_quick_fix_test/bms_bundle_quick_fix_test.cpp @@ -4017,7 +4017,6 @@ HWTEST_F(BmsBundleQuickFixTest, QuickFixManagerRdb_0100, Function | SmallTest | { QuickFixDataMgr rdb; rdb.quickFixManagerDb_ = nullptr; - EXPECT_EQ(rdb.quickFixManagerDb_, nullptr); bool ret = rdb.DeleteInnerAppQuickFix(""); EXPECT_EQ(ret, false); } @@ -4471,7 +4470,7 @@ HWTEST_F(BmsBundleQuickFixTest, to_json_0100, Function | SmallTest | Level0) quickFixMark.bundleName, false, parseResult); - EXPECT_EQ(parseResult, ERR_OK); + EXPECT_EQ(quickFixMark.status, QuickFixStatus::DEFAULT_STATUS); } /** @@ -4492,7 +4491,7 @@ HWTEST_F(BmsBundleQuickFixTest, to_json_0200, Function | SmallTest | Level0) quickFixMark.bundleName, false, parseResult); - EXPECT_EQ(parseResult, ERR_OK); + EXPECT_EQ(quickFixMark.status, QuickFixStatus::DEFAULT_STATUS); } /** 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 3bbdf81ce8..29bfc2c11f 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 @@ -1344,7 +1344,6 @@ HWTEST_F(BmsBundleResourceTest, BmsBundleResourceTest_0062, Function | SmallTest resourceInfo.hapPath_ = HAP_FILE_PATH1; ans = parser.ParseResourceInfo(USERID, resourceInfo); EXPECT_FALSE(ans); - EXPECT_EQ(resourceInfo.label_, BUNDLE_NAME); } /** @@ -2955,8 +2954,8 @@ HWTEST_F(BmsBundleResourceTest, BmsBundleResourceTest_0128, Function | SmallTest )"_json; std::string jsonBuff(layeredImagedJson.dump()); - uint32_t foregroundId = 0; - uint32_t backgroundId = 0; + uint32_t foregroundId = 1; + uint32_t backgroundId = 1; BundleResourceParser parser; bool ans = parser.ParseIconIdFromJson(jsonBuff, foregroundId, backgroundId); EXPECT_TRUE(ans); diff --git a/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp b/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp index 800ec2f30e..625be6f4d4 100644 --- a/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp +++ b/services/bundlemgr/test/unittest/bms_data_mgr_test/bms_data_mgr_test.cpp @@ -1796,7 +1796,7 @@ HWTEST_F(BmsDataMgrTest, ModifyLauncherAbilityInfo_0006, Function | SmallTest | AbilityInfo abilityInfo; abilityInfo.iconId = ICON_ID; dataMgr->ModifyLauncherAbilityInfo(true, abilityInfo); - EXPECT_EQ(abilityInfo.iconId, ICON_ID); + EXPECT_EQ(abilityInfo.label, abilityInfo.applicationInfo.label); } } @@ -1837,7 +1837,7 @@ HWTEST_F(BmsDataMgrTest, ModifyLauncherAbilityInfo_0008, Function | SmallTest | AbilityInfo abilityInfo; abilityInfo.iconId = ICON_ID; dataMgr->ModifyLauncherAbilityInfo(false, abilityInfo); - EXPECT_EQ(abilityInfo.iconId, ICON_ID); + EXPECT_EQ(abilityInfo.label, abilityInfo.bundleName); } } diff --git a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp index a9977e8ebd..834c69d0cf 100644 --- a/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp +++ b/services/bundlemgr/test/unittest/bms_extend_resource_manager_test/bms_extend_resource_manager_test.cpp @@ -440,9 +440,7 @@ HWTEST_F(BmsExtendResourceManagerTest, DynamicIconTest_0400, Function | SmallTes ExtendResourceManagerHostImpl impl; InnerBundleInfo info; bool hasBundle = impl.GetInnerBundleInfo(BUNDLE_NAME2, info); - if (!hasBundle) { - return; - } + ASSERT_EQ(hasBundle, true); auto ret = impl.DisableDynamicIcon(BUNDLE_NAME2); EXPECT_EQ(ret, ERR_EXT_RESOURCE_MANAGER_DISABLE_DYNAMIC_ICON_FAILED); @@ -463,9 +461,7 @@ HWTEST_F(BmsExtendResourceManagerTest, DynamicIconTest_0500, Function | SmallTes ExtendResourceManagerHostImpl impl; InnerBundleInfo info; bool hasBundle = impl.GetInnerBundleInfo(BUNDLE_NAME2, info); - if (!hasBundle) { - return; - } + ASSERT_EQ(hasBundle, true); std::string moudleName; auto ret = impl.GetDynamicIcon(BUNDLE_NAME2, moudleName); diff --git a/services/bundlemgr/test/unittest/bms_install_daemon_test/bms_install_daemon_host_impl_test.cpp b/services/bundlemgr/test/unittest/bms_install_daemon_test/bms_install_daemon_host_impl_test.cpp index 5249220a6a..142e05b6a6 100755 --- a/services/bundlemgr/test/unittest/bms_install_daemon_test/bms_install_daemon_host_impl_test.cpp +++ b/services/bundlemgr/test/unittest/bms_install_daemon_test/bms_install_daemon_host_impl_test.cpp @@ -1145,12 +1145,15 @@ HWTEST_F(BmsInstallDaemonHostImplTest, InstalldHostImplTest_6400, Function | Sma { sptr installdProxy = new (std::nothrow) InstalldProxy(nullptr); ASSERT_NE(installdProxy, nullptr); - int32_t userid = 0; - std::string extensionBundleDir = "com.acts.extension"; + std::string dir = ""; bool isExist = true; - installdProxy->IsExistExtensionDir(userid, extensionBundleDir, isExist); - EXPECT_EQ(isExist, true); + ErrCode ret = installdProxy->IsExistExtensionDir(userid, dir, isExist); + EXPECT_EQ(ret, ERR_APPEXECFWK_INSTALLD_PARAM_ERROR); + + std::string extensionBundleDir = "com.acts.extension"; + ret = installdProxy->IsExistExtensionDir(userid, extensionBundleDir, isExist); + EXPECT_EQ(ret, ERR_OK); } /** diff --git a/services/bundlemgr/test/unittest/bms_service_startup_test/bms_service_startup_test.cpp b/services/bundlemgr/test/unittest/bms_service_startup_test/bms_service_startup_test.cpp index 18c1b297f3..f60d60b3e0 100644 --- a/services/bundlemgr/test/unittest/bms_service_startup_test/bms_service_startup_test.cpp +++ b/services/bundlemgr/test/unittest/bms_service_startup_test/bms_service_startup_test.cpp @@ -859,7 +859,8 @@ HWTEST_F(BmsServiceStartupTest, BundlePermissionMgr_2500, Function | SmallTest | int32_t successCount = 0; int32_t failCount = 0; BundlePermissionMgr::AddPermissionUsedRecord(permission, successCount, failCount); - EXPECT_EQ(failCount, 0); + bool result = BundlePermissionMgr::VerifyRecoverPermission(); + EXPECT_EQ(result, true); } /** @@ -1199,10 +1200,7 @@ HWTEST_F(BmsServiceStartupTest, ConvertPermissionDef_0200, Function | SmallTest */ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0001, Function | SmallTest | Level0) { - if (bundleMgrService_ == nullptr) { - return; - } - + ASSERT_NE(bundleMgrService_, nullptr); auto preInstallExceptionMgr = bundleMgrService_->GetPreInstallExceptionMgr(); bool ret = preInstallExceptionMgr != nullptr; EXPECT_EQ(ret, true); @@ -1580,10 +1578,7 @@ HWTEST_F(BmsServiceStartupTest, BmsParam_1000, Function | MediumTest | Level1) */ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0003, Function | SmallTest | Level0) { - if (bundleMgrService_ == nullptr) { - return; - } - + ASSERT_NE(bundleMgrService_, nullptr); auto preInstallExceptionMgr = bundleMgrService_->GetPreInstallExceptionMgr(); ASSERT_NE(preInstallExceptionMgr, nullptr); @@ -1609,10 +1604,7 @@ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0003, Function | SmallTes */ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0004, Function | SmallTest | Level0) { - if (bundleMgrService_ == nullptr) { - return; - } - + ASSERT_NE(bundleMgrService_, nullptr); auto preInstallExceptionMgr = bundleMgrService_->GetPreInstallExceptionMgr(); ASSERT_NE(preInstallExceptionMgr, nullptr); @@ -1638,10 +1630,7 @@ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0004, Function | SmallTes */ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0005, Function | SmallTest | Level0) { - if (bundleMgrService_ == nullptr) { - return; - } - + ASSERT_NE(bundleMgrService_, nullptr); auto preInstallExceptionMgr = bundleMgrService_->GetPreInstallExceptionMgr(); ASSERT_NE(preInstallExceptionMgr, nullptr); @@ -1666,10 +1655,7 @@ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0005, Function | SmallTes */ HWTEST_F(BmsServiceStartupTest, PreInstallExceptionMgr_0006, Function | SmallTest | Level0) { - if (bundleMgrService_ == nullptr) { - return; - } - + ASSERT_NE(bundleMgrService_, nullptr); auto preInstallExceptionMgr = bundleMgrService_->GetPreInstallExceptionMgr(); ASSERT_NE(preInstallExceptionMgr, nullptr); diff --git a/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp b/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp index 8a235fabaf..f7abcee366 100644 --- a/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp +++ b/test/systemtest/common/bms/acts_bms_kit_system_test/acts_bms_kit_system_test.cpp @@ -10034,10 +10034,7 @@ HWTEST_F(ActsBmsKitSystemTest, InstallCloneAppTest001_AppNotExist, Function | Me { StartProcess(); sptr installerProxy = GetInstallerProxy(); - if (!installerProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_EQ(installerProxy, nullptr); const std::string bundleName = "ohos.samples.appnotfound"; const int32_t userId = 100; int32_t appIndex = TEST_APP_INDEX1; @@ -10056,10 +10053,7 @@ HWTEST_F(ActsBmsKitSystemTest, InstallCloneAppTest001_AppNotExist, Function | Me HWTEST_F(ActsBmsKitSystemTest, InstallCloneAppTest002_UserNotFound, Function | MediumTest | Level1) { sptr installerProxy = GetInstallerProxy(); - if (!installerProxy) { - APP_LOGE("get bundle installer Failure."); - return; - } + ASSERT_EQ(installerProxy, nullptr); const std::string bundleName = "ohos.samples.etsclock"; const int32_t userId = 200; // ensure userId 200 not in system int32_t appIndex = TEST_APP_INDEX1; -- Gitee