Skip to content

Commit 68deb05

Browse files
author
Cruz Monrreal
authored
Merge pull request #9376 from michalpasztamobica/tcpsocket_greentea
TCP/UDP greentea tests refactoring and cleanup
2 parents 30e0d8f + 59e8ded commit 68deb05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+183
-124
lines changed

‎TESTS/netsocket/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,10 @@ content at minimum:
243243
"help" : "Port of echo server",
244244
"value" : "7"
245245
}
246+
"echo-server-discard-port" : {
247+
"help" : "Discard port of echo server",
248+
"value" : "9"
249+
}
246250
}
247251
}
248252
```

‎TESTS/netsocket/tcp/main.cpp

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
using namespace utest::v1;
3535

3636
namespace {
37-
NetworkInterface *net;
3837
Timer tc_bucket; // Timer to limit a test cases run time
3938
}
4039

@@ -45,11 +44,6 @@ mbed_stats_socket_t tcp_stats[MBED_CONF_NSAPI_SOCKET_STATS_MAX_COUNT];
4544
char tcp_global::rx_buffer[RX_BUFF_SIZE];
4645
char tcp_global::tx_buffer[TX_BUFF_SIZE];
4746

48-
NetworkInterface *get_interface()
49-
{
50-
return net;
51-
}
52-
5347
void drop_bad_packets(TCPSocket &sock, int orig_timeout)
5448
{
5549
nsapi_error_t err;
@@ -65,46 +59,50 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
6559

6660
static void _ifup()
6761
{
68-
net = NetworkInterface::get_default_instance();
62+
NetworkInterface *net = NetworkInterface::get_default_instance();
6963
nsapi_error_t err = net->connect();
7064
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
7165
printf("MBED: TCPClient IP address is '%s'\n", net->get_ip_address());
7266
}
7367

7468
static void _ifdown()
7569
{
76-
net->disconnect();
70+
NetworkInterface::get_default_instance()->disconnect();
7771
printf("MBED: ifdown\n");
7872
}
7973

80-
nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock)
74+
nsapi_error_t tcpsocket_connect_to_srv(TCPSocket &sock, uint16_t port)
8175
{
8276
SocketAddress tcp_addr;
8377

84-
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
85-
tcp_addr.set_port(MBED_CONF_APP_ECHO_SERVER_PORT);
78+
NetworkInterface::get_default_instance()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
79+
tcp_addr.set_port(port);
80+
81+
printf("MBED: Server '%s', port %d\n", tcp_addr.get_ip_address(), tcp_addr.get_port());
8682

87-
nsapi_error_t err = sock.open(get_interface());
83+
nsapi_error_t err = sock.open(NetworkInterface::get_default_instance());
8884
if (err != NSAPI_ERROR_OK) {
85+
printf("Error from sock.open: %d\n", err);
8986
return err;
9087
}
9188

92-
return sock.connect(tcp_addr);
93-
}
94-
95-
nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock)
96-
{
97-
SocketAddress tcp_addr;
98-
99-
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
100-
tcp_addr.set_port(9);
101-
102-
nsapi_error_t err = sock.open(get_interface());
89+
err = sock.connect(tcp_addr);
10390
if (err != NSAPI_ERROR_OK) {
91+
printf("Error from sock.connect: %d\n", err);
10492
return err;
10593
}
10694

107-
return sock.connect(tcp_addr);
95+
return NSAPI_ERROR_OK;
96+
}
97+
98+
nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock)
99+
{
100+
return tcpsocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_PORT);
101+
}
102+
103+
nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock)
104+
{
105+
return tcpsocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT);
108106
}
109107

110108
void fill_tx_buffer_ascii(char *buff, size_t len)

‎TESTS/netsocket/tcp/tcpsocket_bind_address.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ void TCPSOCKET_BIND_ADDRESS()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41-
SocketAddress sockAddr = SocketAddress(get_interface()->get_ip_address(), 80);
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
42+
SocketAddress sockAddr = SocketAddress(NetworkInterface::get_default_instance()->get_ip_address(), 80);
4243
nsapi_error_t bind_result = sock->bind(sockAddr);
4344
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4445
TEST_IGNORE_MESSAGE("bind() not supported");

‎TESTS/netsocket/tcp/tcpsocket_bind_address_invalid.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TCPSOCKET_BIND_ADDRESS_INVALID()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
4142
nsapi_error_t bind_result = sock->bind("190.2.3.4", 1024);
4243
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4344
TEST_IGNORE_MESSAGE("bind() not supported");

‎TESTS/netsocket/tcp/tcpsocket_bind_address_null.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TCPSOCKET_BIND_ADDRESS_NULL()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
4142
nsapi_error_t bind_result = sock->bind(NULL, 1024);
4243
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4344
TEST_IGNORE_MESSAGE("bind() not supported");

‎TESTS/netsocket/tcp/tcpsocket_bind_address_port.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ void TCPSOCKET_BIND_ADDRESS_PORT()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41-
nsapi_error_t bind_result = sock->bind(get_interface()->get_ip_address(), 80);
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
42+
nsapi_error_t bind_result = sock->bind(NetworkInterface::get_default_instance()->get_ip_address(), 80);
4243
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4344
TEST_IGNORE_MESSAGE("bind() not supported");
4445
} else {

‎TESTS/netsocket/tcp/tcpsocket_bind_port.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TCPSOCKET_BIND_PORT()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
4142
nsapi_error_t bind_result = sock->bind(1024);
4243
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4344
TEST_IGNORE_MESSAGE("bind() not supported");

‎TESTS/netsocket/tcp/tcpsocket_bind_port_fail.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TCPSOCKET_BIND_PORT_FAIL()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
4142
nsapi_error_t bind_result = sock->bind(1024);
4243
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {
4344
TEST_IGNORE_MESSAGE("bind() not supported");
@@ -51,7 +52,7 @@ void TCPSOCKET_BIND_PORT_FAIL()
5152
if (!sock2) {
5253
TEST_FAIL();
5354
}
54-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock2->open(get_interface()));
55+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock2->open(NetworkInterface::get_default_instance()));
5556
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, sock2->bind(1024));
5657

5758
delete sock;

‎TESTS/netsocket/tcp/tcpsocket_bind_unopened.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ void TCPSOCKET_BIND_UNOPENED()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
4041
nsapi_error_t bind_result = sock->bind(1024);
4142
if (bind_result == NSAPI_ERROR_UNSUPPORTED) {

‎TESTS/netsocket/tcp/tcpsocket_bind_wrong_type.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ void TCPSOCKET_BIND_WRONG_TYPE()
3636
TCPSocket *sock = new TCPSocket;
3737
if (!sock) {
3838
TEST_FAIL();
39+
return;
3940
}
40-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(get_interface()));
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->open(NetworkInterface::get_default_instance()));
4142
char addr_bytes[16] = {0xfe, 0x80, 0xff, 0x1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
4243
SocketAddress sockAddr = SocketAddress(addr_bytes, NSAPI_IPv4, 80);
4344
nsapi_error_t bind_result = sock->bind(sockAddr);

0 commit comments

Comments
 (0)