diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/get_interface.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/get_interface.cpp index d23e06c377b..b992f165367 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/get_interface.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/get_interface.cpp @@ -15,6 +15,8 @@ * limitations under the License. */ +#include "wifi_tests.h" + #define WIFI 2 #if !defined(MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE) || \ MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE != WIFI @@ -25,7 +27,6 @@ #else #include "mbed.h" -#include "WiFiInterface.h" WiFiInterface *get_interface() { diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/get_security.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/get_security.cpp index ddc2771e36d..05a8c13b75d 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/get_security.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/get_security.cpp @@ -47,6 +47,8 @@ nsapi_security get_security() if (strcmp(MBED_CONF_APP_WIFI_SECURE_PROTOCOL, SEC_WPA3_WPA2) == 0) { return NSAPI_SECURITY_WPA3_WPA2; } +#elif defined MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY + return MBED_CONCAT(NSAPI_SECURITY_, MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY); #endif return NSAPI_SECURITY_NONE; } diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/main.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/main.cpp index ac9c6c7a7d5..78c597339ee 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/main.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/main.cpp @@ -27,22 +27,21 @@ #include "utest.h" #include "wifi_tests.h" +#if !defined(MBED_CONF_APP_WIFI_SECURE_SSID) +#error [NOT_SUPPORTED] Requires secure AP +#endif + // Test for parameters #if defined(MBED_CONF_APP_WIFI_SECURE_SSID) && \ - (!defined(MBED_CONF_APP_AP_MAC_SECURE) || \ - !defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \ - !defined(MBED_CONF_APP_WIFI_CH_SECURE) || \ + (!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \ !defined(MBED_CONF_APP_WIFI_PASSWORD) || \ - !defined(MBED_CONF_APP_WIFI_SECURE_SSID) || \ !defined(MBED_CONF_APP_WIFI_SECURE_PROTOCOL)) #error [NOT_SUPPORTED] Requires parameters from mbed_app.json (for secure connections) #else #if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) && \ - (!defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \ - !defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \ - !defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \ - !defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)) + (!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \ + !defined(MBED_CONF_APP_WIFI_CH_UNSECURE)) #error [NOT_SUPPORTED] Requires parameters from mbed_app.json (for unsecure connections) #else diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt b/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt index 686a83b30c3..482143c6352 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt +++ b/connectivity/netsocket/tests/TESTS/network/wifi/template_mbed_app.txt @@ -1,39 +1,35 @@ { "config": { "wifi-secure-ssid": { - "help": "WiFi SSID for WPA2 secured network", + "help": "WiFi SSID for secure network", + "optional_parameter": "if value is null, MBED_CONF_NSAPI_DEFAULT_WIFI_SSID is used", "value": "\"SSID-SECURE\"" }, "wifi-unsecure-ssid": { - "help": "WiFi SSID for unsecure netwrok", + "help": "WiFi SSID for unsecure network", + "optional_parameter": "if value is null, non-secure tests are skipped", "value": "\"SSID-UNSECURE\"" }, "wifi-password": { "help": "WiFi Password", + "optional_parameter": "if value is null, MBED_CONF_NSAPI_DEFAULT_WIFI_PASSWORD is used", "value": "\"PASSWORD\"" }, "wifi-secure-protocol": { "help": "WiFi security protocol, valid values are WEP, WPA, WPA2, WPA/WPA2", - "value": "\"WPA/WPA2\"" + "optional_parameter": "if value is null, MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY is used", + "value": "\"WPA2\"" }, "wifi-ch-secure": { - "help": "Channel number of secure SSID", + "help": "Channel number of secure SSID (if set_channel() is supported)", "value": 1 }, "wifi-ch-unsecure": { - "help": "Channel number of unsecure SSID", + "help": "Channel number of unsecure SSID (if set_channel() is supported)", "value": 2 }, - "ap-mac-secure": { - "help": "BSSID of secure AP in form of AA:BB:CC:DD:EE:FF", - "value": "\"AA:AA:AA:AA:AA:AA\"" - }, - "ap-mac-unsecure": { - "help": "BSSID of unsecure AP in form of \"AA:BB:CC:DD:EE:FF\"", - "value": "\"BB:BB:BB:BB:BB:BB\"" - }, "max-scan-size": { - "help": "How many networks may appear in Wifi scan result", + "help": "How many networks may appear in Wifi scan result (default is 10)", "value": 10 } }, 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 index 4f8e53ed5c4..de24fa53130 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp @@ -34,8 +34,10 @@ void wifi_connect_disconnect_repeat(void) TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); for (int i = 0; i < 10; i++) { + printf("#%u connecting...\n", i); error = wifi->connect(); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); + printf("#%u diconnecting...\n", i); error = wifi->disconnect(); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); } 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 index 47898de809c..72da4c03404 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_connect_secure_fail.cpp @@ -31,7 +31,9 @@ void wifi_connect_secure_fail(void) TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, "aaaaaaaa", get_security())); nsapi_error_t error; + printf("Wifi connection with wrong password\n"); error = wifi->connect(); + printf("=> %d => Wifi disconnection\n", error); wifi->disconnect(); TEST_ASSERT(error == NSAPI_ERROR_AUTH_FAILURE || error == NSAPI_ERROR_CONNECTION_TIMEOUT || diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp index 202a33181cd..cfa86355b6e 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp +++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_scan.cpp @@ -31,21 +31,17 @@ void wifi_scan(void) WiFiAccessPoint ap[MBED_CONF_APP_MAX_SCAN_SIZE]; int size = wifi->scan(ap, MBED_CONF_APP_MAX_SCAN_SIZE); + printf("Scanned %u AP\n", size); TEST_ASSERT(size >= 1); bool secure_found = false; bool unsecure_found = false; - char secure_bssid[6]; - char unsecure_bssid[6]; - const char *coversion_string = "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx"; - TEST_ASSERT_EQUAL_INT_MESSAGE(6, sscanf(MBED_CONF_APP_AP_MAC_SECURE, coversion_string, &secure_bssid[0], &secure_bssid[1], &secure_bssid[2], &secure_bssid[3], &secure_bssid[4], &secure_bssid[5]), "Failed to convert ap-mac-secure from mbed_app.json"); - TEST_ASSERT_EQUAL_INT_MESSAGE(6, sscanf(MBED_CONF_APP_AP_MAC_UNSECURE, coversion_string, &unsecure_bssid[0], &unsecure_bssid[1], &unsecure_bssid[2], &unsecure_bssid[3], &unsecure_bssid[4], &unsecure_bssid[5]), "Failed to convert ap-mac-unsecure from mbed_app.json"); - for (int i = 0; i < size; i++) { const char *ssid = ap[i].get_ssid(); nsapi_security_t security = ap[i].get_security(); int8_t rssi = ap[i].get_rssi(); + printf("AP %u ssid %s security %u rssi %d\n", i, ssid, security, rssi); TEST_ASSERT_INT8_WITHIN(-10, -100, rssi); #if defined(MBED_CONF_APP_WIFI_SECURE_SSID) if (strcmp(MBED_CONF_APP_WIFI_SECURE_SSID, ssid) == 0) { diff --git a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_tests.h b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_tests.h index 37df86c4f2e..60de5b6e774 100644 --- a/connectivity/netsocket/tests/TESTS/network/wifi/wifi_tests.h +++ b/connectivity/netsocket/tests/TESTS/network/wifi/wifi_tests.h @@ -17,8 +17,29 @@ #ifndef WIFI_TESTS_H #define WIFI_TESTS_H +#ifdef MBED_CONF_NSAPI_PRESENT #include "WiFiInterface.h" +#if !defined(MBED_CONF_APP_WIFI_SECURE_SSID) +#define MBED_CONF_APP_WIFI_SECURE_SSID MBED_CONF_NSAPI_DEFAULT_WIFI_SSID +#endif + +#if !defined(MBED_CONF_APP_WIFI_PASSWORD) +#define MBED_CONF_APP_WIFI_PASSWORD MBED_CONF_NSAPI_DEFAULT_WIFI_PASSWORD +#endif + +#if !defined(MBED_CONF_APP_WIFI_SECURE_PROTOCOL) +#define MBED_CONF_APP_WIFI_SECURE_PROTOCOL MBED_CONF_NSAPI_DEFAULT_WIFI_SECURITY +#endif + +#if !defined(MBED_CONF_APP_WIFI_CH_SECURE) +#define MBED_CONF_APP_WIFI_CH_SECURE 1 +#endif + +#if !defined(MBED_CONF_APP_MAX_SCAN_SIZE) +#define MBED_CONF_APP_MAX_SCAN_SIZE 10 +#endif + /** Get WiFiInterface based on provided * app_json. */ WiFiInterface *get_interface(void); @@ -82,3 +103,4 @@ void wifi_scan_null(void); void wifi_scan(void); #endif //WIFI_TESTS_H +#endif // MBED_CONF_NSAPI_PRESENT