Skip to content

Commit dd77957

Browse files
0xc01700xc0170
authored
Merge pull request #10665 from tymoteuszblochmobica/json
Add hardcoded Echo server defaults for Greentea socket tests.
2 parents dc77c40 + d42ed4e commit dd77957

21 files changed

+98
-39
lines changed

‎TESTS/netsocket/tcp/main.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
2121
#error [NOT_SUPPORTED] No network configuration found for this target.
2222
#endif
23-
#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
24-
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
25-
#endif
2623

2724
#include "mbed.h"
2825
#include "greentea-client/test_env.h"
@@ -31,6 +28,10 @@
3128
#include "utest/utest_stack_trace.h"
3229
#include "tcp_tests.h"
3330

31+
#ifndef ECHO_SERVER_ADDR
32+
#error [NOT_SUPPORTED] Requires parameters for echo server
33+
#endif
34+
3435
using namespace utest::v1;
3536

3637
namespace {
@@ -84,7 +85,7 @@ nsapi_error_t tcpsocket_connect_to_srv(TCPSocket &sock, uint16_t port)
8485
{
8586
SocketAddress tcp_addr;
8687

87-
NetworkInterface::get_default_instance()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
88+
NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &tcp_addr);
8889
tcp_addr.set_port(port);
8990

9091
printf("MBED: Server '%s', port %d\n", tcp_addr.get_ip_address(), tcp_addr.get_port());
@@ -106,12 +107,12 @@ nsapi_error_t tcpsocket_connect_to_srv(TCPSocket &sock, uint16_t port)
106107

107108
nsapi_error_t tcpsocket_connect_to_echo_srv(TCPSocket &sock)
108109
{
109-
return tcpsocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_PORT);
110+
return tcpsocket_connect_to_srv(sock, ECHO_SERVER_PORT);
110111
}
111112

112113
nsapi_error_t tcpsocket_connect_to_discard_srv(TCPSocket &sock)
113114
{
114-
return tcpsocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT);
115+
return tcpsocket_connect_to_srv(sock, ECHO_SERVER_DISCARD_PORT);
115116
}
116117

117118
bool is_tcp_supported()

‎TESTS/netsocket/tcp/tcp_tests.h

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

21+
#include "../test_params.h"
22+
2123
NetworkInterface *get_interface();
2224
void drop_bad_packets(TCPSocket &sock, int orig_timeout);
2325
nsapi_version_t get_ip_version();

‎TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void TCPSOCKET_CONNECT_INVALID()
3333
TEST_ASSERT(sock.connect(NULL, 9) < 0);
3434
TEST_ASSERT(sock.connect("", 9) < 0);
3535
TEST_ASSERT(sock.connect("", 0) < 0);
36-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9));
36+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_DISCARD_PORT));
3737

3838
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
3939
}

‎TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ static nsapi_error_t _tcpsocket_connect_to_daytime_srv(TCPSocket &sock)
3838
{
3939
SocketAddress tcp_addr;
4040

41-
NetworkInterface::get_default_instance()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
41+
NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &tcp_addr);
4242
tcp_addr.set_port(13);
4343

4444
nsapi_error_t err = sock.open(NetworkInterface::get_default_instance());

‎TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static nsapi_error_t _tcpsocket_connect_to_chargen_srv(TCPSocket &sock)
3333
{
3434
SocketAddress tcp_addr;
3535

36-
NetworkInterface::get_default_instance()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tcp_addr);
36+
NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &tcp_addr);
3737
tcp_addr.set_port(19);
3838

3939
nsapi_error_t err = sock.open(NetworkInterface::get_default_instance());

‎TESTS/netsocket/tcp/tcpsocket_setsockopt_keepalive_valid.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID()
4040
}
4141

4242
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, ret);
43-
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9));
43+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(ECHO_SERVER_ADDR, 9));
4444
// LWIP stack does not support getsockopt so the part below is commented out
4545
// int32_t optval;
4646
// unsigned int optlen;

