Skip to content

WIFI test: improve debug messages #9127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions TESTS/network/wifi/wifi_connect_disconnect_repeat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion TESTS/network/wifi/wifi_connect_nocredentials.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
4 changes: 2 additions & 2 deletions TESTS/network/wifi/wifi_connect_params_null.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
12 changes: 6 additions & 6 deletions TESTS/network/wifi/wifi_set_channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
24 changes: 12 additions & 12 deletions TESTS/network/wifi/wifi_set_credential.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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);
}