From 101ba7b8f1563eb152ac91b44c5235a06cb1c5a8 Mon Sep 17 00:00:00 2001 From: fundavid Date: Wed, 16 Apr 2025 16:01:00 +0800 Subject: [PATCH] tdd fixed Signed-off-by: fundavid --- ..._filekey_manager_service_mock_unittest.cpp | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/services/el5filekeymanager/test/src/el5_filekey_manager_service_mock_unittest.cpp b/services/el5filekeymanager/test/src/el5_filekey_manager_service_mock_unittest.cpp index ef928ba96..9d79db749 100644 --- a/services/el5filekeymanager/test/src/el5_filekey_manager_service_mock_unittest.cpp +++ b/services/el5filekeymanager/test/src/el5_filekey_manager_service_mock_unittest.cpp @@ -155,6 +155,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, AcquireAccess001, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->AcquireAccess(DataLockType::DEFAULT_DATA), EFM_SUCCESS); @@ -172,6 +177,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, AcquireAccess002, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->AcquireAccess(DataLockType::DEFAULT_DATA), EFM_SUCCESS); @@ -189,6 +199,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, ReleaseAccess001, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->ReleaseAccess(DataLockType::DEFAULT_DATA), EFM_SUCCESS); @@ -206,6 +221,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, ReleaseAccess002, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->ReleaseAccess(DataLockType::DEFAULT_DATA), EFM_SUCCESS); @@ -539,6 +559,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, QueryAppKeyState001, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->QueryAppKeyState(DataLockType::DEFAULT_DATA), EFM_SUCCESS); @@ -556,6 +581,11 @@ HWTEST_F(El5FilekeyManagerServiceMockTest, QueryAppKeyState002, TestSize.Level1) MockIpc::SetCallingUid(20020025); uint64_t tokenId = GetTokenIdFromBundleName("com.ohos.medialibrary.medialibrarydata"); + // if medialibrarydata not exist, try contactsdataability + if (tokenId == INVALID_TOKENID) { + tokenId = GetTokenIdFromBundleName("com.ohos.contactsdataability"); + } + ASSERT_NE(tokenId, INVALID_TOKENID); MockIpc::SetCallingTokenID(static_cast(tokenId)); ASSERT_EQ(el5FilekeyManagerService_->QueryAppKeyState(DataLockType::DEFAULT_DATA), EFM_SUCCESS); -- Gitee