From 605ee4a0b100da5239974391638a61914738e146 Mon Sep 17 00:00:00 2001 From: Przemek Wirkus Date: Fri, 30 Jan 2015 09:31:21 +0000 Subject: [PATCH] Added HTTP and NTP test to autodetection pool --- .../protocols/HTTPClient_HelloWorld/main.cpp | 17 +++++++++-------- .../net/protocols/NTPClient_HelloWorld/main.cpp | 14 ++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp index b55a616036..7e9417619d 100644 --- a/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp +++ b/libraries/tests/net/protocols/HTTPClient_HelloWorld/main.cpp @@ -8,8 +8,12 @@ namespace { const int BUFFER_SIZE = 512; } -int main() -{ +int main() { + TEST_TIMEOUT(15); + TEST_HOSTTEST(default_auto); + TEST_DESCRIPTION(HTTP client hello world); + TEST_START("NET_7"); + char http_request_buffer[BUFFER_SIZE + 1] = {0}; HTTPClient http; EthernetInterface eth; @@ -31,8 +35,7 @@ int main() if (result == false) { eth.disconnect(); - notify_completion(false); - exit(ret); + TEST_RESULT(false); } } @@ -56,11 +59,9 @@ int main() if (result == false) { eth.disconnect(); - notify_completion(false); - exit(ret); + TEST_RESULT(false); } } eth.disconnect(); - notify_completion(true); - return 0; + TEST_RESULT(true); } diff --git a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp index ee24d34d66..c96b5145b0 100644 --- a/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp +++ b/libraries/tests/net/protocols/NTPClient_HelloWorld/main.cpp @@ -3,8 +3,12 @@ #include "EthernetInterface.h" #include "NTPClient.h" -int main() -{ +int main() { + TEST_TIMEOUT(15); + TEST_HOSTTEST(default_auto); + TEST_DESCRIPTION(NTP client); + TEST_START("NET_8"); + EthernetInterface eth; NTPClient ntp; eth.init(); //Use DHCP @@ -27,11 +31,9 @@ int main() } if (result == false) { - notify_completion(false); - exit(ret); + TEST_RESULT(false); } } eth.disconnect(); - notify_completion(true); - return 0; + TEST_RESULT(true); }