Skip to content

Commit 3c03fef

Browse files
author
Mika Leppänen
committed
Updated greentea UDP tests to use default interface
1 parent 3f47963 commit 3c03fef

9 files changed

+8
-12
lines changed

TESTS/netsocket/udp/main.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,16 @@
1515
* limitations under the License.
1616
*/
1717

18-
#ifndef MBED_CONF_APP_CONNECT_STATEMENT
18+
#define WIFI 2
19+
#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
20+
(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
1921
#error [NOT_SUPPORTED] No network configuration found for this target.
2022
#endif
23+
#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
24+
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
25+
#endif
2126

2227
#include "mbed.h"
23-
#include MBED_CONF_APP_HEADER_FILE
2428
#include "greentea-client/test_env.h"
2529
#include "unity/unity.h"
2630
#include "utest.h"
@@ -40,8 +44,8 @@ NetworkInterface *get_interface()
4044

4145
static void _ifup()
4246
{
43-
net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
44-
nsapi_error_t err = MBED_CONF_APP_CONNECT_STATEMENT;
47+
net = NetworkInterface::get_default_instance();
48+
nsapi_error_t err = net->connect();
4549
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
4650
printf("MBED: UDPClient IP address is '%s'\n", net->get_ip_address());
4751
}

TESTS/netsocket/udp/udpsocket_echotest.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_echotest_burst.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_open_close_repeat.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "greentea-client/test_env.h"
1919
#include "mbed.h"
20-
#include MBED_CONF_APP_HEADER_FILE
2120
#include "udp_tests.h"
2221
#include "UDPSocket.h"
2322
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_open_limit.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include "greentea-client/test_env.h"
1919
#include "mbed.h"
20-
#include MBED_CONF_APP_HEADER_FILE
2120
#include "udp_tests.h"
2221
#include "UDPSocket.h"
2322
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_recv_timeout.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_invalid.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_repeat.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

TESTS/netsocket/udp/udpsocket_sendto_timeout.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717

1818
#include "mbed.h"
19-
#include MBED_CONF_APP_HEADER_FILE
2019
#include "UDPSocket.h"
2120
#include "greentea-client/test_env.h"
2221
#include "unity/unity.h"

0 commit comments

Comments
 (0)