From 38ac77afd0a13075b313f7bef463a34a412ee5ad Mon Sep 17 00:00:00 2001 From: zhouyan Date: Wed, 13 Aug 2025 15:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=B7=AE=E5=BC=82=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyan Change-Id: I4d47fc4f57cfa9a34bb46f0e6c50eb17f12925df --- .../database/access_token_open_callback.cpp | 3 +-- .../cpp/src/database/rdb_dlopen_manager.cpp | 12 +++++----- .../database_dlopen_coverage_test.cpp | 22 ------------------- .../accesstoken_info_manager_test.cpp | 2 +- .../permission_record_manager_test.cpp | 16 -------------- 5 files changed, 8 insertions(+), 47 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp b/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp index fb5c7459f..f675982ef 100644 --- a/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/access_token_open_callback.cpp @@ -518,9 +518,8 @@ int32_t AccessTokenOpenCallback::OnUpgrade(NativeRdb::RdbStore& rdbStore, int32_ } case DATABASE_VERSION_2: // 2->3 - res = CreatePermissionRequestToggleStatusTable(rdbStore); + res = CreateVersionThreeTable(rdbStore); if (res != NativeRdb::E_OK) { - LOGE(ATM_DOMAIN, ATM_TAG, "Failed to create table permission_request_toggle_status_table."); return res; } diff --git a/services/accesstokenmanager/main/cpp/src/database/rdb_dlopen_manager.cpp b/services/accesstokenmanager/main/cpp/src/database/rdb_dlopen_manager.cpp index f423906b8..e95a4fd05 100644 --- a/services/accesstokenmanager/main/cpp/src/database/rdb_dlopen_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/database/rdb_dlopen_manager.cpp @@ -186,9 +186,9 @@ int32_t RdbDlopenManager::Modify(const AtmDataType type, const GenericValues& mo return AccessTokenError::ERR_LOAD_SO_FAILED; } - taskNum_++; + ++taskNum_; int32_t res = instance->Modify(type, modifyValue, conditionValue); - taskNum_--; + --taskNum_; return res; } @@ -200,9 +200,9 @@ int32_t RdbDlopenManager::Find(AtmDataType type, const GenericValues& conditionV return AccessTokenError::ERR_LOAD_SO_FAILED; } - taskNum_++; + ++taskNum_; int32_t res = instance->Find(type, conditionValue, results); - taskNum_--; + --taskNum_; return res; } @@ -214,9 +214,9 @@ int32_t RdbDlopenManager::DeleteAndInsertValues(const std::vector& delI return AccessTokenError::ERR_LOAD_SO_FAILED; } - taskNum_++; + ++taskNum_; int32_t res = instance->DeleteAndInsertValues(delInfoVec, addInfoVec); - taskNum_--; + --taskNum_; return res; } } // namespace AccessToken diff --git a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp index 24fafb200..ea42a0154 100644 --- a/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp +++ b/services/accesstokenmanager/test/database_dlopen/database_dlopen_coverage_test.cpp @@ -199,28 +199,6 @@ HWTEST_F(AccessTokenDatabaseDlopenTest, DelayDlcloseHandle002, TestSize.Level4) ASSERT_EQ(nullptr, instance->handle_); } -/* - * @tc.name: GetDbInstance001 - * @tc.desc: RdbDlopenManager::GetDbInstance - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(AccessTokenDatabaseDlopenTest, GetDbInstance001, TestSize.Level4) -{ - auto instance = RdbDlopenManager::GetInstance(); - ASSERT_NE(nullptr, instance); - ASSERT_EQ(nullptr, instance->handle_); - ASSERT_EQ(nullptr, instance->instance_); - - instance->GetDbInstance(); // handle_ is nullptr - ASSERT_NE(nullptr, instance->handle_); - ASSERT_NE(nullptr, instance->instance_); - instance->GetDbInstance(); // handle_ is nullptr - sleep(WAIT_DELAY_DLCLOSE_TIME); - ASSERT_EQ(nullptr, instance->handle_); - ASSERT_EQ(nullptr, instance->instance_); -} - /* * @tc.name: DynamicCallTest001 * @tc.desc: RdbDlopenManager::DynamicCallTest diff --git a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp index 5522bb9be..98bfddb26 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp @@ -2295,7 +2295,7 @@ HWTEST_F(AccessTokenInfoManagerTest, Dlopen001, TestSize.Level0) LibraryLoader loader1("libnotexist.z.so"); // is a not exist path EXPECT_EQ(nullptr, loader1.handle_); - LibraryLoader loader2("libaccesstoken_manager_service.z.so"); // is a exist lib without create func + LibraryLoader loader2("libaccesstoken_sdk.z.so"); // is a exist lib without create func EXPECT_EQ(nullptr, loader2.instance_); EXPECT_NE(nullptr, loader2.handle_); } diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 0044434d0..17877d3af 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -934,22 +934,6 @@ HWTEST_F(PermissionRecordManagerTest, GetPermissionUsedType001, TestSize.Level0) ASSERT_EQ(0, PermissionRecordManager::GetInstance().GetPermissionUsedTypeInfos(tokenId, permissionName, results)); } -/** - * @tc.name: Dlopen001 - * @tc.desc: Open a not exist lib & not exist func - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(PermissionRecordManagerTest, Dlopen001, TestSize.Level0) -{ - LibraryLoader loader1("libnotexist.z.so"); // is a not exist path - EXPECT_EQ(nullptr, loader1.handle_); - - LibraryLoader loader2("libaccesstoken_manager_service.z.so"); // is a exist lib without create func - EXPECT_EQ(nullptr, loader2.instance_); - EXPECT_NE(nullptr, loader2.handle_); -} - /* * @tc.name: AddDataValueToResults001 * @tc.desc: PermissionRecordManager::AddDataValueToResults function test -- Gitee