From e560861856310fee27388fa6244b69fa80361b59 Mon Sep 17 00:00:00 2001 From: cuiruibin Date: Thu, 10 Apr 2025 10:59:41 +0800 Subject: [PATCH] =?UTF-8?q?NDK=E9=94=99=E8=AF=AF=E7=A0=81=E6=95=B4?= =?UTF-8?q?=E6=94=B9=20Signed-off-by:=20cuiruibin=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/ndk/fileshare/BUILD.gn | 2 +- .../kits/ndk/fileshare/include/error_code.h | 29 ----- interfaces/kits/ndk/fileshare/src/BUILD.gn | 1 + .../kits/ndk/fileshare/src/oh_file_share.cpp | 50 ++++---- .../file_share_permission_sup_test/BUILD.gn | 1 + .../file_share_permission_sup_test.cpp | 40 +++---- .../file_share_permission_test/BUILD.gn | 1 + .../file_share_permission_test.cpp | 110 +++++++++--------- 8 files changed, 104 insertions(+), 130 deletions(-) delete mode 100644 interfaces/kits/ndk/fileshare/include/error_code.h diff --git a/interfaces/kits/ndk/fileshare/BUILD.gn b/interfaces/kits/ndk/fileshare/BUILD.gn index 9ab75ccac..ce77baf38 100644 --- a/interfaces/kits/ndk/fileshare/BUILD.gn +++ b/interfaces/kits/ndk/fileshare/BUILD.gn @@ -29,7 +29,7 @@ ohos_ndk_library("libohfileshare") { ohos_ndk_headers("oh_file_share_header") { dest_dir = "$ndk_headers_out_dir/filemanagement/fileshare/" sources = [ - "${app_file_service_path}/interfaces/kits/ndk/fileshare/include/error_code.h", + "${app_file_service_path}/interfaces/kits/ndk/fileuri/include/error_code.h", "${app_file_service_path}/interfaces/kits/ndk/fileshare/include/oh_file_share.h", ] } diff --git a/interfaces/kits/ndk/fileshare/include/error_code.h b/interfaces/kits/ndk/fileshare/include/error_code.h deleted file mode 100644 index 7f28cd7a5..000000000 --- a/interfaces/kits/ndk/fileshare/include/error_code.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef FILEMANAGEMENT_APP_FILE_SERVICE_INTERFACES_FILE_SHARE_ERROR_CODE_H -#define FILEMANAGEMENT_APP_FILE_SERVICE_INTERFACES_FILE_SHARE_ERROR_CODE_H - -enum FileManagement_ErrCode { - E_NO_ERROR = 0, - E_PERMISSION = 201, - E_PARAMS = 401, - E_DEVICE_NOT_SUPPORT = 801, - E_EPERM = 13900001, - E_ENOMEM = 13900011, - E_UNKNOWN_ERROR = 13900042 -}; - -#endif // FILEMANAGEMENT_APP_FILE_SERVICE_INTERFACES_FILE_SHARE_ERROR_CODE_H \ No newline at end of file diff --git a/interfaces/kits/ndk/fileshare/src/BUILD.gn b/interfaces/kits/ndk/fileshare/src/BUILD.gn index e95da8d62..1345f9a1c 100644 --- a/interfaces/kits/ndk/fileshare/src/BUILD.gn +++ b/interfaces/kits/ndk/fileshare/src/BUILD.gn @@ -29,6 +29,7 @@ ohos_shared_library("ohfileshare") { "${app_file_service_path}/interfaces/common/include/", "${app_file_service_path}/interfaces/innerkits/native/file_share/include/", "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", + "${app_file_service_path}/interfaces/kits/ndk/fileuri/include", ] sources = [ "oh_file_share.cpp" ] diff --git a/interfaces/kits/ndk/fileshare/src/oh_file_share.cpp b/interfaces/kits/ndk/fileshare/src/oh_file_share.cpp index 1a019c34a..019f6a598 100644 --- a/interfaces/kits/ndk/fileshare/src/oh_file_share.cpp +++ b/interfaces/kits/ndk/fileshare/src/oh_file_share.cpp @@ -125,19 +125,19 @@ static bool ConvertPolicyErrorResultBool(const std::vector &errorResults, static FileManagement_ErrCode ErrorCodeConversion(int32_t errorCode) { - FileManagement_ErrCode errCode = E_UNKNOWN_ERROR; + FileManagement_ErrCode errCode = ERR_UNKNOWN; switch (errorCode) { - case static_cast(E_NO_ERROR): - errCode = E_NO_ERROR; + case static_cast(ERR_OK): + errCode = ERR_OK; break; - case static_cast(E_PERMISSION): - errCode = E_PERMISSION; + case static_cast(ERR_PERMISSION_ERROR): + errCode = ERR_PERMISSION_ERROR; break; - case static_cast(E_PARAMS): - errCode = E_PARAMS; + case static_cast(ERR_PARAMS): + errCode = ERR_PARAMS; break; case EPERM: - errCode = E_EPERM; + errCode = ERR_EPERM; break; default: break; @@ -155,16 +155,16 @@ static FileManagement_ErrCode ExecAction(const FileShare_PolicyInfo *policies, (*resultNum) = 0; std::vector uriPolicies; if (!ConvertPolicyInfo(policies, policyNum, uriPolicies)) { - return E_PARAMS; + return ERR_PARAMS; } std::deque errorResults; auto ret = ErrorCodeConversion(exec(uriPolicies, errorResults)); - if (ret == E_NO_ERROR) { - return E_NO_ERROR; + if (ret == ERR_OK) { + return ERR_OK; } if (!ConvertPolicyErrorResult(errorResults, result, *resultNum)) { OH_FileShare_ReleasePolicyErrorResult(*result, *resultNum); - return E_ENOMEM; + return ERR_ENOMEM; } return ret; } @@ -176,11 +176,11 @@ FileManagement_ErrCode OH_FileShare_PersistPermission(const FileShare_PolicyInfo { if (policies == nullptr || result == nullptr || resultNum == nullptr) { LOGE("The external input pointer is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } if (policyNum == 0 || policyNum > OHOS::AppFileService::MAX_ARRAY_SIZE) { LOGE("The policyNum is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } return ExecAction(policies, policyNum, result, resultNum, OHOS::AppFileService::FilePermission::PersistPermission); } @@ -192,11 +192,11 @@ FileManagement_ErrCode OH_FileShare_RevokePermission(const FileShare_PolicyInfo { if (policies == nullptr || result == nullptr || resultNum == nullptr) { LOGE("The external input pointer is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } if (policyNum == 0 || policyNum > OHOS::AppFileService::MAX_ARRAY_SIZE) { LOGE("The policyNum is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } return ExecAction(policies, policyNum, result, resultNum, OHOS::AppFileService::FilePermission::RevokePermission); } @@ -208,11 +208,11 @@ FileManagement_ErrCode OH_FileShare_ActivatePermission(const FileShare_PolicyInf { if (policies == nullptr || result == nullptr || resultNum == nullptr) { LOGE("The external input pointer is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } if (policyNum == 0 || policyNum > OHOS::AppFileService::MAX_ARRAY_SIZE) { LOGE("The policyNum is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } return ExecAction(policies, policyNum, result, resultNum, OHOS::AppFileService::FilePermission::ActivatePermission); } @@ -224,11 +224,11 @@ FileManagement_ErrCode OH_FileShare_DeactivatePermission(const FileShare_PolicyI { if (policies == nullptr || result == nullptr || resultNum == nullptr) { LOGE("The external input pointer is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } if (policyNum == 0 || policyNum > OHOS::AppFileService::MAX_ARRAY_SIZE) { LOGE("The policyNum is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } return ExecAction(policies, policyNum, result, resultNum, OHOS::AppFileService::FilePermission::DeactivatePermission); @@ -241,16 +241,16 @@ FileManagement_ErrCode OH_FileShare_CheckPersistentPermission(const FileShare_Po { if (policies == nullptr || result == nullptr || resultNum == nullptr) { LOGE("The external input pointer is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } if (policyNum == 0 || policyNum > OHOS::AppFileService::MAX_ARRAY_SIZE) { LOGE("The policyNum is abnormal"); - return E_PARAMS; + return ERR_PARAMS; } *resultNum = 0; std::vector uriPolicies; if (!ConvertPolicyInfo(policies, policyNum, uriPolicies)) { - return E_PARAMS; + return ERR_PARAMS; } std::vector errorResults; auto ret = OHOS::AppFileService::FilePermission::CheckPersistentPermission(uriPolicies, errorResults); @@ -258,10 +258,10 @@ FileManagement_ErrCode OH_FileShare_CheckPersistentPermission(const FileShare_Po return ErrorCodeConversion(ret); } if (!ConvertPolicyErrorResultBool(errorResults, result)) { - return E_ENOMEM; + return ERR_ENOMEM; } *resultNum = errorResults.size(); - return E_NO_ERROR; + return ERR_OK; } void OH_FileShare_ReleasePolicyErrorResult(FileShare_PolicyErrorResult *result, unsigned int num) diff --git a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn index 37435f6d3..145bd9f4f 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn @@ -27,6 +27,7 @@ ohos_unittest("file_share_permission_ndk_sup_test") { module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", + "${app_file_service_path}/interfaces/kits/ndk/fileuri/include", "${app_file_service_path}/tests/mock/file_permission_native_mock/include", "${app_file_service_path}/tests/mock/parameter_mock/include", ] diff --git a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/file_share_permission_sup_test.cpp b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/file_share_permission_sup_test.cpp index 9d988473c..abe5cbd67 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/file_share_permission_sup_test.cpp +++ b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/file_share_permission_sup_test.cpp @@ -104,17 +104,17 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_PersistPermission_test_002, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); policies[0].uri = policyUriChar; ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); policies[0].length = sizeof(policyUriChar); ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_002 end"; } @@ -140,9 +140,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_PersistPermission_test_003, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; - EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)).WillOnce(Return(E_PERMISSION)); + EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)).WillOnce(Return(ERR_PERMISSION_ERROR)); FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_ENOMEM); + EXPECT_EQ(ret, ERR_ENOMEM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); std::deque errorResults; @@ -152,9 +152,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_PersistPermission_test_003, } EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(E_PARAMS))); + .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(ERR_PARAMS))); ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_ENOMEM); + EXPECT_EQ(ret, ERR_ENOMEM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_003 end"; } @@ -185,13 +185,13 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_PersistPermission_test_004, EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)) .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(EPERM))); FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(E_EPERM))); + .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(ERR_EPERM))); ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_UNKNOWN_ERROR); + EXPECT_EQ(ret, ERR_UNKNOWN); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_004 end"; } @@ -217,9 +217,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_PersistPermission_test_005, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; - EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)).WillOnce(Return(E_NO_ERROR)); + EXPECT_CALL(*filePermMoc_, PersistPermission(_, _)).WillOnce(Return(ERR_OK)); FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_NO_ERROR); + EXPECT_EQ(ret, ERR_OK); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_005 end"; } @@ -245,7 +245,7 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_CheckPersistentPermission_t bool *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); if (result != nullptr) { free(result); } @@ -253,7 +253,7 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_CheckPersistentPermission_t policies[0].length = strlen(policyUriChar); EXPECT_CALL(*filePermMoc_, CheckPersistentPermission(_, _)).WillOnce(Return(EPERM)); ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { free(result); } @@ -280,9 +280,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_CheckPersistentPermission_t unsigned int policiesNum = sizeof(policies) / sizeof(policies[0]); bool *result = nullptr; unsigned int resultNum; - EXPECT_CALL(*filePermMoc_, CheckPersistentPermission(_, _)).WillOnce(Return(E_NO_ERROR)); + EXPECT_CALL(*filePermMoc_, CheckPersistentPermission(_, _)).WillOnce(Return(ERR_OK)); FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_ENOMEM); + EXPECT_EQ(ret, ERR_ENOMEM); if (result != nullptr) { free(result); } @@ -293,9 +293,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_CheckPersistentPermission_t } EXPECT_CALL(*filePermMoc_, CheckPersistentPermission(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(E_NO_ERROR))); + .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(ERR_OK))); ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_ENOMEM); + EXPECT_EQ(ret, ERR_ENOMEM); if (result != nullptr) { free(result); } @@ -327,9 +327,9 @@ HWTEST_F(NDKFileSharePermissionSupTest, OH_FileShare_CheckPersistentPermission_t errorResults.push_back(false); EXPECT_CALL(*filePermMoc_, CheckPersistentPermission(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(E_NO_ERROR))); + .WillOnce(DoAll(SetArgReferee<1>(errorResults), Return(ERR_OK))); FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_NO_ERROR); + EXPECT_EQ(ret, ERR_OK); if (result != nullptr) { free(result); diff --git a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn index 7fe4c10fe..4ca8b25f1 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("file_share_permission_ndk_test") { module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", + "${app_file_service_path}/interfaces/kits/ndk/fileuri/include", "${app_file_service_path}/interfaces/kits/ndk/fileshare/src", ] resource_config_file = diff --git a/test/unittest/file_share_ndk_test/file_share_permission_test/file_share_permission_test.cpp b/test/unittest/file_share_ndk_test/file_share_permission_test/file_share_permission_test.cpp index e5634aa6d..1564cff2e 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_test/file_share_permission_test.cpp +++ b/test/unittest/file_share_ndk_test/file_share_permission_test/file_share_permission_test.cpp @@ -104,7 +104,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_PersistPermission_test_001, Te FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_001 end"; } @@ -130,7 +130,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_PersistPermission_test_002, Te FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -155,7 +155,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_PersistPermission_test_003, Te FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_PersistPermission(nullptr, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); char policyUriChar[] = "file://com.example.filesharea/data/storage/fileShare02.txt"; FileShare_PolicyInfo policy = {.uri = policyUriChar, @@ -164,17 +164,17 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_PersistPermission_test_003, Te FileShare_OperationMode::READ_MODE | FileShare_OperationMode::WRITE_MODE}; FileShare_PolicyInfo policies[] = {policy}; ret = OH_FileShare_PersistPermission(policies, policiesNum, nullptr, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, nullptr); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); policiesNum = OHOS::AppFileService::MAX_ARRAY_SIZE + 1; ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_PersistPermission_test_003 end"; } @@ -205,7 +205,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_PersistPermission_test_004, Te FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -236,10 +236,10 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_001, Tes FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); FileManagement_ErrCode ret = OH_FileShare_RevokePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_RevokePermission_test_001 end"; } @@ -265,7 +265,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_002, Tes FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_RevokePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -291,7 +291,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_003, Tes FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_RevokePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); char policyUriChar[] = "file://com.example.filesharea/data/storage/fileShare02.txt"; FileShare_PolicyInfo policy = {.uri = policyUriChar, @@ -300,17 +300,17 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_003, Tes FileShare_OperationMode::READ_MODE | FileShare_OperationMode::WRITE_MODE}; FileShare_PolicyInfo policiesTwo[] = {policy}; ret = OH_FileShare_RevokePermission(policiesTwo, policiesNum, nullptr, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_RevokePermission(policiesTwo, policiesNum, &result, nullptr); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_RevokePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); policiesNum = OHOS::AppFileService::MAX_ARRAY_SIZE + 1; ret = OH_FileShare_RevokePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_RevokePermission_test_003 end"; } @@ -336,7 +336,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_004, Tes FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policiesA, policiesNumA, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); char policyUriCharB[] = "file://com.example.filesharea/data/storage/fileShare04.txt"; FileShare_PolicyInfo policyB = {.uri = policyUriCharB, @@ -346,7 +346,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_RevokePermission_test_004, Tes FileShare_PolicyInfo policies[] = {policyA, policyB}; unsigned int policiesNum = sizeof(policies) / sizeof(policies[0]); FileManagement_ErrCode ret = OH_FileShare_RevokePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -377,10 +377,10 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_001, T FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); FileManagement_ErrCode ret = OH_FileShare_ActivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_ActivatePermission_test_001 end"; } @@ -406,7 +406,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_002, T FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_ActivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -432,7 +432,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_003, T FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_ActivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); char policyUriChar[] = "file://com.example.filesharea/data/storage/fileShare02.txt"; FileShare_PolicyInfo policy = {.uri = policyUriChar, @@ -441,17 +441,17 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_003, T FileShare_OperationMode::READ_MODE | FileShare_OperationMode::WRITE_MODE}; FileShare_PolicyInfo policiesTwo[] = {policy}; ret = OH_FileShare_ActivatePermission(policiesTwo, policiesNum, nullptr, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_ActivatePermission(policiesTwo, policiesNum, &result, nullptr); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_ActivatePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); policiesNum = OHOS::AppFileService::MAX_ARRAY_SIZE + 1; ret = OH_FileShare_ActivatePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_ActivatePermission_test_003 end"; } @@ -477,7 +477,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_004, T FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policiesA, policiesNumA, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); char policyUriCharB[] = "file://com.example.filesharea/data/storage/fileShare04.txt"; FileShare_PolicyInfo policyB = {.uri = policyUriCharB, @@ -487,7 +487,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ActivatePermission_test_004, T FileShare_PolicyInfo policies[] = {policyA, policyB}; unsigned int policiesNum = sizeof(policies) / sizeof(policies[0]); FileManagement_ErrCode ret = OH_FileShare_ActivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -518,13 +518,13 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_001, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); FileManagement_ErrCode retActivate = OH_FileShare_ActivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(retActivate, E_EPERM); + EXPECT_EQ(retActivate, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); FileManagement_ErrCode ret = OH_FileShare_DeactivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_DeactivatePermission_test_001 end"; } @@ -551,7 +551,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_002, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_DeactivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -577,7 +577,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_003, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_DeactivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); char policyUriChar[] = "file://com.example.filesharea/data/storage/fileShare02.txt"; FileShare_PolicyInfo policy = {.uri = policyUriChar, @@ -586,17 +586,17 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_003, FileShare_OperationMode::READ_MODE | FileShare_OperationMode::WRITE_MODE}; FileShare_PolicyInfo policiesTwo[] = {policy}; ret = OH_FileShare_DeactivatePermission(policiesTwo, policiesNum, nullptr, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_DeactivatePermission(policiesTwo, policiesNum, &result, nullptr); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_DeactivatePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); policiesNum = OHOS::AppFileService::MAX_ARRAY_SIZE + 1; ret = OH_FileShare_DeactivatePermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); GTEST_LOG_(INFO) << "OH_FileShare_DeactivatePermission_test_003 end"; } @@ -622,10 +622,10 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_004, FileShare_PolicyErrorResult *result = nullptr; unsigned int resultNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policiesA, policiesNumA, &result, &resultNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); FileManagement_ErrCode retActivate = OH_FileShare_ActivatePermission(policiesA, policiesNumA, &result, &resultNum); - EXPECT_EQ(retActivate, E_EPERM); + EXPECT_EQ(retActivate, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(result, resultNum); char policyUriCharB[] = "file://com.example.filesharea/data/storage/fileShare04.txt"; FileShare_PolicyInfo policyB = {.uri = policyUriCharB, @@ -635,7 +635,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_DeactivatePermission_test_004, FileShare_PolicyInfo policies[] = {policyA, policyB}; unsigned int policiesNum = sizeof(policies) / sizeof(policies[0]); FileManagement_ErrCode ret = OH_FileShare_DeactivatePermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_EPERM); + EXPECT_EQ(ret, ERR_EPERM); if (result != nullptr) { EXPECT_EQ(FileShare_PolicyErrorCode::INVALID_PATH, result[0].code); } else { @@ -667,12 +667,12 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test unsigned int resultPersistNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policies, policiesNum, &resultPersist, &resultPersistNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(resultPersist, resultPersistNum); bool *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_NO_ERROR); + EXPECT_EQ(ret, ERR_OK); if (result != nullptr) { EXPECT_EQ(result[0], false); } else { @@ -705,7 +705,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test bool *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_NO_ERROR); + EXPECT_EQ(ret, ERR_OK); if (result != nullptr) { EXPECT_EQ(result[0], false); } else { @@ -733,7 +733,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test bool *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); char policyUriChar[] = "file://com.example.filesharea/data/storage/fileShare02.txt"; FileShare_PolicyInfo policy = {.uri = policyUriChar, @@ -742,17 +742,17 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test FileShare_OperationMode::READ_MODE | FileShare_OperationMode::WRITE_MODE}; FileShare_PolicyInfo policiesTwo[] = {policy}; ret = OH_FileShare_CheckPersistentPermission(policiesTwo, policiesNum, nullptr, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_CheckPersistentPermission(policiesTwo, policiesNum, &result, nullptr); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); ret = OH_FileShare_CheckPersistentPermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); policiesNum = OHOS::AppFileService::MAX_ARRAY_SIZE + 1; ret = OH_FileShare_CheckPersistentPermission(policiesTwo, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_PARAMS); + EXPECT_EQ(ret, ERR_PARAMS); if (result != nullptr) { free(result); } @@ -781,7 +781,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test unsigned int resultPersistNum; FileManagement_ErrCode retPersist = OH_FileShare_PersistPermission(policiesA, policiesNumA, &resultPersist, &resultPersistNum); - EXPECT_EQ(retPersist, E_EPERM); + EXPECT_EQ(retPersist, ERR_EPERM); OH_FileShare_ReleasePolicyErrorResult(resultPersist, resultPersistNum); char policyUriCharB[] = "file://com.example.filesharea/data/storage/fileShare04.txt"; FileShare_PolicyInfo policyB = {.uri = policyUriCharB, @@ -793,7 +793,7 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_CheckPersistentPermission_test bool *result = nullptr; unsigned int resultNum; FileManagement_ErrCode ret = OH_FileShare_CheckPersistentPermission(policies, policiesNum, &result, &resultNum); - EXPECT_EQ(ret, E_NO_ERROR); + EXPECT_EQ(ret, ERR_OK); if (result != nullptr && resultNum == 2) { EXPECT_EQ(result[0], false); EXPECT_EQ(result[1], false); @@ -1077,11 +1077,11 @@ HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ConvertPolicyErrorResultBool_0 HWTEST_F(NDKFileSharePermissionTest, OH_FileShare_ErrorCodeConversion_0100, TestSize.Level1) { GTEST_LOG_(INFO) << "OH_FileShare_ErrorCodeConversion_0100 start"; - EXPECT_EQ(ErrorCodeConversion(static_cast(E_NO_ERROR)), E_NO_ERROR); - EXPECT_EQ(ErrorCodeConversion(static_cast(E_PERMISSION)), E_PERMISSION); - EXPECT_EQ(ErrorCodeConversion(static_cast(E_PARAMS)), E_PARAMS); - EXPECT_EQ(ErrorCodeConversion(EPERM), E_EPERM); - EXPECT_EQ(ErrorCodeConversion(-EPERM), E_UNKNOWN_ERROR); + EXPECT_EQ(ErrorCodeConversion(static_cast(ERR_OK)), ERR_OK); + EXPECT_EQ(ErrorCodeConversion(static_cast(ERR_PERMISSION_ERROR)), ERR_PERMISSION_ERROR); + EXPECT_EQ(ErrorCodeConversion(static_cast(ERR_PARAMS)), ERR_PARAMS); + EXPECT_EQ(ErrorCodeConversion(EPERM), ERR_EPERM); + EXPECT_EQ(ErrorCodeConversion(-EPERM), ERR_UNKNOWN); GTEST_LOG_(INFO) << "OH_FileShare_ErrorCodeConversion_0100 end"; } } // namespace OHOS::AppFileService::ModuleFileSharePermission -- Gitee