From e35c0a79c9cbf6bf11bd166952d97b88a183f0ad Mon Sep 17 00:00:00 2001 From: Veijo Pesonen Date: Sat, 24 Nov 2018 12:28:14 +0200 Subject: [PATCH] Tests-network-wifi organize test cases for clarity --- TESTS/network/wifi/main.cpp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/TESTS/network/wifi/main.cpp b/TESTS/network/wifi/main.cpp index bee9e66dd2..aeb139137a 100644 --- a/TESTS/network/wifi/main.cpp +++ b/TESTS/network/wifi/main.cpp @@ -62,32 +62,24 @@ Case cases[] = { Case("WIFI-CONNECT-NOCREDENTIALS", wifi_connect_nocredentials), Case("WIFI-SET-CREDENTIAL", wifi_set_credential), Case("WIFI-SET-CHANNEL", wifi_set_channel), + Case("WIFI-CONNECT-PARAMS-NULL", wifi_connect_params_null), + Case("WIFI-SCAN-NULL", wifi_scan_null), +#if defined(MBED_CONF_APP_WIFI_SECURE_SSID) || defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) + Case("WIFI-SCAN", wifi_scan), +#endif #if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) Case("WIFI-GET-RSSI", wifi_get_rssi), -#endif - Case("WIFI-CONNECT-PARAMS-NULL", wifi_connect_params_null), -#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) Case("WIFI-CONNECT-PARAMS-VALID-UNSECURE", wifi_connect_params_valid_unsecure), + Case("WIFI-CONNECT", wifi_connect), + Case("WIFI-CONNECT-DISCONNECT-REPEAT", wifi_connect_disconnect_repeat), #endif #if defined(MBED_CONF_APP_WIFI_SECURE_SSID) Case("WIFI-CONNECT-PARAMS-VALID-SECURE", wifi_connect_params_valid_secure), Case("WIFI-CONNECT-PARAMS-CHANNEL", wifi_connect_params_channel), Case("WIFI-CONNECT-PARAMS-CHANNEL-FAIL", wifi_connect_params_channel_fail), -#endif -#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) - Case("WIFI-CONNECT", wifi_connect), -#endif -#if defined(MBED_CONF_APP_WIFI_SECURE_SSID) Case("WIFI-CONNECT-SECURE", wifi_connect_secure), Case("WIFI-CONNECT-SECURE-FAIL", wifi_connect_secure_fail), #endif -#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) - Case("WIFI-CONNECT-DISCONNECT-REPEAT", wifi_connect_disconnect_repeat), -#endif - Case("WIFI-SCAN-NULL", wifi_scan_null), -#if defined(MBED_CONF_APP_WIFI_SECURE_SSID) || defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) - Case("WIFI-SCAN", wifi_scan), -#endif }; Specification specification(test_setup, cases, greentea_continue_handlers);