From 6bb71b7e6142da039e57f4fce89c08c671fb786f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9C=E9=99=B6=E9=87=91=E6=B2=9B=E2=80=9D?= Date: Fri, 8 Aug 2025 12:03:42 +0800 Subject: [PATCH] y and b differences MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “陶金沛” --- .../class_atomicfile/atomicfile_n_exporter.cpp | 1 + .../kits/js/src/mod_fs/properties/fsync.cpp | 2 +- .../js/src/mod_fs/properties/prop_n_exporter.cpp | 5 ++--- .../class_atomicfile/atomicfile_mock_test.cpp | 16 +++++++++------- .../class_atomicfile/mock/atomicfile_mock.cpp | 3 +-- .../class_atomicfile/mock/atomicfile_mock.h | 7 ++++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/class_atomicfile/atomicfile_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/class_atomicfile/atomicfile_n_exporter.cpp index c814d7eac..9eb236ba4 100644 --- a/interfaces/kits/js/src/mod_fs/class_atomicfile/atomicfile_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/class_atomicfile/atomicfile_n_exporter.cpp @@ -400,6 +400,7 @@ napi_value AtomicFileNExporter::FinishWrite(napi_env env, napi_callback_info inf NError(UNKROWN_ERR).ThrowErr(env, "Failed to rename file"); return nullptr; } + std::string tmpNewFileName = rafEntity->baseFileName; rafEntity->newFileName = tmpNewFileName.append(TEMP_FILE_SUFFIX); status = napi_delete_reference(env, rafEntity->writeStreamObj); diff --git a/interfaces/kits/js/src/mod_fs/properties/fsync.cpp b/interfaces/kits/js/src/mod_fs/properties/fsync.cpp index 85c22577c..a475546e0 100644 --- a/interfaces/kits/js/src/mod_fs/properties/fsync.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/fsync.cpp @@ -83,7 +83,7 @@ napi_value Fsync::Async(napi_env env, napi_callback_info info) } int ret = uv_fs_fsync(nullptr, fsync_req.get(), fd, nullptr); if (ret < 0) { - HILOGE("Failed to transfer data associated with file descriptor: %{public}d, ret %{public}d", fd, ret); + HILOGE("Failed to transfer data associated with file descriptor: %{public}d, ret:%{public}d", fd, ret); return NError(ret); } else { return NError(ERRNO_NOERR); diff --git a/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp index b1ff25baf..74502ebf6 100644 --- a/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp @@ -296,11 +296,10 @@ napi_value PropNExporter::Access(napi_env env, napi_callback_info info) } auto cbExec = [path = args.path, result, mode = args.mode, flag = args.flag]() -> NError { int ret = AccessCore(path, mode, flag); - if (ret < 0) { - HILOGE("Accesscore finish ret %{public}d", ret); - } if (ret == 0) { result->isAccess = true; + } else { + HILOGE("Accesscore finish ret %{public}d", ret); } return (ret < 0 && (string_view(uv_err_name(ret)) != "ENOENT")) ? NError(ret) : NError(ERRNO_NOERR); }; diff --git a/interfaces/test/unittest/class_atomicfile/atomicfile_mock_test.cpp b/interfaces/test/unittest/class_atomicfile/atomicfile_mock_test.cpp index 98a057a7c..f9c778d51 100644 --- a/interfaces/test/unittest/class_atomicfile/atomicfile_mock_test.cpp +++ b/interfaces/test/unittest/class_atomicfile/atomicfile_mock_test.cpp @@ -14,6 +14,7 @@ */ #include "atomicfile_mock.h" + #include #include @@ -26,13 +27,14 @@ using namespace std::filesystem; using namespace OHOS::FileManagement::ModuleFileIO; static const string g_atomicfilePath = "/data/test/AtomicfileMockTest.txt"; +static const mode_t g_atomicfilePermission = 0644; class AtomicfileMockTest : public testing::Test { public: static void SetUpTestCase(void) { AtomicfileMock::EnableMock(); - int32_t fd = open(g_atomicfilePath.c_str(), O_CREAT | O_RDWR, 0644); + int32_t fd = open(g_atomicfilePath.c_str(), O_CREAT | O_RDWR, g_atomicfilePermission); close(fd); }; static void TearDownTestCase() @@ -46,7 +48,7 @@ public: /** * @tc.name: AtomicfileFailWrite_0001 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FailWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -80,7 +82,7 @@ HWTEST_F(AtomicfileMockTest, AtomicfileFailWrite_0001, testing::ext::TestSize.Le /** * @tc.name: AtomicfileFailWrite_0002 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FailWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -115,7 +117,7 @@ HWTEST_F(AtomicfileMockTest, AtomicfileFailWrite_0002, testing::ext::TestSize.Le /** * @tc.name: AtomicfileFailWrite_0003 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FailWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -150,7 +152,7 @@ HWTEST_F(AtomicfileMockTest, AtomicfileFailWrite_0003, testing::ext::TestSize.Le /** * @tc.name: AtomicfileFinishWrite_0001 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FinishWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -184,7 +186,7 @@ HWTEST_F(AtomicfileMockTest, AtomicfileFinishWrite_0001, testing::ext::TestSize. /** * @tc.name: AtomicfileFinishWrite_0002 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FinishWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -219,7 +221,7 @@ HWTEST_F(AtomicfileMockTest, AtomicfileFinishWrite_0002, testing::ext::TestSize. /** * @tc.name: AtomicfileFinishWrite_0003 - * @tc.desc: Test function of FailWrite() interface for fail. + * @tc.desc: Test function of Atomicfile::FinishWrite() interface for fail. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 diff --git a/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.cpp b/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.cpp index 1bad899d9..db45803f3 100644 --- a/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.cpp +++ b/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.cpp @@ -17,9 +17,8 @@ #include -using namespace OHOS::FileManagement::ModuleFileIO; - namespace OHOS::FileManagement::ModuleFileIO::Test { +using namespace OHOS::FileManagement::ModuleFileIO; thread_local std::shared_ptr AtomicfileMock::atomicfileMock = nullptr; thread_local bool AtomicfileMock::mockable = false; diff --git a/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.h b/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.h index 125bf88af..9b3730ed3 100644 --- a/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.h +++ b/interfaces/test/unittest/class_atomicfile/mock/atomicfile_mock.h @@ -16,14 +16,15 @@ #ifndef INTERFACES_TEST_UNITTEST_CLASS_ATOMICFILE_MOCK_ATOMICFILE_MOCK_H #define INTERFACES_TEST_UNITTEST_CLASS_ATOMICFILE_MOCK_ATOMICFILE_MOCK_H -#include -#include -#include #include "n_napi.h" #include "atomicfile_entity.h" #include "atomicfile_n_exporter.h" #include "filemgmt_libn.h" +#include +#include +#include + namespace OHOS::FileManagement::ModuleFileIO::Test { using namespace std::filesystem; using namespace OHOS::FileManagement::ModuleFileIO; -- Gitee