Skip to content

Commit f949ee5

Browse files
author
Cruz Monrreal
authored
Merge pull request #9127 from jeromecoutant/PR_WIFIDEBUG
WIFI test: improve debug messages
2 parents 187d2d0 + da6ad75 commit f949ee5

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ void wifi_connect_disconnect_repeat(void)
3131
nsapi_error_t error;
3232

3333
error = wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL);
34-
TEST_ASSERT(error == NSAPI_ERROR_OK);
34+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
3535

3636
for (int i = 0; i < 10; i++) {
3737
error = wifi->connect();
38-
TEST_ASSERT(error == NSAPI_ERROR_OK);
38+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
3939
error = wifi->disconnect();
40-
TEST_ASSERT(error == NSAPI_ERROR_OK);
40+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
4141
}
4242
}
4343

‎TESTS/network/wifi/wifi_connect_nocredentials.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ void wifi_connect_nocredentials(void)
3030
error_connect = wifi->connect();
3131
error_disconnect = wifi->disconnect();
3232
TEST_ASSERT(error_connect == NSAPI_ERROR_NO_SSID || error_connect == NSAPI_ERROR_PARAMETER);
33-
TEST_ASSERT(error_disconnect == NSAPI_ERROR_NO_CONNECTION);
33+
TEST_ASSERT_EQUAL(NSAPI_ERROR_NO_CONNECTION, error_disconnect);
3434
}

‎TESTS/network/wifi/wifi_connect_params_null.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ void wifi_connect_params_null(void)
2929
WiFiInterface *wifi = get_interface();
3030
error = wifi->connect(NULL, NULL);
3131
wifi->disconnect();
32-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
32+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
3333
error = wifi->connect("", "");
3434
wifi->disconnect();
35-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
35+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
3636
}

‎TESTS/network/wifi/wifi_set_channel.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,22 @@ void wifi_set_channel(void)
5151

5252
if (is_2Ghz) {
5353
error = wifi->set_channel(0);
54-
TEST_ASSERT(error == NSAPI_ERROR_OK);
54+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
5555
error = wifi->set_channel(1);
56-
TEST_ASSERT(error == NSAPI_ERROR_OK);
56+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
5757
error = wifi->set_channel(13);
5858
TEST_ASSERT(error == NSAPI_ERROR_OK || error == NSAPI_ERROR_PARAMETER);
5959
error = wifi->set_channel(15);
60-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
60+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
6161
}
6262

6363
if (is_5Ghz) {
6464
error = wifi->set_channel(30);
65-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
65+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
6666
error = wifi->set_channel(36);
67-
TEST_ASSERT(error == NSAPI_ERROR_OK);
67+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
6868
error = wifi->set_channel(169);
69-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
69+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
7070
}
7171

7272
wifi->set_channel(0);

‎TESTS/network/wifi/wifi_set_credential.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,31 @@ void wifi_set_credential(void)
2929
nsapi_error_t error;
3030

3131
error = iface->set_credentials(NULL, NULL, NSAPI_SECURITY_NONE);
32-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
32+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
3333

3434
error = iface->set_credentials("", "", NSAPI_SECURITY_NONE);
35-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
35+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
3636

3737
error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_NONE);
38-
TEST_ASSERT(error == NSAPI_ERROR_OK);
38+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
3939

4040
error = iface->set_credentials("OK", "", NSAPI_SECURITY_NONE);
41-
TEST_ASSERT(error == NSAPI_ERROR_OK);
41+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
4242

4343
error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_WEP);
44-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
44+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
4545

4646
error = iface->set_credentials("OK", "", NSAPI_SECURITY_WEP);
47-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
47+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
4848

4949
error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_WPA_WPA2);
50-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
50+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
5151

5252
error = iface->set_credentials("OK", "", NSAPI_SECURITY_WPA_WPA2);
53-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
53+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
5454

5555
error = iface->set_credentials("OK", NULL, NSAPI_SECURITY_NONE);
56-
TEST_ASSERT(error == NSAPI_ERROR_OK);
56+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
5757

5858
error = iface->set_credentials("OK", "12345678", NSAPI_SECURITY_WEP);
5959
TEST_ASSERT((error == NSAPI_ERROR_OK) || (error == NSAPI_ERROR_UNSUPPORTED));
@@ -65,11 +65,11 @@ void wifi_set_credential(void)
6565
TEST_ASSERT((error == NSAPI_ERROR_OK) || (error == NSAPI_ERROR_UNSUPPORTED));
6666

6767
error = iface->set_credentials("OK", "12345678", NSAPI_SECURITY_WPA_WPA2);
68-
TEST_ASSERT(error == NSAPI_ERROR_OK);
68+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
6969

7070
error = iface->set_credentials("OK", "kUjd0PHHeAqaDoyfcDDEOvbyiVbYMpUHDukGoR6EJZnO5iLzWsfwiM9JQqOngni", get_security());
71-
TEST_ASSERT(error == NSAPI_ERROR_OK);
71+
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
7272

7373
error = iface->set_credentials("OK", "kUjd0PHHeAqaDoyfcDDEOvbyiVbYMpUHDukGoR6EJZnO5iLzWsfwiM9JQqOngni8", get_security());
74-
TEST_ASSERT(error == NSAPI_ERROR_PARAMETER);
74+
TEST_ASSERT_EQUAL(NSAPI_ERROR_PARAMETER, error);
7575
}

0 commit comments

Comments
 (0)