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.
pull/6665/head
Veijo Pesonen 2018-05-16 16:32:09 +03:00 committed by Seppo Takalo
parent 1b041721a0
commit 21ec972798
23 changed files with 75 additions and 81 deletions

View File

@ -19,10 +19,6 @@
#error [NOT_SUPPORTED] No network configuration found for this target.
#endif
#ifndef MBED_EXTENDED_TESTS
#error [NOT_SUPPORTED] Pressure tests are not supported by default
#endif
#include "mbed.h"
#include MBED_CONF_APP_HEADER_FILE
#include "greentea-client/test_env.h"
@ -111,20 +107,22 @@ void greentea_teardown(const size_t passed, const size_t failed, const failure_t
Case cases[] = {
Case("Invalid endpoint rejected", test_tcpsocket_connect_invalid),
Case("Echo", test_tcpsocket_echotest),
Case("Echo non-block", test_tcpsocket_echotest_nonblock),
Case("Echo burst", test_tcpsocket_echotest_burst),
Case("Echo burst non-block", test_tcpsocket_echotest_burst_nonblock),
Case("Reuse a socket", test_tcpsocket_open_close_repeat),
Case("Open at least 4 sockets", test_tcpsocket_open_limit),
Case("Receive 100k from CHARGEN service", test_tcpsocket_recv_100k),
Case("Receive 100k from CHARGEN service non-block", test_tcpsocket_recv_100k_nonblock),
Case("Receive in given time", test_tcpsocket_recv_timeout),
Case("Send repeatedly", test_tcpsocket_send_repeat),
Case("Sending shall not take too long", test_tcpsocket_send_timeout),
Case("Parallel socket thread safety", test_tcpsocket_thread_per_socket_safety),
Case("Endpoint initiated close", test_tcpsocket_endpoint_close),
Case("TCPSOCKET_ECHOTEST", TCPSOCKET_ECHOTEST),
Case("TCPSOCKET_ECHOTEST_NONBLOCK", TCPSOCKET_ECHOTEST_NONBLOCK),
Case("TCPSOCKET_OPEN_CLOSE_REPEAT", TCPSOCKET_OPEN_CLOSE_REPEAT),
Case("TCPSOCKET_OPEN_LIMIT", TCPSOCKET_OPEN_LIMIT),
Case("TCPSOCKET_THREAD_PER_SOCKET_SAFETY", TCPSOCKET_THREAD_PER_SOCKET_SAFETY),
#ifdef MBED_EXTENDED_TESTS
Case("TCPSOCKET_CONNECT_INVALID", TCPSOCKET_CONNECT_INVALID),
Case("TCPSOCKET_ECHOTEST_BURST", TCPSOCKET_ECHOTEST_BURST),
Case("TCPSOCKET_ECHOTEST_BURST_NONBLOCK", TCPSOCKET_ECHOTEST_BURST_NONBLOCK),
Case("TCPSOCKET_RECV_100K", TCPSOCKET_RECV_100K),
Case("TCPSOCKET_RECV_100K_NONBLOCK", TCPSOCKET_RECV_100K_NONBLOCK),
Case("TCPSOCKET_RECV_TIMEOUT", TCPSOCKET_RECV_TIMEOUT),
Case("TCPSOCKET_SEND_REPEAT", TCPSOCKET_SEND_REPEAT),
Case("TCPSOCKET_SEND_TIMEOUT", TCPSOCKET_SEND_TIMEOUT),
Case("TCPSOCKET_ENDPOINT_CLOSE", TCPSOCKET_ENDPOINT_CLOSE),
#endif
};
Specification specification(greentea_setup, cases, greentea_teardown);

View File

@ -27,19 +27,19 @@ void tcpsocket_connect_to_discard_srv(TCPSocket& sock);
/*
* Test cases
*/
void test_tcpsocket_connect_invalid();
void test_tcpsocket_echotest();
void test_tcpsocket_echotest_nonblock();
void test_tcpsocket_echotest_burst();
void test_tcpsocket_echotest_burst_nonblock();
void test_tcpsocket_endpoint_close();
void test_tcpsocket_open_close_repeat();
void test_tcpsocket_open_limit();
void test_tcpsocket_recv_100k();
void test_tcpsocket_recv_100k_nonblock();
void test_tcpsocket_recv_timeout();
void test_tcpsocket_send_repeat();
void test_tcpsocket_send_timeout();
void test_tcpsocket_thread_per_socket_safety();
void TCPSOCKET_CONNECT_INVALID();
void TCPSOCKET_ECHOTEST();
void TCPSOCKET_ECHOTEST_NONBLOCK();
void TCPSOCKET_ECHOTEST_BURST();
void TCPSOCKET_ECHOTEST_BURST_NONBLOCK();
void TCPSOCKET_ENDPOINT_CLOSE();
void TCPSOCKET_OPEN_CLOSE_REPEAT();
void TCPSOCKET_OPEN_LIMIT();
void TCPSOCKET_RECV_100K();
void TCPSOCKET_RECV_100K_NONBLOCK();
void TCPSOCKET_RECV_TIMEOUT();
void TCPSOCKET_SEND_REPEAT();
void TCPSOCKET_SEND_TIMEOUT();
void TCPSOCKET_THREAD_PER_SOCKET_SAFETY();
#endif //TCP_TESTS_H

View File

@ -25,7 +25,7 @@
using namespace utest::v1;
void test_tcpsocket_connect_invalid()
void TCPSOCKET_CONNECT_INVALID()
{
TCPSocket sock;
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));

