Merge pull request #7812 from mikaleppanen/greentea_def_interf

Update greentea tests to use default interface

Author: Cruz Monrreal

TESTS/netsocket/dns/main.cpp

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-#ifndef MBED_CONF_APP_CONNECT_STATEMENT
+#define WIFI 2
+#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
+    (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
 #error [NOT_SUPPORTED] No network configuration found for this target.
 #endif
 
@@ -27,8 +29,6 @@
 #include "EventQueue.h"
 #include "dns_tests.h"
 
-#include MBED_CONF_APP_HEADER_FILE
-
 using namespace utest::v1;
 
 namespace {
@@ -116,12 +116,10 @@ static void net_bringup()
 {
     MBED_ASSERT(MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_NSAPI_DNS_CACHE_SIZE && MBED_CONF_APP_DNS_TEST_HOSTS_NUM >= MBED_CONF_APP_DNS_SIMULT_QUERIES + 1);
 
-    net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
-    int err =  MBED_CONF_APP_CONNECT_STATEMENT;
-    TEST_ASSERT_EQUAL(0, err);
-
-    printf("MBED: Connected to network\n");
-    printf("MBED: IP Address: %s\n", net->get_ip_address());
+    net = NetworkInterface::get_default_instance();
+    nsapi_error_t err = net->connect();
+    TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
+    printf("MBED: IP address is '%s'\n", net->get_ip_address());
 }
 
 // Test setup

TESTS/netsocket/tcp/main.cpp

@@ -15,12 +15,16 @@
  * limitations under the License.
  */
 
-#ifndef MBED_CONF_APP_CONNECT_STATEMENT
+#define WIFI 2
+#if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \
+    (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI && !defined(MBED_CONF_NSAPI_DEFAULT_WIFI_SSID))
 #error [NOT_SUPPORTED] No network configuration found for this target.
 #endif
+#ifndef MBED_CONF_APP_ECHO_SERVER_ADDR
+#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
+#endif
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"
 #include "utest.h"
@@ -57,8 +61,8 @@ void drop_bad_packets(TCPSocket &sock, int orig_timeout)
 
 static void _ifup()
 {
-    net = MBED_CONF_APP_OBJECT_CONSTRUCTION;
-    nsapi_error_t err = MBED_CONF_APP_CONNECT_STATEMENT;
+    net = NetworkInterface::get_default_instance();
+    nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     printf("MBED: TCPClient IP address is '%s'\n", net->get_ip_address());
 }

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_echotest.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_echotest_burst.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_endpoint_close.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_open_close_repeat.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "tcp_tests.h"
 #include "TCPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_open_limit.cpp

@@ -17,7 +17,6 @@
 
 #include "greentea-client/test_env.h"
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "tcp_tests.h"
 #include "TCPSocket.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_recv_100k.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"

TESTS/netsocket/tcp/tcpsocket_recv_timeout.cpp

@@ -16,7 +16,6 @@
  */
 
 #include "mbed.h"
-#include MBED_CONF_APP_HEADER_FILE
 #include "TCPSocket.h"
 #include "greentea-client/test_env.h"
 #include "unity/unity.h"