Merge pull request #15068 from jeromecoutant/PR_INTERFACE

0xc0170 · web-flow · commit e4111eaa0dad · 2021-10-14T15:43:07.000+02:00
connectivity tests: avoid HardFault with null pointer
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/dns/main.cpp
@@ -168,6 +168,7 @@ 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 = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/tcp/main.cpp
@@ -75,6 +75,7 @@ nsapi_version_t get_ip_version()
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/tls/main.cpp
@@ -71,6 +71,7 @@ void drop_bad_packets(TLSSocket &sock, int orig_timeout)
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp b/connectivity/netsocket/tests/TESTS/netsocket/udp/main.cpp
@@ -62,6 +62,7 @@ void drop_bad_packets(UDPSocket &sock, int orig_timeout)
 static void _ifup()
 {
     NetworkInterface *net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     nsapi_error_t err = net->connect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);
     SocketAddress address;
diff --git a/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp b/connectivity/netsocket/tests/TESTS/network/interface/networkinterface_status.cpp
@@ -75,6 +75,7 @@ void NETWORKINTERFACE_STATUS()
     current_status = NSAPI_STATUS_ERROR_UNSUPPORTED;
 
     net = NetworkInterface::get_default_instance();
+    TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");
     net->attach(status_cb);
     net->set_blocking(true);
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect.cpp
@@ -30,6 +30,10 @@ using namespace utest::v1;
 void wifi_connect(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     char ssid[SSID_MAX_LEN + 1] = MBED_CONF_APP_WIFI_UNSECURE_SSID;
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_disconnect_repeat(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     nsapi_error_t error;
 
     error = wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security());
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_nocredentials.cpp
@@ -26,6 +26,10 @@ using namespace utest::v1;
 void wifi_connect_nocredentials(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     nsapi_error_t error_connect, error_disconnect;
     error_connect = wifi->connect();
     error_disconnect = wifi->disconnect();
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_params_channel(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_channel_fail.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_params_channel_fail(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_null.cpp
@@ -27,6 +27,10 @@ void wifi_connect_params_null(void)
 {
     nsapi_error_t error;
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     error = wifi->connect(NULL, NULL);
     wifi->disconnect();
     TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_params_valid_secure(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()) == NSAPI_ERROR_OK) {
         if (wifi->disconnect() == NSAPI_ERROR_OK) {
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_secure(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     // Driver shall cache the credentials
     char ssid[] = MBED_CONF_APP_WIFI_SECURE_SSID;
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_connect_secure_fail(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, "aaaaaaaa", get_security()));
     nsapi_error_t error;
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_get_rssi.cpp
@@ -28,6 +28,10 @@ using namespace utest::v1;
 void wifi_get_rssi(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, get_security()));
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp
@@ -27,6 +27,10 @@ using namespace utest::v1;
 void wifi_scan(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     WiFiAccessPoint ap[MBED_CONF_APP_MAX_SCAN_SIZE];
 
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan_null.cpp
@@ -26,5 +26,9 @@ using namespace utest::v1;
 void wifi_scan_null(void)
 {
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
     TEST_ASSERT(wifi->scan(NULL, 0) >= 1);
 }
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_channel.cpp
@@ -30,6 +30,10 @@ void wifi_set_channel(void)
     bool is_5Ghz = false;
 
     WiFiInterface *wifi = get_interface();
+    TEST_ASSERT(wifi);
+    if (wifi == NULL) {
+        return;
+    }
 
     if (wifi->set_channel(1) == NSAPI_ERROR_UNSUPPORTED && wifi->set_channel(36) == NSAPI_ERROR_UNSUPPORTED) {
         TEST_IGNORE_MESSAGE("set_channel() not supported");
diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_set_credential.cpp
@@ -26,6 +26,10 @@ using namespace utest::v1;
 void wifi_set_credential(void)
 {
     WiFiInterface *iface = get_interface();
+    TEST_ASSERT(iface);
+    if (iface == NULL) {
+        return;
+    }
     nsapi_error_t error;
 
     error = iface->set_credentials(NULL, NULL, NSAPI_SECURITY_NONE);

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ nsapi_version_t get_ip_version()`
`75`	`75`	`static void _ifup()`
`76`	`76`	`{`
`77`	`77`	`NetworkInterface *net = NetworkInterface::get_default_instance();`
	`78`	`+ TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");`
`78`	`79`	`nsapi_error_t err = net->connect();`
`79`	`80`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);`
`80`	`81`	`SocketAddress address;`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ void drop_bad_packets(TLSSocket &sock, int orig_timeout)`
`71`	`71`	`static void _ifup()`
`72`	`72`	`{`
`73`	`73`	`NetworkInterface *net = NetworkInterface::get_default_instance();`
	`74`	`+ TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");`
`74`	`75`	`nsapi_error_t err = net->connect();`
`75`	`76`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);`
`76`	`77`	`SocketAddress address;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ void drop_bad_packets(UDPSocket &sock, int orig_timeout)`
`62`	`62`	`static void _ifup()`
`63`	`63`	`{`
`64`	`64`	`NetworkInterface *net = NetworkInterface::get_default_instance();`
	`65`	`+ TEST_ASSERT_NOT_NULL_MESSAGE(net, "No NetworkInterface configured");`
`65`	`66`	`nsapi_error_t err = net->connect();`
`66`	`67`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, err);`
`67`	`68`	`SocketAddress address;`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,10 @@ using namespace utest::v1;`
`30`	`30`	`void wifi_connect(void)`
`31`	`31`	`{`
`32`	`32`	`WiFiInterface *wifi = get_interface();`
	`33`	`+ TEST_ASSERT(wifi);`
	`34`	`+ if (wifi == NULL) {`
	`35`	`+ return;`
	`36`	`+ }`
`33`	`37`
`34`	`38`	`char ssid[SSID_MAX_LEN + 1] = MBED_CONF_APP_WIFI_UNSECURE_SSID;`
`35`	`39`