Skip to content

Commit 506dfca

Browse files
author
Cruz Monrreal
authored
Merge pull request #8235 from VeijoPesonen/mbedgt-netsocket-tc-fixes
Mbedgt netsocket tc fixes
2 parents b81c8a9 + d302a62 commit 506dfca

File tree

4 files changed

+7
-18
lines changed

4 files changed

+7
-18
lines changed

TESTS/netsocket/README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -715,10 +715,9 @@ Call `UDPSocket::sendto()` with invalid parameters.
715715
3. Call `UDPSocket:sendto( "", 0, NULL, 0);`
716716
4. Call `UDPSocket:sendto(NULL, 9, "hello", 5);`
717717
5. Call `UDPSocket:sendto(NULL, 0, "hello", 5);`
718-
6. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 0, "hello", 5);`
719-
7. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9,NULL, 0);`
720-
8. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9, "hello", 5);`
721-
9. destroy the socket
718+
6. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9,NULL, 0);`
719+
7. Call `UDPSocket:sendto("echo.mbedcloudtesting.com", 9, "hello", 5);`
720+
8. destroy the socket
722721

723722
**Expected result:**
724723

@@ -990,9 +989,8 @@ Call `TCPSocket::connect()` with invalid parameters.
990989
1. Call `TCPSocket:connect( NULL, 9);`
991990
2. Call `TCPSocket:connect( "", 9);`
992991
3. Call `TCPSocket:connect( "", 0);`
993-
4. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 0);`
994-
5. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 9);`
995-
6. destroy the socket
992+
4. Call `TCPSocket:connect( "echo.mbedcloudtesting.com", 9);`
993+
5. destroy the socket
996994

997995
**Expected result:**
998996

TESTS/netsocket/tcp/tcpsocket_connect_invalid.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void TCPSOCKET_CONNECT_INVALID()
3232
TEST_ASSERT(sock.connect(NULL, 9) < 0);
3333
TEST_ASSERT(sock.connect("", 9) < 0);
3434
TEST_ASSERT(sock.connect("", 0) < 0);
35-
TEST_ASSERT(sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 0) < 0);
3635
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.connect(MBED_CONF_APP_ECHO_SERVER_ADDR, 9));
3736

3837
TEST_ASSERT_EQUAL(NSAPI_ERROR_OK, sock.close());

TESTS/netsocket/udp/udpsocket_sendto_invalid.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ void UDPSOCKET_SENDTO_INVALID()
3232
TEST_ASSERT(sock.sendto(NULL, 9, NULL, 0) < 0);
3333
TEST_ASSERT(sock.sendto("", 9, NULL, 0) < 0);
3434
TEST_ASSERT(sock.sendto("", 0, NULL, 0) < 0);
35-
TEST_ASSERT_EQUAL(5, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 0, "hello", 5));
3635
TEST_ASSERT_EQUAL(0, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, NULL, 0));
3736
TEST_ASSERT_EQUAL(5, sock.sendto(MBED_CONF_APP_ECHO_SERVER_ADDR, 9, "hello", 5));
3837

TESTS/network/wifi/wifi_scan.cpp

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,18 @@ void wifi_scan(void)
4848
const char *ssid = ap[i].get_ssid();
4949
nsapi_security_t security = ap[i].get_security();
5050
int8_t rssi = ap[i].get_rssi();
51-
uint8_t ch = ap[i].get_channel();
5251
TEST_ASSERT_INT8_WITHIN(-10, -100, rssi);
5352
if (strcmp(MBED_CONF_APP_WIFI_SECURE_SSID, ssid) == 0) {
5453
secure_found = true;
5554
TEST_ASSERT_EQUAL_INT(get_security(), security);
56-
if (MBED_CONF_APP_WIFI_CH_SECURE) {
57-
TEST_ASSERT_EQUAL_INT(MBED_CONF_APP_WIFI_CH_SECURE, ch);
58-
}
5955
}
6056
if (strcmp(MBED_CONF_APP_WIFI_UNSECURE_SSID, ssid) == 0) {
6157
unsecure_found = true;
6258
TEST_ASSERT_EQUAL_INT(NSAPI_SECURITY_NONE, security);
63-
if (MBED_CONF_APP_WIFI_CH_UNSECURE) {
64-
TEST_ASSERT_EQUAL_INT(MBED_CONF_APP_WIFI_CH_UNSECURE, ch);
65-
}
6659
}
6760
}
68-
TEST_ASSERT_TRUE(secure_found);
69-
TEST_ASSERT_TRUE(unsecure_found);
61+
// Finding one SSID is enough
62+
TEST_ASSERT_TRUE(secure_found || unsecure_found);
7063
}
7164

7265
#endif // defined(MBED_CONF_APP_WIFI_SECURE_SSID) && defined(MBED_CONF_APP_WIFI_UNSECURE_SSID)

0 commit comments

Comments
 (0)