Skip to content

Commit 21ec972

Browse files
Veijo PesonenSeppo Takalo
authored andcommitted
Switches Greentea netsocket test case naming convention
From lowercase to uppercase and drops 'test_'-prefix. Test case descriptions do also match to TC names now. Additionally all the TCs are not behing MBED_EXTENDED_TESTS anymore.
1 parent 1b04172 commit 21ec972

23 files changed

+75
-81
lines changed

TESTS/netsocket/tcp/main.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@
1919
#error [NOT_SUPPORTED] No network configuration found for this target.
2020
#endif
2121

22-
#ifndef MBED_EXTENDED_TESTS
23-
#error [NOT_SUPPORTED] Pressure tests are not supported by default
24-
#endif
25-
2622
#include "mbed.h"
2723
#include MBED_CONF_APP_HEADER_FILE
2824
#include "greentea-client/test_env.h"
@@ -111,20 +107,22 @@ void greentea_teardown(const size_t passed, const size_t failed, const failure_t
111107

112108

113109
Case cases[] = {
114-
Case("Invalid endpoint rejected", test_tcpsocket_connect_invalid),
115-
Case("Echo", test_tcpsocket_echotest),
116-
Case("Echo non-block", test_tcpsocket_echotest_nonblock),
117-
Case("Echo burst", test_tcpsocket_echotest_burst),
118-
Case("Echo burst non-block", test_tcpsocket_echotest_burst_nonblock),
119-
Case("Reuse a socket", test_tcpsocket_open_close_repeat),
120-
Case("Open at least 4 sockets", test_tcpsocket_open_limit),
121-
Case("Receive 100k from CHARGEN service", test_tcpsocket_recv_100k),
122-
Case("Receive 100k from CHARGEN service non-block", test_tcpsocket_recv_100k_nonblock),
123-
Case("Receive in given time", test_tcpsocket_recv_timeout),
124-
Case("Send repeatedly", test_tcpsocket_send_repeat),
125-
Case("Sending shall not take too long", test_tcpsocket_send_timeout),
126-
Case("Parallel socket thread safety", test_tcpsocket_thread_per_socket_safety),
127-
Case("Endpoint initiated close", test_tcpsocket_endpoint_close),
110+
Case("TCPSOCKET_ECHOTEST", TCPSOCKET_ECHOTEST),
111+
Case("TCPSOCKET_ECHOTEST_NONBLOCK", TCPSOCKET_ECHOTEST_NONBLOCK),
112+
Case("TCPSOCKET_OPEN_CLOSE_REPEAT", TCPSOCKET_OPEN_CLOSE_REPEAT),
113+
Case("TCPSOCKET_OPEN_LIMIT", TCPSOCKET_OPEN_LIMIT),
114+
Case("TCPSOCKET_THREAD_PER_SOCKET_SAFETY", TCPSOCKET_THREAD_PER_SOCKET_SAFETY),
115+
#ifdef MBED_EXTENDED_TESTS
116+
Case("TCPSOCKET_CONNECT_INVALID", TCPSOCKET_CONNECT_INVALID),
117+
Case("TCPSOCKET_ECHOTEST_BURST", TCPSOCKET_ECHOTEST_BURST),
118+
Case("TCPSOCKET_ECHOTEST_BURST_NONBLOCK", TCPSOCKET_ECHOTEST_BURST_NONBLOCK),
119+
Case("TCPSOCKET_RECV_100K", TCPSOCKET_RECV_100K),
120+
Case("TCPSOCKET_RECV_100K_NONBLOCK", TCPSOCKET_RECV_100K_NONBLOCK),
121+
Case("TCPSOCKET_RECV_TIMEOUT", TCPSOCKET_RECV_TIMEOUT),
122+
Case("TCPSOCKET_SEND_REPEAT", TCPSOCKET_SEND_REPEAT),
123+
Case("TCPSOCKET_SEND_TIMEOUT", TCPSOCKET_SEND_TIMEOUT),
124+
Case("TCPSOCKET_ENDPOINT_CLOSE", TCPSOCKET_ENDPOINT_CLOSE),
125+
#endif
128126
};
129127

130128
Specification specification(greentea_setup, cases, greentea_teardown);

TESTS/netsocket/tcp/tcp_tests.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ void tcpsocket_connect_to_discard_srv(TCPSocket& sock);
2727
/*
2828
* Test cases
2929
*/
30-
void test_tcpsocket_connect_invalid();
31-
void test_tcpsocket_echotest();
32-
void test_tcpsocket_echotest_nonblock();
33-
void test_tcpsocket_echotest_burst();
34-
void test_tcpsocket_echotest_burst_nonblock();
35-
void test_tcpsocket_endpoint_close();
36-
void test_tcpsocket_open_close_repeat();
37-
void test_tcpsocket_open_limit();
38-
void test_tcpsocket_recv_100k();
39-
void test_tcpsocket_recv_100k_nonblock();
40-
void test_tcpsocket_recv_timeout();
41-
void test_tcpsocket_send_repeat();
42-
void test_tcpsocket_send_timeout();
43-
void test_tcpsocket_thread_per_socket_safety();
30+
void TCPSOCKET_CONNECT_INVALID();
31+
void TCPSOCKET_ECHOTEST();
32+
void TCPSOCKET_ECHOTEST_NONBLOCK();
33+
void TCPSOCKET_ECHOTEST_BURST();
34+
void TCPSOCKET_ECHOTEST_BURST_NONBLOCK();
35+
void TCPSOCKET_ENDPOINT_CLOSE();
36+
void TCPSOCKET_OPEN_CLOSE_REPEAT();
37+
void TCPSOCKET_OPEN_LIMIT();
38+
void TCPSOCKET_RECV_100K();
39+
void TCPSOCKET_RECV_100K_NONBLOCK();
40+
void TCPSOCKET_RECV_TIMEOUT();
41+
void TCPSOCKET_SEND_REPEAT();
42+
void TCPSOCKET_SEND_TIMEOUT();
43+
void TCPSOCKET_THREAD_PER_SOCKET_SAFETY();
4444

4545
#endif //TCP_TESTS_H

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
using namespace utest::v1;
2727

28-
void test_tcpsocket_connect_invalid()
28+
void TCPSOCKET_CONNECT_INVALID()
2929
{
3030
TCPSocket sock;
3131
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void _sigio_handler(osThreadId id) {
4646
osSignalSet(id, SIGNAL_SIGIO);
4747
}
4848

49-
void test_tcpsocket_echotest()
49+
void TCPSOCKET_ECHOTEST()
5050
{
5151
tcpsocket_connect_to_echo_srv(sock);
5252

@@ -103,7 +103,7 @@ void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)
103103

104104
}
105105

106-
void test_tcpsocket_echotest_nonblock()
106+
void TCPSOCKET_ECHOTEST_NONBLOCK()
107107
{
108108
tcpsocket_connect_to_echo_srv(sock);
109109
sock.set_blocking(false);

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static void _sigio_handler(osThreadId id) {
3838
osSignalSet(id, SIGNAL_SIGIO);
3939
}
4040

41-
void test_tcpsocket_echotest_burst()
41+
void TCPSOCKET_ECHOTEST_BURST()
4242
{
4343
TCPSocket sock;
4444
tcpsocket_connect_to_echo_srv(sock);
@@ -86,7 +86,7 @@ void test_tcpsocket_echotest_burst()
8686
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
8787
}
8888

89-
void test_tcpsocket_echotest_burst_nonblock()
89+
void TCPSOCKET_ECHOTEST_BURST_NONBLOCK()
9090
{
9191
TCPSocket sock;
9292
tcpsocket_connect_to_echo_srv(sock);

TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void _tcpsocket_connect_to_daytime_srv(TCPSocket& sock) {
4646
}
4747

4848

49-
void test_tcpsocket_endpoint_close()
49+
void TCPSOCKET_ENDPOINT_CLOSE()
5050
{
5151
static const int MORE_THAN_AVAILABLE = 30;
5252
char buff[MORE_THAN_AVAILABLE];

TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "unity/unity.h"
2424
#include "utest.h"
2525

26-
void test_tcpsocket_open_close_repeat()
26+
void TCPSOCKET_OPEN_CLOSE_REPEAT()
2727
{
2828
TCPSocket *sock = new TCPSocket;
2929
if (!sock) {

TESTS/netsocket/tcp/tcpsocket_open_limit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace
3333
} SocketItem;
3434
}
3535

36-
void test_tcpsocket_open_limit()
36+
void TCPSOCKET_OPEN_LIMIT()
3737
{
3838
int open_sockets[2] = {0};
3939

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void rcv_n_chk_against_rfc864_pattern(TCPSocket& sock) {
9292
}
9393
}
9494

95-
void test_tcpsocket_recv_100k()
95+
void TCPSOCKET_RECV_100K()
9696
{
9797
TCPSocket sock;
9898
_tcpsocket_connect_to_chargen_srv(sock);
@@ -130,7 +130,7 @@ static void _sigio_handler(osThreadId id) {
130130
osSignalSet(id, SIGNAL_SIGIO);
131131
}
132132

133-
void test_tcpsocket_recv_100k_nonblock()
133+
void TCPSOCKET_RECV_100K_NONBLOCK()
134134
{
135135
TCPSocket sock;
136136
_tcpsocket_connect_to_chargen_srv(sock);

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ static void _sigio_handler(osThreadId id) {
3030
osSignalSet(id, SIGNAL_SIGIO);
3131
}
3232

33-
void test_tcpsocket_recv_timeout()
33+
void TCPSOCKET_RECV_TIMEOUT()
3434
{
3535
static const int DATA_LEN = 100;
3636
char buff[DATA_LEN] = {0};

0 commit comments

Comments
 (0)