summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2016-08-23 14:17:30 +0200
committerGitHub <noreply@github.com>2016-08-23 14:17:30 +0200
commitc94628959db64698bf4bd11d43e6369721cfe85a (patch)
tree41f9d786c52985118f444d86721649e1186e6b2d /tests
parentMerge pull request #3341 from cuberite/LuaStateImprovements (diff)
parentcUrlClient: Exported to Lua API. (diff)
downloadcuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar.gz
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar.bz2
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar.lz
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar.xz
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.tar.zst
cuberite-c94628959db64698bf4bd11d43e6369721cfe85a.zip
Diffstat (limited to '')
-rw-r--r--tests/HTTP/CMakeLists.txt30
-rw-r--r--tests/HTTP/UrlClientTest.cpp241
-rw-r--r--tests/Network/CMakeLists.txt13
3 files changed, 280 insertions, 4 deletions
diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt
index ed5c9daaf..cb2329adc 100644
--- a/tests/HTTP/CMakeLists.txt
+++ b/tests/HTTP/CMakeLists.txt
@@ -2,6 +2,7 @@ enable_testing()
include_directories(${CMAKE_SOURCE_DIR}/src/)
include_directories(${CMAKE_SOURCE_DIR}/lib/libevent/include)
+include_directories(${CMAKE_SOURCE_DIR}/lib/polarssl/include)
add_definitions(-DTEST_GLOBALS=1)
@@ -11,6 +12,8 @@ set (HTTP_SRCS
${CMAKE_SOURCE_DIR}/src/HTTP/HTTPMessage.cpp
${CMAKE_SOURCE_DIR}/src/HTTP/HTTPMessageParser.cpp
${CMAKE_SOURCE_DIR}/src/HTTP/TransferEncodingParser.cpp
+ ${CMAKE_SOURCE_DIR}/src/HTTP/UrlClient.cpp
+ ${CMAKE_SOURCE_DIR}/src/HTTP/UrlParser.cpp
${CMAKE_SOURCE_DIR}/src/StringUtils.cpp
)
@@ -19,13 +22,20 @@ set (HTTP_HDRS
${CMAKE_SOURCE_DIR}/src/HTTP/HTTPMessage.h
${CMAKE_SOURCE_DIR}/src/HTTP/HTTPMessageParser.h
${CMAKE_SOURCE_DIR}/src/HTTP/TransferEncodingParser.h
+ ${CMAKE_SOURCE_DIR}/src/HTTP/UrlClient.h
+ ${CMAKE_SOURCE_DIR}/src/HTTP/UrlParser.h
${CMAKE_SOURCE_DIR}/src/StringUtils.h
)
+set (SHARED_SRCS
+ ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp
+)
+
add_library(HTTP
${HTTP_SRCS}
${HTTP_HDRS}
)
+target_link_libraries(HTTP Network OSSupport)
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_flags_cxx("-Wno-error=conversion -Wno-error=old-style-cast")
@@ -35,11 +45,21 @@ endif()
-# Define individual tests:
+# Define individual test executables:
# HTTPMessageParser_file: Feed file contents into a cHTTPResponseParser and print the callbacks as they're called:
add_executable(HTTPMessageParser_file-exe HTTPMessageParser_file.cpp)
-target_link_libraries(HTTPMessageParser_file-exe HTTP)
+target_link_libraries(HTTPMessageParser_file-exe HTTP Network OSSupport)
+
+# UrlClientTest: Tests the UrlClient class by requesting a few things off the internet:
+add_executable(UrlClientTest-exe UrlClientTest.cpp)
+target_link_libraries(UrlClientTest-exe HTTP)
+
+
+
+
+
+# Define individual tests:
# Test parsing the response file in 2-byte chunks (should go from response line parsing through headers parsing to body parsing, each within a different step):
add_test(NAME HTTPMessageParser_file-test1-2 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPResponse1.data 2)
@@ -56,6 +76,9 @@ add_test(NAME HTTPMessageParser_file-test3-2 COMMAND HTTPMessageParser_file-exe
# Test parsing the request file in 512-byte chunks (should process everything in a single call):
add_test(NAME HTTPMessageParser_file-test4-512 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPRequest1.data 512)
+# Test the URLClient
+add_test(NAME UrlClient-test COMMAND UrlClientTest-exe)
+
@@ -63,7 +86,8 @@ add_test(NAME HTTPMessageParser_file-test4-512 COMMAND HTTPMessageParser_file-ex
# Put all the tests into a solution folder (MSVC):
set_target_properties(
HTTPMessageParser_file-exe
- PROPERTIES FOLDER Tests
+ UrlClientTest-exe
+ PROPERTIES FOLDER Tests/HTTP
)
set_target_properties(
HTTP
diff --git a/tests/HTTP/UrlClientTest.cpp b/tests/HTTP/UrlClientTest.cpp
new file mode 100644
index 000000000..d8412fddf
--- /dev/null
+++ b/tests/HTTP/UrlClientTest.cpp
@@ -0,0 +1,241 @@
+
+#include "Globals.h"
+#include "HTTP/UrlClient.h"
+#include "OSSupport/NetworkSingleton.h"
+
+
+
+
+
+/** Simple callbacks that dump the events to the console and signalize a cEvent when the request is finished. */
+class cCallbacks:
+ public cUrlClient::cCallbacks
+{
+public:
+ cCallbacks(cEvent & a_Event):
+ m_Event(a_Event)
+ {
+ LOGD("Created a cCallbacks instance at %p", reinterpret_cast<void *>(this));
+ }
+
+
+ ~cCallbacks()
+ {
+ LOGD("Deleting the cCallbacks instance at %p", reinterpret_cast<void *>(this));
+ }
+
+
+ virtual void OnConnected(cTCPLink & a_Link) override
+ {
+ LOG("Link connected to %s:%u", a_Link.GetRemoteIP().c_str(), a_Link.GetRemotePort());
+ }
+
+
+ virtual bool OnCertificateReceived() override
+ {
+ LOG("Server certificate received");
+ return true;
+ }
+
+
+ virtual void OnTlsHandshakeCompleted() override
+ {
+ LOG("TLS handshake has completed.");
+ }
+
+
+ virtual void OnRequestSent() override
+ {
+ LOG("Request has been sent");
+ }
+
+
+ virtual void OnHeader(const AString & a_Key, const AString & a_Value) override
+ {
+ LOG("HTTP Header: \"%s\" -> \"%s\"", a_Key.c_str(), a_Value.c_str());
+ }
+
+
+ virtual void OnHeadersFinished() override
+ {
+ LOG("HTTP headers finished.");
+ }
+
+
+ virtual void OnBodyData(const void * a_Data, size_t a_Size) override
+ {
+ #if 0
+ // Output the whole received data blob:
+ AString body(reinterpret_cast<const char *>(a_Data), a_Size);
+ LOG("Body part:\n%s", body.c_str());
+ #else
+ // Output only the data size, to keep the log short:
+ LOG("Body part: %u bytes", static_cast<unsigned>(a_Size));
+ #endif
+ }
+
+
+ virtual void OnBodyFinished() override
+ {
+ LOG("Body finished.");
+ m_Event.Set();
+ }
+
+
+ virtual void OnRedirecting(const AString & a_RedirectUrl) override
+ {
+ LOG("Redirecting to \"%s\".", a_RedirectUrl.c_str());
+ }
+
+
+ virtual void OnError(const AString & a_ErrorMsg) override
+ {
+ LOG("Error: %s", a_ErrorMsg.c_str());
+ m_Event.Set();
+ }
+
+protected:
+ cEvent & m_Event;
+};
+
+
+
+
+
+static int TestRequest1()
+{
+ LOG("Running test 1");
+ cEvent evtFinished;
+ auto callbacks = cpp14::make_unique<cCallbacks>(evtFinished);
+ AStringMap options;
+ options["MaxRedirects"] = "0";
+ auto res = cUrlClient::Get("http://github.com", std::move(callbacks), AStringMap(), AString(), options);
+ if (res.first)
+ {
+ evtFinished.Wait();
+ }
+ else
+ {
+ LOG("Immediate error: %s", res.second.c_str());
+ return 1;
+ }
+ return 0;
+}
+
+
+
+
+
+static int TestRequest2()
+{
+ LOG("Running test 2");
+ cEvent evtFinished;
+ auto callbacks = cpp14::make_unique<cCallbacks>(evtFinished);
+ auto res = cUrlClient::Get("http://github.com", std::move(callbacks));
+ if (res.first)
+ {
+ evtFinished.Wait();
+ }
+ else
+ {
+ LOG("Immediate error: %s", res.second.c_str());
+ return 1;
+ }
+ return 0;
+}
+
+
+
+
+
+static int TestRequest3()
+{
+ LOG("Running test 3");
+ cEvent evtFinished;
+ auto callbacks = cpp14::make_unique<cCallbacks>(evtFinished);
+ AStringMap options;
+ options["MaxRedirects"] = "0";
+ auto res = cUrlClient::Get("https://github.com", std::move(callbacks), AStringMap(), AString(), options);
+ if (res.first)
+ {
+ evtFinished.Wait();
+ }
+ else
+ {
+ LOG("Immediate error: %s", res.second.c_str());
+ return 1;
+ }
+ return 0;
+}
+
+
+
+
+
+static int TestRequest4()
+{
+ LOG("Running test 4");
+ cEvent evtFinished;
+ auto callbacks = cpp14::make_unique<cCallbacks>(evtFinished);
+ auto res = cUrlClient::Get("https://github.com", std::move(callbacks));
+ if (res.first)
+ {
+ evtFinished.Wait();
+ }
+ else
+ {
+ LOG("Immediate error: %s", res.second.c_str());
+ return 1;
+ }
+ return 0;
+}
+
+
+
+
+
+static int TestRequests()
+{
+ std::function<int(void)> tests[] =
+ {
+ &TestRequest1,
+ &TestRequest2,
+ &TestRequest3,
+ &TestRequest4,
+ };
+ for (const auto & test: tests)
+ {
+ LOG("%s", AString(60, '-').c_str());
+ auto res = test();
+ if (res != 0)
+ {
+ return res;
+ }
+ }
+ return 0;
+}
+
+
+
+
+
+int main()
+{
+ LOGD("Test started");
+
+ LOGD("Initializing cNetwork...");
+ cNetworkSingleton::Get().Initialise();
+
+ LOGD("Testing...");
+ auto res = TestRequests();
+
+ LOGD("Terminating cNetwork...");
+ cNetworkSingleton::Get().Terminate();
+ LOGD("cUrlClient test finished");
+
+ return res;
+}
+
+
+
+
diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt
index c02a53456..c6c76385e 100644
--- a/tests/Network/CMakeLists.txt
+++ b/tests/Network/CMakeLists.txt
@@ -2,6 +2,7 @@ enable_testing()
include_directories(${CMAKE_SOURCE_DIR}/src/)
include_directories(${CMAKE_SOURCE_DIR}/lib/libevent/include)
+include_directories(${CMAKE_SOURCE_DIR}/lib/polarssl/include)
add_definitions(-DTEST_GLOBALS=1)
@@ -15,6 +16,11 @@ set (Network_SRCS
${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp
${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp
${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.cpp
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.cpp
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.cpp
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.cpp
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.cpp
${CMAKE_SOURCE_DIR}/src/StringUtils.cpp
)
@@ -27,6 +33,11 @@ set (Network_HDRS
${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.h
${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.h
${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.h
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CtrDrbgContext.h
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/CryptoKey.h
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/EntropyContext.h
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/SslContext.h
+ ${CMAKE_SOURCE_DIR}/src/PolarSSL++/X509Cert.h
${CMAKE_SOURCE_DIR}/src/StringUtils.h
)
@@ -35,7 +46,7 @@ add_library(Network
${Network_HDRS}
)
-target_link_libraries(Network event_core event_extra)
+target_link_libraries(Network event_core event_extra mbedtls)
if (MSVC)
target_link_libraries(Network ws2_32.lib)
endif()