Greentea TCP test cases - check all socket calls

Veijo Pesonen · Seppo Takalo · commit 4fa57e36fede · 2018-05-25T09:39:36.000+03:00
diff --git a/TESTS/netsocket/tcp/main.cpp b/TESTS/netsocket/tcp/main.cpp
@@ -68,6 +68,26 @@ static void _ifdown() {
     printf("MBED: ifdown\n");
 }
 
+void tcpsocket_connect_to_echo_srv(TCPSocket& sock) {
+    SocketAddress tcp_addr;
+
+    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
+    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(tcp_addr));
+}
+
+void tcpsocket_connect_to_discard_srv(TCPSocket& sock) {
+    SocketAddress tcp_addr;
+
+    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
+    tcp_addr.set_port(9);
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(tcp_addr));
+}
+
 void fill_tx_buffer_ascii(char *buff, size_t len)
 {
     for (size_t i = 0; i<len; ++i) {
diff --git a/TESTS/netsocket/tcp/tcp_tests.h b/TESTS/netsocket/tcp/tcp_tests.h
@@ -21,6 +21,8 @@
 NetworkInterface* get_interface();
 void drop_bad_packets(TCPSocket& sock);
 void fill_tx_buffer_ascii(char *buff, size_t len);
+void tcpsocket_connect_to_echo_srv(TCPSocket& sock);
+void tcpsocket_connect_to_discard_srv(TCPSocket& sock);
 
 /*
  * Test cases
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest.cpp
@@ -48,13 +48,7 @@ static void _sigio_handler(osThreadId id) {
 
 void test_tcpsocket_echotest()
 {
-    SocketAddress tcp_addr;
-    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
-    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
-
-    TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(tcp_addr);
+    tcpsocket_connect_to_echo_srv(sock);
 
     int recvd;
     int sent;
@@ -82,7 +76,7 @@ void test_tcpsocket_echotest()
         }
         TEST_ASSERT_EQUAL(0, memcmp(tx_buffer, rx_buffer, sent));
     }
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
 
 void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)
@@ -111,12 +105,7 @@ void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)
 
 void test_tcpsocket_echotest_nonblock()
 {
-    SocketAddress tcp_addr;
-    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
-    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
-
-    sock.open(get_interface());
-    sock.connect(tcp_addr);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.set_blocking(false);
     sock.sigio(callback(_sigio_handler, Thread::gettid()));
 
@@ -155,5 +144,5 @@ void test_tcpsocket_echotest_nonblock()
         delete thread;
     }
     free(stack_mem);
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp b/TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp
@@ -40,13 +40,8 @@ static void _sigio_handler(osThreadId id) {
 
 void test_tcpsocket_echotest_burst()
 {
-    SocketAddress tcp_addr;
-    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
-    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
-
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(tcp_addr);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.sigio(callback(_sigio_handler, Thread::gettid()));
 
     // TX buffer to be preserved for comparison
@@ -88,18 +83,13 @@ void test_tcpsocket_echotest_burst()
 
         TEST_ASSERT_EQUAL(0, memcmp(tx_buffer, rx_buffer, BURST_SIZE));
     }
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
 
 void test_tcpsocket_echotest_burst_nonblock()
 {
-    SocketAddress tcp_addr;
-    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
-    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
-
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(tcp_addr);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.set_blocking(false);
     sock.sigio(callback(_sigio_handler, Thread::gettid()));
 
@@ -150,5 +140,5 @@ void test_tcpsocket_echotest_burst_nonblock()
 
         TEST_ASSERT_EQUAL(0, memcmp(tx_buffer, rx_buffer, BURST_SIZE));
     }
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp b/TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp
@@ -32,16 +32,11 @@ static void _sigio_handler(osThreadId id) {
 
 void test_tcpsocket_recv_timeout()
 {
-    SocketAddress tcp_addr;
-    get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
-    tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
-
     static const int DATA_LEN = 100;
     char buff[DATA_LEN] = {0};
 
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(tcp_addr);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.set_timeout(100);
     sock.sigio(callback(_sigio_handler, Thread::gettid()));
 
@@ -72,5 +67,5 @@ void test_tcpsocket_recv_timeout()
             pkt_unrecvd -= recvd;
         }
     }
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp b/TESTS/netsocket/tcp/tcpsocket_send_repeat.cpp
@@ -28,8 +28,7 @@ using namespace utest::v1;
 void test_tcpsocket_send_repeat()
 {
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9);
+    tcpsocket_connect_to_discard_srv(sock);
 
     int err;
     Timer timer;
@@ -38,5 +37,6 @@ void test_tcpsocket_send_repeat()
         err = sock.send(tx_buffer, sizeof(tx_buffer));
         TEST_ASSERT_EQUAL(sizeof(tx_buffer), err);
     }
-    sock.close();
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp b/TESTS/netsocket/tcp/tcpsocket_send_timeout.cpp
@@ -28,8 +28,7 @@ using namespace utest::v1;
 void test_tcpsocket_send_timeout()
 {
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9);
+    tcpsocket_connect_to_discard_srv(sock);
 
     int err;
     Timer timer;
@@ -42,5 +41,6 @@ void test_tcpsocket_send_timeout()
         TEST_ASSERT_EQUAL(sizeof(tx_buffer), err);
         TEST_ASSERT(timer.read_ms() <= 800);
     }
-    sock.close();
+
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
diff --git a/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp b/TESTS/netsocket/tcp/tcpsocket_thread_per_socket_safety.cpp
@@ -43,8 +43,7 @@ static void _sigio_handler2(osThreadId id) {
 static void check_const_len_rand_sequence()
 {
     TCPSocket sock;
-    sock.open(get_interface());
-    sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_PORT);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.sigio(callback(_sigio_handler1, Thread::gettid()));
 
     static const int BUFF_SIZE = 10;
@@ -90,15 +89,13 @@ static void check_const_len_rand_sequence()
         }
         TEST_ASSERT_EQUAL(0, memcmp(tx_buff, rx_buff, BUFF_SIZE));
     }
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
 
 static void check_var_len_rand_sequence()
 {
     TCPSocket sock;
-
-    sock.open(get_interface());
-    sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_PORT);
+    tcpsocket_connect_to_echo_srv(sock);
     sock.sigio(callback(_sigio_handler2, Thread::gettid()));
 
     static const int BUFF_SIZE = 1001;
@@ -145,7 +142,7 @@ static void check_var_len_rand_sequence()
         TEST_ASSERT_EQUAL(0, memcmp(tx_buff, rx_buff, i));
     }
 
-    sock.close();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
 }
 
 void test_tcpsocket_thread_per_socket_safety()

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,7 @@ static void _sigio_handler(osThreadId id) {`
`48`	`48`
`49`	`49`	`void test_tcpsocket_echotest()`
`50`	`50`	`{`
`51`		`- SocketAddress tcp_addr;`
`52`		`- get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);`
`53`		`- tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);`
`54`		`-`
`55`		`- TCPSocket sock;`
`56`		`- sock.open(get_interface());`
`57`		`- sock.connect(tcp_addr);`
	`51`	`+ tcpsocket_connect_to_echo_srv(sock);`
`58`	`52`
`59`	`53`	`int recvd;`
`60`	`54`	`int sent;`
`@@ -82,7 +76,7 @@ void test_tcpsocket_echotest()`
`82`	`76`	`}`
`83`	`77`	`TEST_ASSERT_EQUAL(0, memcmp(tx_buffer, rx_buffer, sent));`
`84`	`78`	`}`
`85`		`- sock.close();`
	`79`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`86`	`80`	`}`
`87`	`81`
`88`	`82`	`void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)`
`@@ -111,12 +105,7 @@ void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)`
`111`	`105`
`112`	`106`	`void test_tcpsocket_echotest_nonblock()`
`113`	`107`	`{`
`114`		`- SocketAddress tcp_addr;`
`115`		`- get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);`
`116`		`- tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);`
`117`		`-`
`118`		`- sock.open(get_interface());`
`119`		`- sock.connect(tcp_addr);`
	`108`	`+ tcpsocket_connect_to_echo_srv(sock);`
`120`	`109`	`sock.set_blocking(false);`
`121`	`110`	`sock.sigio(callback(_sigio_handler, Thread::gettid()));`
`122`	`111`
`@@ -155,5 +144,5 @@ void test_tcpsocket_echotest_nonblock()`
`155`	`144`	`delete thread;`
`156`	`145`	`}`
`157`	`146`	`free(stack_mem);`
`158`		`- sock.close();`
	`147`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`159`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,11 @@ static void _sigio_handler(osThreadId id) {`
`32`	`32`
`33`	`33`	`void test_tcpsocket_recv_timeout()`
`34`	`34`	`{`
`35`		`- SocketAddress tcp_addr;`
`36`		`- get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);`
`37`		`- tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);`
`38`		`-`
`39`	`35`	`static const int DATA_LEN = 100;`
`40`	`36`	`char buff[DATA_LEN] = {0};`
`41`	`37`
`42`	`38`	`TCPSocket sock;`
`43`		`- sock.open(get_interface());`
`44`		`- sock.connect(tcp_addr);`
	`39`	`+ tcpsocket_connect_to_echo_srv(sock);`
`45`	`40`	`sock.set_timeout(100);`
`46`	`41`	`sock.sigio(callback(_sigio_handler, Thread::gettid()));`
`47`	`42`
`@@ -72,5 +67,5 @@ void test_tcpsocket_recv_timeout()`
`72`	`67`	`pkt_unrecvd -= recvd;`
`73`	`68`	`}`
`74`	`69`	`}`
`75`		`- sock.close();`
	`70`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`76`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ using namespace utest::v1;`
`28`	`28`	`void test_tcpsocket_send_repeat()`
`29`	`29`	`{`
`30`	`30`	`TCPSocket sock;`
`31`		`- sock.open(get_interface());`
`32`		`- sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9);`
	`31`	`+ tcpsocket_connect_to_discard_srv(sock);`
`33`	`32`
`34`	`33`	`int err;`
`35`	`34`	`Timer timer;`
`@@ -38,5 +37,6 @@ void test_tcpsocket_send_repeat()`
`38`	`37`	`err = sock.send(tx_buffer, sizeof(tx_buffer));`
`39`	`38`	`TEST_ASSERT_EQUAL(sizeof(tx_buffer), err);`
`40`	`39`	`}`
`41`		`- sock.close();`
	`40`	`+`
	`41`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ static void _sigio_handler2(osThreadId id) {`
`43`	`43`	`static void check_const_len_rand_sequence()`
`44`	`44`	`{`
`45`	`45`	`TCPSocket sock;`
`46`		`- sock.open(get_interface());`
`47`		`- sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_PORT);`
	`46`	`+ tcpsocket_connect_to_echo_srv(sock);`
`48`	`47`	`sock.sigio(callback(_sigio_handler1, Thread::gettid()));`
`49`	`48`
`50`	`49`	`static const int BUFF_SIZE = 10;`
`@@ -90,15 +89,13 @@ static void check_const_len_rand_sequence()`
`90`	`89`	`}`
`91`	`90`	`TEST_ASSERT_EQUAL(0, memcmp(tx_buff, rx_buff, BUFF_SIZE));`
`92`	`91`	`}`
`93`		`- sock.close();`
	`92`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`static void check_var_len_rand_sequence()`
`97`	`96`	`{`
`98`	`97`	`TCPSocket sock;`
`99`		`-`
`100`		`- sock.open(get_interface());`
`101`		`- sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_PORT);`
	`98`	`+ tcpsocket_connect_to_echo_srv(sock);`
`102`	`99`	`sock.sigio(callback(_sigio_handler2, Thread::gettid()));`
`103`	`100`
`104`	`101`	`static const int BUFF_SIZE = 1001;`
`@@ -145,7 +142,7 @@ static void check_var_len_rand_sequence()`
`145`	`142`	`TEST_ASSERT_EQUAL(0, memcmp(tx_buff, rx_buff, i));`
`146`	`143`	`}`
`147`	`144`
`148`		`- sock.close();`
	`145`	`+ TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());`
`149`	`146`	`}`
`150`	`147`
`151`	`148`	`void test_tcpsocket_thread_per_socket_safety()`