Skip to content

Commit af65522

Browse files
michalpasztamobicamichalpasztamobica
committed
Publish TLSSocket test documentation
The whole README.md had to be updated to match the internal Confluence documentation, which can now be locked. In the process I also updated any spotted mistakes in tests documentation, removed the obsolete TCPServer tests documentation and added a test which was missing from UDPSocket's main.
1 parent d568e21 commit af65522

19 files changed

+277
-213
lines changed

‎TESTS/netsocket/README.md

Lines changed: 198 additions & 208 deletions
Large diffs are not rendered by default.

‎TESTS/netsocket/tls/main.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include "utest/utest_stack_trace.h"
3232
#include "tls_tests.h"
3333

34+
#if defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
35+
3436
using namespace utest::v1;
3537

3638
namespace {
@@ -193,7 +195,9 @@ Case cases[] = {
193195
Case("TLSSOCKET_SEND_REPEAT", TLSSOCKET_SEND_REPEAT),
194196
Case("TLSSOCKET_SEND_TIMEOUT", TLSSOCKET_SEND_TIMEOUT),
195197
Case("TLSSOCKET_NO_CERT", TLSSOCKET_NO_CERT),
198+
#ifndef __IAR_SYSTEMS_ICC__
196199
Case("TLSSOCKET_SIMULTANEOUS", TLSSOCKET_SIMULTANEOUS)
200+
#endif
197201
};
198202

199203
Specification specification(greentea_setup, cases, greentea_teardown, greentea_continue_handlers);
@@ -212,3 +216,7 @@ int main()
212216
th->join();
213217
return retval;
214218
}
219+
220+
#else
221+
#error [NOT_SUPPORTED] This device does not support SSL library
222+
#endif // defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)

‎TESTS/netsocket/tls/tls_tests.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
#ifndef TLS_TESTS_H
1919
#define TLS_TESTS_H
2020

21+
#include "TLSSocket.h"
22+
23+
#if defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
24+
2125
NetworkInterface *get_interface();
2226
void drop_bad_packets(TLSSocket &sock, int orig_timeout);
2327
void fill_tx_buffer_ascii(char *buff, size_t len);
@@ -67,4 +71,6 @@ void TLSSOCKET_NO_CERT();
6771
void TLSSOCKET_SIMULTANEOUS();
6872
void TLSSOCKET_SEND_TIMEOUT();
6973

74+
#endif // defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
75+
7076
#endif //TLS_TESTS_H

