From 9144c973ebfbe7ab2fcab9e0ca9440f518a549d7 Mon Sep 17 00:00:00 2001 From: “pengxuanzheng” Date: Mon, 6 Sep 2021 15:26:20 +0800 Subject: ✨ feat(TSG-7599): 修改测试用例 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gtest/CMakeLists.txt | 2 +- gtest/CheckHosClient.cpp | 2 +- gtest/gtest_hos_close_fd.cpp | 8 ++++---- gtest/gtest_hos_get_instance.cpp | 6 +++--- gtest/gtest_hos_init_instance.cpp | 10 +++++----- gtest/gtest_hos_open_fd.cpp | 8 ++++---- gtest/gtest_hos_shutdown_instance.cpp | 6 +++--- gtest/gtest_hos_upload_buff.cpp | 8 ++++---- gtest/gtest_hos_upload_file.cpp | 10 +++++----- gtest/gtest_hos_write.cpp | 20 ++++++++++---------- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gtest/CMakeLists.txt b/gtest/CMakeLists.txt index dc244b81..a3d29106 100644 --- a/gtest/CMakeLists.txt +++ b/gtest/CMakeLists.txt @@ -13,7 +13,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-cove add_definitions(-g -W -Wall -std=c++11) #add_executable(gtest_hos_client gtest_hos_init_instance.cpp gtest_hos_get_instance.cpp gtest_hos_close_fd.cpp gtest_hos_open_fd.cpp) -add_executable(gtest_hos_client CheckHosClient.cpp gtest_hos_write.cpp) +add_executable(gtest_hos_client CheckHosClient.cpp gtest_hos_get_instance.cpp) #add_executable(gtest_hos_client ${SRCS}) target_link_libraries(gtest_hos_client hos-client-cpp gtest gtest_main pthread) diff --git a/gtest/CheckHosClient.cpp b/gtest/CheckHosClient.cpp index 75787eed..0bec9cc8 100644 --- a/gtest/CheckHosClient.cpp +++ b/gtest/CheckHosClient.cpp @@ -110,7 +110,7 @@ void CheckStructGHosFdContext(hos_fd_context_t *actual, hos_fd_context_t *expect void CheckHosInstance(hos_instance actual, hos_instance expect) { - EXPECT_EQ(actual->result, expect->result); + EXPECT_EQ(actual->status, expect->status); EXPECT_EQ(actual->error_code, expect->error_code); EXPECT_STREQ(actual->error_message, expect->error_message); EXPECT_STREQ(actual->hos_url_prefix, expect->hos_url_prefix); diff --git a/gtest/gtest_hos_close_fd.cpp b/gtest/gtest_hos_close_fd.cpp index dbedf6a6..3b8f5c04 100644 --- a/gtest/gtest_hos_close_fd.cpp +++ b/gtest/gtest_hos_close_fd.cpp @@ -43,7 +43,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -92,7 +92,7 @@ TEST(hos_close_fd, normal) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -137,7 +137,7 @@ TEST(hos_close_fd, paramer_error) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -181,7 +181,7 @@ TEST(hos_close_fd, fd_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_get_instance.cpp b/gtest/gtest_hos_get_instance.cpp index 03528aea..bbce57c7 100644 --- a/gtest/gtest_hos_get_instance.cpp +++ b/gtest/gtest_hos_get_instance.cpp @@ -43,7 +43,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = INSTANCE_ENABLE_STATE; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -56,7 +56,7 @@ TEST(hos_get_instance, normal) hos_instance hos_instance = hos_get_instance(); memset(&expect_hos_instance, 0, sizeof(hos_instance_s)); - expect_hos_instance.result = false; + expect_hos_instance.status = false; CheckHosInstance(hos_instance, &expect_hos_instance); hos_instance = hos_init_instance(HOS_CONF, "hos_default_conf", 1, HOS_BUCKET); @@ -77,7 +77,7 @@ TEST(hos_get_instance, normal) int ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_init_instance.cpp b/gtest/gtest_hos_init_instance.cpp index bf27c431..886aabf8 100644 --- a/gtest/gtest_hos_init_instance.cpp +++ b/gtest/gtest_hos_init_instance.cpp @@ -48,7 +48,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -88,7 +88,7 @@ TEST(hos_init_instance, param_error) hos_instance_s expect_hos_instance; hos_instance hos_instance = hos_init_instance(NULL, "hos_default_conf", 1, HOS_BUCKET); - expect_hos_instance.result = false; + expect_hos_instance.status = false; expect_hos_instance.error_code = HOS_PARAMETER_ERROR; const char *err_msg = "param error:conf_path:(null), module:hos_default_conf, thread_num:1, bucket:firewall_hos_bucket"; memcpy(expect_hos_instance.error_message, err_msg, strlen(err_msg)+1); @@ -101,7 +101,7 @@ TEST(hos_init_instance, bucket_not_exits) hos_instance hos_instance = hos_init_instance(HOS_CONF, "hos_default_conf", 1, "hos_bucket_not_exits"); hos_instance_s expect_hos_instance; - expect_hos_instance.result = false; + expect_hos_instance.status = false; expect_hos_instance.error_code = HOS_BUCKET_NOT_EXIST; const char *err_msg = "bucket:hos_bucket_not_exits not exits."; memcpy(expect_hos_instance.error_message, err_msg, strlen(err_msg)+1); @@ -117,7 +117,7 @@ TEST(hos_init_instance, conf_error) { hos_instance hos_instance = hos_init_instance(HOS_CONF, "hos_error_conf", 1, "hos_bucket_not_exits"); hos_instance_s expect_hos_instance; - expect_hos_instance.result = false; + expect_hos_instance.status = false; expect_hos_instance.error_code = HOS_CONF_ERROR; const char *err_msg = "hos param error:hos ip:, hos port:0, accesskeyid:, secretkey:"; memcpy(expect_hos_instance.error_message, err_msg, strlen(err_msg)+1); @@ -129,7 +129,7 @@ TEST(hos_init_instance, server_conn_failed) { hos_instance hos_instance = hos_init_instance(HOS_CONF, "hos_error_server_conf", 1, "hos_bucket_not_exits"); hos_instance_s expect_hos_instance; - expect_hos_instance.result = false; + expect_hos_instance.status = false; expect_hos_instance.error_code = NETWORK_CONNECTION; const char *err_msg = "curlCode: 7, Couldn't connect to server"; memcpy(expect_hos_instance.error_message, err_msg, strlen(err_msg)+1); diff --git a/gtest/gtest_hos_open_fd.cpp b/gtest/gtest_hos_open_fd.cpp index 121cdcef..caffe328 100644 --- a/gtest/gtest_hos_open_fd.cpp +++ b/gtest/gtest_hos_open_fd.cpp @@ -43,7 +43,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -105,7 +105,7 @@ TEST(hos_open_fd, normal) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -142,7 +142,7 @@ TEST(hos_open_fd, paramer_error) int ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -179,7 +179,7 @@ TEST(hos_open_fd, over_threadnums) int ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_shutdown_instance.cpp b/gtest/gtest_hos_shutdown_instance.cpp index b371029a..f15d9c0a 100644 --- a/gtest/gtest_hos_shutdown_instance.cpp +++ b/gtest/gtest_hos_shutdown_instance.cpp @@ -48,7 +48,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -69,7 +69,7 @@ TEST(hos_shutdown_instance, normal) int ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -107,7 +107,7 @@ TEST(hos_shutdown_instance, shutdown_more) int ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_upload_buff.cpp b/gtest/gtest_hos_upload_buff.cpp index 2edca10a..19a079c1 100644 --- a/gtest/gtest_hos_upload_buff.cpp +++ b/gtest/gtest_hos_upload_buff.cpp @@ -44,7 +44,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -93,7 +93,7 @@ TEST(hos_upload_buff, normal) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -135,7 +135,7 @@ TEST(hos_upload_buff, bucket_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -173,7 +173,7 @@ TEST(hos_upload_buff, param_error) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_upload_file.cpp b/gtest/gtest_hos_upload_file.cpp index 4f886fa3..5732c988 100644 --- a/gtest/gtest_hos_upload_file.cpp +++ b/gtest/gtest_hos_upload_file.cpp @@ -44,7 +44,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -95,7 +95,7 @@ TEST(hos_upload_file, normal) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -133,7 +133,7 @@ TEST(hos_upload_file, param_error) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -171,7 +171,7 @@ TEST(hos_upload_file, file_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -221,7 +221,7 @@ TEST(hos_upload_file, bucket_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); diff --git a/gtest/gtest_hos_write.cpp b/gtest/gtest_hos_write.cpp index e08445a3..d49b8418 100644 --- a/gtest/gtest_hos_write.cpp +++ b/gtest/gtest_hos_write.cpp @@ -45,7 +45,7 @@ static void gtest_hos_handle_init(hos_client_handle_t *hos_handle, int thread_nu static void gtest_hos_instance_init(hos_instance instance) { memset(instance, 0, sizeof(hos_instance_s)); - instance->result = true; + instance->status = true; instance->error_code = 0; instance->error_message[0] ='\0'; instance->hos_url_prefix = "http://127.0.0.1:9098/hos/"; @@ -191,7 +191,7 @@ TEST(hos_write, normal) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -294,7 +294,7 @@ TEST(hos_write, bucket_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -393,7 +393,7 @@ TEST(hos_write, sync_mode) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -495,7 +495,7 @@ TEST(hos_write, sync_mode_bucket_not_exits) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -542,7 +542,7 @@ TEST(hos_write, paramer_error) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -581,7 +581,7 @@ TEST(hos_write, fd_not_find) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -628,7 +628,7 @@ TEST(hos_write, over_threadnums) ret = hos_shutdown_instance(); EXPECT_EQ(ret, HOS_CLIENT_OK); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); @@ -670,7 +670,7 @@ static void *hos_function(void *ptr) { hos_instance = hos_get_instance(); - if (hos_instance->result == false) + if (hos_instance->status == false) { hos_instance = hos_init_instance(HOS_CONF, "hos_default_conf", thread_num, HOS_BUCKET); } @@ -723,7 +723,7 @@ static void *hos_function(void *ptr) ret = hos_shutdown_instance(); EXPECT_EQ(ret, 0); - expect_hos_instance.result = 0; + expect_hos_instance.status = 0; expect_hos_instance.hos_url_prefix = NULL; CheckHosInstance(hos_instance, &expect_hos_instance); -- cgit v1.2.3