From 0d568c6bcd712f4d83e975fcf668681b41931ebd Mon Sep 17 00:00:00 2001 From: liyuke Date: Tue, 1 Jul 2025 11:00:23 +0800 Subject: [PATCH] =?UTF-8?q?0603=E4=BF=AE=E6=94=B9mock=E7=9A=84getxattr?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liyuke Change-Id: I97553b4dce10ea8d5fbd3b54f4c41870cc5b51ab --- .../test/unittest/js/mod_fs/properties/mock/system_mock.cpp | 2 +- .../test/unittest/js/mod_fs/properties/mock/system_mock.h | 4 ++-- .../unittest/js/mod_fs/properties/xattr_core_mock_test.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.cpp b/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.cpp index 5878a9304..189edf925 100644 --- a/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.cpp +++ b/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.cpp @@ -23,7 +23,7 @@ int setxattr(const char *path, const char *name, const void *value, size_t size, return System::ins->setxattr(path, name, value, size, flags); } -int getxattr(const char *path, const char *name, void *value, size_t size) +ssize_t getxattr(const char *path, const char *name, void *value, size_t size) { return System::ins->getxattr(path, name, value, size); } diff --git a/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.h b/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.h index 3ff74be78..dad578b09 100644 --- a/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.h +++ b/interfaces/test/unittest/js/mod_fs/properties/mock/system_mock.h @@ -29,7 +29,7 @@ public: public: virtual ~System() = default; virtual int setxattr(const char *path, const char *name, const void *value, size_t size, int flags) = 0; - virtual int getxattr(const char *path, const char *name, void *value, size_t size) = 0; + virtual ssize_t getxattr(const char *path, const char *name, void *value, size_t size) = 0; virtual int fgetxattr(int filedes, const char *name, void *value, size_t size) = 0; virtual int flock(int fd, int operation) = 0; }; @@ -37,7 +37,7 @@ public: class SystemMock : public System { public: MOCK_METHOD5(setxattr, int(const char *path, const char *name, const void *value, size_t size, int flags)); - MOCK_METHOD4(getxattr, int(const char *path, const char *name, void *value, size_t size)); + MOCK_METHOD4(getxattr, ssize_t(const char *path, const char *name, void *value, size_t size)); MOCK_METHOD4(fgetxattr, int(int filedes, const char *name, void *value, size_t size)); MOCK_METHOD2(flock, int(int fd, int operation)); }; diff --git a/interfaces/test/unittest/js/mod_fs/properties/xattr_core_mock_test.cpp b/interfaces/test/unittest/js/mod_fs/properties/xattr_core_mock_test.cpp index 5ff953b3e..e34ff3bdf 100644 --- a/interfaces/test/unittest/js/mod_fs/properties/xattr_core_mock_test.cpp +++ b/interfaces/test/unittest/js/mod_fs/properties/xattr_core_mock_test.cpp @@ -84,7 +84,7 @@ HWTEST_F(XattrCoreMockTest, XattrCoreMockTest_DoSetXattr_001, testing::ext::Test string key = "test_key"; string value = "test_value"; - EXPECT_CALL(*sys, setxattr(_, _, _, _, _)).WillOnce(Return(-1)); + EXPECT_CALL(*sys, setxattr(_, _, _, _, _)).WillOnce(SetErrnoAndReturn(EIO, -1)); auto ret = XattrCore::DoSetXattr(path, key, value); EXPECT_FALSE(ret.IsSuccess()); @@ -127,7 +127,7 @@ HWTEST_F(XattrCoreMockTest, XattrCoreMockTest_DoGetXattr_001, testing::ext::Test string path = tempFilePath.string(); string key = "test_key"; - EXPECT_CALL(*sys, getxattr(_, _, _, _)).WillRepeatedly(Return(-1)); + EXPECT_CALL(*sys, getxattr(_, _, _, _)).WillRepeatedly(SetErrnoAndReturn(EIO, -1)); auto ret = XattrCore::DoGetXattr(path, key); EXPECT_TRUE(ret.IsSuccess()); @@ -148,7 +148,7 @@ HWTEST_F(XattrCoreMockTest, XattrCoreMockTest_DoGetXattr_002, testing::ext::Test string path = tempFilePath.string(); string key = "test_key"; - EXPECT_CALL(*sys, getxattr(_, _, _, _)).WillOnce(Return(1)).WillOnce(Return(-1)); + EXPECT_CALL(*sys, getxattr(_, _, _, _)).WillOnce(Return(1)).WillOnce(SetErrnoAndReturn(EIO, -1)); auto ret = XattrCore::DoGetXattr(path, key); EXPECT_FALSE(ret.IsSuccess()); -- Gitee