Skip to content

Commit 79a8bf1

Browse files
0xc01700xc0170
authored
Merge pull request #5605 from betzw/betzw_tests_network_wb
TESTS/NETWORK: Split Wi-Fi test for secure & unsecure tests
2 parents 84192fe + 043ee4a commit 79a8bf1

13 files changed

+66
-7
lines changed

‎TESTS/network/wifi/get_interface.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Pick the correct driver based on mbed_app.json
2121
#define INTERNAL 1
2222
#define WIFI_ESP8266 2
23-
#define X_NUCLEO_IDW01M1 3
23+
#define X_NUCLEO_IDW0XX1 3
2424

2525
#if MBED_CONF_APP_WIFI_DRIVER == INTERNAL
2626

@@ -39,7 +39,7 @@
3939
#include "ESP8266Interface.h"
4040
#define DRIVER ESP8266Interface
4141

42-
#elif MBED_CONF_APP_WIFI_DRIVER == X_NUCLEO_IDW01M1
42+
#elif MBED_CONF_APP_WIFI_DRIVER == X_NUCLEO_IDW0XX1
4343
#include "SpwfSAInterface.h"
4444
#define DRIVER SpwfSAInterface
4545
#else

‎TESTS/network/wifi/main.cpp

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,31 @@
2222
#include "wifi_tests.h"
2323

2424
// Test for parameters
25+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
2526
#if !defined(MBED_CONF_APP_AP_MAC_SECURE) || \
26-
!defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \
2727
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
2828
!defined(MBED_CONF_APP_WIFI_CH_SECURE) || \
29-
!defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \
3029
!defined(MBED_CONF_APP_WIFI_DRIVER) || \
3130
!defined(MBED_CONF_APP_WIFI_PASSWORD) || \
3231
!defined(MBED_CONF_APP_WIFI_RX) || \
3332
!defined(MBED_CONF_APP_WIFI_SECURE_SSID) || \
33+
!defined(MBED_CONF_APP_WIFI_TX)
34+
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json (for secure connections)
35+
#endif
36+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
37+
38+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
39+
#if !defined(MBED_CONF_APP_AP_MAC_UNSECURE) || \
40+
!defined(MBED_CONF_APP_MAX_SCAN_SIZE) || \
41+
!defined(MBED_CONF_APP_WIFI_CH_UNSECURE) || \
42+
!defined(MBED_CONF_APP_WIFI_DRIVER) || \
43+
!defined(MBED_CONF_APP_WIFI_PASSWORD) || \
44+
!defined(MBED_CONF_APP_WIFI_RX) || \
3445
!defined(MBED_CONF_APP_WIFI_TX) || \
3546
!defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
36-
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json
47+
#error [NOT_SUPPORTED] Requires parameters from mbed_app.json (for unsecure connections)
3748
#endif
49+
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
3850

3951
using namespace utest::v1;
4052

@@ -48,19 +60,33 @@ Case cases[] = {
4860
Case("WIFI-CONSTRUCTOR", wifi_constructor),
4961
Case("WIFI-SET-CREDENTIAL", wifi_set_credential),
5062
Case("WIFI-SET-CHANNEL", wifi_set_channel),
63+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
5164
Case("WIFI-GET-RSSI", wifi_get_rssi),
65+
#endif
5266
Case("WIFI-CONNECT-PARAMS-NULL", wifi_connect_params_null),
67+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
5368
Case("WIFI-CONNECT-PARAMS-VALID-UNSECURE", wifi_connect_params_valid_unsecure),
69+
#endif
70+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
5471
Case("WIFI-CONNECT-PARAMS-VALID-SECURE", wifi_connect_params_valid_secure),
5572
Case("WIFI-CONNECT-PARAMS-CHANNEL", wifi_connect_params_channel),
5673
Case("WIFI-CONNECT-PARAMS-CHANNEL-FAIL", wifi_connect_params_channel_fail),
74+
#endif
5775
Case("WIFI-CONNECT-NOCREDENTIALS", wifi_connect_nocredentials),
76+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
5877
Case("WIFI-CONNECT", wifi_connect),
78+
#endif
79+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
5980
Case("WIFI-CONNECT-SECURE", wifi_connect_secure),
6081
Case("WIFI-CONNECT-SECURE-FAIL", wifi_connect_secure_fail),
82+
#endif
83+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
6184
Case("WIFI-CONNECT-DISCONNECT-REPEAT", wifi_connect_disconnect_repeat),
85+
#endif
6286
Case("WIFI-SCAN-NULL", wifi_scan_null),
87+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID) && defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
6388
Case("WIFI-SCAN", wifi_scan),
89+
#endif
6490
};
6591

6692
Specification specification(test_setup, cases);

‎TESTS/network/wifi/template_mbed_app.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"value": 2
2222
},
2323
"wifi-driver": {
24-
"help": "Wifi driver to use, valid values are INTERNAL, WIFI_ESP8266 and X_NUCLEO_IDW01M1",
24+
"help": "Wifi driver to use, valid values are INTERNAL, WIFI_ESP8266 and X_NUCLEO_IDW0XX1",
2525
"value": "INTERNAL"
2626
},
2727
"wifi-tx": {

‎TESTS/network/wifi/wifi_connect.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
27+
2628
void wifi_connect(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
@@ -31,3 +33,5 @@ void wifi_connect(void)
3133

3234
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
3335
}
36+
37+
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

‎TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
27+
2628
void wifi_connect_disconnect_repeat(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
@@ -38,3 +40,5 @@ void wifi_connect_disconnect_repeat(void)
3840
TEST_ASSERT(error == NSAPI_ERROR_OK);
3941
}
4042
}
43+
44+
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

‎TESTS/network/wifi/wifi_connect_params_channel.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
27+
2628
void wifi_connect_params_channel(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
@@ -36,3 +38,4 @@ void wifi_connect_params_channel(void)
3638
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
3739
}
3840

41+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

‎TESTS/network/wifi/wifi_connect_params_channel_fail.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
27+
2628
void wifi_connect_params_channel_fail(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
@@ -32,7 +34,8 @@ void wifi_connect_params_channel_fail(void)
3234
return;
3335
}
3436

35-
nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2, MBED_CONF_APP_WIFI_CH_UNSECURE);
37+
nsapi_error_t error = wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2, MBED_CONF_APP_WIFI_CH_SECURE);
3638
TEST_ASSERT(error==NSAPI_ERROR_CONNECTION_TIMEOUT || error==NSAPI_ERROR_NO_CONNECTION);
3739
}
3840

41+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

‎TESTS/network/wifi/wifi_connect_params_valid_secure.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
27+
2628
void wifi_connect_params_valid_secure(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
2931
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2));
3032
}
33+
34+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

‎TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
27+
2628
void wifi_connect_params_valid_unsecure(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
2931
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));
3032
}
3133

34+
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

‎TESTS/network/wifi/wifi_connect_secure.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
using namespace utest::v1;
2525

26+
#if defined(MBED_CONF_APP_WIFI_SECURE_SSID)
27+
2628
void wifi_connect_secure(void)
2729
{
2830
WiFiInterface *wifi = get_interface();
@@ -32,3 +34,4 @@ void wifi_connect_secure(void)
3234
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
3335
}
3436

37+
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

0 commit comments

Comments
 (0)