ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8235 from VeijoPesonen/mbedgt-netsocket-tc-fixes 

Mbedgt netsocket tc fixes
pull/7948/head
Cruz Monrreal 2018-10-08 10:14:52 -05:00 committed by GitHub
parent b81c8a99d7 d302a62e60
commit 506dfca8d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TESTS/netsocket/README.md
View File

@ -715,10 +715,9 @@ Call `UDPSocket::sendto()` with invalid parameters.
3. Call `UDPSocket:sendto( "", 0, NULL, 0);` 3. Call `UDPSocket:sendto( "", 0, NULL, 0);`
4. Call `UDPSocket:sendto(NULL, 9, "hello", 5);` 4. Call `UDPSocket:sendto(NULL, 9, "hello", 5);`
5. Call `UDPSocket:sendto(NULL, 0, "hello", 5);` 5. Call `UDPSocket:sendto(NULL, 0, "hello", 5);`
6. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 0, "hello", 5);` 6. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9,NULL, 0);`
7. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9,NULL, 0);` 7. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9, "hello", 5);`
8. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9, "hello", 5);` 8. destroy the socket
9. destroy the socket
**Expected result:** **Expected result:**
@ -990,9 +989,8 @@ Call `TCPSocket::connect()` with invalid parameters.
1. Call `TCPSocket:connect( NULL, 9);` 1. Call `TCPSocket:connect( NULL, 9);`
2. Call `TCPSocket:connect( "", 9);` 2. Call `TCPSocket:connect( "", 9);`
3. Call `TCPSocket:connect( "", 0);` 3. Call `TCPSocket:connect( "", 0);`
4. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 0);` 4. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 9);`
5. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 9);` 5. destroy the socket
6. destroy the socket
**Expected result:** **Expected result:**

1
TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp
View File

@ -32,7 +32,6 @@ void TCPSOCKET_CONNECT_INVALID()
TEST_ASSERT(sock.connect(NULL, 9) < 0); TEST_ASSERT(sock.connect(NULL, 9) < 0);
TEST_ASSERT(sock.connect("", 9) < 0); TEST_ASSERT(sock.connect("", 9) < 0);
TEST_ASSERT(sock.connect("", 0) < 0); TEST_ASSERT(sock.connect("", 0) < 0);
TEST_ASSERT(sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 0) < 0);
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9)); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9));
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close()); TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());

1
TESTS/netsocket/udp/udpsocket_sendto_invalid.cpp
View File

@ -32,7 +32,6 @@ void UDPSOCKET_SENDTO_INVALID()
TEST_ASSERT(sock.sendto(NULL, 9, NULL, 0) < 0); TEST_ASSERT(sock.sendto(NULL, 9, NULL, 0) < 0);
TEST_ASSERT(sock.sendto("", 9, NULL, 0) < 0); TEST_ASSERT(sock.sendto("", 9, NULL, 0) < 0);
TEST_ASSERT(sock.sendto("", 0, NULL, 0) < 0); TEST_ASSERT(sock.sendto("", 0, NULL, 0) < 0);
TEST_ASSERT_EQUAL(5, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 0, "hello", 5));
TEST_ASSERT_EQUAL(0, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, NULL, 0)); TEST_ASSERT_EQUAL(0, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, NULL, 0));
TEST_ASSERT_EQUAL(5, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, "hello", 5)); TEST_ASSERT_EQUAL(5, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, "hello", 5));

11
TESTS/network/wifi/wifi_scan.cpp
View File

@ -48,25 +48,18 @@ void wifi_scan(void)
const char *ssid = ap[i].get_ssid(); const char *ssid = ap[i].get_ssid();
nsapi_security_t security = ap[i].get_security(); nsapi_security_t security = ap[i].get_security();
int8_t rssi = ap[i].get_rssi(); int8_t rssi = ap[i].get_rssi();
uint8_t ch = ap[i].get_channel();
TEST_ASSERT_INT8_WITHIN(-10, -100, rssi); TEST_ASSERT_INT8_WITHIN(-10, -100, rssi);
if (strcmp(MBED_CONF_APP_WIFI_SECURE_SSID, ssid) == 0) { if (strcmp(MBED_CONF_APP_WIFI_SECURE_SSID, ssid) == 0) {
secure_found = true; secure_found = true;
TEST_ASSERT_EQUAL_INT(get_security(), security); TEST_ASSERT_EQUAL_INT(get_security(), security);
if (MBED_CONF_APP_WIFI_CH_SECURE) {
TEST_ASSERT_EQUAL_INT(MBED_CONF_APP_WIFI_CH_SECURE, ch);
}
} }
if (strcmp(MBED_CONF_APP_WIFI_UNSECURE_SSID, ssid) == 0) { if (strcmp(MBED_CONF_APP_WIFI_UNSECURE_SSID, ssid) == 0) {
unsecure_found = true; unsecure_found = true;
TEST_ASSERT_EQUAL_INT(NSAPI_SECURITY_NONE, security); TEST_ASSERT_EQUAL_INT(NSAPI_SECURITY_NONE, security);
if (MBED_CONF_APP_WIFI_CH_UNSECURE) {
TEST_ASSERT_EQUAL_INT(MBED_CONF_APP_WIFI_CH_UNSECURE, ch);
}
} }
} }
TEST_ASSERT_TRUE(secure_found); // Finding one SSID is enough
TEST_ASSERT_TRUE(unsecure_found); TEST_ASSERT_TRUE(secure_found || unsecure_found);
} }
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && defined(MBED_CONF_APP_WIFI_UNSECURE_SSID) #endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)