View File

@ -46,7 +46,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_tcpsocket_echotest()
void TCPSOCKET_ECHOTEST()
{
tcpsocket_connect_to_echo_srv(sock);
@ -103,7 +103,7 @@ void tcpsocket_echotest_nonblock_receiver(void *receive_bytes)
}
void test_tcpsocket_echotest_nonblock()
void TCPSOCKET_ECHOTEST_NONBLOCK()
{
tcpsocket_connect_to_echo_srv(sock);
sock.set_blocking(false);

View File

@ -38,7 +38,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_tcpsocket_echotest_burst()
void TCPSOCKET_ECHOTEST_BURST()
{
TCPSocket sock;
tcpsocket_connect_to_echo_srv(sock);
@ -86,7 +86,7 @@ void test_tcpsocket_echotest_burst()
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
}
void test_tcpsocket_echotest_burst_nonblock()
void TCPSOCKET_ECHOTEST_BURST_NONBLOCK()
{
TCPSocket sock;
tcpsocket_connect_to_echo_srv(sock);

View File

@ -46,7 +46,7 @@ static void _tcpsocket_connect_to_daytime_srv(TCPSocket& sock) {
}
void test_tcpsocket_endpoint_close()
void TCPSOCKET_ENDPOINT_CLOSE()
{
static const int MORE_THAN_AVAILABLE = 30;
char buff[MORE_THAN_AVAILABLE];

View File

@ -23,7 +23,7 @@
#include "unity/unity.h"
#include "utest.h"
void test_tcpsocket_open_close_repeat()
void TCPSOCKET_OPEN_CLOSE_REPEAT()
{
TCPSocket *sock = new TCPSocket;
if (!sock) {

View File

@ -33,7 +33,7 @@ namespace
} SocketItem;
}
void test_tcpsocket_open_limit()
void TCPSOCKET_OPEN_LIMIT()
{
int open_sockets[2] = {0};

View File

@ -92,7 +92,7 @@ void rcv_n_chk_against_rfc864_pattern(TCPSocket& sock) {
}
}
void test_tcpsocket_recv_100k()
void TCPSOCKET_RECV_100K()
{
TCPSocket sock;
_tcpsocket_connect_to_chargen_srv(sock);
@ -130,7 +130,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_tcpsocket_recv_100k_nonblock()
void TCPSOCKET_RECV_100K_NONBLOCK()
{
TCPSocket sock;
_tcpsocket_connect_to_chargen_srv(sock);

View File

@ -30,7 +30,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_tcpsocket_recv_timeout()
void TCPSOCKET_RECV_TIMEOUT()
{
static const int DATA_LEN = 100;
char buff[DATA_LEN] = {0};

View File

@ -25,7 +25,7 @@
using namespace utest::v1;
void test_tcpsocket_send_repeat()
void TCPSOCKET_SEND_REPEAT()
{
TCPSocket sock;
tcpsocket_connect_to_discard_srv(sock);

View File

@ -25,7 +25,7 @@
using namespace utest::v1;
void test_tcpsocket_send_timeout()
void TCPSOCKET_SEND_TIMEOUT()
{
TCPSocket sock;
tcpsocket_connect_to_discard_srv(sock);

View File

@ -145,7 +145,7 @@ static void check_var_len_rand_sequence()
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
}
void test_tcpsocket_thread_per_socket_safety()
void TCPSOCKET_THREAD_PER_SOCKET_SAFETY()
{
thread.start(callback(check_const_len_rand_sequence));

View File

@ -19,10 +19,6 @@
#error [NOT_SUPPORTED] No network configuration found for this target.
#endif
#ifndef MBED_EXTENDED_TESTS
#error [NOT_SUPPORTED] Pressure tests are not supported by default
#endif
#include "mbed.h"
#include MBED_CONF_APP_HEADER_FILE
#include "greentea-client/test_env.h"
@ -77,7 +73,7 @@ void fill_tx_buffer_ascii(char *buff, size_t len)
// Test setup
utest::v1::status_t greentea_setup(const size_t number_of_cases)
{
GREENTEA_SETUP(120, "default_auto");
GREENTEA_SETUP(240, "default_auto");
_ifup();
return greentea_test_setup_handler(number_of_cases);
}
@ -89,16 +85,16 @@ void greentea_teardown(const size_t passed, const size_t failed, const failure_t
}
Case cases[] = {
Case("Echo", test_udpsocket_echotest),
Case("Echo non-block", test_udpsocket_echotest_nonblock),
Case("Echo burst", test_udpsocket_echotest_burst),
Case("Echo burst non-block", test_udpsocket_echotest_burst_nonblock),
Case("Reuse a socket", test_udpsocket_open_close_repeat),
Case("Open at least 3 sockets", test_udpsocket_open_limit),
Case("Receive in given time", test_udpsocket_recv_timeout),
Case("Detect sendto invalid params", test_udpsocket_sendto_invalid),
Case("Send repeatedly", test_udpsocket_sendto_repeat),
Case("Send in given time", test_udpsocket_sendto_timeout),
Case("UDPSOCKET_ECHOTEST_NONBLOCK", UDPSOCKET_ECHOTEST_NONBLOCK),
Case("UDPSOCKET_OPEN_CLOSE_REPEAT", UDPSOCKET_OPEN_CLOSE_REPEAT),
Case("UDPSOCKET_OPEN_LIMIT", UDPSOCKET_OPEN_LIMIT),
Case("UDPSOCKET_SENDTO_TIMEOUT", UDPSOCKET_SENDTO_TIMEOUT),
#ifdef MBED_EXTENDED_TESTS
Case("UDPSOCKET_ECHOTEST", UDPSOCKET_ECHOTEST),
Case("UDPSOCKET_ECHOTEST_BURST", UDPSOCKET_ECHOTEST_BURST),
Case("UDPSOCKET_ECHOTEST_BURST_NONBLOCK", UDPSOCKET_ECHOTEST_BURST_NONBLOCK),
Case("UDPSOCKET_SENDTO_REPEAT", UDPSOCKET_SENDTO_REPEAT),
#endif
};
Specification specification(greentea_setup, cases, greentea_teardown);

View File

@ -25,15 +25,15 @@ void fill_tx_buffer_ascii(char *buff, size_t len);
/*
* Test cases
*/
void test_udpsocket_echotest();
void test_udpsocket_echotest_nonblock();
void test_udpsocket_echotest_burst();
void test_udpsocket_echotest_burst_nonblock();
void test_udpsocket_open_close_repeat();
void test_udpsocket_open_limit();
void test_udpsocket_recv_timeout();
void test_udpsocket_sendto_invalid();
void test_udpsocket_sendto_repeat();
void test_udpsocket_sendto_timeout();
void UDPSOCKET_ECHOTEST();
void UDPSOCKET_ECHOTEST_NONBLOCK();
void UDPSOCKET_ECHOTEST_BURST();
void UDPSOCKET_ECHOTEST_BURST_NONBLOCK();
void UDPSOCKET_OPEN_CLOSE_REPEAT();
void UDPSOCKET_OPEN_LIMIT();
void UDPSOCKET_RECV_TIMEOUT();
void UDPSOCKET_SENDTO_INVALID();
void UDPSOCKET_SENDTO_REPEAT();
void UDPSOCKET_SENDTO_TIMEOUT();
#endif //UDP_TESTS_H

View File

@ -49,7 +49,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_udpsocket_echotest()
void UDPSOCKET_ECHOTEST()
{
SocketAddress udp_addr;
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);
@ -103,7 +103,7 @@ void udpsocket_echotest_nonblock_receiver(void *receive_bytes)
tx_sem.release();
}
void test_udpsocket_echotest_nonblock()
void UDPSOCKET_ECHOTEST_NONBLOCK()
{
SocketAddress udp_addr;
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);

View File

@ -61,7 +61,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_udpsocket_echotest_burst()
void UDPSOCKET_ECHOTEST_BURST()
{
SocketAddress udp_addr;
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);
@ -137,7 +137,7 @@ void test_udpsocket_echotest_burst()
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
}
void test_udpsocket_echotest_burst_nonblock()
void UDPSOCKET_ECHOTEST_BURST_NONBLOCK()
{
SocketAddress udp_addr;
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);

View File

@ -23,7 +23,7 @@
#include "unity/unity.h"
#include "utest.h"
void test_udpsocket_open_close_repeat()
void UDPSOCKET_OPEN_CLOSE_REPEAT()
{
UDPSocket *sock = new UDPSocket;
if (!sock) {

View File

@ -33,7 +33,7 @@ namespace
} SocketItem;
}
void test_udpsocket_open_limit()
void UDPSOCKET_OPEN_LIMIT()
{
int open_sockets[2] = {0};

View File

@ -35,7 +35,7 @@ static void _sigio_handler(osThreadId id) {
osSignalSet(id, SIGNAL_SIGIO);
}
void test_udpsocket_recv_timeout()
void UDPSOCKET_RECV_TIMEOUT()
{
SocketAddress udp_addr;
get_interface()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &udp_addr);

View File

@ -25,7 +25,7 @@
using namespace utest::v1;
void test_udpsocket_sendto_invalid()
void UDPSOCKET_SENDTO_INVALID()
{
UDPSocket sock;
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));

View File

@ -25,7 +25,7 @@
using namespace utest::v1;
void test_udpsocket_sendto_repeat()
void UDPSOCKET_SENDTO_REPEAT()
{
UDPSocket sock;
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(get_interface()));

View File

@ -23,7 +23,7 @@
#include "utest.h"
#include "udp_tests.h"
void test_udpsocket_sendto_timeout()
void UDPSOCKET_SENDTO_TIMEOUT()
{
char tx_buffer[100];
fill_tx_buffer_ascii(tx_buffer, sizeof(tx_buffer));