From da6ad75666dd956cfd978c51b45e3f6ca1ea3839 Mon Sep 17 00:00:00 2001 From: jeromecoutant Date: Mon, 17 Dec 2018 13:58:12 +0100 Subject: [PATCH] WIFI test: improve debug messages --- .../wifi/wifi_connect_disconnect_repeat.cpp | 6 ++--- .../wifi/wifi_connect_nocredentials.cpp | 2 +- .../network/wifi/wifi_connect_params_null.cpp | 4 ++-- TESTS/network/wifi/wifi_set_channel.cpp | 12 +++++----- TESTS/network/wifi/wifi_set_credential.cpp | 24 +++++++++---------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp b/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp index e23980e18a..e70546c486 100644 --- a/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp +++ b/TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp @@ -31,13 +31,13 @@ void wifi_connect_disconnect_repeat(void) nsapi_error_t error; error = wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); for (int i = 0; i < 10; i++) { error = wifi->connect(); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = wifi->disconnect(); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); } } diff --git a/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/TESTS/network/wifi/wifi_connect_nocredentials.cpp index 2fe2b16261..73e8c015fc 100644 --- a/TESTS/network/wifi/wifi_connect_nocredentials.cpp +++ b/TESTS/network/wifi/wifi_connect_nocredentials.cpp @@ -30,5 +30,5 @@ void wifi_connect_nocredentials(void) error_connect = wifi->connect(); error_disconnect = wifi->disconnect(); TEST_ASSERT(error_connect == NSAPI_ERROR_NO_SSID || error_connect == NSAPI_ERROR_PARAMETER); - TEST_ASSERT(error_disconnect == NSAPI_ERROR_NO_CONNECTION); + TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_CONNECTION, error_disconnect); } diff --git a/TESTS/network/wifi/wifi_connect_params_null.cpp b/TESTS/network/wifi/wifi_connect_params_null.cpp index 21bb8cc96e..0c2350dfce 100644 --- a/TESTS/network/wifi/wifi_connect_params_null.cpp +++ b/TESTS/network/wifi/wifi_connect_params_null.cpp @@ -29,8 +29,8 @@ void wifi_connect_params_null(void) WiFiInterface *wifi = get_interface(); error = wifi->connect(NULL, NULL); wifi->disconnect(); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = wifi->connect("", ""); wifi->disconnect(); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); } diff --git a/TESTS/network/wifi/wifi_set_channel.cpp b/TESTS/network/wifi/wifi_set_channel.cpp index 5f609e0848..f9f35f1d00 100644 --- a/TESTS/network/wifi/wifi_set_channel.cpp +++ b/TESTS/network/wifi/wifi_set_channel.cpp @@ -51,22 +51,22 @@ void wifi_set_channel(void) if (is_2Ghz) { error = wifi->set_channel(0); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = wifi->set_channel(1); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = wifi->set_channel(13); TEST_ASSERT(error == NSAPI_ERROR_OK || error == NSAPI_ERROR_PARAMETER); error = wifi->set_channel(15); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); } if (is_5Ghz) { error = wifi->set_channel(30); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = wifi->set_channel(36); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = wifi->set_channel(169); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); } wifi->set_channel(0); diff --git a/TESTS/network/wifi/wifi_set_credential.cpp b/TESTS/network/wifi/wifi_set_credential.cpp index cf659a81d4..d2c0ba6613 100644 --- a/TESTS/network/wifi/wifi_set_credential.cpp +++ b/TESTS/network/wifi/wifi_set_credential.cpp @@ -29,31 +29,31 @@ void wifi_set_credential(void) nsapi_error_t error; error = iface->set_credentials(NULL, NULL, NSAPI_SECURITY_NONE); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("", "", NSAPI_SECURITY_NONE); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_NONE); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = iface->set_credentials("OK", "", NSAPI_SECURITY_NONE); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_WEP); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("OK", "", NSAPI_SECURITY_WEP); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_WPA_WPA2); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("OK", "", NSAPI_SECURITY_WPA_WPA2); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_NONE); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = iface->set_credentials("OK", "12345678", NSAPI_SECURITY_WEP); TEST_ASSERT((error == NSAPI_ERROR_OK) || (error == NSAPI_ERROR_UNSUPPORTED)); @@ -65,11 +65,11 @@ void wifi_set_credential(void) TEST_ASSERT((error == NSAPI_ERROR_OK) || (error == NSAPI_ERROR_UNSUPPORTED)); error = iface->set_credentials("OK", "12345678", NSAPI_SECURITY_WPA_WPA2); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = iface->set_credentials("OK", "kUjd0PHHeAqaDoyfcDDEOvbyiVbYMpUHDukGoR6EJZnO5iLzWsfwiM9JQqOngni", get_security()); - TEST_ASSERT(error == NSAPI_ERROR_OK); + TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); error = iface->set_credentials("OK", "kUjd0PHHeAqaDoyfcDDEOvbyiVbYMpUHDukGoR6EJZnO5iLzWsfwiM9JQqOngni8", get_security()); - TEST_ASSERT(error == NSAPI_ERROR_PARAMETER); + TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error); }