remove disconnect from test cases as it's going to be called implicitly from get_interface-function

pull/5767/head
Veijo Pesonen 2017-12-22 10:18:28 +02:00 committed by adbridge
parent 4d154b8e20
commit 0680821652
8 changed files with 0 additions and 12 deletions

View File

@ -32,7 +32,6 @@ void wifi_connect(void)
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL)); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect()); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
wifi->disconnect();
} }
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

View File

@ -28,6 +28,5 @@ void wifi_connect_nocredentials(void)
WiFiInterface *wifi = get_interface(); WiFiInterface *wifi = get_interface();
nsapi_error_t error; nsapi_error_t error;
error = wifi->connect(); error = wifi->connect();
wifi->disconnect();
TEST_ASSERT(error == NSAPI_ERROR_NO_SSID); TEST_ASSERT(error == NSAPI_ERROR_NO_SSID);
} }

View File

@ -36,7 +36,6 @@ void wifi_connect_params_channel(void)
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); 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);
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
wifi->disconnect();
} }
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

View File

@ -27,5 +27,4 @@ void wifi_connect_params_null(void)
{ {
WiFiInterface *wifi = get_interface(); WiFiInterface *wifi = get_interface();
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL)); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL));
wifi->disconnect();
} }

View File

@ -30,22 +30,18 @@ void wifi_connect_params_valid_secure(void)
WiFiInterface *wifi = get_interface(); WiFiInterface *wifi = get_interface();
if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2) == NSAPI_ERROR_OK) { if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2) == NSAPI_ERROR_OK) {
wifi->disconnect();
return; return;
} }
if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2) == NSAPI_ERROR_OK) { if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2) == NSAPI_ERROR_OK) {
wifi->disconnect();
return; return;
} }
if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA) == NSAPI_ERROR_OK) { if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA) == NSAPI_ERROR_OK) {
wifi->disconnect();
return; return;
} }
if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WEP) == NSAPI_ERROR_OK) { if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WEP) == NSAPI_ERROR_OK) {
wifi->disconnect();
return; return;
} }

View File

@ -29,7 +29,6 @@ void wifi_connect_params_valid_unsecure(void)
{ {
WiFiInterface *wifi = get_interface(); WiFiInterface *wifi = get_interface();
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL)); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));
wifi->disconnect();
} }
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

View File

@ -32,7 +32,6 @@ void wifi_connect_secure(void)
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2)); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2));
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect()); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
wifi->disconnect();
} }
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)

View File

@ -36,8 +36,6 @@ void wifi_get_rssi(void)
TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect()); TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
TEST_ASSERT_INT8_WITHIN(-10, -100, wifi->get_rssi()); TEST_ASSERT_INT8_WITHIN(-10, -100, wifi->get_rssi());
wifi->disconnect();
} }
#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)