‎TESTS/netsocket/tls/tlssocket_connect_invalid.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_CONNECT_INVALID()
2830
{
2931
TLSSocket sock;
@@ -39,3 +41,5 @@ void TLSSOCKET_CONNECT_INVALID()
3941

4042
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
4143
}
44+
45+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_echotest.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
namespace {
2830
static const int SIGNAL_SIGIO = 0x1;
2931
static const int SIGIO_TIMEOUT = 20000; //[ms]
@@ -118,8 +120,7 @@ void tlssocket_echotest_nonblock_receive()
118120
static int round = 0;
119121
printf("[Recevr#%02d] bytes received: %d\n", round++, bytes2recv_total);
120122
tx_sem.release();
121-
}
122-
else if (receive_error || bytes2recv < 0) {
123+
} else if (receive_error || bytes2recv < 0) {
123124
TEST_FAIL();
124125
tx_sem.release();
125126
}
@@ -150,9 +151,9 @@ void TLSSOCKET_ECHOTEST_NONBLOCK()
150151
unsigned char *stack_mem = (unsigned char *)malloc(tls_global::TLS_OS_STACK_SIZE);
151152
TEST_ASSERT_NOT_NULL(stack_mem);
152153
Thread *receiver_thread = new Thread(osPriorityNormal,
153-
tls_global::TLS_OS_STACK_SIZE,
154-
stack_mem,
155-
"receiver");
154+
tls_global::TLS_OS_STACK_SIZE,
155+
stack_mem,
156+
"receiver");
156157
EventQueue queue(2 * EVENTS_EVENT_SIZE);
157158
event_queue = &queue;
158159
TEST_ASSERT_EQUAL(osOK, receiver_thread->start(callback(&queue, &EventQueue::dispatch_forever)));
@@ -207,3 +208,5 @@ void TLSSOCKET_ECHOTEST_NONBLOCK()
207208
free(stack_mem);
208209
delete sock;
209210
}
211+
212+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_echotest_burst.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
namespace {
2830
static const int SIGNAL_SIGIO = 0x1;
2931
static const int SIGIO_TIMEOUT = 20000; //[ms]
@@ -152,3 +154,5 @@ void TLSSOCKET_ECHOTEST_BURST_NONBLOCK()
152154
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock->close());
153155
delete sock;
154156
}
157+
158+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_endpoint_close.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
namespace {
2830
static const int SIGNAL_SIGIO = 0x1;
2931
static const int SIGIO_TIMEOUT = 20000; //[ms]
@@ -89,3 +91,5 @@ void TLSSOCKET_ENDPOINT_CLOSE()
8991
tc_exec_time.stop();
9092
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
9193
}
94+
95+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_handshake_invalid.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_HANDSHAKE_INVALID()
2830
{
2931
TLSSocket sock;
@@ -33,3 +35,5 @@ void TLSSOCKET_HANDSHAKE_INVALID()
3335
sock.connect("os.mbed.com", MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS));
3436
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3537
}
38+
39+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_no_cert.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_NO_CERT()
2830
{
2931
TLSSocket sock;
@@ -32,3 +34,5 @@ void TLSSOCKET_NO_CERT()
3234
sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_PORT_TLS));
3335
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3436
}
37+
38+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_open_destruct.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_OPEN_DESTRUCT()
2830
{
2931
#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
@@ -48,3 +50,5 @@ void TLSSOCKET_OPEN_DESTRUCT()
4850
}
4951
#endif
5052
}
53+
54+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_open_limit.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
namespace {
2830
typedef struct TLSSocketItem {
2931
TLSSocket *sock;
@@ -95,3 +97,5 @@ void TLSSOCKET_OPEN_LIMIT()
9597
TEST_ASSERT_EQUAL(open_sockets[0], open_sockets[1]);
9698
TEST_ASSERT(open_sockets[0] >= 4);
9799
}
100+
101+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_open_twice.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_OPEN_TWICE()
2830
{
2931
#if MBED_CONF_NSAPI_SOCKET_STATS_ENABLE
@@ -48,3 +50,5 @@ void TLSSOCKET_OPEN_TWICE()
4850
}
4951
#endif
5052
}
53+
54+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_recv_timeout.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
namespace {
2830
static const int SIGNAL_SIGIO = 0x1;
2931
static const int SIGIO_TIMEOUT = 20000; //[ms]
@@ -82,3 +84,5 @@ void TLSSOCKET_RECV_TIMEOUT()
8284
tc_exec_time.stop();
8385
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
8486
}
87+
88+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_send_closed.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_SEND_CLOSED()
2830
{
2931
TLSSocket sock;
@@ -34,3 +36,5 @@ void TLSSOCKET_SEND_CLOSED()
3436
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3537
TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_SOCKET, sock.send("12345", 5));
3638
}
39+
40+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_send_repeat.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_SEND_REPEAT()
2830
{
2931
TLSSocket sock;
@@ -42,3 +44,5 @@ void TLSSOCKET_SEND_REPEAT()
4244

4345
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
4446
}
47+
48+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_send_timeout.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_SEND_TIMEOUT()
2830
{
2931
TLSSocket sock;
@@ -50,3 +52,5 @@ void TLSSOCKET_SEND_TIMEOUT()
5052

5153
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
5254
}
55+
56+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_send_unconnected.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_SEND_UNCONNECTED()
2830
{
2931
TLSSocket sock;
@@ -32,3 +34,5 @@ void TLSSOCKET_SEND_UNCONNECTED()
3234
TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_CONNECTION, sock.send("12345", 5));
3335
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3436
}
37+
38+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/tls/tlssocket_simultaneous.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
using namespace utest::v1;
2626

27+
#if defined(MBEDTLS_SSL_CLI_C)
28+
2729
void TLSSOCKET_SIMULTANEOUS()
2830
{
2931
TLSSocket sock1;
@@ -64,3 +66,5 @@ void TLSSOCKET_SIMULTANEOUS()
6466
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock1.close());
6567
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock2.close());
6668
}
69+
70+
#endif // defined(MBEDTLS_SSL_CLI_C)

‎TESTS/netsocket/udp/main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ Case cases[] = {
9797
Case("UDPSOCKET_ECHOTEST_NONBLOCK", UDPSOCKET_ECHOTEST_NONBLOCK),
9898
Case("UDPSOCKET_OPEN_CLOSE_REPEAT", UDPSOCKET_OPEN_CLOSE_REPEAT),
9999
Case("UDPSOCKET_OPEN_LIMIT", UDPSOCKET_OPEN_LIMIT),
100+
Case("UDPSOCKET_RECV_TIMEOUT", UDPSOCKET_RECV_TIMEOUT),
100101
Case("UDPSOCKET_SENDTO_TIMEOUT", UDPSOCKET_SENDTO_TIMEOUT),
101102
Case("UDPSOCKET_OPEN_DESTRUCT", UDPSOCKET_OPEN_DESTRUCT),
102103
Case("UDPSOCKET_OPEN_TWICE", UDPSOCKET_OPEN_TWICE),

0 commit comments

Comments
 (0)