‎TESTS/netsocket/test_params.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* Copyright (c) 2018, ARM Limited, All Rights Reserved
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License"); you may
6+
* not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#ifndef TEST_PARAMS_H
19+
#define TEST_PARAMS_H
20+
21+
#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
22+
#define ECHO_SERVER_ADDR "echo.mbedcloudtesting.com"
23+
#else
24+
#define ECHO_SERVER_ADDR MBED_CONF_APP_ECHO_SERVER_ADDR
25+
#endif
26+
27+
#ifndef MBED_CONF_APP_ECHO_SERVER_PORT
28+
#define ECHO_SERVER_PORT 7
29+
#else
30+
#define ECHO_SERVER_PORT MBED_CONF_APP_ECHO_SERVER_PORT
31+
#endif
32+
33+
#ifndef MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT
34+
#define ECHO_SERVER_DISCARD_PORT 9
35+
#else
36+
#define ECHO_SERVER_DISCARD_PORT MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT
37+
#endif
38+
39+
#ifndef MBED_CONF_APP_ECHO_SERVER_PORT_TLS
40+
#define ECHO_SERVER_PORT_TLS 2007
41+
#else
42+
#define ECHO_SERVER_PORT_TLS MBED_CONF_APP_ECHO_SERVER_PORT_TLS
43+
#endif
44+
45+
#ifndef MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS
46+
#define ECHO_SERVER_DISCARD_PORT_TLS 2009
47+
#else
48+
#define ECHO_SERVER_DISCARD_PORT_TLS MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS
49+
#endif
50+
51+
#endif //TEST_PARAMS_H

‎TESTS/netsocket/tls/main.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
2121
#error [NOT_SUPPORTED] No network configuration found for this target.
2222
#endif
23-
#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
24-
#error [NOT_SUPPORTED] Requires echo-server-discard-port parameter from mbed_app.json
25-
#endif
2623

2724
#include "mbed.h"
2825
#include "greentea-client/test_env.h"
@@ -31,6 +28,10 @@
3128
#include "utest/utest_stack_trace.h"
3229
#include "tls_tests.h"
3330

31+
#ifndef ECHO_SERVER_ADDR
32+
#error [NOT_SUPPORTED] Requires parameters for echo server
33+
#endif
34+
3435
#if defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
3536

3637
using namespace utest::v1;
@@ -106,7 +107,7 @@ nsapi_error_t tlssocket_connect_to_srv(TLSSocket &sock, uint16_t port)
106107
{
107108
SocketAddress tls_addr;
108109

109-
NetworkInterface::get_default_instance()->gethostbyname(MBED_CONF_APP_ECHO_SERVER_ADDR, &tls_addr);
110+
NetworkInterface::get_default_instance()->gethostbyname(ECHO_SERVER_ADDR, &tls_addr);
110111
tls_addr.set_port(port);
111112

112113
printf("MBED: Server '%s', port %d\n", tls_addr.get_ip_address(), tls_addr.get_port());
@@ -134,12 +135,12 @@ nsapi_error_t tlssocket_connect_to_srv(TLSSocket &sock, uint16_t port)
134135

135136
nsapi_error_t tlssocket_connect_to_echo_srv(TLSSocket &sock)
136137
{
137-
return tlssocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_PORT_TLS);
138+
return tlssocket_connect_to_srv(sock, ECHO_SERVER_PORT_TLS);
138139
}
139140

140141
nsapi_error_t tlssocket_connect_to_discard_srv(TLSSocket &sock)
141142
{
142-
return tlssocket_connect_to_srv(sock, MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS);
143+
return tlssocket_connect_to_srv(sock, ECHO_SERVER_DISCARD_PORT_TLS);
143144
}
144145

145146
bool is_tcp_supported()

‎TESTS/netsocket/tls/tls_tests.h

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

21+
#include "../test_params.h"
2122
#include "TLSSocket.h"
2223

2324
#if defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)

‎TESTS/netsocket/tls/tlssocket_connect_invalid.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ void TLSSOCKET_CONNECT_INVALID()
3333
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.open(NetworkInterface::get_default_instance()));
3434
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.set_root_ca_cert(tls_global::cert));
3535

36-
TEST_ASSERT(sock.connect(NULL, MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS) < 0);
37-
TEST_ASSERT(sock.connect("", MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS) < 0);
36+
TEST_ASSERT(sock.connect(NULL, ECHO_SERVER_DISCARD_PORT_TLS) < 0);
37+
TEST_ASSERT(sock.connect("", ECHO_SERVER_DISCARD_PORT_TLS) < 0);
3838
TEST_ASSERT(sock.connect("", 0) < 0);
3939

4040
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK,
41-
sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, MBED_CONF_APP_ECHO_SERVER_DISCARD_PORT_TLS));
41+
sock.connect(ECHO_SERVER_ADDR, ECHO_SERVER_DISCARD_PORT_TLS));
4242

4343
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());
4444
}

0 commit comments

Comments
 (0)