diff --git a/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.cpp b/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.cpp index 6dab686d59c122fab2141d0f3be3bd9f01ff8c83..761f58dbe38f7c4190016c5b3b1907d08a3616b5 100644 --- a/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.cpp +++ b/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-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 @@ -34,9 +34,9 @@ using namespace OHOS; using namespace FileAccessFwk; const int ABILITY_ID = 5003; -shared_ptr g_fah = nullptr; const int UID_TRANSFORM_TMP = 20000000; const int UID_DEFAULT = 0; +shared_ptr g_fah = nullptr; void SetNativeToken() { @@ -45,18 +45,18 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .acls = nullptr, .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, - .acls = nullptr, .aplStr = "system_core", }; + const uint64_t systemAppMask = (static_cast(1) << 32); infoInstance.processName = "SetUpTestCase"; tokenId = GetAccessTokenId(&infoInstance); - const uint64_t systemAppMask = (static_cast(1) << 32); tokenId |= systemAppMask; SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); @@ -79,17 +79,17 @@ shared_ptr GetFileAccessHelper() HILOG_ERROR("GetRegisteredFileAccessExtAbilityInfo failed."); return nullptr; } - bool sus = false; + bool isFound = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; - sus = true; + isFound = true; break; } } - if (!sus) { + if (!isFound) { HILOG_ERROR("not found bundleName."); return nullptr; } @@ -107,18 +107,18 @@ bool CreatorFuzzTest(const uint8_t* data, size_t size) { SetNativeToken(); if ((data == nullptr) || (size <= 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("Null pointer or invalid size for parameter data."); return false; } std::string bundleName(reinterpret_cast(data), size); auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); + auto systemAbility = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; want.SetElementName(bundleName, "FileExtensionAbility"); vector wants {want}; setuid(UID_TRANSFORM_TMP); shared_ptr helper = nullptr; - helper = FileAccessHelper::Creator(remoteObj, wants); + helper = FileAccessHelper::Creator(systemAbility, wants); setuid(UID_DEFAULT); if (helper == nullptr) { HILOG_ERROR("creator return nullptr."); @@ -131,7 +131,7 @@ bool CreatorFuzzTest(const uint8_t* data, size_t size) bool AccessFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size <= 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("Parameter data is null or size is invalid size <= 0."); return false; } Uri uri(std::string(reinterpret_cast(data), size)); @@ -151,20 +151,20 @@ bool AccessFuzzTest(const uint8_t* data, size_t size) bool OpenFileFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size <= 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("parameter data is nullptr or size <= 0."); return false; } Uri uri(std::string(reinterpret_cast(data), size)); shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("Failed to create FileAccessHelper."); return false; } int fd = -1; int result = 0; result = helper->OpenFile(uri, WRITE_READ, fd); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("OpenFile failed. ret : %{public}d", result); + HILOG_ERROR("Open file failed. ret : %{public}d", result); return false; } close(fd); @@ -174,7 +174,7 @@ bool OpenFileFuzzTest(const uint8_t* data, size_t size) bool CreateFileFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size <= 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("parameter data is null or size is invalid."); return false; } shared_ptr helper = GetFileAccessHelper(); @@ -214,14 +214,14 @@ bool MkdirFuzzTest(const uint8_t* data, size_t size) } shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("Failed to create FileAccessHelper."); return false; } vector info; int result = helper->GetRoots(info); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("GetRoots failed. ret : %{public}d", result); + HILOG_ERROR("Failed to retrieve roots in GetRoots method. ret : %{public}d", result); return false; } for (size_t i = 0; i < info.size(); i++) { @@ -250,7 +250,7 @@ bool DeleteFuzzTest(const uint8_t* data, size_t size) Uri uri(std::string(reinterpret_cast(data), size)); shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("Unable to create FileAccessHelper."); return false; } int result = helper->Delete(uri); @@ -264,12 +264,12 @@ bool DeleteFuzzTest(const uint8_t* data, size_t size) bool MoveFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size <= 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("parameter data is nullptr or size <= 0."); return false; } shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("Unable to create FileAccessHelper."); return false; } vector info; @@ -317,13 +317,13 @@ bool RenameFuzzTest(const uint8_t* data, size_t size) } shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("GetFileAccessHelper failed."); return false; } vector info; int result = helper->GetRoots(info); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("GetRoots failed. ret : %{public}d", result); + HILOG_ERROR("Failed to obtain roots data in GetRoots method. ret : %{public}d", result); return false; } for (size_t i = 0; i < info.size(); i++) { @@ -352,12 +352,12 @@ bool RenameFuzzTest(const uint8_t* data, size_t size) bool ListFileFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size == 0)) { - HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); + HILOG_ERROR("parameter data is nullptr or invalid size."); return false; } shared_ptr helper = GetFileAccessHelper(); if (helper == nullptr) { - HILOG_ERROR("GetFileAccessHelper return nullptr."); + HILOG_ERROR("Failed to create FileAccessHelper."); return false; } @@ -401,7 +401,7 @@ bool ScanFileFuzzTest(const uint8_t* data, size_t size) FileFilter filter; int result = helper->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("ScanFile failed. ret : %{public}d", result); + HILOG_ERROR("ScanFile operation failed. ret : %{public}d", result); return false; } return true; diff --git a/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.h b/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.h index 8b72c9dac070d8a822ca2e94bedefaf00f640641..9a4b9e746f87aa4ccf2a1f0ef1f026bfc97c3c11 100644 --- a/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.h +++ b/test/fuzztest/externalfileaccess_fuzzer/external_file_access_fuzzer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-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 diff --git a/test/fuzztest/externalfileaccessaccess_fuzzer/externalfileaccessaccess_fuzzer.cpp b/test/fuzztest/externalfileaccessaccess_fuzzer/externalfileaccessaccess_fuzzer.cpp index fa7893bb2ca1e1de5883eab8f5c236fb5fa8d134..a9842fb15cd5a9183ebec6fefb317fdeda28c5e9 100644 --- a/test/fuzztest/externalfileaccessaccess_fuzzer/externalfileaccessaccess_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessaccess_fuzzer/externalfileaccessaccess_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,9 +52,9 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .aclsNum = 0, .dcapsNum = 0, .permsNum = 2, - .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, diff --git a/test/fuzztest/externalfileaccesscreatefile_fuzzer/externalfileaccesscreatefile_fuzzer.cpp b/test/fuzztest/externalfileaccesscreatefile_fuzzer/externalfileaccesscreatefile_fuzzer.cpp index 77ffd6b4ade52df61c85e62d5d2fbc608b5d036f..d9bc28093a37a02d535f2f67111484eeab96fef7 100644 --- a/test/fuzztest/externalfileaccesscreatefile_fuzzer/externalfileaccesscreatefile_fuzzer.cpp +++ b/test/fuzztest/externalfileaccesscreatefile_fuzzer/externalfileaccesscreatefile_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,8 +52,8 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, .permsNum = 2, + .dcapsNum = 0, .aclsNum = 0, .dcaps = nullptr, .perms = perms, diff --git a/test/fuzztest/externalfileaccessdelete_fuzzer/externalfileaccessdelete_fuzzer.cpp b/test/fuzztest/externalfileaccessdelete_fuzzer/externalfileaccessdelete_fuzzer.cpp index b8cafecdf4fba041ac237a4282a886b0996fb294..b2b07ac77267575ca70a6722e7a75754abf19a6a 100644 --- a/test/fuzztest/externalfileaccessdelete_fuzzer/externalfileaccessdelete_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessdelete_fuzzer/externalfileaccessdelete_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,12 +52,12 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, + .dcapsNum = 0, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/externalfileaccessgetfileinfofromrelativepath_fuzzer.cpp b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/externalfileaccessgetfileinfofromrelativepath_fuzzer.cpp index e2f3e46443c581a8e65483ec34d5b941d4503a1d..e5fd0ba34d2f806cc76501f966a78aaaa20f03d7 100644 --- a/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/externalfileaccessgetfileinfofromrelativepath_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessgetfileinfofromrelativepath_fuzzer/externalfileaccessgetfileinfofromrelativepath_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -53,11 +53,11 @@ void SetNativeToken() perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, - .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, + .permsNum = 2, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/externalfileaccessgetfileinfofromuri_fuzzer.cpp b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/externalfileaccessgetfileinfofromuri_fuzzer.cpp index b383fb52f5d5f88848ee0f0ddf327dc5930df8c2..f491d0dc0e56ba5873883d595be33c043d809b32 100644 --- a/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/externalfileaccessgetfileinfofromuri_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessgetfileinfofromuri_fuzzer/externalfileaccessgetfileinfofromuri_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -54,10 +54,10 @@ void SetNativeToken() NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = 2, - .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, + .aclsNum = 0, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessgetroots_fuzzer/externalfileaccessgetroots_fuzzer.cpp b/test/fuzztest/externalfileaccessgetroots_fuzzer/externalfileaccessgetroots_fuzzer.cpp index 51885bf85f21bc0050e50f8852176f5c7715172c..1dec13d903fc58948eaea4ffdabafc1c7b0cfa9e 100644 --- a/test/fuzztest/externalfileaccessgetroots_fuzzer/externalfileaccessgetroots_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessgetroots_fuzzer/externalfileaccessgetroots_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -55,9 +55,9 @@ void SetNativeToken() .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, - .dcaps = nullptr, .perms = perms, .acls = nullptr, + .dcaps = nullptr, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccesslistfile_fuzzer/externalfileaccesslistfile_fuzzer.cpp b/test/fuzztest/externalfileaccesslistfile_fuzzer/externalfileaccesslistfile_fuzzer.cpp index 54724b5d397b0d5b8762b24a2d12a2b6f5123d7f..802e4e0b021b8370bef38280f8a32dad117f33d1 100644 --- a/test/fuzztest/externalfileaccesslistfile_fuzzer/externalfileaccesslistfile_fuzzer.cpp +++ b/test/fuzztest/externalfileaccesslistfile_fuzzer/externalfileaccesslistfile_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -56,8 +56,8 @@ void SetNativeToken() .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, - .perms = perms, .acls = nullptr, + .perms = perms, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessmkdir_fuzzer/externalfileaccessmkdir_fuzzer.cpp b/test/fuzztest/externalfileaccessmkdir_fuzzer/externalfileaccessmkdir_fuzzer.cpp index 58954b0a198f0c18571850a37469d35bfe45d91b..7014052b258fe92e0733069c270e174c965ba31b 100644 --- a/test/fuzztest/externalfileaccessmkdir_fuzzer/externalfileaccessmkdir_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessmkdir_fuzzer/externalfileaccessmkdir_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,9 +52,9 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .aclsNum = 0, .dcapsNum = 0, .permsNum = 2, - .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, diff --git a/test/fuzztest/externalfileaccessmove_fuzzer/externalfileaccessmove_fuzzer.cpp b/test/fuzztest/externalfileaccessmove_fuzzer/externalfileaccessmove_fuzzer.cpp index 93e0506461223763bcae7f93fce83a9ca54ec5fe..07d1e527adc0186b68c851e16b9ebe3167d8a369 100644 --- a/test/fuzztest/externalfileaccessmove_fuzzer/externalfileaccessmove_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessmove_fuzzer/externalfileaccessmove_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,10 +52,10 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, + .dcapsNum = 0, + .permsNum = 2, .perms = perms, .acls = nullptr, .aplStr = "system_core", diff --git a/test/fuzztest/externalfileaccessopenfile_fuzzer/externalfileaccessopenfile_fuzzer.cpp b/test/fuzztest/externalfileaccessopenfile_fuzzer/externalfileaccessopenfile_fuzzer.cpp index 859c919abbf378e6f33abe127b19bbdafae3e5df..7dc13b30980db52bd75fe9614d496a2bac1a1c02 100644 --- a/test/fuzztest/externalfileaccessopenfile_fuzzer/externalfileaccessopenfile_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessopenfile_fuzzer/externalfileaccessopenfile_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,11 +52,11 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, + .dcapsNum = 0, + .permsNum = 2, .acls = nullptr, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessrename_fuzzer/externalfileaccessrename_fuzzer.cpp b/test/fuzztest/externalfileaccessrename_fuzzer/externalfileaccessrename_fuzzer.cpp index a86ef762aae18f994606d3fd7b9cf4853af5bcb3..54e0a88d6a6c36937ecfd50340ce085e2e23a5d2 100644 --- a/test/fuzztest/externalfileaccessrename_fuzzer/externalfileaccessrename_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessrename_fuzzer/externalfileaccessrename_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,12 +52,12 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, + .dcapsNum = 0, + .permsNum = 2, .aplStr = "system_core", }; diff --git a/test/fuzztest/externalfileaccessscanfile_fuzzer/externalfileaccessscanfile_fuzzer.cpp b/test/fuzztest/externalfileaccessscanfile_fuzzer/externalfileaccessscanfile_fuzzer.cpp index 6d3b0ede19391ca2d6998bd605005688c0b474b0..5f57c21587c4298c5517f1421a9aded9f35d9961 100644 --- a/test/fuzztest/externalfileaccessscanfile_fuzzer/externalfileaccessscanfile_fuzzer.cpp +++ b/test/fuzztest/externalfileaccessscanfile_fuzzer/externalfileaccessscanfile_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2023-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 @@ -52,10 +52,10 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .dcaps = nullptr, .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, - .dcaps = nullptr, .perms = perms, .acls = nullptr, .aplStr = "system_core", diff --git a/test/unittest/abnormal_file_access_test.cpp b/test/unittest/abnormal_file_access_test.cpp index fef7a9063d6ed741afb09a6c7fceba2b748072c7..45c2c32506f442614060ebf3f38764bf1d6a7c8d 100755 --- a/test/unittest/abnormal_file_access_test.cpp +++ b/test/unittest/abnormal_file_access_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-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 @@ -44,13 +44,13 @@ static void SetNativeToken(bool isSystemApp) perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .aplStr = "system_core", .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, .perms = perms, .acls = nullptr, - .aplStr = "system_core", }; infoInstance.processName = "SetUpTestCase"; @@ -71,27 +71,27 @@ public: cout << "AbnormalFileExtensionHelperTest code test" << endl; SetNativeToken(true); auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); + auto systemAbility = saManager->GetSystemAbility(ABILITY_ID); g_context = make_shared(); - g_context->SetToken(remoteObj); + g_context->SetToken(systemAbility); AAFwk::Want want; vector wantVec; setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - bool sus = false; + bool isSuccessful = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; - sus = true; + isSuccessful = true; break; } } - EXPECT_TRUE(sus); + EXPECT_TRUE(isSuccessful); vector wants{want}; - g_fah = FileAccessHelper::Creator(remoteObj, wants); + g_fah = FileAccessHelper::Creator(systemAbility, wants); if (g_fah == nullptr) { GTEST_LOG_(ERROR) << "AbnormalFileExtensionHelperTest g_fah is nullptr"; exit(1); diff --git a/test/unittest/external_file_access_test_info.cpp b/test/unittest/external_file_access_test_info.cpp index 4ff00a2e7c3ba0c10bfb668378f3f14c7dbe1e12..3994b3ae62c2eaf575c8cc60cd266a3640c1c4e9 100644 --- a/test/unittest/external_file_access_test_info.cpp +++ b/test/unittest/external_file_access_test_info.cpp @@ -96,18 +96,18 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext Uri newFileUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "external_file_access_Access_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - bool isExist = false; - result = fileAccessHelper->Access(newDirUriTest, isExist); + bool isFileExist = false; + result = fileAccessHelper->Access(newDirUriTest, isFileExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_TRUE(isExist); - result = fileAccessHelper->Access(newFileUri, isExist); + EXPECT_TRUE(isFileExist); + result = fileAccessHelper->Access(newFileUri, isFileExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_TRUE(isExist); + EXPECT_TRUE(isFileExist); result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Access(newDirUriTest, isExist); + result = fileAccessHelper->Access(newDirUriTest, isFileExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_FALSE(isExist); + EXPECT_FALSE(isFileExist); } } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Access_0000 occurs an exception."; @@ -135,7 +135,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0001, testing::ext for (size_t i = 0; i < info.size(); i++) { std::string str = info[i].uri; if (!ReplaceBundleNameFromPath(str, "ohos.com.NotExistBundleName")) { - GTEST_LOG_(ERROR) << "replace BundleName failed."; + GTEST_LOG_(ERROR) << "Error in replacing BundleName."; EXPECT_TRUE(false); } Uri newDirUriTest(str + "/test.txt"); @@ -216,8 +216,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0000, int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); SharedMemoryInfo memInfo; - result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", DEFAULT_CAPACITY_200KB, - memInfo); + result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", + DEFAULT_CAPACITY_200KB, memInfo); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); FileInfo fileinfo; @@ -255,9 +255,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0001, vector info; int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - SharedMemoryInfo memInfo; + SharedMemoryInfo sharedMemoryInfo; result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", DEFAULT_CAPACITY_200KB, - memInfo); + sharedMemoryInfo); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); @@ -270,14 +270,14 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0001, int64_t offset = 0; FileFilter filter; - result = fileAccessHelper->ListFile(dirInfo, offset, filter, memInfo); + result = fileAccessHelper->ListFile(dirInfo, offset, filter, sharedMemoryInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GE(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); + EXPECT_GE(sharedMemoryInfo.Size(), OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(memInfo); + FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(sharedMemoryInfo); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_GetFileInfoFromUri_0001 occurs an exception."; } @@ -302,9 +302,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0002, vector info; int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - SharedMemoryInfo memInfo; + SharedMemoryInfo memoryInfo; result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", DEFAULT_CAPACITY_200KB, - memInfo); + memoryInfo); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); @@ -321,14 +321,14 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0002, int64_t offset = 0; FileFilter filter; - result = fileAccessHelper->ListFile(fileinfo, offset, filter, memInfo); + result = fileAccessHelper->ListFile(fileinfo, offset, filter, memoryInfo); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(memoryInfo.Size(), OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(memInfo); + FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(memoryInfo); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_GetFileInfoFromUri_0002 occurs an exception."; } @@ -355,8 +355,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0003, EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(std::string("\?\?\?\?/") + info[i].uri); - FileInfo fileinfo; - result = fileAccessHelper->GetFileInfoFromUri(parentUri, fileinfo); + FileInfo fileInfo; + result = fileAccessHelper->GetFileInfoFromUri(parentUri, fileInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::E_URIS); } } catch (...) { @@ -386,7 +386,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0004, for (size_t i = 0; i < info.size(); i++) { std::string str = info[i].uri; if (!ReplaceBundleNameFromPath(str, "ohos.com.NotExistBundleName")) { - GTEST_LOG_(ERROR) << "replace BundleName failed."; + GTEST_LOG_(ERROR) << "BundleName replacement failed."; EXPECT_TRUE(false); } Uri parentUri(str); @@ -416,16 +416,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0005, GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_GetFileInfoFromUri_0005"; try { Uri uri("~!@#$%^&*()_"); - FileInfo fileInfo; - int result = fileAccessHelper->GetFileInfoFromUri(uri, fileInfo); + FileInfo info; + int result = fileAccessHelper->GetFileInfoFromUri(uri, info); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); uri = Uri("/"); - result = fileAccessHelper->GetFileInfoFromUri(uri, fileInfo); + result = fileAccessHelper->GetFileInfoFromUri(uri, info); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); uri = Uri(""); - result = fileAccessHelper->GetFileInfoFromUri(uri, fileInfo); + result = fileAccessHelper->GetFileInfoFromUri(uri, info); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_GetFileInfoFromUri_0005 occurs an exception."; @@ -451,9 +451,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0006, vector info; int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - SharedMemoryInfo memInfo; + SharedMemoryInfo sharedMemInfo; result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", DEFAULT_CAPACITY_200KB, - memInfo); + sharedMemInfo); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); @@ -467,14 +467,14 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0006, int64_t offset = 0; FileFilter filter; - result = fileAccessHelper->ListFile(dirInfo, offset, filter, memInfo); + result = fileAccessHelper->ListFile(dirInfo, offset, filter, sharedMemInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GE(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); + EXPECT_GE(sharedMemInfo.Size(), OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(memInfo); + FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(sharedMemInfo); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_GetFileInfoFromUri_0006 occurs an exception."; } @@ -505,13 +505,13 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0007, for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "测试目录", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "测试目录1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(newDirUriTest.ToString().find("测试目录"), std::string::npos); + EXPECT_EQ(newDirUriTest.ToString().find("测试目录1"), std::string::npos); Uri newFileUri(""); - result = fileAccessHelper->CreateFile(newDirUriTest, "测试文件.txt", newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest, "测试文件1.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(newFileUri.ToString().find("测试文件.txt"), std::string::npos); + EXPECT_EQ(newFileUri.ToString().find("测试文件1.txt"), std::string::npos); FileInfo fileinfo; result = fileAccessHelper->GetFileInfoFromUri(newFileUri, fileinfo); @@ -957,17 +957,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Query_0000, testing::ext: result = fileAccessHelper->CreateFile(newDirUriTest2, fileName, newFileUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd = -1; - std::string buff = "query test"; + std::string buff = "Query test"; result = fileAccessHelper->OpenFile(newFileUri1, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - ssize_t fileSize = write(fd, buff.c_str(), buff.size()); + ssize_t size = write(fd, buff.c_str(), buff.size()); close(fd); - EXPECT_EQ(fileSize, buff.size()); + EXPECT_EQ(size, buff.size()); result = fileAccessHelper->OpenFile(newFileUri2, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - fileSize = write(fd, buff.c_str(), buff.size()); + size = write(fd, buff.c_str(), buff.size()); close(fd); - EXPECT_EQ(fileSize, buff.size()); + EXPECT_EQ(size, buff.size()); int len = buff.size() + buff.size(); CheckJson(newDirUriTest1, displayName, relativePath, len, fileAccessHelper); result = fileAccessHelper->Delete(newDirUriTest1); @@ -1048,7 +1048,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Query_0002, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri1(""); Uri newFileUri2(""); - std::string fileName = "external_file_access_Query_00001.txt"; + std::string fileName = "external_file_access_Query_00002.txt"; result = fileAccessHelper->CreateFile(newDirUriTest1, fileName, newFileUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->CreateFile(newDirUriTest2, fileName, newFileUri2); @@ -1057,14 +1057,14 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Query_0002, testing::ext: std::string buff = "query test"; result = fileAccessHelper->OpenFile(newFileUri1, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - ssize_t fileSize = write(fd, buff.c_str(), buff.size()); + ssize_t sizeOfBuffer = write(fd, buff.c_str(), buff.size()); close(fd); - EXPECT_EQ(fileSize, buff.size()); + EXPECT_EQ(sizeOfBuffer, buff.size()); result = fileAccessHelper->OpenFile(newFileUri2, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - fileSize = write(fd, buff.c_str(), buff.size()); + sizeOfBuffer = write(fd, buff.c_str(), buff.size()); close(fd); - EXPECT_EQ(fileSize, buff.size()); + EXPECT_EQ(sizeOfBuffer, buff.size()); json testJson = { {FILE_SIZE, " "} }; @@ -1327,9 +1327,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0000, testing:: Uri parentUri(info[0].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); @@ -1366,9 +1366,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0001, testing:: Uri parentUri(info[0].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test5", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test6", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -1409,9 +1409,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0002, testing:: Uri parentUri(info[0].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test7", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test8", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -1451,9 +1451,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0003, testing:: Uri parentUri(info[0].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test9", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test10", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -1494,11 +1494,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0004, testing:: Uri newDirUriTest1(""); Uri newDirUriTest2(""); Uri newDirUriTest3(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Mkdir(newDirUriTest2, "test1", newDirUriTest3); + result = fileAccessHelper->Mkdir(newDirUriTest2, "test3", newDirUriTest3); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -1638,25 +1638,25 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0007, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(newDirUriTest1, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(newDirUriTest1, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri1(""); result = fileAccessHelper->CreateFile(newDirUriTest2, "test.txt", sourceUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri2(""); - result = fileAccessHelper->CreateFile(newDirUriTest2, "test1.txt", sourceUri2); + result = fileAccessHelper->CreateFile(newDirUriTest2, "test3.txt", sourceUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest3(""); - result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest3); + result = fileAccessHelper->Mkdir(parentUri, "test5", newDirUriTest3); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest4(""); - result = fileAccessHelper->Mkdir(newDirUriTest3, "test1", newDirUriTest4); + result = fileAccessHelper->Mkdir(newDirUriTest3, "test3", newDirUriTest4); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest5(""); - result = fileAccessHelper->Mkdir(newDirUriTest4, "test2", newDirUriTest5); + result = fileAccessHelper->Mkdir(newDirUriTest4, "test4", newDirUriTest5); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri targetUri1(""); result = fileAccessHelper->CreateFile(newDirUriTest5, "test.txt", targetUri1); @@ -1861,26 +1861,26 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_item_0012, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "测试目录1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri1(""); - result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", uri1); + result = fileAccessHelper->CreateFile(newDirUriTest1, "测试文件.txt", uri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri2(""); - result = fileAccessHelper->CreateFile(newDirUriTest1, "test4", uri2); + result = fileAccessHelper->CreateFile(newDirUriTest1, "测试目录4", uri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "测试目录3", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest3(""); - result = fileAccessHelper->Mkdir(newDirUriTest2, "test1", newDirUriTest3); + result = fileAccessHelper->Mkdir(newDirUriTest2, "测试目录1", newDirUriTest3); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest4(""); - result = fileAccessHelper->Mkdir(newDirUriTest3, "test4", newDirUriTest4); + result = fileAccessHelper->Mkdir(newDirUriTest3, "测试目录4", newDirUriTest4); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest5(""); - result = fileAccessHelper->CreateFile(newDirUriTest3, "test.txt", newDirUriTest5); + result = fileAccessHelper->CreateFile(newDirUriTest3, "测试文件.txt", newDirUriTest5); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->MoveItem(newDirUriTest1, newDirUriTest2, moveResult, false); diff --git a/test/unittest/external_file_access_test_management.cpp b/test/unittest/external_file_access_test_management.cpp index e99bbb74f03e49f8f561e4724bd4f60300637cb7..a3b4777f35446ca11641179a3eeb914f8c212e57 100644 --- a/test/unittest/external_file_access_test_management.cpp +++ b/test/unittest/external_file_access_test_management.cpp @@ -240,11 +240,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0006, testing: shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0006"; try { - vector info; - int result = fileAccessHelper->GetRoots(info); + vector rootInfo; + int result = fileAccessHelper->GetRoots(rootInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (size_t i = 0; i < info.size(); i++) { - std::string str = info[i].uri; + for (size_t i = 0; i < rootInfo.size(); i++) { + std::string str = rootInfo[i].uri; if (!ReplaceBundleNameFromPath(str, "ohos.com.NotExistBundleName")) { GTEST_LOG_(ERROR) << "replace BundleName failed."; EXPECT_TRUE(false); @@ -308,17 +308,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_file_0000, testing:: shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_file_0000"; try { - vector info; - int result = fileAccessHelper->GetRoots(info); + vector rootInfo; + int result = fileAccessHelper->GetRoots(rootInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri parentUri(info[0].uri); + Uri parentUri(rootInfo[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "测试目录1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(newDirUriTest1.ToString() + "/" + "test"); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "测试目录3", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFile(""); std::string fileName = "a"; @@ -352,16 +352,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_file_001, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri targetUri(newDirUriTest2.ToString() + "/" + "test3"); + Uri targetUri(newDirUriTest2.ToString() + "/" + "test5"); std::string fileName("a.txt"); Uri newFile(""); result = fileAccessHelper->MoveFile(sourceUri, targetUri, fileName, newFile); @@ -432,7 +432,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_file_003, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -474,7 +474,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_file_004, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test4", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -519,25 +519,25 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_file_005, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test5", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test1.txt", sourceUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test05", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri targetUri1(""); - result = fileAccessHelper->CreateFile(newDirUriTest2, "test1.txt", targetUri1); + result = fileAccessHelper->CreateFile(newDirUriTest2, "test5.txt", targetUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri targetUri2(""); - result = fileAccessHelper->CreateFile(newDirUriTest2, "test2.txt", targetUri2); + result = fileAccessHelper->CreateFile(newDirUriTest2, "test05.txt", targetUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string fileName("test2.txt"); + std::string fileName("test05.txt"); Uri newFile(""); result = fileAccessHelper->MoveFile(sourceUri, newDirUriTest2, fileName, newFile); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_EXIST); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest2); @@ -566,12 +566,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_000, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(newDirUriTest1.ToString() + "/" + "test"); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test5", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFile(""); std::string fileName = "a"; @@ -605,16 +605,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_001, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test6", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test7", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri targetUri(newDirUriTest2.ToString() + "/" + "test3"); + Uri targetUri(newDirUriTest2.ToString() + "/" + "test8"); std::string fileName("a.txt"); Uri newFile(""); result = fileAccessHelper->CopyFile(sourceUri, targetUri, fileName, newFile); @@ -647,11 +647,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_002, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::string fileName("a.txt"); Uri newFile(""); @@ -685,7 +685,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_003, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test7", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -727,7 +727,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_004, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test8", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -771,23 +771,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_005, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test9", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newDirUriTest2(""); - result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); + Uri newDirUriTest10(""); + result = fileAccessHelper->Mkdir(parentUri, "test10", newDirUriTest10); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::string fileName("a.txt"); Uri newFile(""); - result = fileAccessHelper->CopyFile(sourceUri, newDirUriTest2, fileName, newFile); + result = fileAccessHelper->CopyFile(sourceUri, newDirUriTest10, fileName, newFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(newFile.GetPath(), newDirUriTest2.GetPath() + '/' +"test.txt"); + EXPECT_EQ(newFile.GetPath(), newDirUriTest10.GetPath() + '/' +"test.txt"); result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest10); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Copy_file_005 occurs an exception."; @@ -813,7 +813,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_006, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test10", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); @@ -905,7 +905,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_file_008, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); - result = fileAccessHelper->Mkdir(parentUri, "测试1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "测试目录1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceUri(""); result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", sourceUri); diff --git a/test/unittest/external_file_access_test_operations.cpp b/test/unittest/external_file_access_test_operations.cpp index 0e543f3d1c4b7cdc539347e40db328d5c01ca8bd..0e1b2bb7c2ddaf091ec2eecfdff65ed011f13a61 100644 --- a/test/unittest/external_file_access_test_operations.cpp +++ b/test/unittest/external_file_access_test_operations.cpp @@ -86,10 +86,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0000, testing::ext:: EXPECT_EQ(srcFileSize, destFileSize); close(fd); - result = fileAccessHelper->Delete(srcDir); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(destDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fileAccessHelper->Delete(srcDir); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Copy_0000 occurs an exception."; @@ -136,10 +136,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0001, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0001_dest", destDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector copyResult; - result = fileAccessHelper->Copy(srcDir, destDir, copyResult, false); + std::vector copyResults; + result = fileAccessHelper->Copy(srcDir, destDir, copyResults, false); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(copyResult.size(), 0); + EXPECT_EQ(copyResults.size(), 0); result = fileAccessHelper->Delete(srcDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -217,12 +217,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0003, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0003_src", srcDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri srcFile(""); - result = fileAccessHelper->CreateFile(srcDir, "a.txt", srcFile); + result = fileAccessHelper->CreateFile(srcDir, "b.txt", srcFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd = -1; result = fileAccessHelper->OpenFile(srcFile, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - char buff[] = "Copy test content for a.txt"; + char buff[] = "Copy test content for b.txt"; ssize_t srcFileSize = write(fd, buff, sizeof(buff)); EXPECT_EQ(srcFileSize, sizeof(buff)); close(fd); @@ -231,7 +231,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0003, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0003_dest", destDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri existFile(""); - result = fileAccessHelper->CreateFile(destDir, "a.txt", existFile); + result = fileAccessHelper->CreateFile(destDir, "b.txt", existFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::vector copyResult; @@ -279,12 +279,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0004, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0004_src", srcDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri srcFile(""); - result = fileAccessHelper->CreateFile(srcDir, "a.txt", srcFile); + result = fileAccessHelper->CreateFile(srcDir, "c.txt", srcFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd = -1; result = fileAccessHelper->OpenFile(srcFile, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - char buff[] = "Copy test content for a.txt"; + char buff[] = "Copy test content for c.txt"; ssize_t srcFileSize = write(fd, buff, sizeof(buff)); EXPECT_EQ(srcFileSize, sizeof(buff)); close(fd); @@ -293,7 +293,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0004, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0004_dest", destDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri existFile(""); - result = fileAccessHelper->CreateFile(destDir, "a.txt", existFile); + result = fileAccessHelper->CreateFile(destDir, "c.txt", existFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::vector copyResult; @@ -303,8 +303,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0004, testing::ext:: result = fileAccessHelper->OpenFile(existFile, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - ssize_t destFileSize = read(fd, buff, sizeof(buff)); - EXPECT_EQ(destFileSize, 0); + ssize_t fileSize = read(fd, buff, sizeof(buff)); + EXPECT_EQ(fileSize, 0); close(fd); result = fileAccessHelper->Delete(srcDir); @@ -341,12 +341,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0005, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0005_src", srcDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri srcFile(""); - result = fileAccessHelper->CreateFile(srcDir, "a.txt", srcFile); + result = fileAccessHelper->CreateFile(srcDir, "d.txt", srcFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd = -1; result = fileAccessHelper->OpenFile(srcFile, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - char buff[] = "Copy test content for a.txt"; + char buff[] = "Copy test content for d.txt"; ssize_t srcFileSize = write(fd, buff, sizeof(buff)); EXPECT_EQ(srcFileSize, sizeof(buff)); close(fd); @@ -355,7 +355,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0005, testing::ext:: result = fileAccessHelper->Mkdir(parentUri, "Copy_0005_dest", destDir); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri existFile(""); - result = fileAccessHelper->CreateFile(destDir, "a.txt", existFile); + result = fileAccessHelper->CreateFile(destDir, "d.txt", existFile); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::vector copyResult; @@ -434,10 +434,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Copy_0006, testing::ext:: result = fileAccessHelper->CreateFile(destSrcDir, "b.txt", bFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector copyResult; - result = fileAccessHelper->Copy(srcDir, destDir, copyResult, true); + std::vector copiedFiles; + result = fileAccessHelper->Copy(srcDir, destDir, copiedFiles, true); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(copyResult.size(), 0); + EXPECT_EQ(copiedFiles.size(), 0); int fd = -1; result = fileAccessHelper->OpenFile(bFileUri, WRITE_READ, fd); @@ -675,7 +675,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0000, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test7", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); @@ -713,7 +713,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0001, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test8", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); result = fileAccessHelper->Rename(newDirUriTest, "testRename", renameUri); @@ -773,13 +773,13 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test9", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); + Uri sourceFileUri("storage/media/100/local/files/Download/test9/test.txt"); result = fileAccessHelper->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result; @@ -837,7 +837,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test10", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); @@ -889,7 +889,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test11", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); std::string displayName1 = "test1.txt"; @@ -932,7 +932,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0007, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test12", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::string str = newDirUriTest.ToString(); @@ -974,9 +974,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0008, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "测试目录", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "测试目录2", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(newDirUriTest.ToString().find("测试目录"), std::string::npos); + EXPECT_EQ(newDirUriTest.ToString().find("测试目录2"), std::string::npos); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1014,7 +1014,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0009, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test13", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); @@ -1053,7 +1053,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test14", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "external_file_access_ListFile_0000.txt", testUri); @@ -1096,11 +1096,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0001, testing::e FileInfo fileInfo; fileInfo.uri = sourceFileUri.ToString(); int64_t offset = 0; - FileFilter filter; + FileFilter fileFilter; SharedMemoryInfo memInfo; int result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", DEFAULT_CAPACITY_200KB, memInfo); - result = fileAccessHelper->ListFile(fileInfo, offset, filter, memInfo); + result = fileAccessHelper->ListFile(fileInfo, offset, fileFilter, memInfo); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); FileAccessFwk::SharedMemoryOperation::DestroySharedMemory(memInfo); @@ -1130,22 +1130,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test15", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); + Uri sourceFileUri("storage/media/100/local/files/Download/test15/test.txt"); FileInfo fileInfo; fileInfo.uri = sourceFileUri.ToString(); Uri sourceFile(fileInfo.uri); int64_t offset = 0; - FileFilter filter; + FileFilter fileFilter; SharedMemoryInfo memInfo; - int result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", - DEFAULT_CAPACITY_200KB, - memInfo); - result = fileAccessHelper->ListFile(fileInfo, offset, filter, memInfo); + result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", + DEFAULT_CAPACITY_200KB, memInfo); + result = fileAccessHelper->ListFile(fileInfo, offset, fileFilter, memInfo); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); result = fileAccessHelper->Delete(newDirUriTest); @@ -1226,7 +1225,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test16", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "external_file_access_ListFile_0004.txt", testUri); @@ -1274,7 +1273,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0005, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test17", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); @@ -1290,9 +1289,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0005, testing::e int64_t offset = 0; FileFilter filter; SharedMemoryInfo memInfo; - int result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", - DEFAULT_CAPACITY_200KB, - memInfo); + result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", + DEFAULT_CAPACITY_200KB, memInfo); result = fileAccessHelper->ListFile(fileInfo, offset, filter, memInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::E_IPCS); result = fileAccessHelper->Delete(newDirUriTest); @@ -1325,9 +1323,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0006, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = fileAccessHelper->Mkdir(parentUri, "测试目录", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "测试目录0006", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(newDirUriTest.ToString().find("测试目录"), std::string::npos); + EXPECT_EQ(newDirUriTest.ToString().find("测试目录0006"), std::string::npos); Uri testUri(""); result = fileAccessHelper->CreateFile(newDirUriTest, "测试文件.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1337,9 +1335,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0006, testing::e int64_t offset = 0; FileFilter filter; SharedMemoryInfo memInfo; - int result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", - DEFAULT_CAPACITY_200KB, - memInfo); + result = FileAccessFwk::SharedMemoryOperation::CreateSharedMemory("FileInfo List", + DEFAULT_CAPACITY_200KB, memInfo); result = fileAccessHelper->ListFile(fileInfo, offset, filter, memInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(memInfo.Size(), OHOS::FileAccessFwk::ERR_OK); diff --git a/test/unittest/external_notify_test.cpp b/test/unittest/external_notify_test.cpp index 838eae9b97ee21099114ce51a2b5554d2cd11ec0..c5b551c1cef6f53ba86e183026e463e060744591 100644 --- a/test/unittest/external_notify_test.cpp +++ b/test/unittest/external_notify_test.cpp @@ -60,19 +60,19 @@ void SetNativeToken() perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; NativeTokenInfoParams infoInstance = { + .perms = perms, + .aplStr = "system_core", .dcapsNum = 0, .permsNum = 2, .aclsNum = 0, .dcaps = nullptr, - .perms = perms, .acls = nullptr, - .aplStr = "system_core", }; infoInstance.processName = "SetUpTestCase"; tokenId = GetAccessTokenId(&infoInstance); - const uint64_t systemAppMask = (static_cast(1) << 32); - tokenId |= systemAppMask; + const uint64_t systemTokenMask = (static_cast(1) << 32); + tokenId |= systemTokenMask; SetSelfTokenID(tokenId); OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); delete[] perms; @@ -103,8 +103,8 @@ public: { cout << "FileExtensionNotifyTest code test" << endl; SetNativeToken(); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); + auto sysAbilityManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + auto remoteObj = sysAbilityManager->GetSystemAbility(ABILITY_ID); g_context = make_shared(); g_context->SetToken(remoteObj); AAFwk::Want want; @@ -112,17 +112,17 @@ public: setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - bool sus = false; + bool successFlag = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; - sus = true; + successFlag = true; break; } } - EXPECT_TRUE(sus); + EXPECT_TRUE(successFlag); vector wants{want}; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { @@ -1123,12 +1123,12 @@ HWTEST_F(FileExtensionNotifyTest, external_file_access_notify_0018, testing::ext { GTEST_LOG_(INFO) << "FileExtensionNotifyTest-begin external_file_access_notify_0018"; try { - vector info; - int result = g_fah->GetRoots(info); + vector rootInfo; + int result = g_fah->GetRoots(rootInfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); bool notifyForDescendants = true; sptr myObserver1 = new (std::nothrow) TestObserver(); - Uri parentUri(info[1].uri); + Uri parentUri(rootInfo[1].uri); Uri newFileDir1(""); result = g_fah->Mkdir(parentUri, "uri_dir", newFileDir1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/test/unittest/js_file_access_ext_ability_test.cpp b/test/unittest/js_file_access_ext_ability_test.cpp index b6cd7080f12cf5539d6f66dd1cd5aef87ac0f144..1cfbc7397e9b2f67a30811516ce474216427a05e 100644 --- a/test/unittest/js_file_access_ext_ability_test.cpp +++ b/test/unittest/js_file_access_ext_ability_test.cpp @@ -31,20 +31,23 @@ namespace OHOS::FileAccessFwk { using namespace std; using namespace testing; using namespace testing::ext; +const int ARG_INDEX_SECOND = 2; +const int ARG_INDEX_THIRD = 3; +const int ARG_INDEX_FIFTH = 5; FileAccessServiceStub::FileAccessServiceStub() {} FileAccessServiceStub::~FileAccessServiceStub() {} -int32_t FileAccessServiceStub::OnRemoteRequest(unsigned int, OHOS::MessageParcel&, OHOS::MessageParcel&, - OHOS::MessageOption&) +int32_t FileAccessServiceProxy::OnChange(Uri uri, NotifyType notifyType) { - return 0; + return ERR_OK; } -int32_t FileAccessServiceProxy::OnChange(Uri uri, NotifyType notifyType) +int32_t FileAccessServiceStub::OnRemoteRequest(unsigned int, OHOS::MessageParcel&, OHOS::MessageParcel&, + OHOS::MessageOption&) { - return ERR_OK; + return 0; } int32_t FileAccessServiceProxy::GetExensionProxy(const std::shared_ptr &, @@ -365,6 +368,21 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0001, t GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-end js_file_access_ext_ability_OpenFile_0001"; } +static void MockNapiCalls(shared_ptr insMoc, napi_value rslt) +{ + EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); + EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) + .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); + EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) + .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); + EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) + .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); + EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) + .WillOnce(DoAll(SetArgPointee(reinterpret_cast(&rslt)), Return(napi_ok))); +} + /** * @tc.number: user_file_service_js_file_access_ext_ability_OpenFile_0002 * @tc.name: js_file_access_ext_ability_OpenFile_0002 @@ -378,23 +396,13 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0002, t { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_OpenFile_0002"; try { - napi_value rslt; + napi_value rslt = nullptr; const Uri uri(""); int fd = -1; ability->jsObj_ = make_shared(); // 模拟获取value->code失败 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int32(_, _, _)) @@ -405,17 +413,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0002, t EXPECT_EQ(result, E_IPCS); // 模拟获取value->data为-1 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int32(_, _, _)) @@ -443,23 +441,13 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_OpenFile_0003, t { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_OpenFile_0003"; try { - napi_value rslt; + napi_value rslt = nullptr; const Uri uri(""); int fd = -1; ability->jsObj_ = make_shared(); // 模拟OpenFile调用成功 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_int32(_, _, _)) @@ -553,51 +541,31 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CreateFile_0002, { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_CreateFile_0002"; try { - napi_value rslt; + napi_value rslt = nullptr; Uri parent(""); - string displayName(""); + string fileDisplayName(""); Uri newFile(""); ability->jsObj_ = make_shared(); // 模拟获取value->code失败 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(DoAll(SetArgPointee<2>(E_IPCS), Return(napi_ok))); - auto result = ability->CreateFile(parent, displayName, newFile); + auto result = ability->CreateFile(parent, fileDisplayName, newFile); EXPECT_EQ(result, E_IPCS); // 模拟获取value->data为-1 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)) .WillOnce(Return(napi_ok)); - result = ability->CreateFile(parent, displayName, newFile); + result = ability->CreateFile(parent, fileDisplayName, newFile); EXPECT_EQ(result, E_GETRESULT); } catch (...) { GTEST_LOG_(ERROR) << "JsFileAccessExtAbilityTest occurs an exception."; @@ -618,7 +586,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CreateFile_0003, { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_CreateFile_0003"; try { - napi_value rslt; + napi_value napiResult; string path = "test"; Uri parent(""); string displayName(""); @@ -629,18 +597,18 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_CreateFile_0003, EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))) .WillOnce(Return(napi_ok)) .WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) .WillOnce(DoAll(SetArgPointee<4>(path.length()), Return(napi_ok))) .WillOnce(DoAll(SetArrayArgument<2>(path.begin(), path.end()), Return(napi_ok))); @@ -733,50 +701,30 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Mkdir_0002, test { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Mkdir_0002"; try { - napi_value rslt; + napi_value rslt = nullptr; Uri parent(""); string displayName(""); - Uri newFile(""); + Uri file(""); ability->jsObj_ = make_shared(); // 模拟获取value->code失败 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(DoAll(SetArgPointee<2>(E_IPCS), Return(napi_ok))); - auto result = ability->Mkdir(parent, displayName, newFile); + auto result = ability->Mkdir(parent, displayName, file); EXPECT_EQ(result, E_IPCS); // 模拟获取value->data为-1 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(Return(napi_ok)); - result = ability->Mkdir(parent, displayName, newFile); + result = ability->Mkdir(parent, displayName, file); EXPECT_EQ(result, E_GETRESULT); } catch (...) { GTEST_LOG_(ERROR) << "JsFileAccessExtAbilityTest occurs an exception."; @@ -799,7 +747,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Mkdir_0003, test try { napi_value rslt; string path = "test"; - Uri parent(""); + Uri parentDirectory(""); string displayName(""); Uri newFile(""); ability->jsObj_ = make_shared(); @@ -824,7 +772,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Mkdir_0003, test .WillOnce(DoAll(SetArgPointee<4>(path.length()), Return(napi_ok))) .WillOnce(DoAll(SetArrayArgument<2>(path.begin(), path.end()), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(Return(napi_ok)); - auto result = ability->Mkdir(parent, displayName, newFile); + auto result = ability->Mkdir(parentDirectory, displayName, newFile); EXPECT_EQ(result, ERR_OK); } catch (...) { GTEST_LOG_(ERROR) << "JsFileAccessExtAbilityTest occurs an exception."; @@ -917,7 +865,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Delete_0002, tes { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Delete_0002"; try { - napi_value rslt; + napi_value napiResult; Uri sourceFile(""); ability->jsObj_ = make_shared(); @@ -925,15 +873,15 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Delete_0002, tes EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)) .WillOnce(DoAll(SetArgPointee<2>(ERR_OK), Return(napi_ok))); auto result = ability->Delete(sourceFile); @@ -1024,24 +972,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Move_0002, testi { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Move_0002"; try { - napi_value rslt; + napi_value rslt = nullptr; Uri sourceFile(""); Uri targetParent(""); Uri newFile(""); ability->jsObj_ = make_shared(); // 模拟获取value->code失败 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) @@ -1051,17 +989,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Move_0002, testi EXPECT_EQ(result, E_IPCS); // 模拟获取value->data为-1 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) @@ -1261,7 +1189,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0003, testi { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Copy_0003"; try { - napi_value rslt; + napi_value resultValue; Uri sourceUri(""); Uri destUri(""); vector copyResult; @@ -1272,19 +1200,19 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0003, testi EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&resultValue)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&resultValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&resultValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&resultValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&resultValue)), Return(napi_ok))) .WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&resultValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&resultValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(Return(napi_invalid_arg)); auto result = ability->Copy(sourceUri, destUri, copyResult, force); EXPECT_EQ(result, EXCEPTION); @@ -1307,7 +1235,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0004, testi { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Copy_0004"; try { - napi_value rslt; + napi_value returnValue; Uri sourceUri(""); Uri destUri(""); vector copyResult; @@ -1318,19 +1246,19 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0004, testi EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&returnValue)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&returnValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&returnValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&returnValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&returnValue)), Return(napi_ok))) .WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&returnValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&returnValue)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(DoAll(SetArgPointee<2>(ERR_OK), Return(napi_ok))); auto result = ability->Copy(sourceUri, destUri, copyResult, force); EXPECT_EQ(result, ERR_OK); @@ -1353,7 +1281,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0005, testi { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Copy_0005"; try { - napi_value rslt; + napi_value napiResult; Uri sourceUri(""); Uri destUri(""); vector copyResult; @@ -1364,19 +1292,19 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0005, testi EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))) .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&napiResult)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(DoAll(SetArgPointee<2>(E_IPCS), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_array(_, _)).WillOnce(Return(napi_ok)); auto result = ability->Copy(sourceUri, destUri, copyResult, force); @@ -1400,7 +1328,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0006, testi { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Copy_0006"; try { - napi_value rslt; + napi_value result; Uri sourceUri(""); Uri destUri(""); vector copyResult; @@ -1411,26 +1339,26 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Copy_0006, testi EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&result)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_boolean(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&result)), Return(napi_ok))) .WillOnce(Return(napi_ok)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(DoAll(SetArgPointee<2>(E_IPCS), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_create_array(_, _)) - .WillRepeatedly(DoAll(SetArgPointee<1>(reinterpret_cast(&rslt)), Return(napi_ok))); + .WillRepeatedly(DoAll(SetArgPointee<1>(reinterpret_cast(&result)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_array_length(_, _, _)).WillOnce(Return(napi_invalid_arg)); - auto result = ability->Copy(sourceUri, destUri, copyResult, force); - EXPECT_EQ(result, E_IPCS); + auto rslt = ability->Copy(sourceUri, destUri, copyResult, force); + EXPECT_EQ(rslt, E_IPCS); } catch (...) { GTEST_LOG_(ERROR) << "JsFileAccessExtAbilityTest occurs an exception."; } @@ -1568,24 +1496,14 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Rename_0002, tes { GTEST_LOG_(INFO) << "JsFileAccessExtAbilityTest-begin js_file_access_ext_ability_Rename_0002"; try { - napi_value rslt; + napi_value rslt = nullptr; Uri sourceFile(""); string displayName(""); Uri newFile(""); ability->jsObj_ = make_shared(); // 模拟获取value->code失败 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) @@ -1595,17 +1513,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Rename_0002, tes EXPECT_EQ(result, E_IPCS); // 模拟获取value->data为-1 - EXPECT_CALL(*insMoc, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, uv_queue_work(_, _, _, _)).WillOnce(Return(0)); - EXPECT_CALL(*insMoc, napi_get_reference_value(_, _, _)) - .WillOnce(DoAll(SetArgPointee<2>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_get_named_property(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))) - .WillOnce(Return(napi_ok)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*insMoc, napi_call_function(_, _, _, _, _, _)) - .WillOnce(DoAll(SetArgPointee<5>(reinterpret_cast(&rslt)), Return(napi_ok))); - EXPECT_CALL(*insMoc, napi_escape_handle(_, _, _, _)) - .WillOnce(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); + MockNapiCalls(insMoc, rslt); EXPECT_CALL(*insMoc, napi_create_string_utf8(_, _, _, _)) .WillRepeatedly(DoAll(SetArgPointee<3>(reinterpret_cast(&rslt)), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_string_utf8(_, _, _, _, _)) @@ -1636,7 +1544,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Rename_0003, tes string path = "test"; Uri sourceFile(""); string displayName(""); - Uri newFile(""); + Uri file(""); ability->jsObj_ = make_shared(); // 模拟Rename调用成功 @@ -1659,7 +1567,7 @@ HWTEST_F(JsFileAccessExtAbilityTest, js_file_access_ext_ability_Rename_0003, tes .WillOnce(DoAll(SetArgPointee<4>(path.length()), Return(napi_ok))) .WillOnce(DoAll(SetArrayArgument<2>(path.begin(), path.end()), Return(napi_ok))); EXPECT_CALL(*insMoc, napi_get_value_int32(_, _, _)).WillOnce(Return(napi_ok)); - auto result = ability->Rename(sourceFile, displayName, newFile); + auto result = ability->Rename(sourceFile, displayName, file); EXPECT_EQ(result, ERR_OK); } catch (...) { GTEST_LOG_(ERROR) << "JsFileAccessExtAbilityTest occurs an exception."; diff --git a/test/unittest/medialibrary_file_access_test_basic.cpp b/test/unittest/medialibrary_file_access_test_basic.cpp index 54a23fc8c9cef65b958a85da6155b43a6a53e59f..8a1d55b815874f4700ba0c9758d78448051bc2c9 100644 --- a/test/unittest/medialibrary_file_access_test_basic.cpp +++ b/test/unittest/medialibrary_file_access_test_basic.cpp @@ -704,9 +704,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0001, testing::ext: try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test3", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test4", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); @@ -769,15 +769,15 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0003, testing::ext: try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test5", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test6", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); + Uri sourceFileUri("storage/media/100/local/files/Download/test5/test.txt"); result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result; @@ -867,15 +867,15 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext: try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test7", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test8", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - Uri targetParentUri("storage/media/100/local/files/Download/test2"); + Uri targetParentUri("storage/media/100/local/files/Download/test8"); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result; @@ -904,9 +904,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0007, testing::ext: try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test9", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test10", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); @@ -1155,22 +1155,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0001, testing::ext: int result = g_fah->Mkdir(g_newDirUri, "Copy_0001_src", srcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri aFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", aFileUri); + result = g_fah->CreateFile(srcUri, "b.txt", aFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(aFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for b.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); Uri bFileUri(""); - result = g_fah->CreateFile(srcUri, "b.txt", bFileUri); + result = g_fah->CreateFile(srcUri, "c.txt", bFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->OpenFile(bFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string bFileBuff = "Copy test content for b.txt"; + std::string bFileBuff = "Copy test content for c.txt"; ssize_t bFileSize = write(fd, bFileBuff.c_str(), bFileBuff.size()); close(fd); EXPECT_EQ(bFileSize, bFileBuff.size()); @@ -1259,12 +1259,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0003, testing::ext: int result = g_fah->Mkdir(g_newDirUri, "Copy_0003_src", srcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri srcFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", srcFileUri); + result = g_fah->CreateFile(srcUri, "d.txt", srcFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(srcFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for d.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); @@ -1273,7 +1273,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0003, testing::ext: result = g_fah->Mkdir(g_newDirUri, "Copy_0003_dest_true", destUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri destFileUri(""); - result = g_fah->CreateFile(destUri, "a.txt", destFileUri); + result = g_fah->CreateFile(destUri, "d.txt", destFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); vector copyResult; @@ -1308,22 +1308,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0004, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri aFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", aFileUri); + result = g_fah->CreateFile(srcUri, "e.txt", aFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(aFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for e.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); Uri bFileUri(""); - result = g_fah->CreateFile(srcUri, "b.txt", bFileUri); + result = g_fah->CreateFile(srcUri, "f.txt", bFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->OpenFile(bFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string bFileBuff = "Copy test content for b.txt"; + std::string bFileBuff = "Copy test content for f.txt"; ssize_t bFileSize = write(fd, bFileBuff.c_str(), bFileBuff.size()); close(fd); EXPECT_EQ(bFileSize, bFileBuff.size()); @@ -1335,7 +1335,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0004, testing::ext: result = g_fah->Mkdir(destUri, "Copy_0004_src", destSrcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri destSrcAUri(""); - result = g_fah->CreateFile(destSrcUri, "a.txt", destSrcAUri); + result = g_fah->CreateFile(destSrcUri, "e.txt", destSrcAUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); vector copyResult; @@ -1371,22 +1371,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0005, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri aFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", aFileUri); + result = g_fah->CreateFile(srcUri, "g.txt", aFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(aFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for g.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); Uri bFileUri(""); - result = g_fah->CreateFile(srcUri, "b.txt", bFileUri); + result = g_fah->CreateFile(srcUri, "h.txt", bFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->OpenFile(bFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string bFileBuff = "Copy test content for b.txt"; + std::string bFileBuff = "Copy test content for h.txt"; ssize_t bFileSize = write(fd, bFileBuff.c_str(), bFileBuff.size()); close(fd); EXPECT_EQ(bFileSize, bFileBuff.size()); @@ -1398,7 +1398,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0005, testing::ext: result = g_fah->Mkdir(destUri, "Copy_0005_src", destSrcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri destSrcAUri(""); - result = g_fah->CreateFile(destSrcUri, "a.txt", destSrcAUri); + result = g_fah->CreateFile(destSrcUri, "g.txt", destSrcAUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); vector copyResult; @@ -1432,12 +1432,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0006, testing::ext: int result = g_fah->Mkdir(g_newDirUri, "Copy_0006_src", srcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri srcFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", srcFileUri); + result = g_fah->CreateFile(srcUri, "i.txt", srcFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(srcFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for i.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); @@ -1446,7 +1446,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0006, testing::ext: result = g_fah->Mkdir(g_newDirUri, "Copy_0006_dest_false", destUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri destFileUri(""); - result = g_fah->CreateFile(destUri, "a.txt", destFileUri); + result = g_fah->CreateFile(destUri, "i.txt", destFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); vector copyResult; @@ -1482,22 +1482,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0007, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri aFileUri(""); - result = g_fah->CreateFile(srcUri, "a.txt", aFileUri); + result = g_fah->CreateFile(srcUri, "j.txt", aFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; result = g_fah->OpenFile(aFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string aFileBuff = "Copy test content for a.txt"; + std::string aFileBuff = "Copy test content for j.txt"; ssize_t aFileSize = write(fd, aFileBuff.c_str(), aFileBuff.size()); close(fd); EXPECT_EQ(aFileSize, aFileBuff.size()); Uri bFileUri(""); - result = g_fah->CreateFile(srcUri, "b.txt", bFileUri); + result = g_fah->CreateFile(srcUri, "k.txt", bFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->OpenFile(bFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::string bFileBuff = "Copy test content for b.txt"; + std::string bFileBuff = "Copy test content for k.txt"; ssize_t bFileSize = write(fd, bFileBuff.c_str(), bFileBuff.size()); close(fd); EXPECT_EQ(bFileSize, bFileBuff.size()); @@ -1509,7 +1509,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Copy_0007, testing::ext: result = g_fah->Mkdir(destUri, "Copy_0007_src", destSrcUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri destSrcAUri(""); - result = g_fah->CreateFile(destSrcUri, "a.txt", destSrcAUri); + result = g_fah->CreateFile(destSrcUri, "j.txt", destSrcAUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); vector copyResult; diff --git a/test/unittest/medialibrary_file_access_test_info.cpp b/test/unittest/medialibrary_file_access_test_info.cpp index 1f5b986401275ad7d4f53bdd438531b1c1357a78..e862161011713dca44f6f7e10081f9aff704a39b 100644 --- a/test/unittest/medialibrary_file_access_test_info.cpp +++ b/test/unittest/medialibrary_file_access_test_info.cpp @@ -682,16 +682,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing:: fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; int64_t maxCount = 1000; - std::vector fileInfoVec; + std::vector fileInfoList; FileFilter filter({".q1w2e3r4"}, {}, {}, -1, -1, false, true); - result = fileAccessHelper->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fileAccessHelper->ScanFile(fileInfo, offset, maxCount, filter, fileInfoList); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 1); + EXPECT_EQ(fileInfoList.size(), 1); FileFilter filter1({".q1w2e3r4", ".txt"}, {}, {}, -1, -1, false, true); - result = fileAccessHelper->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); + result = fileAccessHelper->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoList); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 2); - GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; + EXPECT_EQ(fileInfoList.size(), 2); + GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoList.size() << endl; result = fileAccessHelper->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -775,10 +775,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); FileInfo fileInfo; - result = fileAccessHelper->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.q1w2e3r4", + result = fileAccessHelper->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0004.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fileAccessHelper->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.txt", + result = fileAccessHelper->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0004.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); fileInfo.uri = "file://media/root"; @@ -813,19 +813,19 @@ static bool ReplaceBundleNameFromPath(std::string &path, const std::string &newN std::string tPath = Uri(path).GetPath(); if (tPath.empty()) { - GTEST_LOG_(INFO) << "Uri path error."; + GTEST_LOG_(INFO) << "Invalid Uri path."; return false; } if (tPath.front() != '/') { - GTEST_LOG_(INFO) << "Uri path format error."; + GTEST_LOG_(INFO) << "Incorrect Uri path format."; return false; } auto index = tPath.substr(1).find_first_of("/"); auto bundleName = tPath.substr(1, index); if (bundleName.empty()) { - GTEST_LOG_(INFO) << "bundleName empty."; + GTEST_LOG_(INFO) << "Missing bundleName."; return false; }