From 124ebd25b85b89004efb2e44004c267c90c3df11 Mon Sep 17 00:00:00 2001 From: zhouyan Date: Tue, 2 Sep 2025 20:04:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=9B=B8=E6=9C=BA=E6=BC=8F?= =?UTF-8?q?=E6=B4=9E=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BF=AE=E6=94=B9=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyan Change-Id: Ibb447c7b7816ad115f60dedb1ee47b277e978e4a --- .../test/unittest/permission_record_manager_test.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 02e4f525d..6c89c8f53 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -581,7 +581,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest008, TestSize.Leve ASSERT_EQ(PERM_INACTIVE, callback->type_); } -#ifdef CAMERA_FRAMEWORK_ENABL +#ifdef CAMERA_FRAMEWORK_ENABLE /* * @tc.name: StartUsingPermissionTest009 * @tc.desc: Test multiple process start using permission @@ -590,6 +590,10 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest008, TestSize.Leve */ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest009, TestSize.Level0) { + auto cameraCallbackMap = PermissionRecordManager::GetInstance().cameraCallbackMap_; // backup + PermissionRecordManager::GetInstance().cameraCallbackMap_.EnsureInsert( + PermissionRecordManager::GetInstance().GetUniqueId(RANDOM_TOKENID, -1), nullptr); + auto callbackPtr1 = std::make_shared(); auto callbackWrap1 = new (std::nothrow) StateChangeCallback(callbackPtr1); ASSERT_NE(nullptr, callbackPtr1); @@ -605,6 +609,8 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest009, TestSize.Leve AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; ASSERT_NE(INVALID_TOKENID, tokenId); std::string permissionName = "ohos.permission.CAMERA"; + PermissionRecordManager::GetInstance().cameraCallbackMap_.EnsureInsert( + PermissionRecordManager::GetInstance().GetUniqueId(tokenId, -1), nullptr); ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().StartUsingPermission( MakeInfo(tokenId, TEST_PID_1, permissionName), callbackWrap1->AsObject(), CALLER_PID)); @@ -635,6 +641,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest009, TestSize.Leve ASSERT_FALSE(callbackPtr1->isShow_); ASSERT_FALSE(callbackPtr2->isShow_); #endif + PermissionRecordManager::GetInstance().cameraCallbackMap_ = cameraCallbackMap; // recovery } #endif -- Gitee