Skip to content

Instantly share code, notes, and snippets.

@hyeonseop-lee

hyeonseop-lee/KENSv3.diff

Created June 2, 2015 21:56
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save hyeonseop-lee/de7b61fe9495f804e3bb to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save hyeonseop-lee/de7b61fe9495f804e3bb to your computer and use it in GitHub Desktop.
Download ZIP
Raw
KENSv3.diff
commit a8b41673084c9d8d9aac70bf3e420d02697c2b59
Author: Lee Hyeonseop <[email protected]>
Date: Wed Jun 3 06:27:14 2015 +0900
using explicit gtest assertions
diff --git a/app/TestTCP/testbind.cpp b/app/TestTCP/testbind.cpp
index 78782bb..ad6742d 100644
--- a/app/TestTCP/testbind.cpp
+++ b/app/TestTCP/testbind.cpp
@@ -43,7 +43,7 @@ protected:
int ret = bind(fd, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
close(fd);
}
@@ -79,14 +79,14 @@ protected:
int ret = bind(fd, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
addr.sin_port = htons(10000);
//bind to port 10000 with INADDR_ADY (should fail, fd is already bound to 9999)
ret = bind(fd, (struct sockaddr*)&addr, len);
- EXPECT_FALSE(ret == 0);
+ EXPECT_NE(ret, 0);
close(fd);
}
@@ -122,7 +122,7 @@ protected:
int ret = bind(fd, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
struct sockaddr* addr2 = (struct sockaddr*)malloc(len * 2);
socklen_t len2 = len * 2;
@@ -131,8 +131,8 @@ protected:
ret = getsockname(fd, addr2, &len2);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(memcmp(&addr, addr2, len) == 0);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(memcmp(&addr, addr2, len), 0);
free(addr2);
close(fd);
@@ -169,7 +169,7 @@ protected:
int ret = bind(fd1, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
int fd2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -178,7 +178,7 @@ protected:
ret = bind(fd2, (struct sockaddr*)&addr, len);
- EXPECT_FALSE(ret == 0);
+ EXPECT_NE(ret, 0);
close(fd1);
close(fd2);
@@ -215,7 +215,7 @@ protected:
int ret = bind(fd1, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
close(fd1);
@@ -226,7 +226,7 @@ protected:
ret = bind(fd2, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
close(fd2);
}
@@ -262,7 +262,7 @@ protected:
int ret = bind(fd1, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
int fd2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -271,7 +271,7 @@ protected:
ret = bind(fd2, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
close(fd1);
close(fd2);
@@ -308,7 +308,7 @@ protected:
int ret = bind(fd1, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
int fd2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -317,7 +317,7 @@ protected:
ret = bind(fd2, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
close(fd1);
close(fd2);
diff --git a/app/TestTCP/testclose.cpp b/app/TestTCP/testclose.cpp
index 597ada5..9d2a1a9 100644
--- a/app/TestTCP/testclose.cpp
+++ b/app/TestTCP/testclose.cpp
@@ -46,13 +46,13 @@ protected:
addr.sin_port = htons(atoi(env["LISTEN_PORT"].c_str()));
int ret = bind(server_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long listen_time = atol(env["LISTEN_TIME"].c_str());
usleep(listen_time);
ret = listen(server_socket, atoi(env["BACKLOG"].c_str()));
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long accept_time = atol(env["ACCEPT_TIME"].c_str());
usleep(accept_time);
@@ -61,29 +61,29 @@ protected:
socklen_t client_len = sizeof(client_addr);
memset(&client_addr, 0, client_len);
int client_fd = accept(server_socket, (struct sockaddr*)&client_addr, &client_len);
- EXPECT_TRUE(client_fd >= 0);
+ EXPECT_GE(client_fd, 0);
- EXPECT_TRUE(client_len == sizeof(client_addr));
- EXPECT_TRUE(client_addr.sin_family == AF_INET);
+ EXPECT_EQ(client_len, sizeof(client_addr));
+ EXPECT_EQ(client_addr.sin_family, AF_INET);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getsockname(client_fd, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
EXPECT_TRUE( (addr.sin_addr.s_addr == 0) ||
(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr));
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long close_time = atol(env["CLOSE_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = close_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("accept sleep: %ld\n", sleep_time);
usleep(sleep_time);
@@ -119,24 +119,24 @@ protected:
addr.sin_port = htons(atoi(env["CONNECT_PORT"].c_str()));
int ret = connect(client_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret >= 0);
+ EXPECT_GE(ret, 0);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getpeername(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long close_time = atol(env["CLOSE_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = close_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("connect sleep: %ld\n", sleep_time);
usleep(sleep_time);
diff --git a/app/TestTCP/testcongestion.cpp b/app/TestTCP/testcongestion.cpp
index 6dca118..bfed568 100644
--- a/app/TestTCP/testcongestion.cpp
+++ b/app/TestTCP/testcongestion.cpp
@@ -52,13 +52,13 @@ protected:
addr.sin_port = htons(atoi(env["LISTEN_PORT"].c_str()));
int ret = bind(server_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long listen_time = atol(env["LISTEN_TIME"].c_str());
usleep(listen_time);
ret = listen(server_socket, atoi(env["BACKLOG"].c_str()));
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long accept_time = atol(env["ACCEPT_TIME"].c_str());
usleep(accept_time);
@@ -67,28 +67,28 @@ protected:
socklen_t client_len = sizeof(client_addr);
memset(&client_addr, 0, client_len);
int client_fd = accept(server_socket, (struct sockaddr*)&client_addr, &client_len);
- EXPECT_TRUE(client_fd >= 0);
+ EXPECT_GE(client_fd, 0);
- EXPECT_TRUE(client_len == sizeof(client_addr));
- EXPECT_TRUE(client_addr.sin_family == AF_INET);
+ EXPECT_EQ(client_len, sizeof(client_addr));
+ EXPECT_EQ(client_addr.sin_family, AF_INET);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getsockname(client_fd, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
EXPECT_TRUE( (addr.sin_addr.s_addr == 0) ||
(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr));
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long start_time = atol(env["START_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = start_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("connect sleep: %ld\n", sleep_time);
usleep(sleep_time);
@@ -117,7 +117,7 @@ protected:
{
total_size += write_byte;
remaining -= write_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -132,7 +132,7 @@ protected:
{
total_size += read_byte;
remaining -= read_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -140,7 +140,7 @@ protected:
{
for(int j=0; j<buffer_size - remaining; j++)
{
- EXPECT_TRUE(send_buffer[j] == recv_buffer[j]);
+ EXPECT_EQ(send_buffer[j], recv_buffer[j]);
}
}
if(read_byte < 0)
@@ -155,10 +155,10 @@ protected:
free(send_buffer);
free(recv_buffer);
- EXPECT_TRUE(expect_size == total_size);
+ EXPECT_EQ(expect_size, total_size);
struct timeval timeval;
gettimeofday(&timeval, 0);
- EXPECT_TRUE(timeval.tv_sec < connection_timeout);
+ EXPECT_LT(timeval.tv_sec, connection_timeout);
close(client_fd);
close(server_socket);
@@ -191,24 +191,24 @@ protected:
addr.sin_port = htons(atoi(env["CONNECT_PORT"].c_str()));
int ret = connect(client_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret >= 0);
+ EXPECT_GE(ret, 0);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getpeername(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long start_time = atol(env["START_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = start_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("connect sleep: %ld\n", sleep_time);
usleep(sleep_time);
@@ -237,7 +237,7 @@ protected:
{
total_size += write_byte;
remaining -= write_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -252,7 +252,7 @@ protected:
{
total_size += read_byte;
remaining -= read_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -260,7 +260,7 @@ protected:
{
for(int j=0; j<buffer_size - remaining; j++)
{
- EXPECT_TRUE(send_buffer[j] == recv_buffer[j]);
+ EXPECT_EQ(send_buffer[j], recv_buffer[j]);
}
}
if(read_byte < 0)
@@ -275,7 +275,7 @@ protected:
free(send_buffer);
free(recv_buffer);
- EXPECT_TRUE(expect_size == total_size);
+ EXPECT_EQ(expect_size, total_size);
close(client_socket);
}
diff --git a/app/TestTCP/testhandshake.cpp b/app/TestTCP/testhandshake.cpp
index 8bc1bfa..d6c8f38 100644
--- a/app/TestTCP/testhandshake.cpp
+++ b/app/TestTCP/testhandshake.cpp
@@ -45,13 +45,13 @@ protected:
addr.sin_port = htons(atoi(env["LISTEN_PORT"].c_str()));
int ret = bind(server_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long listen_time = atol(env["LISTEN_TIME"].c_str());
usleep(listen_time);
ret = listen(server_socket, atoi(env["BACKLOG"].c_str()));
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long accept_time = atol(env["ACCEPT_TIME"].c_str());
usleep(accept_time);
@@ -70,24 +70,24 @@ protected:
int client_fd = accept(server_socket, (struct sockaddr*)&client_addr, &client_len);
if(client_fd >= 0)
{
- EXPECT_TRUE(client_len == sizeof(client_addr));
- EXPECT_TRUE(client_addr.sin_family == AF_INET);
+ EXPECT_EQ(client_len, sizeof(client_addr));
+ EXPECT_EQ(client_addr.sin_family, AF_INET);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
int ret = getsockname(client_fd, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
EXPECT_TRUE( (addr.sin_addr.s_addr == 0) ||
(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr));
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
client_sockets.push_back(client_fd);
}
usleep(accept_period);
}
- EXPECT_TRUE((int)client_sockets.size() == expected_accept);
+ EXPECT_EQ((int)client_sockets.size(), expected_accept);
for(auto client_fd : client_sockets)
{
int same_count = 0;
@@ -96,7 +96,7 @@ protected:
if(client_fd == client_fd2)
same_count++;
}
- EXPECT_TRUE(same_count == 1);
+ EXPECT_EQ(same_count, 1);
}
for(auto client_fd : client_sockets)
@@ -146,16 +146,16 @@ protected:
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
int ret = getpeername(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
ret = getsockname(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
for(int other_port : client_ports)
{
- EXPECT_FALSE((int)temp_addr.sin_port == other_port);
+ EXPECT_NE((int)temp_addr.sin_port, other_port);
}
client_sockets.push_back(client_socket);
@@ -165,7 +165,7 @@ protected:
usleep(connect_period);
}
- EXPECT_TRUE((int)client_sockets.size() == expected_connect);
+ EXPECT_EQ((int)client_sockets.size(), expected_connect);
for(auto client_fd : client_sockets)
{
int same_count = 0;
@@ -174,7 +174,7 @@ protected:
if(client_fd == client_fd2)
same_count++;
}
- EXPECT_TRUE(same_count == 1);
+ EXPECT_EQ(same_count, 1);
}
for(auto client_fd : client_sockets)
@@ -615,7 +615,7 @@ protected:
bind_addr.sin_port = htons(atoi(env["BIND_PORT"].c_str()));
int ret = bind(client_socket, (struct sockaddr*)&bind_addr, bind_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
struct sockaddr_in addr;
socklen_t len = sizeof(addr);
@@ -626,22 +626,22 @@ protected:
addr.sin_port = htons(atoi(env["CONNECT_PORT"].c_str()));
ret = connect(client_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getpeername(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
ret = getsockname(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
- EXPECT_TRUE(bind_addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(bind_addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(bind_addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(bind_addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(bind_addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(bind_addr.sin_port, temp_addr.sin_port);
close(client_socket);
}
diff --git a/app/TestTCP/testopen.cpp b/app/TestTCP/testopen.cpp
index 2845112..8147bd1 100644
--- a/app/TestTCP/testopen.cpp
+++ b/app/TestTCP/testopen.cpp
@@ -62,9 +62,9 @@ protected:
close(fd_array[k]);
}
}
- EXPECT_TRUE(success == ((size_t)test_size) * ((size_t)test_repeat));
- EXPECT_TRUE(failed == 0);
- EXPECT_TRUE(duplicated == 0);
+ EXPECT_EQ(success, ((size_t)test_size) * ((size_t)test_repeat));
+ EXPECT_EQ(failed, 0);
+ EXPECT_EQ(duplicated, 0);
}
};
diff --git a/app/TestTCP/testtransfer.cpp b/app/TestTCP/testtransfer.cpp
index 9d1d88c..fc59b1b 100644
--- a/app/TestTCP/testtransfer.cpp
+++ b/app/TestTCP/testtransfer.cpp
@@ -50,13 +50,13 @@ protected:
addr.sin_port = htons(atoi(env["LISTEN_PORT"].c_str()));
int ret = bind(server_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long listen_time = atol(env["LISTEN_TIME"].c_str());
usleep(listen_time);
ret = listen(server_socket, atoi(env["BACKLOG"].c_str()));
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long accept_time = atol(env["ACCEPT_TIME"].c_str());
usleep(accept_time);
@@ -65,28 +65,28 @@ protected:
socklen_t client_len = sizeof(client_addr);
memset(&client_addr, 0, client_len);
int client_fd = accept(server_socket, (struct sockaddr*)&client_addr, &client_len);
- EXPECT_TRUE(client_fd >= 0);
+ EXPECT_GE(client_fd, 0);
- EXPECT_TRUE(client_len == sizeof(client_addr));
- EXPECT_TRUE(client_addr.sin_family == AF_INET);
+ EXPECT_EQ(client_len, sizeof(client_addr));
+ EXPECT_EQ(client_addr.sin_family, AF_INET);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getsockname(client_fd, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
EXPECT_TRUE( (addr.sin_addr.s_addr == 0) ||
(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr));
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long start_time = atol(env["START_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = start_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("connect sleep: %ld\n", sleep_time);
usleep(sleep_time);
@@ -115,7 +115,7 @@ protected:
{
total_size += write_byte;
remaining -= write_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -130,7 +130,7 @@ protected:
{
total_size += read_byte;
remaining -= read_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -138,7 +138,7 @@ protected:
{
for(int j=0; j<buffer_size - remaining; j++)
{
- EXPECT_TRUE(send_buffer[j] == recv_buffer[j]);
+ EXPECT_EQ(send_buffer[j], recv_buffer[j]);
}
}
if(read_byte < 0)
@@ -153,7 +153,7 @@ protected:
free(send_buffer);
free(recv_buffer);
- EXPECT_TRUE(expect_size == total_size);
+ EXPECT_EQ(expect_size, total_size);
close(client_fd);
close(server_socket);
@@ -186,24 +186,24 @@ protected:
addr.sin_port = htons(atoi(env["CONNECT_PORT"].c_str()));
int ret = connect(client_socket, (struct sockaddr*)&addr, len);
- EXPECT_TRUE(ret >= 0);
+ EXPECT_GE(ret, 0);
struct sockaddr_in temp_addr;
socklen_t temp_len = sizeof(temp_addr);
ret = getpeername(client_socket, (struct sockaddr*)&temp_addr, &temp_len);
- EXPECT_TRUE(ret == 0);
- EXPECT_TRUE(addr.sin_addr.s_addr == temp_addr.sin_addr.s_addr);
- EXPECT_TRUE(addr.sin_family == temp_addr.sin_family);
- EXPECT_TRUE(addr.sin_port == temp_addr.sin_port);
+ EXPECT_EQ(ret, 0);
+ EXPECT_EQ(addr.sin_addr.s_addr, temp_addr.sin_addr.s_addr);
+ EXPECT_EQ(addr.sin_family, temp_addr.sin_family);
+ EXPECT_EQ(addr.sin_port, temp_addr.sin_port);
long start_time = atol(env["START_TIME"].c_str());
struct timeval tv;
ret = gettimeofday(&tv, 0);
- EXPECT_TRUE(ret == 0);
+ EXPECT_EQ(ret, 0);
long sleep_time = start_time - (1000*1000*tv.tv_sec) - tv.tv_usec;
- EXPECT_TRUE(sleep_time >= 0);
+ EXPECT_GE(sleep_time, 0);
//printf("connect sleep: %ld\n", sleep_time);
usleep(sleep_time);
@@ -232,7 +232,7 @@ protected:
{
total_size += write_byte;
remaining -= write_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -247,7 +247,7 @@ protected:
{
total_size += read_byte;
remaining -= read_byte;
- EXPECT_TRUE(remaining >= 0);
+ EXPECT_GE(remaining, 0);
if(remaining == 0)
break;
}
@@ -255,7 +255,7 @@ protected:
{
for(int j=0; j<buffer_size - remaining; j++)
{
- EXPECT_TRUE(send_buffer[j] == recv_buffer[j]);
+ EXPECT_EQ(send_buffer[j], recv_buffer[j]);
}
}
if(read_byte < 0)
@@ -270,7 +270,7 @@ protected:
free(send_buffer);
free(recv_buffer);
- EXPECT_TRUE(expect_size == total_size);
+ EXPECT_EQ(expect_size, total_size);
close(client_socket);
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment