gfwleak/pxz-hos-client-cpp-module
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(TSG-8143): 区分hos_open_fd的错误值以及fd的值，不再共用一个返回值

Browse Source
This commit is contained in:
pengxuanzheng
2021-10-22 18:02:23 +08:00
parent 88a8dccbd0
commit 400c33e92e
8 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtest/gtest_hos_open_fd.cpp
View File

@@ -77,13 +77,15 @@ TEST(hos_open_fd, normal)
gtest_hos_handle_init(&expect_hos_handle, 2);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
size_t fd = hos_open_fd(HOS_BUCKET, "object", NULL, NULL, 0);
size_t fd = 0;
int err = hos_open_fd(HOS_BUCKET, "object", NULL, NULL, 0, &fd);
CheckHosInstance(hos_instance, &expect_hos_instance);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
gtest_hos_fd_init(&expect_fd_info[0]);
CheckStructGHosFdContext((hos_fd_context_t *)fd, &expect_fd_info[0]);
size_t fd1 = hos_open_fd(HOS_BUCKET, "object", NULL, NULL, 1);
size_t fd1 = 0;
err = hos_open_fd(HOS_BUCKET, "object", NULL, NULL, 1, &fd1);
CheckHosInstance(hos_instance, &expect_hos_instance);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
gtest_hos_fd_init(&expect_fd_info[1]);
@@ -129,8 +131,9 @@ TEST(hos_open_fd, paramer_error)
gtest_hos_handle_init(&expect_hos_handle, 2);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
int fd = hos_open_fd(NULL, "object", NULL, NULL, 0);
EXPECT_EQ(fd, HOS_PARAMETER_ERROR);
size_t fd = 0;
int err = hos_open_fd(NULL, "object", NULL, NULL, 0, &fd);
EXPECT_EQ(err, HOS_PARAMETER_ERROR);
CheckHosInstance(hos_instance, &expect_hos_instance);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
@@ -164,8 +167,9 @@ TEST(hos_open_fd, over_threadnums)
gtest_hos_handle_init(&expect_hos_handle, 2);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
int fd = hos_open_fd(HOS_CONF, "object", NULL, NULL, 3);
EXPECT_EQ(fd, HOS_PARAMETER_ERROR);
size_t fd = 0;
int err = hos_open_fd(HOS_CONF, "object", NULL, NULL, 3, &fd);
EXPECT_EQ(err, HOS_PARAMETER_ERROR);
CheckHosInstance(hos_instance, &expect_hos_instance);
CheckStructGHosHandle(&g_hos_handle, &expect_hos_handle);
@@ -190,6 +194,7 @@ TEST(hos_open_fd, over_threadnums)
TEST(hos_open_fd, not_init_instance)
{
int fd = hos_open_fd(HOS_CONF, "object", NULL, NULL, 0);
EXPECT_EQ(fd, HOS_INSTANCE_NOT_ENABLE);
size_t fd = 0;
int err = hos_open_fd(HOS_CONF, "object", NULL, NULL, 0, &fd);
EXPECT_EQ(err, HOS_INSTANCE_NOT_ENABLE);
}