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

Veijo Pesonen · Veijo Pesonen · commit 402ab8173006 · 2017-12-22T10:18:28.000+02:00
diff --git a/TESTS/network/wifi/wifi_connect.cpp b/TESTS/network/wifi/wifi_connect.cpp
@@ -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->connect());
-    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_nocredentials.cpp b/TESTS/network/wifi/wifi_connect_nocredentials.cpp
@@ -28,6 +28,5 @@ void wifi_connect_nocredentials(void)
     WiFiInterface *wifi = get_interface();
     nsapi_error_t error;
     error = wifi->connect();
-    wifi->disconnect();
     TEST_ASSERT(error == NSAPI_ERROR_NO_SSID);
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_channel.cpp b/TESTS/network/wifi/wifi_connect_params_channel.cpp
@@ -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);
     TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);
-    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_connect_params_null.cpp b/TESTS/network/wifi/wifi_connect_params_null.cpp
@@ -27,5 +27,4 @@ void wifi_connect_params_null(void)
 {
     WiFiInterface *wifi = get_interface();
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL));
-    wifi->disconnect();
 }
diff --git a/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp b/TESTS/network/wifi/wifi_connect_params_valid_secure.cpp
@@ -30,22 +30,18 @@ void wifi_connect_params_valid_secure(void)
     WiFiInterface *wifi = get_interface();
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2) == NSAPI_ERROR_OK) {
-        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2) == NSAPI_ERROR_OK) {
-        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA) == NSAPI_ERROR_OK) {
-        wifi->disconnect();
         return;
     }
 
     if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WEP) == NSAPI_ERROR_OK) {
-        wifi->disconnect();
         return;
     }
 
diff --git a/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp b/TESTS/network/wifi/wifi_connect_params_valid_unsecure.cpp
@@ -29,7 +29,6 @@ void wifi_connect_params_valid_unsecure(void)
 {
     WiFiInterface *wifi = get_interface();
     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)
diff --git a/TESTS/network/wifi/wifi_connect_secure.cpp b/TESTS/network/wifi/wifi_connect_secure.cpp
@@ -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->connect());
-    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)
diff --git a/TESTS/network/wifi/wifi_get_rssi.cpp b/TESTS/network/wifi/wifi_get_rssi.cpp
@@ -36,8 +36,6 @@ void wifi_get_rssi(void)
     TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());
 
     TEST_ASSERT_INT8_WITHIN(-10, -100, wifi->get_rssi());
-
-    wifi->disconnect();
 }
 
 #endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ void wifi_connect(void)`
`32`	`32`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->set_credentials(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));`
`33`	`33`
`34`	`34`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());`
`35`		`- wifi->disconnect();`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,5 @@ void wifi_connect_nocredentials(void)`
`28`	`28`	`WiFiInterface *wifi = get_interface();`
`29`	`29`	`nsapi_error_t error;`
`30`	`30`	`error = wifi->connect();`
`31`		`- wifi->disconnect();`
`32`	`31`	`TEST_ASSERT(error == NSAPI_ERROR_NO_SSID);`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ void wifi_connect_params_channel(void)`
`36`	`36`
`37`	`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);`
`38`	`38`	`TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, error);`
`39`		`- wifi->disconnect();`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)`
Original file line number	Diff line number	Diff line change
`@@ -27,5 +27,4 @@ void wifi_connect_params_null(void)`
`27`	`27`	`{`
`28`	`28`	`WiFiInterface *wifi = get_interface();`
`29`	`29`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_PARAMETER, wifi->connect(NULL, NULL));`
`30`		`- wifi->disconnect();`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,22 +30,18 @@ void wifi_connect_params_valid_secure(void)`
`30`	`30`	`WiFiInterface *wifi = get_interface();`
`31`	`31`
`32`	`32`	`if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA2) == NSAPI_ERROR_OK) {`
`33`		`- wifi->disconnect();`
`34`	`33`	`return;`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2) == NSAPI_ERROR_OK) {`
`38`		`- wifi->disconnect();`
`39`	`37`	`return;`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA) == NSAPI_ERROR_OK) {`
`43`		`- wifi->disconnect();`
`44`	`41`	`return;`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`if(wifi->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WEP) == NSAPI_ERROR_OK) {`
`48`		`- wifi->disconnect();`
`49`	`45`	`return;`
`50`	`46`	`}`
`51`	`47`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ void wifi_connect_params_valid_unsecure(void)`
`29`	`29`	`{`
`30`	`30`	`WiFiInterface *wifi = get_interface();`
`31`	`31`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect(MBED_CONF_APP_WIFI_UNSECURE_SSID, NULL));`
`32`		`- wifi->disconnect();`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ void wifi_connect_secure(void)`
`32`	`32`	`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));`
`33`	`33`
`34`	`34`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());`
`35`		`- wifi->disconnect();`
`36`	`35`	`}`
`37`	`36`
`38`	`37`	`#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID)`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ void wifi_get_rssi(void)`
`36`	`36`	`TEST_ASSERT_EQUAL_INT(NSAPI_ERROR_OK, wifi->connect());`
`37`	`37`
`38`	`38`	`TEST_ASSERT_INT8_WITHIN(-10, -100, wifi->get_rssi());`
`39`		`-`
`40`		`- wifi->disconnect();`
`41`	`39`	`}`
`42`	`40`
`43`	`41`	`#endif // defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)`