Skip to content

TESTS/NETSOCKET: Refinement of netsocket tests #5604

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.

Sign up for GitHub

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 2 commits into from
Feb 8, 2018
Merged

TESTS/NETSOCKET: Refinement of netsocket tests #5604

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ec9f6b
Correct test `socket_sigio`
betzw Nov 21, 2017
d6cb385
Enlarge event queue in `test_socket_attach()`
betzw Feb 7, 2018
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
19 changes: 10 additions & 9 deletions TESTS/netsocket/socket_sigio/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ bool find_substring(const char *first, const char *last, const char *s_first, co
void get_data(TCPSocket* sock){
bool result = false;
// Server will respond with HTTP GET's success code
const int ret = sock->recv(buffer, sizeof(buffer) - 1);
if(ret <= 0)
return;

buffer[ret] = '\0';
int len = 0;
int ret;
while((ret = sock->recv(buffer+len, sizeof(buffer) - 1 - len)) > 0) {
len += ret;
}
buffer[len] = '\0';

// Find 200 OK HTTP status in reply
bool found_200_ok = find_substring(buffer, buffer + ret, HTTP_OK_STR, HTTP_OK_STR + strlen(HTTP_OK_STR));
bool found_200_ok = find_substring(buffer, buffer + len, HTTP_OK_STR, HTTP_OK_STR + strlen(HTTP_OK_STR));
// Find "Hello World!" string in reply
bool found_hello = find_substring(buffer, buffer + ret, HTTP_HELLO_STR, HTTP_HELLO_STR + strlen(HTTP_HELLO_STR));
bool found_hello = find_substring(buffer, buffer + len, HTTP_HELLO_STR, HTTP_HELLO_STR + strlen(HTTP_HELLO_STR));

TEST_ASSERT_TRUE(found_200_ok);
TEST_ASSERT_TRUE(found_hello);
Expand All @@ -85,7 +86,7 @@ void get_data(TCPSocket* sock){

TEST_ASSERT_EQUAL(result, true);

printf("HTTP: Received %d chars from server\r\n", ret);
printf("HTTP: Received %d chars from server\r\n", len);
printf("HTTP: Received 200 OK status ... %s\r\n", found_200_ok ? "[OK]" : "[FAIL]");
printf("HTTP: Received '%s' status ... %s\r\n", HTTP_HELLO_STR, found_hello ? "[OK]" : "[FAIL]");
printf("HTTP: Received message:\r\n");
Expand All @@ -109,7 +110,7 @@ void test_socket_attach() {

// Dispatch event queue
Thread eventThread;
EventQueue queue(4*EVENTS_EVENT_SIZE);
EventQueue queue(10*EVENTS_EVENT_SIZE);
eventThread.start(callback(&queue, &EventQueue::dispatch_forever));

printf("TCP client IP Address is %s\r\n", net->get_ip_address());
Expand Down