diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp index 02337045e058ffcf61cad76254c65f93a9ee4937..d37c2ef07be775d7aa8613fccd799727af87d659 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp @@ -1218,8 +1218,8 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapTokenAbnormal004, TestSize.Level1) testPolicyParam.apl = g_testPolicyParams.apl; // invalid domain 1025 - const static int32_t MAX_DCAP_LENGTH = 1025; - std::string invalidDomain (MAX_DCAP_LENGTH, 'x'); + const static int32_t maxDcapLength = 1025; + std::string invalidDomain (maxDcapLength, 'x'); testPolicyParam.domain = invalidDomain; res = AccessTokenKit::InitHapToken(testHapInfoParams, testPolicyParam, fullTokenId); EXPECT_NE(RET_SUCCESS, res); diff --git a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp index fd1612b6a0f3ec36f8814adb530d28aadb2bca70..7e3a0709aa9c14d455a214fabc85ab36ad44c793 100644 --- a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp +++ b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp @@ -129,7 +129,7 @@ public: ~PermissionRecordManagerCoverTestCb1() {} - virtual int32_t NotifyWhetherFormsVisible(const FormVisibilityType visibleType, + int32_t NotifyWhetherFormsVisible(const FormVisibilityType visibleType, const std::string &bundleName, std::vector &formInstances) override { return 0; diff --git a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp index b81359df89eb2fbec7d8de7bc74c4ee90c524183..824e8ef0f3f9de00819df9396fe899e78e86a78c 100644 --- a/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp +++ b/services/privacymanager/test/coverage/permission_record_manager_coverage_test.cpp @@ -44,7 +44,7 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static int32_t PID = -1; +static int32_t g_pid = -1; static AccessTokenID g_selfTokenId = 0; static AccessTokenID g_nativeToken = 0; static constexpr int32_t MAX_DETAIL_NUM = 500; @@ -221,14 +221,14 @@ HWTEST_F(PermissionRecordManagerTest, AppStatusListener001, TestSize.Level1) PermissionRecordManager::GetInstance().startRecordList_.emplace_back(recordB1); PermissionRecordManager::GetInstance().startRecordList_.emplace_back(recordB2); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, PID, PERM_ACTIVE_IN_FOREGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, PID, PERM_ACTIVE_IN_FOREGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, PID, PERM_ACTIVE_IN_FOREGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, PID, PERM_ACTIVE_IN_FOREGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, PID, PERM_ACTIVE_IN_BACKGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, PID, PERM_ACTIVE_IN_BACKGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, PID, PERM_ACTIVE_IN_BACKGROUND); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, PID, PERM_ACTIVE_IN_BACKGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, g_pid, PERM_ACTIVE_IN_FOREGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, g_pid, PERM_ACTIVE_IN_FOREGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, g_pid, PERM_ACTIVE_IN_FOREGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, g_pid, PERM_ACTIVE_IN_FOREGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, g_pid, PERM_ACTIVE_IN_BACKGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, g_pid, PERM_ACTIVE_IN_BACKGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId1, g_pid, PERM_ACTIVE_IN_BACKGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId2, g_pid, PERM_ACTIVE_IN_BACKGROUND); } /* @@ -248,15 +248,15 @@ HWTEST_F(PermissionRecordManagerTest, FindRecordsToUpdateAndExecutedTest001, Tes ActiveChangeType status = PERM_ACTIVE_IN_BACKGROUND; std::string permission = "ohos.permission.CAMERA"; PermissionRecordManager::GetInstance().SetMutePolicy(PolicyType::PRIVACY, CallerType::CAMERA, false); - PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, PID, permission, status); + PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, g_pid, permission, status); #ifdef CAMERA_FLOAT_WINDOW_ENABLE PermissionRecordManager::GetInstance().NotifyCameraWindowChange(false, tokenId, false); PermissionRecordManager::GetInstance().NotifyCameraWindowChange(true, tokenId, false); #endif - PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, PID, status); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, PID, status); + PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, g_pid, status); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, g_pid, status); - ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, permission)); + ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, permission)); } /* @@ -272,15 +272,15 @@ HWTEST_F(PermissionRecordManagerTest, FindRecordsToUpdateAndExecutedTest002, Tes ASSERT_NE(INVALID_TOKENID, tokenId); ActiveChangeType status = PERM_ACTIVE_IN_BACKGROUND; std::string permission = "ohos.permission.MICROPHONE"; - PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, PID, permission, status); + PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, g_pid, permission, status); #ifdef CAMERA_FLOAT_WINDOW_ENABLE PermissionRecordManager::GetInstance().NotifyCameraWindowChange(false, tokenId, false); PermissionRecordManager::GetInstance().NotifyCameraWindowChange(true, tokenId, false); #endif - PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, PID, status); - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, PID, status); + PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, g_pid, status); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, g_pid, status); - ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, permission)); + ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, permission)); } /* @@ -296,14 +296,14 @@ HWTEST_F(PermissionRecordManagerTest, FindRecordsToUpdateAndExecutedTest003, Tes ASSERT_NE(INVALID_TOKENID, tokenId); ActiveChangeType status = PERM_ACTIVE_IN_FOREGROUND; std::string permission = "ohos.permission.CAMERA"; - PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, PID, permission, status); + PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, g_pid, permission, status); #ifdef CAMERA_FLOAT_WINDOW_ENABLE PermissionRecordManager::GetInstance().NotifyCameraWindowChange(false, tokenId, false); PermissionRecordManager::GetInstance().NotifyCameraWindowChange(true, tokenId, false); #endif - PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, PID, status); + PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, g_pid, status); - ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, permission)); + ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, permission)); } /* @@ -319,14 +319,14 @@ HWTEST_F(PermissionRecordManagerTest, FindRecordsToUpdateAndExecutedTest004, Tes ASSERT_NE(INVALID_TOKENID, tokenId); ActiveChangeType status = PERM_ACTIVE_IN_BACKGROUND; std::string permission = "ohos.permission.CAMERA"; - PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, PID, permission, status); + PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, g_pid, permission, status); #ifdef CAMERA_FLOAT_WINDOW_ENABLE PermissionRecordManager::GetInstance().NotifyCameraWindowChange(false, tokenId, false); PermissionRecordManager::GetInstance().NotifyCameraWindowChange(true, tokenId, false); #endif - PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, PID, status); + PermissionRecordManager::GetInstance().ExecuteAndUpdateRecord(tokenId, g_pid, status); - ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, permission)); + ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, permission)); } /* @@ -345,9 +345,9 @@ HWTEST_F(PermissionRecordManagerTest, ExecuteCameraCallbackAsyncTest001, TestSiz auto callbackWrap = new (std::nothrow) StateChangeCallback(callbackPtr); ASSERT_NE(nullptr, callbackPtr); ASSERT_NE(nullptr, callbackWrap); - PermissionRecordManager::GetInstance().ExecuteCameraCallbackAsync(tokenId, PID); + PermissionRecordManager::GetInstance().ExecuteCameraCallbackAsync(tokenId, g_pid); - PermissionRecordManager::GetInstance().ExecuteCameraCallbackAsync(tokenId, PID); + PermissionRecordManager::GetInstance().ExecuteCameraCallbackAsync(tokenId, g_pid); } class PermActiveStatusChangeCallbackTest : public PermActiveStatusChangeCallbackStub { @@ -545,20 +545,20 @@ HWTEST_F(PermissionRecordManagerTest, RemoveRecordFromStartList001, TestSize.Lev std::string permission = "ohos.permission.READ_MEDIA"; ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); // it->opcode == record.opcode && it->tokenId == record.tokenId - PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, "ohos.permission.READ_MEDIA"); + PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, "ohos.permission.READ_MEDIA"); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); // it->opcode == record.opcode && it->tokenId != record.tokenId - PermissionRecordManager::GetInstance().RemoveRecordFromStartList(RANDOM_TOKENID, PID, "ohos.permission.READ_MEDIA"); + PermissionRecordManager::GetInstance().RemoveRecordFromStartList(RANDOM_TOKENID, g_pid, "ohos.permission.READ_MEDIA"); // it->opcode != record.opcode && it->tokenId != record.tokenId - PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, PID, "ohos.permission.MICROPHONE"); + PermissionRecordManager::GetInstance().RemoveRecordFromStartList(tokenId, g_pid, "ohos.permission.MICROPHONE"); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); } /* @@ -600,13 +600,13 @@ HWTEST_F(PermissionRecordManagerTest, Unregister001, TestSize.Level1) ASSERT_NE(static_cast(0), tokenId); ASSERT_EQ(Constant::SUCCESS, PermissionRecordManager::GetInstance().StartUsingPermission( - tokenId, PID, "ohos.permission.READ_MEDIA")); + tokenId, g_pid, "ohos.permission.READ_MEDIA")); PermissionRecordManager::GetInstance().Unregister(); PermissionRecordManager::GetInstance().Unregister(); ASSERT_EQ(Constant::SUCCESS, PermissionRecordManager::GetInstance().StopUsingPermission( - tokenId, PID, "ohos.permission.READ_MEDIA")); + tokenId, g_pid, "ohos.permission.READ_MEDIA")); } /* @@ -938,8 +938,8 @@ HWTEST_F(PermissionRecordManagerTest, RemoveRecordFromStartListTest001, TestSize EXPECT_EQ(0, SetSelfTokenID(tokenId)); ActiveChangeType status = PERM_ACTIVE_IN_FOREGROUND; - PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, PID, "ohos.permission.CAMERA", status); - PermissionRecordManager::GetInstance().AddRecordToStartList(0, PID, "ohos.permission.MICROPHONE", status); + PermissionRecordManager::GetInstance().AddRecordToStartList(tokenId, g_pid, "ohos.permission.CAMERA", status); + PermissionRecordManager::GetInstance().AddRecordToStartList(0, g_pid, "ohos.permission.MICROPHONE", status); PermissionRecordManager::GetInstance().RemoveRecordFromStartListByToken(tokenId); ASSERT_EQ(1, PermissionRecordManager::GetInstance().startRecordList_.size()); PermissionRecordManager::GetInstance().startRecordList_ = startRecordList; @@ -966,9 +966,9 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest001, TestSize.Leve g_InfoParms1.instIndex); ASSERT_NE(INVALID_TOKENID, tokenId); ASSERT_EQ(RET_SUCCESS, PermissionRecordManager::GetInstance().StartUsingPermission( - tokenId, PID, "ohos.permission.CAMERA", callbackWrap->AsObject())); + tokenId, g_pid, "ohos.permission.CAMERA", callbackWrap->AsObject())); sleep(3); // wait for dialog disappear - ASSERT_EQ(0, PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.CAMERA")); + ASSERT_EQ(0, PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.CAMERA")); } /* diff --git a/services/privacymanager/test/unittest/permission_record_manager_test.cpp b/services/privacymanager/test/unittest/permission_record_manager_test.cpp index 9e3b06a6520669d1b1bf834016b93373678d9345..3b3f8054a5f03b0a30d1e8059dd9649fb00cd190 100644 --- a/services/privacymanager/test/unittest/permission_record_manager_test.cpp +++ b/services/privacymanager/test/unittest/permission_record_manager_test.cpp @@ -49,7 +49,7 @@ namespace OHOS { namespace Security { namespace AccessToken { namespace { -static int32_t PID = -1; +static int32_t g_pid = -1; static int32_t TEST_PID_1 = 1; static int32_t TEST_PID_2 = 2; static int32_t TEST_PID_3 = 3; @@ -287,7 +287,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest001, TestSize.Leve g_InfoParms1.instIndex); ASSERT_NE(INVALID_TOKENID, tokenId); ASSERT_EQ(ERR_PARAM_INVALID, PermissionRecordManager::GetInstance().StartUsingPermission( - 0, PID, permissionName, callbackWrap->AsObject())); + 0, g_pid, permissionName, callbackWrap->AsObject())); } /* @@ -308,19 +308,19 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest002, TestSize.Leve g_InfoParms1.instIndex); ASSERT_NE(INVALID_TOKENID, tokenId); ASSERT_EQ(ERR_PARAM_INVALID, PermissionRecordManager::GetInstance().StartUsingPermission( - tokenId, PID, "ohos.permission.LOCATION", callbackWrap->AsObject())); + tokenId, g_pid, "ohos.permission.LOCATION", callbackWrap->AsObject())); // tokenId invaild ASSERT_EQ(PrivacyError::ERR_PARAM_INVALID, PermissionRecordManager::GetInstance().StartUsingPermission( - g_nativeToken, PID, "ohos.permission.CAMERA", nullptr)); + g_nativeToken, g_pid, "ohos.permission.CAMERA", nullptr)); ASSERT_EQ(Constant::SUCCESS, PermissionRecordManager::GetInstance().StartUsingPermission( - tokenId, PID, "ohos.permission.CAMERA", nullptr)); + tokenId, g_pid, "ohos.permission.CAMERA", nullptr)); ASSERT_EQ(PrivacyError::ERR_PERMISSION_ALREADY_START_USING, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, "ohos.permission.CAMERA", nullptr)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, "ohos.permission.CAMERA", nullptr)); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.CAMERA")); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.CAMERA")); } /* @@ -345,7 +345,7 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest003, TestSize.Leve ASSERT_NE(static_cast(0), tokenId); std::string permissionName = "ohos.permission.MICROPHONE"; ASSERT_EQ(PrivacyError::ERR_EDM_POLICY_CHECK_FAILED, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); std::string str = isMute ? "true" : "false"; SetParameter(EDM_MIC_MUTE_KEY, str.c_str()); } @@ -381,12 +381,12 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest004, TestSize.Leve ASSERT_NE(static_cast(0), tokenId); std::string permissionName = "ohos.permission.MICROPHONE"; ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); usleep(500000); // 500000us = 0.5s ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callback->type_); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, permissionName)); std::string str = isMute ? "true" : "false"; SetParameter(EDM_MIC_MUTE_KEY, str.c_str()); } @@ -420,12 +420,12 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest005, TestSize.Leve ASSERT_NE(static_cast(0), tokenId); std::string permissionName = "ohos.permission.MICROPHONE"; ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); usleep(500000); // 500000us = 0.5s ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callback->type_); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, permissionName)); std::string str = isMute ? "true" : "false"; SetParameter(EDM_MIC_MUTE_KEY, str.c_str()); @@ -460,12 +460,12 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest006, TestSize.Leve ASSERT_NE(static_cast(0), tokenId); std::string permissionName = "ohos.permission.LOCATION"; ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); usleep(500000); // 500000us = 0.5s ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callback->type_); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, permissionName)); std::string str = isMute ? "true" : "false"; SetParameter(EDM_MIC_MUTE_KEY, str.c_str()); @@ -485,15 +485,15 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest007, TestSize.Leve // tokenId invaild ASSERT_EQ(PrivacyError::ERR_PARAM_INVALID, PermissionRecordManager::GetInstance().StartUsingPermission( - g_nativeToken, PID, "ohos.permission.READ_MEDIA")); + g_nativeToken, g_pid, "ohos.permission.READ_MEDIA")); ASSERT_EQ(Constant::SUCCESS, PermissionRecordManager::GetInstance().StartUsingPermission( - tokenId, PID, "ohos.permission.READ_MEDIA")); + tokenId, g_pid, "ohos.permission.READ_MEDIA")); ASSERT_EQ(PrivacyError::ERR_PERMISSION_ALREADY_START_USING, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); ASSERT_EQ(Constant::SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); } /* @@ -645,16 +645,16 @@ HWTEST_F(PermissionRecordManagerTest, StartUsingPermissionTest011, TestSize.Leve ASSERT_NE(static_cast(0), tokenId); std::string permissionName = "ohos.permission.CAMERA"; ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); ASSERT_EQ(PrivacyError::ERR_PERMISSION_ALREADY_START_USING, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, permissionName)); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, permissionName)); // makesure callback end usleep(500000); // 500000us = 0.5s callback->type_ = PERM_TEMPORARY_CALL; ProcessData processData; processData.accessTokenId = tokenId; - processData.pid = PID; + processData.pid = g_pid; appStateObserver_->OnProcessDied(processData); usleep(500000); ASSERT_EQ(PERM_TEMPORARY_CALL, callback->type_); @@ -701,11 +701,11 @@ HWTEST_F(PermissionRecordManagerTest, AppStateChangeListener001, TestSize.Level1 g_InfoParms1.instIndex); // status is inactive ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, PID, "ohos.permission.MICROPHONE")); + PermissionRecordManager::GetInstance().StartUsingPermission(tokenId, g_pid, "ohos.permission.MICROPHONE")); sleep(3); // wait for dialog disappear - PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, PID, PERM_ACTIVE_IN_BACKGROUND); + PermissionRecordManager::GetInstance().NotifyAppStateChange(tokenId, g_pid, PERM_ACTIVE_IN_BACKGROUND); ASSERT_EQ(RET_SUCCESS, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.MICROPHONE")); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.MICROPHONE")); std::string str = isMute ? "true" : "false"; SetParameter(EDM_MIC_MUTE_KEY, str.c_str()); } @@ -800,15 +800,15 @@ HWTEST_F(PermissionRecordManagerTest, StopUsingPermission001, TestSize.Level1) // tokenId invaild ASSERT_EQ(PrivacyError::ERR_PARAM_INVALID, PermissionRecordManager::GetInstance().StopUsingPermission( - static_cast(0), PID, "ohos.permission.READ_MEDIA")); + static_cast(0), g_pid, "ohos.permission.READ_MEDIA")); // permission invaild ASSERT_EQ(PrivacyError::ERR_PERMISSION_NOT_EXIST, PermissionRecordManager::GetInstance().StopUsingPermission( - tokenId, PID, "ohos.permission.test")); + tokenId, g_pid, "ohos.permission.test")); // not start using ASSERT_EQ(PrivacyError::ERR_PERMISSION_NOT_START_USING, - PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, PID, "ohos.permission.READ_MEDIA")); + PermissionRecordManager::GetInstance().StopUsingPermission(tokenId, g_pid, "ohos.permission.READ_MEDIA")); } /* diff --git a/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp b/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp index 33bdc35d887dac3f138192a2af8e49d17a6fb596..640d0ce66c96c279427929a3954945ee874e5bcf 100644 --- a/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp +++ b/services/tokensyncmanager/test/coverage/token_sync_service_coverage_test.cpp @@ -157,8 +157,8 @@ void TokenSyncServiceTest::OnDeviceOffline(const DistributedHardware::DmDeviceIn */ HWTEST_F(TokenSyncServiceTest, CheckAndCopyStr001, TestSize.Level1) { - std::string test_src = "testSrc"; - ASSERT_FALSE(SoftBusManager::GetInstance().CheckAndCopyStr(nullptr, test_src.length(), test_src)); + std::string testSrc = "testSrc"; + ASSERT_FALSE(SoftBusManager::GetInstance().CheckAndCopyStr(nullptr, testSrc.length(), testSrc)); } /** diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp index b139ea6fc879a8012c8155a41636e0dbf86c6141..0b3ed6f4384cdf17f09c9aaf3e0074e52395eec4 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp +++ b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/getpermissionsstatus_fuzzer.cpp @@ -30,7 +30,7 @@ using namespace std; using namespace OHOS::Security::AccessToken; namespace OHOS { -const uint8_t *g_baseFuzzData = nullptr; +const uint8_t *BASE_FUZZ_DATA = nullptr; size_t g_baseFuzzSize = 0; size_t g_baseFuzzPos = 0; @@ -65,10 +65,10 @@ size_t g_baseFuzzPos = 0; { T object {}; size_t objectSize = sizeof(object); - if (g_baseFuzzData == nullptr || objectSize > g_baseFuzzSize - g_baseFuzzPos) { + if (BASE_FUZZ_DATA == nullptr || objectSize > g_baseFuzzSize - g_baseFuzzPos) { return object; } - errno_t ret = memcpy_s(&object, objectSize, g_baseFuzzData + g_baseFuzzPos, objectSize); + errno_t ret = memcpy_s(&object, objectSize, BASE_FUZZ_DATA + g_baseFuzzPos, objectSize); if (ret != EOK) { return {}; } @@ -94,7 +94,7 @@ size_t g_baseFuzzPos = 0; } int32_t result = RET_SUCCESS; - g_baseFuzzData = data; + BASE_FUZZ_DATA = data; g_baseFuzzSize = size; g_baseFuzzPos = 0; if (size > sizeof(uint32_t) + sizeof(std::string)) { diff --git a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp index 472fcc4808d963d1e5cdd4936405f69cc2f16d20..7e1382f203438718bbad339bbbfdbd54e84ff88f 100644 --- a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/getpermissionsstatusstub_fuzzer.cpp @@ -36,7 +36,7 @@ const int CONSTANTS_NUMBER_TWO = 2; static const int32_t ROOT_UID = 0; namespace OHOS { -const uint8_t *g_baseFuzzData = nullptr; +const uint8_t *BASE_FUZZ_DATA = nullptr; size_t g_baseFuzzSize = 0; size_t g_baseFuzzPos = 0; void GetNativeToken() @@ -70,10 +70,10 @@ size_t g_baseFuzzPos = 0; { T object {}; size_t objectSize = sizeof(object); - if (g_baseFuzzData == nullptr || objectSize > g_baseFuzzSize - g_baseFuzzPos) { + if (BASE_FUZZ_DATA == nullptr || objectSize > g_baseFuzzSize - g_baseFuzzPos) { return object; } - errno_t ret = memcpy_s(&object, objectSize, g_baseFuzzData + g_baseFuzzPos, objectSize); + errno_t ret = memcpy_s(&object, objectSize, BASE_FUZZ_DATA + g_baseFuzzPos, objectSize); if (ret != EOK) { return {}; } @@ -98,7 +98,7 @@ size_t g_baseFuzzPos = 0; return false; } int32_t result = RET_SUCCESS; - g_baseFuzzData = data; + BASE_FUZZ_DATA = data; g_baseFuzzSize = size; g_baseFuzzPos = 0; if (size > sizeof(uint32_t) + sizeof(std::string)) { diff --git a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp index 29dbac5e941da34e0c83d6e1c260bc7ecd11f9f8..31682ad7e189e4bfc758084e3cd5dbef8e2eed93 100644 --- a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp +++ b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/setmutepolicystub_fuzzer.cpp @@ -33,7 +33,7 @@ const int CONSTANTS_NUMBER_TWO = 2; static const int32_t ROOT_UID = 0; namespace OHOS { -const uint8_t *g_baseFuzzData = nullptr; +const uint8_t *BASE_FUZZ_DATA = nullptr; size_t g_baseFuzzSize = 0; size_t g_baseFuzzPos = 0; void GetNativeToken()