diff options
Diffstat (limited to 'gtest/CheckHosClient.cpp')
| -rw-r--r-- | gtest/CheckHosClient.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/gtest/CheckHosClient.cpp b/gtest/CheckHosClient.cpp index 644c4ab0..296f16a7 100644 --- a/gtest/CheckHosClient.cpp +++ b/gtest/CheckHosClient.cpp @@ -2,22 +2,22 @@ void CheckStructHosConfigT(hos_config_t *actual, hos_config_t *expect) { - EXPECT_STREQ(actual->accesskeyid, expect->accesskeyid); - EXPECT_STREQ(actual->secretkey, expect->secretkey); - EXPECT_STREQ(actual->log_path, expect->log_path); - EXPECT_EQ(actual->log_level, expect->log_level); - EXPECT_EQ(actual->pool_thread_size, expect->pool_thread_size); - EXPECT_EQ(actual->cache_count, expect->cache_count); - EXPECT_EQ(actual->cache_size, expect->cache_size); - EXPECT_EQ(actual->fs2_fmt, expect->fs2_fmt); - EXPECT_STREQ(actual->fs2_ip, expect->fs2_ip); - EXPECT_STREQ(actual->fs2_path, expect->fs2_path); - EXPECT_EQ(actual->fs2_port, expect->fs2_port); - EXPECT_STREQ(actual->ip, expect->ip); - EXPECT_EQ(actual->port, expect->port); - EXPECT_EQ(actual->thread_num, expect->thread_num); - EXPECT_EQ(actual->max_request_context, expect->max_request_context); - EXPECT_EQ(actual->max_request_num, expect->max_request_num); + ASSERT_STREQ(actual->accesskeyid, expect->accesskeyid); + ASSERT_STREQ(actual->secretkey, expect->secretkey); + ASSERT_STREQ(actual->log_path, expect->log_path); + ASSERT_EQ(actual->log_level, expect->log_level); + ASSERT_EQ(actual->pool_thread_size, expect->pool_thread_size); + ASSERT_EQ(actual->cache_count, expect->cache_count); + ASSERT_EQ(actual->cache_size, expect->cache_size); + ASSERT_EQ(actual->fs2_fmt, expect->fs2_fmt); + ASSERT_STREQ(actual->fs2_ip, expect->fs2_ip); + ASSERT_STREQ(actual->fs2_path, expect->fs2_path); + ASSERT_EQ(actual->fs2_port, expect->fs2_port); + ASSERT_STREQ(actual->ip, expect->ip); + ASSERT_EQ(actual->port, expect->port); + ASSERT_EQ(actual->thread_num, expect->thread_num); + ASSERT_EQ(actual->max_request_context, expect->max_request_context); + ASSERT_EQ(actual->max_request_num, expect->max_request_num); } void CheckStructFs2DataInfo(data_info_t *actual, data_info_t *expect, int thread_num) @@ -28,59 +28,59 @@ void CheckStructFs2DataInfo(data_info_t *actual, data_info_t *expect, int thread { if (actual->cache) { - EXPECT_EQ(actual->cache[i], expect->cache[i]); + ASSERT_EQ(actual->cache[i], expect->cache[i]); } if (actual->rx_bytes) { - EXPECT_EQ(actual->rx_bytes[i], expect->rx_bytes[i]); + ASSERT_EQ(actual->rx_bytes[i], expect->rx_bytes[i]); } if (actual->rx_pkts) { - EXPECT_EQ(actual->rx_pkts[i], expect->rx_pkts[i]); + ASSERT_EQ(actual->rx_pkts[i], expect->rx_pkts[i]); } if (actual->tx_bytes) { - EXPECT_EQ(actual->tx_bytes[i], expect->tx_bytes[i]); + ASSERT_EQ(actual->tx_bytes[i], expect->tx_bytes[i]); } if (actual->tx_pkts) { - EXPECT_EQ(actual->tx_pkts[i], expect->tx_pkts[i]); + ASSERT_EQ(actual->tx_pkts[i], expect->tx_pkts[i]); } if (actual->tx_failed_bytes) { - EXPECT_EQ(actual->tx_failed_bytes[i], expect->tx_failed_bytes[i]); + ASSERT_EQ(actual->tx_failed_bytes[i], expect->tx_failed_bytes[i]); } if (actual->tx_failed_pkts) { - EXPECT_EQ(actual->tx_failed_pkts[i], expect->tx_failed_pkts[i]); + ASSERT_EQ(actual->tx_failed_pkts[i], expect->tx_failed_pkts[i]); } } } void CheckStructHosFunc(hos_func_thread_t *actual, hos_func_thread_t *expect, int thread_num) { - //EXPECT_EQ(actual->fd_thread, expect->fd_thread); - EXPECT_EQ(actual->fd_thread_status, expect->fd_thread_status); + //ASSERT_EQ(actual->fd_thread, expect->fd_thread); + ASSERT_EQ(actual->fd_thread_status, expect->fd_thread_status); if (actual->fs2_info.reserved != NULL) { CheckStructFs2DataInfo((data_info_t *)actual->fs2_info.reserved, (data_info_t *)expect->fs2_info.reserved, thread_num); } - EXPECT_EQ(actual->fs2_status, expect->fs2_status); - //EXPECT_EQ(actual->fs2_thread, expect->fs2_thread); + ASSERT_EQ(actual->fs2_status, expect->fs2_status); + //ASSERT_EQ(actual->fs2_thread, expect->fs2_thread); } void CheckStructGHosHandle(hos_client_handle_t *actual, hos_client_handle_t *expect) { - //EXPECT_STREQ(actual->buckets.c_str(), expect->buckets.c_str()); + //ASSERT_STREQ(actual->buckets.c_str(), expect->buckets.c_str()); int bucketNum = actual->buckets.size() > expect->buckets.size() ? expect->buckets.size() : actual->buckets.size(); for (int i = 0; i < bucketNum; i++) { - EXPECT_STREQ(actual->buckets.at(i).GetName().c_str(), expect->buckets.at(i).GetName().c_str()); + ASSERT_STREQ(actual->buckets.at(i).GetName().c_str(), expect->buckets.at(i).GetName().c_str()); } - EXPECT_EQ(actual->count, expect->count); - //EXPECT_TRUE(actual->log != NULL); - //EXPECT_TRUE(actual->S3Client != NULL); + ASSERT_EQ(actual->count, expect->count); + //ASSERT_TRUE(actual->log != NULL); + //ASSERT_TRUE(actual->S3Client != NULL); CheckStructHosConfigT(&actual->hos_config, &expect->hos_config); CheckStructHosFunc(&actual->hos_func, &expect->hos_func, actual->hos_config.thread_num); } @@ -89,28 +89,28 @@ void CheckStructGHosFdContext(hos_fd_context_t *actual, hos_fd_context_t *expect { if (actual == NULL || expect == NULL) { - EXPECT_TRUE(actual == expect); + ASSERT_TRUE(actual == expect); } else { - EXPECT_STREQ(actual->bucket, expect->bucket); - //EXPECT_TRUE(actual->cache == NULL); - EXPECT_EQ(actual->cache_count, expect->cache_count); - EXPECT_EQ(actual->cache_rest, expect->cache_rest); - EXPECT_EQ(actual->callback, expect->callback); - EXPECT_EQ(actual->fd_status, expect->fd_status); - EXPECT_EQ(actual->mode, expect->mode); - EXPECT_STREQ(actual->object, expect->object); - EXPECT_EQ(actual->position, expect->position); - EXPECT_EQ(actual->recive_cnt, expect->recive_cnt); - EXPECT_EQ(actual->userdata, expect->userdata); + ASSERT_STREQ(actual->bucket, expect->bucket); + //ASSERT_TRUE(actual->cache == NULL); + ASSERT_EQ(actual->cache_count, expect->cache_count); + ASSERT_EQ(actual->cache_rest, expect->cache_rest); + ASSERT_EQ(actual->callback, expect->callback); + ASSERT_EQ(actual->fd_status, expect->fd_status); + ASSERT_EQ(actual->mode, expect->mode); + ASSERT_STREQ(actual->object, expect->object); + ASSERT_EQ(actual->position, expect->position); + ASSERT_EQ(actual->recive_cnt, expect->recive_cnt); + ASSERT_EQ(actual->userdata, expect->userdata); } } void CheckHosInstance(hos_instance actual, hos_instance expect) { - 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); + ASSERT_EQ(actual->status, expect->status); + ASSERT_EQ(actual->error_code, expect->error_code); + ASSERT_STREQ(actual->error_message, expect->error_message); + ASSERT_STREQ(actual->hos_url_prefix, expect->hos_url_prefix); }
\ No newline at end of file |
