From 76a27c96244cb655d4828cb7ed1e86881d39ed3d Mon Sep 17 00:00:00 2001 From: dingqiaoqiao Date: Fri, 30 May 2025 11:41:07 +0800 Subject: [PATCH] =?UTF-8?q?assert=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dingqiaoqiao Change-Id: Ie4a9fa278fcfebaff10d70956087a2341a131ed2 --- .../get_hap_dlp_flag_test.cpp | 2 +- .../get_permission_flag_test.cpp | 14 +-- .../get_permissions_status_test.cpp | 46 ++++----- .../permission_request_toggle_status_test.cpp | 40 ++++---- .../HapTokenTest/alloc_hap_token_test.cpp | 22 ++--- .../app_installation_optimized_test.cpp | 98 +++++++++---------- .../HapTokenTest/get_hap_token_test.cpp | 44 ++++----- .../HapTokenTest/get_token_type_test.cpp | 12 +-- .../HapTokenTest/update_hap_token_test.cpp | 78 +++++++-------- 9 files changed, 177 insertions(+), 179 deletions(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_hap_dlp_flag_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_hap_dlp_flag_test.cpp index f55615cce..f6a3b8747 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_hap_dlp_flag_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_hap_dlp_flag_test.cpp @@ -64,7 +64,7 @@ HWTEST_F(GetHapDlpFlagTest, GetHapDlpFlagFuncTest001, TestSize.Level0) AccessTokenID tokenID = 0; int32_t ret = AccessTokenKit::GetHapDlpFlag(tokenID); - ASSERT_EQ(INVALID_DLP_TOKEN_FLAG, ret); + EXPECT_EQ(INVALID_DLP_TOKEN_FLAG, ret); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permission_flag_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permission_flag_test.cpp index 9aab3422a..155da9739 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permission_flag_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permission_flag_test.cpp @@ -108,7 +108,7 @@ void GetPermissionFlagTest::SetUp() AccessTokenIDEx tokenIdEx = {0}; EXPECT_EQ(RET_SUCCESS, TestCommon::AllocTestHapToken(info, policy, tokenIdEx)); - ASSERT_NE(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_NE(INVALID_TOKENID, tokenIdEx.tokenIDEx); } void GetPermissionFlagTest::TearDown() @@ -159,22 +159,22 @@ HWTEST_F(GetPermissionFlagTest, GetPermissionFlagAbnormalTest001, TestSize.Level uint32_t flag; int ret = AccessTokenKit::GetPermissionFlag(tokenID, "ohos.permission.GAMMA", flag); - ASSERT_EQ(AccessTokenError::ERR_PERMISSION_NOT_EXIST, ret); + EXPECT_EQ(AccessTokenError::ERR_PERMISSION_NOT_EXIST, ret); ret = AccessTokenKit::GetPermissionFlag(tokenID, "", flag); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); std::string invalidPerm(INVALID_PERMNAME_LEN, 'a'); ret = AccessTokenKit::GetPermissionFlag(tokenID, invalidPerm, flag); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); ret = AccessTokenKit::GetPermissionFlag(TEST_TOKENID_INVALID, PERMISSION_MICROPHONE, flag); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); EXPECT_EQ(RET_SUCCESS, TestCommon::DeleteTestHapToken(tokenID)); ret = AccessTokenKit::GetPermissionFlag(tokenID, "ohos.permission.ALPHA", flag); - ASSERT_EQ(AccessTokenError::ERR_PERMISSION_NOT_EXIST, ret); + EXPECT_EQ(AccessTokenError::ERR_PERMISSION_NOT_EXIST, ret); } /** @@ -219,7 +219,7 @@ HWTEST_F(GetPermissionFlagTest, GetPermissionFlagSpecTest002, TestSize.Level0) AccessTokenID tokenID = tokenIdEx.tokenIdExStruct.tokenID; uint32_t flag; - ASSERT_EQ(ERR_NOT_SYSTEM_APP, AccessTokenKit::GetPermissionFlag(tokenID, PERMISSION_MICROPHONE, flag)); + EXPECT_EQ(ERR_NOT_SYSTEM_APP, AccessTokenKit::GetPermissionFlag(tokenID, PERMISSION_MICROPHONE, flag)); } /** diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permissions_status_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permissions_status_test.cpp index bb287281a..5225bd186 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permissions_status_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/get_permissions_status_test.cpp @@ -130,7 +130,7 @@ void GetPermissionsStatusTest::SetUp() PreparePermStateList1(policy); AccessTokenIDEx tokenIdEx = {0}; EXPECT_EQ(RET_SUCCESS, TestCommon::AllocTestHapToken(info, policy, tokenIdEx)); - ASSERT_NE(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_NE(INVALID_TOKENID, tokenIdEx.tokenIDEx); } void GetPermissionsStatusTest::TearDown() @@ -182,11 +182,11 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusFuncTest001, TestSize.Lev permsList.emplace_back(tmpD); permsList.emplace_back(tmpE); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); - ASSERT_EQ(DYNAMIC_OPER, permsList[0].state); - ASSERT_EQ(DYNAMIC_OPER, permsList[1].state); - ASSERT_EQ(INVALID_OPER, permsList[2].state); - ASSERT_EQ(INVALID_OPER, permsList[3].state); - ASSERT_EQ(INVALID_OPER, permsList[4].state); + EXPECT_EQ(DYNAMIC_OPER, permsList[0].state); + EXPECT_EQ(DYNAMIC_OPER, permsList[1].state); + EXPECT_EQ(INVALID_OPER, permsList[2].state); + EXPECT_EQ(INVALID_OPER, permsList[3].state); + EXPECT_EQ(INVALID_OPER, permsList[4].state); } /** @@ -236,12 +236,12 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusFuncTest002, TestSize.Lev }; ASSERT_EQ(RET_SUCCESS, AccessTokenKit::SetPermDialogCap(hapBaseInfo, true)); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); - ASSERT_EQ(FORBIDDEN_OPER, permsList[0].state); - ASSERT_EQ(FORBIDDEN_OPER, permsList[1].state); - ASSERT_EQ(INVALID_OPER, permsList[2].state); - ASSERT_EQ(INVALID_OPER, permsList[3].state); - ASSERT_EQ(INVALID_OPER, permsList[4].state); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::SetPermDialogCap(hapBaseInfo, false)); + EXPECT_EQ(FORBIDDEN_OPER, permsList[0].state); + EXPECT_EQ(FORBIDDEN_OPER, permsList[1].state); + EXPECT_EQ(INVALID_OPER, permsList[2].state); + EXPECT_EQ(INVALID_OPER, permsList[3].state); + EXPECT_EQ(INVALID_OPER, permsList[4].state); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::SetPermDialogCap(hapBaseInfo, false)); } /** @@ -257,15 +257,15 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusAbnormalTest001, TestSize ASSERT_NE(INVALID_TOKENID, tokenID); std::vector permsList; - ASSERT_EQ(ERR_PARAM_INVALID, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); + EXPECT_EQ(ERR_PARAM_INVALID, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); PermissionListState tmpA = { .permissionName = "ohos.permission.testPermDef1", .state = SETTING_OPER }; permsList.emplace_back(tmpA); - ASSERT_EQ(ERR_PARAM_INVALID, AccessTokenKit::GetPermissionsStatus(0, permsList)); - ASSERT_EQ(SETTING_OPER, permsList[0].state); + EXPECT_EQ(ERR_PARAM_INVALID, AccessTokenKit::GetPermissionsStatus(0, permsList)); + EXPECT_EQ(SETTING_OPER, permsList[0].state); } /** @@ -283,8 +283,8 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusAbnormalTest002, TestSize }; permsList.emplace_back(tmpA); - ASSERT_EQ(ERR_TOKENID_NOT_EXIST, AccessTokenKit::GetPermissionsStatus(TOKENID_NOT_EXIST, permsList)); - ASSERT_EQ(SETTING_OPER, permsList[0].state); + EXPECT_EQ(ERR_TOKENID_NOT_EXIST, AccessTokenKit::GetPermissionsStatus(TOKENID_NOT_EXIST, permsList)); + EXPECT_EQ(SETTING_OPER, permsList[0].state); } /** @@ -312,8 +312,8 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusAbnormalTest003, TestSize int32_t selfUid = getuid(); setuid(10001); // 10001： UID - ASSERT_EQ(ERR_PERMISSION_DENIED, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); - ASSERT_EQ(SETTING_OPER, permsList[0].state); + EXPECT_EQ(ERR_PERMISSION_DENIED, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); + EXPECT_EQ(SETTING_OPER, permsList[0].state); setuid(selfUid); } @@ -341,8 +341,8 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusSpecTest001, TestSize.Lev permsList.emplace_back(tmpA); - ASSERT_EQ(ERR_NOT_SYSTEM_APP, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); - ASSERT_EQ(SETTING_OPER, permsList[0].state); + EXPECT_EQ(ERR_NOT_SYSTEM_APP, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); + EXPECT_EQ(SETTING_OPER, permsList[0].state); } /** @@ -365,8 +365,8 @@ HWTEST_F(GetPermissionsStatusTest, GetPermissionsStatusSpecTest002, TestSize.Lev permsList.emplace_back(tmpA); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); - ASSERT_EQ(DYNAMIC_OPER, permsList[0].state); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::GetPermissionsStatus(tokenID, permsList)); + EXPECT_EQ(DYNAMIC_OPER, permsList[0].state); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/permission_request_toggle_status_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/permission_request_toggle_status_test.cpp index 41d16d4e5..62a571ebb 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/permission_request_toggle_status_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapAttributeTest/permission_request_toggle_status_test.cpp @@ -94,8 +94,8 @@ void PermissionRequestToggleStatusTest::SetUp() TestCommon::TestPreparePermStateList(policy); AccessTokenIDEx tokenIdEx = {0}; - ASSERT_EQ(RET_SUCCESS, TestCommon::AllocTestHapToken(info, policy, tokenIdEx)); - ASSERT_NE(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); + EXPECT_EQ(RET_SUCCESS, TestCommon::AllocTestHapToken(info, policy, tokenIdEx)); + EXPECT_NE(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); } void PermissionRequestToggleStatusTest::TearDown() @@ -120,18 +120,18 @@ HWTEST_F(PermissionRequestToggleStatusTest, SetPermissionRequestToggleStatusAbno // Permission name is invalid. int32_t ret = AccessTokenKit::SetPermissionRequestToggleStatus("", status, userID); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); // Status is invalid. status = 2; ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, userID); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); // UserID is invalid. userID = -1; status = PermissionRequestToggleStatus::CLOSED; ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, userID); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); } /** @@ -150,7 +150,7 @@ HWTEST_F(PermissionRequestToggleStatusTest, SetPermissionRequestToggleStatus001, uint32_t status = PermissionRequestToggleStatus::CLOSED; int32_t ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestNormalInfoParms.userID); - ASSERT_EQ(ERR_NOT_SYSTEM_APP, ret); + EXPECT_EQ(ERR_NOT_SYSTEM_APP, ret); } /** @@ -170,12 +170,12 @@ HWTEST_F(PermissionRequestToggleStatusTest, SetPermissionRequestToggleStatus002, uint32_t status = PermissionRequestToggleStatus::CLOSED; int32_t ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); + EXPECT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); status = PermissionRequestToggleStatus::OPEN; ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); + EXPECT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); // restore environment setuid(selfUid); @@ -197,12 +197,12 @@ HWTEST_F(PermissionRequestToggleStatusTest, SetPermissionRequestToggleStatusSpec uint32_t status = PermissionRequestToggleStatus::CLOSED; int32_t ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(RET_SUCCESS, ret); status = PermissionRequestToggleStatus::OPEN; ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(RET_SUCCESS, ret); } /** @@ -220,12 +220,12 @@ HWTEST_F(PermissionRequestToggleStatusTest, GetPermissionRequestToggleStatusAbno // Permission name is invalid. int32_t ret = AccessTokenKit::GetPermissionRequestToggleStatus("", status, userID); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); // UserId is invalid. userID = -1; ret = AccessTokenKit::GetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, userID); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); } /** @@ -244,7 +244,7 @@ HWTEST_F(PermissionRequestToggleStatusTest, GetPermissionRequestToggleStatusSpec uint32_t status; int32_t ret = AccessTokenKit::GetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestNormalInfoParms.userID); - ASSERT_EQ(ERR_NOT_SYSTEM_APP, ret); + EXPECT_EQ(ERR_NOT_SYSTEM_APP, ret); } /** @@ -265,7 +265,7 @@ HWTEST_F(PermissionRequestToggleStatusTest, GetPermissionRequestToggleStatusSpec uint32_t getStatus; int32_t ret = AccessTokenKit::GetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", getStatus, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); + EXPECT_EQ(AccessTokenError::ERR_PERMISSION_DENIED, ret); // restore environment setuid(selfUid); @@ -289,26 +289,26 @@ HWTEST_F(PermissionRequestToggleStatusTest, GetPermissionRequestToggleStatusSpec uint32_t status = PermissionRequestToggleStatus::CLOSED; int32_t ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(RET_SUCCESS, ret); // Get a closed status value. uint32_t getStatus; ret = AccessTokenKit::GetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", getStatus, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(PermissionRequestToggleStatus::CLOSED, getStatus); + EXPECT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(PermissionRequestToggleStatus::CLOSED, getStatus); // Set a open status value. status = PermissionRequestToggleStatus::OPEN; ret = AccessTokenKit::SetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", status, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(RET_SUCCESS, ret); // Get a open status value. ret = AccessTokenKit::GetPermissionRequestToggleStatus("ohos.permission.MICROPHONE", getStatus, g_infoManagerTestSystemInfoParms.userID); - ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(PermissionRequestToggleStatus::OPEN, getStatus); + EXPECT_EQ(RET_SUCCESS, ret); + EXPECT_EQ(PermissionRequestToggleStatus::OPEN, getStatus); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/alloc_hap_token_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/alloc_hap_token_test.cpp index 914e97881..7ced14a82 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/alloc_hap_token_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/alloc_hap_token_test.cpp @@ -217,8 +217,8 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken002, TestSize.Level0) ASSERT_NE(INVALID_TOKENID, tokenID); AccessTokenID tokenID1 = AllocTestToken(g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - ASSERT_NE(INVALID_TOKENID, tokenID1); - ASSERT_NE(tokenID, tokenID1); + EXPECT_NE(INVALID_TOKENID, tokenID1); + EXPECT_NE(tokenID, tokenID1); ASSERT_NE(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID1)); } @@ -474,8 +474,8 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken010, TestSize.Level0) deleteFlag = 1; } } - ASSERT_EQ(allocFlag, 0); - ASSERT_EQ(deleteFlag, 0); + EXPECT_EQ(allocFlag, 0); + EXPECT_EQ(deleteFlag, 0); } /** @@ -493,7 +493,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken011, TestSize.Level0) g_infoManagerTestInfoParms.appIDDesc = invalidAppIDDesc; AccessTokenID tokenID = AllocTestToken(g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); g_infoManagerTestInfoParms.appIDDesc = backup; } @@ -509,7 +509,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken012, TestSize.Level0) g_infoManagerTestInfoParms.bundleName = ""; AccessTokenID tokenID = AllocTestToken(g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); g_infoManagerTestInfoParms.bundleName = backup; } @@ -525,7 +525,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken013, TestSize.Level0) g_infoManagerTestInfoParms.appIDDesc = ""; AccessTokenID tokenID = AllocTestToken(g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); g_infoManagerTestInfoParms.appIDDesc = backup; } @@ -542,7 +542,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken014, TestSize.Level0) g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName = ""; AllocTestToken(g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); PermissionDef permDefResultBeta; - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, AccessTokenKit::GetDefPermission("", permDefResultBeta)); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, AccessTokenKit::GetDefPermission("", permDefResultBeta)); g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName = backup; DeleteTestToken(); @@ -594,7 +594,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken016, TestSize.Level0) PermissionDef permDefResult; int ret = AccessTokenKit::GetDefPermission( g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName, permDefResult); - ASSERT_EQ(ret, AccessTokenError::ERR_PERMISSION_NOT_EXIST); + EXPECT_EQ(ret, AccessTokenError::ERR_PERMISSION_NOT_EXIST); g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].label = backup; g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName = backUpPermission; @@ -619,7 +619,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken017, TestSize.Level0) PermissionDef permDefResult; int ret = AccessTokenKit::GetDefPermission( g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName, permDefResult); - ASSERT_EQ(ret, AccessTokenError::ERR_PERMISSION_NOT_EXIST); + EXPECT_EQ(ret, AccessTokenError::ERR_PERMISSION_NOT_EXIST); g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].description = backupDec; g_infoManagerTestPolicyPrams.permList[INDEX_ZERO].permissionName = backUpPermission; @@ -694,7 +694,7 @@ HWTEST_F(AllocHapTokenTest, AllocHapToken019, TestSize.Level0) }; tokenIdEx = AccessTokenKit::AllocHapToken(infoManagerTestInfoParms1, infoManagerTestPolicyPrams); - ASSERT_EQ(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/app_installation_optimized_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/app_installation_optimized_test.cpp index 9e61f835e..5e8af25c3 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/app_installation_optimized_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/app_installation_optimized_test.cpp @@ -180,10 +180,10 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken002, TestSize.Level0) std::vector permStatList; res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList, true); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), permStatList.size()); - ASSERT_EQ(CERT_PERMISSION, permStatList[0].permissionName); + EXPECT_EQ(static_cast(1), permStatList.size()); + EXPECT_EQ(CERT_PERMISSION, permStatList[0].permissionName); EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -208,7 +208,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken003, TestSize.Level0) uint32_t flag; TestCommon::GetPermissionFlagByTest(fullTokenId.tokenIdExStruct.tokenID, CALENDAR_PERMISSION, flag); EXPECT_EQ(flag, PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -237,11 +237,11 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken004, TestSize.Level0) EXPECT_EQ(ret, PERMISSION_GRANTED); std::vector permStatList; res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList, false); - ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), permStatList.size()); - ASSERT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); + EXPECT_EQ(RET_SUCCESS, res); + EXPECT_EQ(static_cast(1), permStatList.size()); + EXPECT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -272,11 +272,11 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken005, TestSize.Level0) std::vector permStatList; res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList, false); - ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), permStatList.size()); - ASSERT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); + EXPECT_EQ(RET_SUCCESS, res); + EXPECT_EQ(static_cast(1), permStatList.size()); + EXPECT_EQ(CALENDAR_PERMISSION, permStatList[0].permissionName); EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -296,7 +296,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken006, TestSize.Level0) AccessTokenIDEx fullTokenId; int32_t res = AccessTokenKit::InitHapToken(g_testHapInfoParams, testPolicyParam, fullTokenId); EXPECT_EQ(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -373,7 +373,7 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken010, TestSize.Level0) AccessTokenIDEx fullTokenId; int32_t res = AccessTokenKit::InitHapToken(g_testHapInfoParams, testPolicyParam, fullTokenId); EXPECT_EQ(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -422,14 +422,14 @@ HWTEST_F(AppInstallationOptimizedTest, InitHapToken011, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, res); std::vector permStatList2; res = TestCommon::GetReqPermissionsByTest(dlpFullTokenId2.tokenIdExStruct.tokenID, permStatList2, false); - ASSERT_EQ(permStatList2.size(), permStatList1.size()); + EXPECT_EQ(permStatList2.size(), permStatList1.size()); EXPECT_EQ(APP_TRACKING_PERMISSION, permStatList2[0].permissionName); EXPECT_EQ(permStatList2[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(permStatList2[0].grantFlags[0], PERMISSION_USER_SET); EXPECT_EQ(CALENDAR_PERMISSION, permStatList2[1].permissionName); EXPECT_EQ(permStatList2[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(permStatList2[1].grantFlags[0], PERMISSION_USER_SET); - ASSERT_EQ(RET_SUCCESS, res); + EXPECT_EQ(RET_SUCCESS, res); } /** @@ -487,7 +487,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken001, TestSize.Level0) ret = AccessTokenKit::VerifyAccessToken(fullTokenId.tokenIdExStruct.tokenID, CERT_PERMISSION); EXPECT_EQ(PERMISSION_DENIED, ret); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -513,8 +513,8 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken002, TestSize.Level0) std::vector permStatList; int32_t res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), permStatList.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList[0].permissionName); + EXPECT_EQ(static_cast(1), permStatList.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, permStatList[0].permissionName); EXPECT_EQ(permStatList[0].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_USER_FIXED); @@ -532,15 +532,15 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken002, TestSize.Level0) std::vector permStatList1; res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList1, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(2), permStatList1.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); + EXPECT_EQ(static_cast(2), permStatList1.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); EXPECT_EQ(permStatList1[0].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(permStatList1[0].grantFlags[0], PERMISSION_USER_FIXED); - ASSERT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); + EXPECT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); EXPECT_EQ(permStatList1[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(permStatList1[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -583,15 +583,15 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken003, TestSize.Level0) std::vector permStatList1; int32_t res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, permStatList1, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(2), permStatList1.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); + EXPECT_EQ(static_cast(2), permStatList1.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, permStatList1[0].permissionName); EXPECT_EQ(permStatList1[0].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(permStatList1[0].grantFlags[0], PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); + EXPECT_EQ(CALENDAR_PERMISSION, permStatList1[1].permissionName); EXPECT_EQ(permStatList1[1].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(permStatList1[1].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -631,12 +631,12 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken004, TestSize.Level0) std::vector state; int32_t res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(2), state.size()); - ASSERT_EQ(CALENDAR_PERMISSION, state[1].permissionName); + EXPECT_EQ(static_cast(2), state.size()); + EXPECT_EQ(CALENDAR_PERMISSION, state[1].permissionName); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -669,7 +669,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken005, TestSize.Level0) info.appDistributionType = "enterprise_mdm"; res = AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParam2); EXPECT_EQ(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -702,7 +702,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken006, TestSize.Level0) info.appDistributionType = ""; res = AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParam2); EXPECT_EQ(ERR_PERM_REQUEST_CFG_FAILED, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -735,7 +735,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken007, TestSize.Level0) info.appDistributionType = "none"; res = AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParam2); EXPECT_EQ(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -767,7 +767,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken008, TestSize.Level0) }; res = AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParam2); EXPECT_EQ(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -799,7 +799,7 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken009, TestSize.Level0) }; res = AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParam1); EXPECT_NE(RET_SUCCESS, res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -839,12 +839,12 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken010, TestSize.Level0) std::vector state; int32_t res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), state.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); + EXPECT_EQ(static_cast(1), state.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -884,12 +884,12 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken011, TestSize.Level0) std::vector state; int32_t res = TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); ASSERT_EQ(RET_SUCCESS, res); - ASSERT_EQ(static_cast(1), state.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); + EXPECT_EQ(static_cast(1), state.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -938,15 +938,15 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken012, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); - ASSERT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); + EXPECT_EQ(static_cast(2), state.size()); + EXPECT_EQ(APP_TRACKING_PERMISSION, state[0].permissionName); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_USER_FIXED); - ASSERT_EQ(CALENDAR_PERMISSION, state[1].permissionName); + EXPECT_EQ(CALENDAR_PERMISSION, state[1].permissionName); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } @@ -995,13 +995,13 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken013, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); + EXPECT_EQ(static_cast(2), state.size()); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1046,13 +1046,13 @@ HWTEST_F(AppInstallationOptimizedTest, UpdateHapToken014, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; TestCommon::GetReqPermissionsByTest(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); + EXPECT_EQ(static_cast(2), state.size()); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_hap_token_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_hap_token_test.cpp index 05f91d5ae..3e141c829 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_hap_token_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_hap_token_test.cpp @@ -89,7 +89,7 @@ void GetHapTokenTest::SetUp() AccessTokenIDEx tokenIdEx = {0}; ASSERT_EQ(RET_SUCCESS, AccessTokenKit::InitHapToken(info, policy, tokenIdEx)); - ASSERT_NE(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); + EXPECT_NE(INVALID_TOKENID, tokenIdEx.tokenIdExStruct.tokenID); } void GetHapTokenTest::TearDown() @@ -114,7 +114,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDFuncTest001, TestSize.Level0) int ret = AccessTokenKit::GetHapTokenInfo(tokenID, hapTokenInfoRes); ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(hapTokenInfoRes.bundleName, TEST_BUNDLE_NAME); + EXPECT_EQ(hapTokenInfoRes.bundleName, TEST_BUNDLE_NAME); ret = TestCommon::DeleteTestHapToken(tokenID); ASSERT_EQ(RET_SUCCESS, ret); @@ -131,7 +131,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDAbnormalTest001, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDAbnormalTest001"); AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(TEST_USER_ID_INVALID, TEST_BUNDLE_NAME, 0); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); } /** @@ -145,10 +145,10 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDAbnormalTest002, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDAbnormalTest002"); AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(TEST_USER_ID, "", 0); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); tokenID = AccessTokenKit::GetHapTokenID(TEST_USER_ID, "invalid bundlename", 0); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); } /** @@ -162,7 +162,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDAbnormalTest003, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDAbnormalTest003"); AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0xffff); - ASSERT_EQ(INVALID_TOKENID, tokenID); + EXPECT_EQ(INVALID_TOKENID, tokenID); } /** @@ -181,7 +181,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDExFuncTest001, TestSize.Level0) g_infoManagerTestSystemInfoParms.bundleName, g_infoManagerTestSystemInfoParms.instIndex); - ASSERT_EQ(tokenIdEx.tokenIDEx, tokenIdEx1.tokenIDEx); + EXPECT_EQ(tokenIdEx.tokenIDEx, tokenIdEx1.tokenIDEx); HapTokenInfo hapTokenInfoRes; AccessTokenID tokenID = tokenIdEx.tokenIdExStruct.tokenID; EXPECT_EQ(RET_SUCCESS, AccessTokenKit::GetHapTokenInfo(tokenID, hapTokenInfoRes)); @@ -200,7 +200,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDExAbnormalTest001, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDExAbnormalTest001"); AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(TEST_USER_ID_INVALID, TEST_BUNDLE_NAME, 0); - ASSERT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); } /** @@ -214,7 +214,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDExAbnormalTest002, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDExAbnormalTest002"); AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(TEST_USER_ID, "invalid bundlename", 0); - ASSERT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); } /** @@ -228,10 +228,10 @@ HWTEST_F(GetHapTokenTest, GetHapTokenIDExAbnormalTest003, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetHapTokenIDExAbnormalTest003"); AccessTokenIDEx tokenIdEx = AccessTokenKit::GetHapTokenIDEx(TEST_USER_ID, "", 0); - ASSERT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); tokenIdEx = AccessTokenKit::GetHapTokenIDEx(TEST_USER_ID, TEST_BUNDLE_NAME, 0xffff); - ASSERT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); + EXPECT_EQ(INVALID_TOKENID, tokenIdEx.tokenIDEx); } /** @@ -250,14 +250,12 @@ HWTEST_F(GetHapTokenTest, GetHapTokenInfoFuncTest001, TestSize.Level0) int ret = AccessTokenKit::GetHapTokenInfo(tokenID, hapTokenInfoRes); ASSERT_EQ(RET_SUCCESS, ret); - - ASSERT_EQ(hapTokenInfoRes.userID, TEST_USER_ID); - ASSERT_EQ(hapTokenInfoRes.tokenID, tokenID); - ASSERT_EQ(hapTokenInfoRes.tokenAttr, static_cast(0)); - ASSERT_EQ(hapTokenInfoRes.instIndex, 0); - - ASSERT_EQ(hapTokenInfoRes.bundleName, TEST_BUNDLE_NAME); - ASSERT_EQ(RET_SUCCESS, TestCommon::DeleteTestHapToken(tokenID)); + EXPECT_EQ(hapTokenInfoRes.userID, TEST_USER_ID); + EXPECT_EQ(hapTokenInfoRes.tokenID, tokenID); + EXPECT_EQ(hapTokenInfoRes.tokenAttr, static_cast(0)); + EXPECT_EQ(hapTokenInfoRes.instIndex, 0); + EXPECT_EQ(hapTokenInfoRes.bundleName, TEST_BUNDLE_NAME); + EXPECT_EQ(RET_SUCCESS, TestCommon::DeleteTestHapToken(tokenID)); } /** @@ -272,7 +270,7 @@ HWTEST_F(GetHapTokenTest, GetHapTokenInfoAbnormalTest001, TestSize.Level0) HapTokenInfo hapTokenInfoRes; int ret = AccessTokenKit::GetHapTokenInfo(TEST_TOKENID_INVALID, hapTokenInfoRes); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); } /** @@ -290,11 +288,11 @@ HWTEST_F(GetHapTokenTest, GetHapTokenInfoExtensionFuncTest001, TestSize.Level0) HapTokenInfoExt hapTokenInfoExt; int ret = AccessTokenKit::GetHapTokenInfoExtension(tokenID, hapTokenInfoExt); ASSERT_EQ(ret, 0); - ASSERT_EQ(TEST_BUNDLE_NAME, hapTokenInfoExt.baseInfo.bundleName); - ASSERT_EQ("appIDDesc", hapTokenInfoExt.appID); + EXPECT_EQ(TEST_BUNDLE_NAME, hapTokenInfoExt.baseInfo.bundleName); + EXPECT_EQ("appIDDesc", hapTokenInfoExt.appID); ret = AccessTokenKit::GetHapTokenInfoExtension(INVALID_TOKENID, hapTokenInfoExt); - ASSERT_EQ(ret, AccessTokenError::ERR_PARAM_INVALID); + EXPECT_EQ(ret, AccessTokenError::ERR_PARAM_INVALID); } /** diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_token_type_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_token_type_test.cpp index 0c0d0d9b1..df1d4effc 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_token_type_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/get_token_type_test.cpp @@ -101,15 +101,15 @@ HWTEST_F(GetTokenTypeTest, GetTokenTypeFuncTest001, TestSize.Level0) // type = TOKEN_SHELL AccessTokenID tokenID = AccessTokenKit::GetNativeTokenId("hdcd"); ASSERT_NE(INVALID_TOKENID, tokenID); - ASSERT_EQ(TOKEN_SHELL, AccessTokenKit::GetTokenType(tokenID)); + EXPECT_EQ(TOKEN_SHELL, AccessTokenKit::GetTokenType(tokenID)); // type = TOKEN_NATIVE tokenID = AccessTokenKit::GetNativeTokenId("foundation"); - ASSERT_EQ(TOKEN_NATIVE, AccessTokenKit::GetTokenType(tokenID)); + EXPECT_EQ(TOKEN_NATIVE, AccessTokenKit::GetTokenType(tokenID)); // type = TOKEN_HAP tokenID = AccessTokenKit::GetHapTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0); - ASSERT_EQ(TOKEN_HAP, AccessTokenKit::GetTokenType(tokenID)); + EXPECT_EQ(TOKEN_HAP, AccessTokenKit::GetTokenType(tokenID)); } /** @@ -123,7 +123,7 @@ HWTEST_F(GetTokenTypeTest, GetTokenTypeAbnormalTest001, TestSize.Level0) LOGI(ATM_DOMAIN, ATM_TAG, "GetTokenTypeAbnormalTest001"); AccessTokenID tokenID = 0; - ASSERT_EQ(TOKEN_INVALID, AccessTokenKit::GetTokenType(tokenID)); + EXPECT_EQ(TOKEN_INVALID, AccessTokenKit::GetTokenType(tokenID)); } /** @@ -138,7 +138,7 @@ HWTEST_F(GetTokenTypeTest, GetTokenTypeFlagAbnormalTest001, TestSize.Level0) AccessTokenID tokenID = 0; ATokenTypeEnum ret = AccessTokenKit::GetTokenTypeFlag(tokenID); - ASSERT_EQ(ret, TOKEN_INVALID); + EXPECT_EQ(ret, TOKEN_INVALID); } /** @@ -165,7 +165,7 @@ HWTEST_F(GetTokenTypeTest, GetTokenTypeFlagFuncTest001, TestSize.Level0) AccessTokenID tokenID = tokenId01 & 0xffffffff; ATokenTypeEnum ret = AccessTokenKit::GetTokenTypeFlag(tokenID); - ASSERT_EQ(ret, TOKEN_NATIVE); + EXPECT_EQ(ret, TOKEN_NATIVE); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp index 4e3f85a9e..ae21df44b 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/HapTokenTest/update_hap_token_test.cpp @@ -192,7 +192,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest001, TestSize.Level0) AccessTokenKit::GetHapTokenInfoExtension(tokenID, hapInfoExt); EXPECT_EQ("HapTokenTestAppID_1", hapInfoExt.appID); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -235,7 +235,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest002, TestSize.Level0) AccessTokenKit::GetHapTokenInfoExtension(tokenID, hapInfoExt); EXPECT_EQ("AccessTokenTestAppID", hapInfoExt.appID); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -285,7 +285,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest003, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetHapTokenInfo(tokenID, hapInfo)); EXPECT_EQ(1, hapInfo.tokenAttr); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } void GetPermissions(string permissionName, PermissionStateFull& stateFull, PreAuthorizationInfo& info) @@ -344,15 +344,15 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest004, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams)); std::vector permStatList; ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetReqPermissions(tokenID, permStatList, false)); - ASSERT_EQ(static_cast(2), permStatList.size()); - ASSERT_EQ("ohos.permission.RECEIVE_SMS", permStatList[0].permissionName); + EXPECT_EQ(static_cast(2), permStatList.size()); + EXPECT_EQ("ohos.permission.RECEIVE_SMS", permStatList[0].permissionName); EXPECT_EQ(permStatList[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(permStatList[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ("ohos.permission.RECEIVE_MMS", permStatList[1].permissionName); + EXPECT_EQ("ohos.permission.RECEIVE_MMS", permStatList[1].permissionName); EXPECT_EQ(permStatList[1].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(permStatList[1].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -533,9 +533,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest007, TestSize.Level0) deleteFlag = 1; } } - ASSERT_EQ(allocFlag, 0); - ASSERT_EQ(updateFlag, 0); - ASSERT_EQ(deleteFlag, 0); + EXPECT_EQ(allocFlag, 0); + EXPECT_EQ(updateFlag, 0); + EXPECT_EQ(deleteFlag, 0); } /** @@ -571,9 +571,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest008, TestSize.Level0) ret = AccessTokenKit::GetDefPermission("ohos.permission.test3", permDefResult); ASSERT_EQ(AccessTokenError::ERR_PERMISSION_NOT_EXIST, ret); - ASSERT_NE("ohos.permission.test3", permDefResult.permissionName); + EXPECT_NE("ohos.permission.test3", permDefResult.permissionName); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** * @tc.name: UpdateHapTokenFuncTest009 @@ -685,9 +685,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest011, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, AccessTokenKit::UpdateHapToken(tokenIdEx, info, g_testPolicyParams)); ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetHapTokenInfo(tokenID, hapTokenInfoRes)); - ASSERT_EQ(info.apiVersion, hapTokenInfoRes.apiVersion); + EXPECT_EQ(info.apiVersion, hapTokenInfoRes.apiVersion); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -704,7 +704,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenFuncTest012, TestSize.Level0) info.appIDDesc = std::string("updateFailed"); info.apiVersion = 0; info.isSystemApp = false; - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, AccessTokenKit::UpdateHapToken(tokenID, info, policy)); } @@ -1055,9 +1055,9 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest005, TestSize.Level0) HapInfoCheckResult result; ASSERT_EQ(ERR_PERM_REQUEST_CFG_FAILED, AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams, result)); - ASSERT_EQ(result.permCheckResult.permissionName, "ohos.permission.ENTERPRISE_MANAGE_SETTINGS"); - ASSERT_EQ(result.permCheckResult.rule, PERMISSION_EDM_RULE); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(result.permCheckResult.permissionName, "ohos.permission.ENTERPRISE_MANAGE_SETTINGS"); + EXPECT_EQ(result.permCheckResult.rule, PERMISSION_EDM_RULE); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -1097,12 +1097,12 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest006, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, AccessTokenKit::UpdateHapToken(fullTokenId, info, testPolicyParams2)); std::vector state; ASSERT_EQ(RET_SUCCESS, AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false)); - ASSERT_EQ(static_cast(1), state.size()); - ASSERT_EQ("ohos.permission.CAMERA", state[0].permissionName); + EXPECT_EQ(static_cast(1), state.size()); + EXPECT_EQ("ohos.permission.CAMERA", state[0].permissionName); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1157,15 +1157,15 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest007, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); - ASSERT_EQ("ohos.permission.CAMERA", state[0].permissionName); + EXPECT_EQ(static_cast(2), state.size()); + EXPECT_EQ("ohos.permission.CAMERA", state[0].permissionName); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_USER_FIXED); - ASSERT_EQ("ohos.permission.MICROPHONE", state[1].permissionName); + EXPECT_EQ("ohos.permission.MICROPHONE", state[1].permissionName); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1217,13 +1217,13 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest008, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); + EXPECT_EQ(static_cast(2), state.size()); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_GRANTED_BY_POLICY); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_DEFAULT_FLAG); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1272,13 +1272,13 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest009, TestSize.Level0) ASSERT_EQ(RET_SUCCESS, ret); std::vector state; AccessTokenKit::GetReqPermissions(fullTokenId.tokenIdExStruct.tokenID, state, false); - ASSERT_EQ(static_cast(2), state.size()); + EXPECT_EQ(static_cast(2), state.size()); EXPECT_EQ(state[0].grantStatus[0], PERMISSION_GRANTED); EXPECT_EQ(state[0].grantFlags[0], PERMISSION_SYSTEM_FIXED); EXPECT_EQ(state[1].grantStatus[0], PERMISSION_DENIED); EXPECT_EQ(state[1].grantFlags[0], PERMISSION_USER_FIXED | PERMISSION_GRANTED_BY_POLICY); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1323,17 +1323,17 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest010, TestSize.Level0) HapInfoCheckResult result; ret = AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams, result); ASSERT_EQ(ERR_PERM_REQUEST_CFG_FAILED, ret); - ASSERT_EQ(result.permCheckResult.permissionName, "ohos.permission.ACCESS_DDK_USB"); - ASSERT_EQ(result.permCheckResult.rule, PERMISSION_ACL_RULE); + EXPECT_EQ(result.permCheckResult.permissionName, "ohos.permission.ACCESS_DDK_USB"); + EXPECT_EQ(result.permCheckResult.rule, PERMISSION_ACL_RULE); result.permCheckResult.permissionName = "test"; // invalid Name result.permCheckResult.rule = static_cast(-1); // invalid reasan policyParams.aclRequestedList = { "ohos.permission.ACCESS_DDK_USB" }; ret = AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams, result); ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(result.permCheckResult.permissionName, "test"); - ASSERT_EQ(result.permCheckResult.rule, -1); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(result.permCheckResult.permissionName, "test"); + EXPECT_EQ(result.permCheckResult.rule, -1); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -1377,7 +1377,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenSpecsTest011, TestSize.Level0) EXPECT_EQ(AccessTokenError::ERR_PERMISSION_WITHOUT_VALUE, AccessTokenKit::GetReqPermissionByName( tokenID, "ohos.permission.CAMERA", value)); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -1408,7 +1408,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest001, TestSize.Level0) ret = AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams); EXPECT_EQ(ERR_PARAM_INVALID, ret); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1443,7 +1443,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest002, TestSize.Level0) ret = AccessTokenKit::UpdateHapToken(fullTokenId, updateHapInfoParams, policyParams); EXPECT_EQ(ERR_PARAM_INVALID, ret); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(fullTokenId.tokenIdExStruct.tokenID)); } /** @@ -1620,7 +1620,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest005, TestSize.Level0) ret = AccessTokenKit::VerifyAccessToken(tokenID, "ohos.permission.AGENT_REQUIRE_FORM"); EXPECT_EQ(PERMISSION_DENIED, ret); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); + EXPECT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenID)); } /** @@ -1641,7 +1641,7 @@ HWTEST_F(UpdateHapTokenTest, UpdateHapTokenAbnormalTest006, TestSize.Level0) info.isSystemApp = false; int ret = AccessTokenKit::UpdateHapToken( tokenIdEx, info, g_testPolicyParams); - ASSERT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); + EXPECT_EQ(AccessTokenError::ERR_PARAM_INVALID, ret); } } // namespace AccessToken } // namespace Security -- Gitee