From 3184433756c6014e5192bdb92df9a233c62b55e7 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 18:12:33 +0100 Subject: Moved NetworkInterfaceEnum test to a separate test project. --- src/OSSupport/NetworkInterfaceEnum.cpp | 28 ------------------------- tests/Network/CMakeLists.txt | 22 ++++++++++++++++++++ tests/Network/EnumInterfaces.cpp | 37 ++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 tests/Network/EnumInterfaces.cpp diff --git a/src/OSSupport/NetworkInterfaceEnum.cpp b/src/OSSupport/NetworkInterfaceEnum.cpp index d74565e07..c7339c408 100644 --- a/src/OSSupport/NetworkInterfaceEnum.cpp +++ b/src/OSSupport/NetworkInterfaceEnum.cpp @@ -22,34 +22,6 @@ -#ifdef SELF_TEST - -static class cEnumIPAddressTest -{ -public: - cEnumIPAddressTest(void) - { - cSelfTests::Get().Register(std::function(&Test), "Network IP enumeration"); - } - - static void Test(void) - { - LOG("Enumerating all IP addresses..."); - auto IPs = cNetwork::EnumLocalIPAddresses(); - for (auto & ip: IPs) - { - LOG(" %s", ip.c_str()); - } - LOG("Done."); - } -} g_EnumIPAddressTest; - -#endif // SELF_TEST - - - - - #ifdef _WIN32 /** Converts the SOCKET_ADDRESS structure received from the OS into an IP address string. */ diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index f93ccad8e..e47b01e11 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -13,6 +13,7 @@ set (Network_SRCS ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/HostnameLookup.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/IPLookup.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkInterfaceEnum.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp ${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp @@ -62,3 +63,24 @@ target_link_libraries(EchoServer Network) # NameLookup: Lookup hostname-to-IP and IP-to-hostname: add_executable(NameLookup NameLookup.cpp) target_link_libraries(NameLookup Network) + +# EnumInterfaces: List all network interfaces: +add_executable(EnumInterfaces-exe EnumInterfaces.cpp) +target_link_libraries(EnumInterfaces-exe Network) +add_test(NAME EnumInterfaces-test COMMAND EnumInterfaces-exe) + + + + +# Put all the tests into a solution folder (MSVC): +set_target_properties( + EchoServer + Google-exe + NameLookup + EnumInterfaces-exe + PROPERTIES FOLDER Tests +) + + + + diff --git a/tests/Network/EnumInterfaces.cpp b/tests/Network/EnumInterfaces.cpp new file mode 100644 index 000000000..a24158c62 --- /dev/null +++ b/tests/Network/EnumInterfaces.cpp @@ -0,0 +1,37 @@ + +// EnumInterfaces.cpp + +// Implements the main app entrypoint for the EnumInterfaces network test +// Lists all network interfaces to the console + +#include "Globals.h" +#include "OSSupport/Network.h" +#include "OSSupport/NetworkSingleton.h" + + + + + +int main(int argc, char * argv[]) +{ + // Initialize the cNetwork subsystem: + cNetworkSingleton::Get().Initialise(); + + // Enumerate all the addresses: + printf("Enumerating all IP addresses...\n"); + auto IPs = cNetwork::EnumLocalIPAddresses(); + for (auto & ip: IPs) + { + printf(" %s\n", ip.c_str()); + } + printf("Done.\n"); + + // Terminate the cNetwork subsystem: + cNetworkSingleton::Get().Terminate(); + + return 0; +} + + + + -- cgit v1.2.3 From 3d164a77cb1057e982f3217a505cb21eadf46535 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 18:22:35 +0100 Subject: SelfTests: Organized into solution folders. --- CMakeLists.txt | 21 --------------------- tests/ChunkData/CMakeLists.txt | 17 +++++++++++++++++ tests/HTTP/CMakeLists.txt | 13 +++++++++++++ tests/LoadablePieces/CMakeLists.txt | 5 +++++ tests/Network/CMakeLists.txt | 6 +++++- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17644e86c..02de722bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -264,27 +264,6 @@ if (MSVC) tolua PROPERTIES FOLDER Support ) - if (${SELF_TEST}) - set_target_properties( - Network - HTTP - PROPERTIES FOLDER Lib - ) - set_target_properties( - arraystocoords-exe - ChunkBuffer - coordinates-exe - copies-exe - copyblocks-exe - creatable-exe - EchoServer - Google-exe - HTTPMessageParser_file-exe - LoadablePieces - NameLookup - PROPERTIES FOLDER Tests - ) - endif() if(${BUILD_TOOLS}) set_target_properties( diff --git a/tests/ChunkData/CMakeLists.txt b/tests/ChunkData/CMakeLists.txt index bd2d6d9b4..8c1b10e9f 100644 --- a/tests/ChunkData/CMakeLists.txt +++ b/tests/ChunkData/CMakeLists.txt @@ -33,3 +33,20 @@ add_test(NAME arraystocoords-test COMMAND arraystocoords-exe) add_executable(copyblocks-exe CopyBlocks.cpp) target_link_libraries(copyblocks-exe ChunkBuffer) add_test(NAME copyblocks-test COMMAND copyblocks-exe) + + + + +# Put all test projects into a separate folder: +set_target_properties( + arraystocoords-exe + coordinates-exe + copies-exe + copyblocks-exe + creatable-exe + PROPERTIES FOLDER Tests/ChunkData +) +set_target_properties( + ChunkBuffer + PROPERTIES FOLDER Lib +) diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt index 233e5c0cb..55552c095 100644 --- a/tests/HTTP/CMakeLists.txt +++ b/tests/HTTP/CMakeLists.txt @@ -58,3 +58,16 @@ 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 HTTPRequest1.data 512) + + + + +# Put all the tests into a solution folder (MSVC): +set_target_properties( + HTTPMessageParser_file-exe + PROPERTIES FOLDER Tests +) +set_target_properties( + HTTP + PROPERTIES FOLDER Lib +) diff --git a/tests/LoadablePieces/CMakeLists.txt b/tests/LoadablePieces/CMakeLists.txt index 16a89633a..c467d7c38 100644 --- a/tests/LoadablePieces/CMakeLists.txt +++ b/tests/LoadablePieces/CMakeLists.txt @@ -98,3 +98,8 @@ add_test(NAME LoadablePieces-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +# Put the projects into solution folders (MSVC): +set_target_properties( + LoadablePieces + PROPERTIES FOLDER Tests +) diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index e47b01e11..2e0915cca 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -78,7 +78,11 @@ set_target_properties( Google-exe NameLookup EnumInterfaces-exe - PROPERTIES FOLDER Tests + PROPERTIES FOLDER Tests/Network +) +set_target_properties( + Network + PROPERTIES FOLDER Lib ) -- cgit v1.2.3 From ab6f68b42cac83e4f8fdc93e9654eb536f7f2e32 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 18:59:42 +0100 Subject: SelfTests: Moved ByteBuffer test to a separate project. --- src/ByteBuffer.cpp | 66 ------------------------------ tests/ByteBuffer/ByteBufferTest.cpp | 80 +++++++++++++++++++++++++++++++++++++ tests/ByteBuffer/CMakeLists.txt | 46 +++++++++++++++++++++ tests/CMakeLists.txt | 5 ++- 4 files changed, 129 insertions(+), 68 deletions(-) create mode 100644 tests/ByteBuffer/ByteBufferTest.cpp create mode 100644 tests/ByteBuffer/CMakeLists.txt diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp index 16620becd..230a5ffbb 100644 --- a/src/ByteBuffer.cpp +++ b/src/ByteBuffer.cpp @@ -8,7 +8,6 @@ #include "ByteBuffer.h" #include "Endianness.h" #include "OSSupport/IsThread.h" -#include "SelfTests.h" @@ -54,71 +53,6 @@ Unfortunately it is very slow, so it is disabled even for regular DEBUG builds. -#ifdef SELF_TEST - -/** Self-test of the VarInt-reading and writing code */ -static class cByteBufferSelfTest -{ -public: - cByteBufferSelfTest(void) - { - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestRead), "ByteBuffer read"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestWrite), "ByteBuffer write"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestWrap), "ByteBuffer wraparound"); - } - - static void TestRead(void) - { - cByteBuffer buf(50); - buf.Write("\x05\xac\x02\x00", 4); - UInt32 v1; - assert_test(buf.ReadVarInt(v1) && (v1 == 5)); - UInt32 v2; - assert_test(buf.ReadVarInt(v2) && (v2 == 300)); - UInt32 v3; - assert_test(buf.ReadVarInt(v3) && (v3 == 0)); - } - - static void TestWrite(void) - { - cByteBuffer buf(50); - buf.WriteVarInt32(5); - buf.WriteVarInt32(300); - buf.WriteVarInt32(0); - AString All; - buf.ReadAll(All); - assert_test(All.size() == 4); - assert_test(memcmp(All.data(), "\x05\xac\x02\x00", All.size()) == 0); - } - - static void TestWrap(void) - { - cByteBuffer buf(3); - for (int i = 0; i < 1000; i++) - { - size_t FreeSpace = buf.GetFreeSpace(); - assert_test(buf.GetReadableSpace() == 0); - assert_test(FreeSpace > 0); - assert_test(buf.Write("a", 1)); - assert_test(buf.CanReadBytes(1)); - assert_test(buf.GetReadableSpace() == 1); - UInt8 v = 0; - assert_test(buf.ReadBEUInt8(v)); - assert_test(v == 'a'); - assert_test(buf.GetReadableSpace() == 0); - buf.CommitRead(); - assert_test(buf.GetFreeSpace() == FreeSpace); // We're back to normal - } - } - -} g_ByteBufferTest; - -#endif - - - - - #ifdef DEBUG_SINGLE_THREAD_ACCESS /** Simple RAII class that is used for checking that no two threads are using an object simultanously. diff --git a/tests/ByteBuffer/ByteBufferTest.cpp b/tests/ByteBuffer/ByteBufferTest.cpp new file mode 100644 index 000000000..98a802554 --- /dev/null +++ b/tests/ByteBuffer/ByteBufferTest.cpp @@ -0,0 +1,80 @@ + +// ByteBufferTest.cpp + +// Implements the main app entrypoint for the cByteBuffer class test + +#include "Globals.h" +#include "ByteBuffer.h" + + + + + +static void TestRead(void) +{ + cByteBuffer buf(50); + buf.Write("\x05\xac\x02\x00", 4); + UInt32 v1; + assert_test(buf.ReadVarInt(v1) && (v1 == 5)); + UInt32 v2; + assert_test(buf.ReadVarInt(v2) && (v2 == 300)); + UInt32 v3; + assert_test(buf.ReadVarInt(v3) && (v3 == 0)); +} + + + + + +static void TestWrite(void) +{ + cByteBuffer buf(50); + buf.WriteVarInt32(5); + buf.WriteVarInt32(300); + buf.WriteVarInt32(0); + AString All; + buf.ReadAll(All); + assert_test(All.size() == 4); + assert_test(memcmp(All.data(), "\x05\xac\x02\x00", All.size()) == 0); +} + + + + + +static void TestWrap(void) +{ + cByteBuffer buf(3); + for (int i = 0; i < 1000; i++) + { + size_t FreeSpace = buf.GetFreeSpace(); + assert_test(buf.GetReadableSpace() == 0); + assert_test(FreeSpace > 0); + assert_test(buf.Write("a", 1)); + assert_test(buf.CanReadBytes(1)); + assert_test(buf.GetReadableSpace() == 1); + UInt8 v = 0; + assert_test(buf.ReadBEUInt8(v)); + assert_test(v == 'a'); + assert_test(buf.GetReadableSpace() == 0); + buf.CommitRead(); + assert_test(buf.GetFreeSpace() == FreeSpace); // We're back to normal + } +} + + + + + +int main(int argc, char * argv[]) +{ + TestRead(); + TestWrite(); + TestWrap(); + LOG("ByteBuffer test finished."); +} + + + + + diff --git a/tests/ByteBuffer/CMakeLists.txt b/tests/ByteBuffer/CMakeLists.txt new file mode 100644 index 000000000..5c82d25d9 --- /dev/null +++ b/tests/ByteBuffer/CMakeLists.txt @@ -0,0 +1,46 @@ +cmake_minimum_required (VERSION 2.6) + +enable_testing() +add_definitions(-DTEST_GLOBALS=1) + +include_directories(${CMAKE_SOURCE_DIR}/src/) + +add_definitions(-DTEST_GLOBALS=1) + +set (SHARED_SRCS + ${CMAKE_SOURCE_DIR}/src/ByteBuffer.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp +) + +set (SHARED_HDRS + ${CMAKE_SOURCE_DIR}/src/ByteBuffer.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h +) + +set (SRCS + ByteBufferTest.cpp +) + +if (MSVC) + # Add the MSVC-specific LeakFinder / StackTracer sources: + list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp) + list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h ${CMAKE_SOURCE_DIR}/src/StackWalker.h) +endif() + +source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) +source_group("Sources" FILES ${SRCS}) +add_executable(ByteBuffer-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS}) +if (WIN32) + target_link_libraries(ByteBuffer-exe ws2_32) +endif() +add_test(NAME ByteBuffer-test COMMAND ByteBuffer-exe) + + + + + +# Put the projects into solution folders (MSVC): +set_target_properties( + ByteBuffer-exe + PROPERTIES FOLDER Tests +) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 63eb8ae3a..2a85f7b3d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -6,9 +6,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "COVERAGE") setup_target_for_coverage("${PROJECT_NAME}_coverage" "ctest" coverage) endif() -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +# include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_subdirectory(ByteBuffer) add_subdirectory(ChunkData) add_subdirectory(HTTP) -add_subdirectory(Network) add_subdirectory(LoadablePieces) +add_subdirectory(Network) -- cgit v1.2.3 From db17f585afc283a107b8fbec078e1d2d674e52b0 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 19:34:56 +0100 Subject: SelfTests: Moved cCompositeChat test to a separate project. --- src/CompositeChat.cpp | 89 ------------------------ tests/CMakeLists.txt | 1 + tests/CompositeChat/CMakeLists.txt | 47 +++++++++++++ tests/CompositeChat/ClientHandle.cpp | 20 ++++++ tests/CompositeChat/CompositeChatTest.cpp | 112 ++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 89 deletions(-) create mode 100644 tests/CompositeChat/CMakeLists.txt create mode 100644 tests/CompositeChat/ClientHandle.cpp create mode 100644 tests/CompositeChat/CompositeChatTest.cpp diff --git a/src/CompositeChat.cpp b/src/CompositeChat.cpp index 82e3d09f2..d110d5908 100644 --- a/src/CompositeChat.cpp +++ b/src/CompositeChat.cpp @@ -6,95 +6,6 @@ #include "Globals.h" #include "CompositeChat.h" #include "ClientHandle.h" -#include "SelfTests.h" - - - - - -#ifdef SELF_TEST - -/** A simple self-test that verifies that the composite chat parser is working properly. */ -class SelfTest_CompositeChat -{ -public: - SelfTest_CompositeChat(void) - { - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestParser1), "CompositeChat parser test 1"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestParser2), "CompositeChat parser test 2"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestParser3), "CompositeChat parser test 3"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestParser4), "CompositeChat parser test 4"); - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&TestParser5), "CompositeChat parser test 5"); - } - - static void TestParser1(void) - { - cCompositeChat Msg; - Msg.ParseText("Testing @2color codes and http://links parser"); - const cCompositeChat::cParts & Parts = Msg.GetParts(); - assert_test(Parts.size() == 4); - assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl); - assert_test(Parts[3]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[0]->m_Style == ""); - assert_test(Parts[1]->m_Style == "@2"); - assert_test(Parts[2]->m_Style == "@2"); - assert_test(Parts[3]->m_Style == "@2"); - } - - static void TestParser2(void) - { - cCompositeChat Msg; - Msg.ParseText("@3Advanced stuff: @5overriding color codes and http://links.with/@4color-in-them handling"); - const cCompositeChat::cParts & Parts = Msg.GetParts(); - assert_test(Parts.size() == 4); - assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl); - assert_test(Parts[3]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[0]->m_Style == "@3"); - assert_test(Parts[1]->m_Style == "@5"); - assert_test(Parts[2]->m_Style == "@5"); - assert_test(Parts[3]->m_Style == "@5"); - } - - static void TestParser3(void) - { - cCompositeChat Msg; - Msg.ParseText("http://links.starting the text"); - const cCompositeChat::cParts & Parts = Msg.GetParts(); - assert_test(Parts.size() == 2); - assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl); - assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[0]->m_Style == ""); - assert_test(Parts[1]->m_Style == ""); - } - - static void TestParser4(void) - { - cCompositeChat Msg; - Msg.ParseText("links finishing the text: http://some.server"); - const cCompositeChat::cParts & Parts = Msg.GetParts(); - assert_test(Parts.size() == 2); - assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); - assert_test(Parts[1]->m_PartType == cCompositeChat::ptUrl); - assert_test(Parts[0]->m_Style == ""); - assert_test(Parts[1]->m_Style == ""); - } - - static void TestParser5(void) - { - cCompositeChat Msg; - Msg.ParseText("http://only.links"); - const cCompositeChat::cParts & Parts = Msg.GetParts(); - assert_test(Parts.size() == 1); - assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl); - assert_test(Parts[0]->m_Style == ""); - } - -} gTest; -#endif // SELF_TEST diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 2a85f7b3d..61f34d9fb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,6 +10,7 @@ endif() add_subdirectory(ByteBuffer) add_subdirectory(ChunkData) +add_subdirectory(CompositeChat) add_subdirectory(HTTP) add_subdirectory(LoadablePieces) add_subdirectory(Network) diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt new file mode 100644 index 000000000..e8120eff5 --- /dev/null +++ b/tests/CompositeChat/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required (VERSION 2.6) + +enable_testing() +add_definitions(-DTEST_GLOBALS=1) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_SOURCE_DIR}/src/) +include_directories(${CMAKE_SOURCE_DIR}/lib/jsoncpp/include) + +add_definitions(-DTEST_GLOBALS=1) + +set (SHARED_SRCS + ${CMAKE_SOURCE_DIR}/src/CompositeChat.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp +) + +set (SHARED_HDRS + ${CMAKE_SOURCE_DIR}/src/CompositeChat.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h +) + +set (SRCS + CompositeChatTest.cpp + ClientHandle.cpp +) + +if (MSVC) + # Add the MSVC-specific LeakFinder / StackTracer sources: + list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp) + list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h ${CMAKE_SOURCE_DIR}/src/StackWalker.h) +endif() + +source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) +source_group("Sources" FILES ${SRCS}) +add_executable(CompositeChat-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS}) +target_link_libraries(CompositeChat-exe jsoncpp_lib_static) +add_test(NAME CompositeChat-test COMMAND CompositeChat-exe) + + + + + +# Put the projects into solution folders (MSVC): +set_target_properties( + CompositeChat-exe + PROPERTIES FOLDER Tests +) diff --git a/tests/CompositeChat/ClientHandle.cpp b/tests/CompositeChat/ClientHandle.cpp new file mode 100644 index 000000000..e66b2237e --- /dev/null +++ b/tests/CompositeChat/ClientHandle.cpp @@ -0,0 +1,20 @@ + +// ClientHandle.cpp + +// Mocks the cClientHandle class used by the tests + +#include "Globals.h" +#include "ClientHandle.h" + + + + + +AString cClientHandle::FormatMessageType(bool a_ShouldShowPrefixes, eMessageType a_MsgType, const AString & a_AdditionalData) +{ + return ""; +} + + + + diff --git a/tests/CompositeChat/CompositeChatTest.cpp b/tests/CompositeChat/CompositeChatTest.cpp new file mode 100644 index 000000000..12d9de673 --- /dev/null +++ b/tests/CompositeChat/CompositeChatTest.cpp @@ -0,0 +1,112 @@ + +// CompositeChatTest.cpp + +// Implements the main app entrypoint for the cCompositeChat class test + +#include "Globals.h" +#include "CompositeChat.h" + + + + + +static void TestParser1(void) +{ + cCompositeChat Msg; + Msg.ParseText("Testing @2color codes and http://links parser"); + const cCompositeChat::cParts & Parts = Msg.GetParts(); + assert_test(Parts.size() == 4); + assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl); + assert_test(Parts[3]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[0]->m_Style == ""); + assert_test(Parts[1]->m_Style == "@2"); + assert_test(Parts[2]->m_Style == "@2"); + assert_test(Parts[3]->m_Style == "@2"); +} + + + + + +static void TestParser2(void) +{ + cCompositeChat Msg; + Msg.ParseText("@3Advanced stuff: @5overriding color codes and http://links.with/@4color-in-them handling"); + const cCompositeChat::cParts & Parts = Msg.GetParts(); + assert_test(Parts.size() == 4); + assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[2]->m_PartType == cCompositeChat::ptUrl); + assert_test(Parts[3]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[0]->m_Style == "@3"); + assert_test(Parts[1]->m_Style == "@5"); + assert_test(Parts[2]->m_Style == "@5"); + assert_test(Parts[3]->m_Style == "@5"); +} + + + + + +static void TestParser3(void) +{ + cCompositeChat Msg; + Msg.ParseText("http://links.starting the text"); + const cCompositeChat::cParts & Parts = Msg.GetParts(); + assert_test(Parts.size() == 2); + assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl); + assert_test(Parts[1]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[0]->m_Style == ""); + assert_test(Parts[1]->m_Style == ""); +} + + + + + +static void TestParser4(void) +{ + cCompositeChat Msg; + Msg.ParseText("links finishing the text: http://some.server"); + const cCompositeChat::cParts & Parts = Msg.GetParts(); + assert_test(Parts.size() == 2); + assert_test(Parts[0]->m_PartType == cCompositeChat::ptText); + assert_test(Parts[1]->m_PartType == cCompositeChat::ptUrl); + assert_test(Parts[0]->m_Style == ""); + assert_test(Parts[1]->m_Style == ""); +} + + + + + +static void TestParser5(void) +{ + cCompositeChat Msg; + Msg.ParseText("http://only.links"); + const cCompositeChat::cParts & Parts = Msg.GetParts(); + assert_test(Parts.size() == 1); + assert_test(Parts[0]->m_PartType == cCompositeChat::ptUrl); + assert_test(Parts[0]->m_Style == ""); +} + + + + + +int main(int argc, char * argv[]) +{ + TestParser1(); + TestParser2(); + TestParser3(); + TestParser4(); + TestParser5(); + LOG("CompositeChat test finished."); +} + + + + + -- cgit v1.2.3 From a781be545611ac6dd4aa61433b77fbe4f2aeddad Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 19:13:17 +0100 Subject: SelfTests: Moved SchematicFileSerializer test into a separate project. --- src/WorldStorage/SchematicFileSerializer.cpp | 36 ---- tests/CMakeLists.txt | 1 + tests/SchematicFileSerializer/CMakeLists.txt | 93 ++++++++++ .../SchematicFileSerializerTest.cpp | 43 +++++ tests/SchematicFileSerializer/Stubs.cpp | 193 +++++++++++++++++++++ 5 files changed, 330 insertions(+), 36 deletions(-) create mode 100644 tests/SchematicFileSerializer/CMakeLists.txt create mode 100644 tests/SchematicFileSerializer/SchematicFileSerializerTest.cpp create mode 100644 tests/SchematicFileSerializer/Stubs.cpp diff --git a/src/WorldStorage/SchematicFileSerializer.cpp b/src/WorldStorage/SchematicFileSerializer.cpp index 1b2047574..3fc36e86c 100644 --- a/src/WorldStorage/SchematicFileSerializer.cpp +++ b/src/WorldStorage/SchematicFileSerializer.cpp @@ -9,42 +9,6 @@ #include "FastNBT.h" #include "SchematicFileSerializer.h" #include "../StringCompression.h" -#include "../SelfTests.h" - - - - - -#ifdef SELF_TEST - -static class cSchematicStringSelfTest -{ -public: - cSchematicStringSelfTest(void) - { - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&Test), "Schematic-to-string serialization"); - } - - static void Test(void) - { - cBlockArea ba; - ba.Create(21, 256, 21); - ba.RelLine(0, 0, 0, 9, 8, 7, cBlockArea::baTypes | cBlockArea::baMetas, E_BLOCK_WOODEN_STAIRS, 1); - AString Schematic; - if (!cSchematicFileSerializer::SaveToSchematicString(ba, Schematic)) - { - assert_test(!"Schematic failed to save!"); - } - cBlockArea ba2; - if (!cSchematicFileSerializer::LoadFromSchematicString(ba2, Schematic)) - { - assert_test(!"Schematic failed to load!"); - } - } -} g_SelfTest; - -#endif - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 61f34d9fb..17ad2baa4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,3 +14,4 @@ add_subdirectory(CompositeChat) add_subdirectory(HTTP) add_subdirectory(LoadablePieces) add_subdirectory(Network) +add_subdirectory(SchematicFileSerializer) diff --git a/tests/SchematicFileSerializer/CMakeLists.txt b/tests/SchematicFileSerializer/CMakeLists.txt new file mode 100644 index 000000000..43b19e4c3 --- /dev/null +++ b/tests/SchematicFileSerializer/CMakeLists.txt @@ -0,0 +1,93 @@ +cmake_minimum_required (VERSION 2.6) + +enable_testing() + +include_directories(${CMAKE_SOURCE_DIR}/src/) +include_directories(${CMAKE_SOURCE_DIR}/lib/) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + +add_definitions(-DTEST_GLOBALS=1) + +set (SHARED_SRCS + ${CMAKE_SOURCE_DIR}/src/BiomeDef.cpp + ${CMAKE_SOURCE_DIR}/src/BlockArea.cpp + ${CMAKE_SOURCE_DIR}/src/Cuboid.cpp + ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp + ${CMAKE_SOURCE_DIR}/src/StringCompression.cpp + ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp + + ${CMAKE_SOURCE_DIR}/src/Noise/Noise.cpp + + ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp + + ${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp + ${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp +) + +set (SHARED_HDRS + ${CMAKE_SOURCE_DIR}/src/BiomeDef.h + ${CMAKE_SOURCE_DIR}/src/BlockArea.h + ${CMAKE_SOURCE_DIR}/src/Cuboid.h + ${CMAKE_SOURCE_DIR}/src/ChunkData.h + ${CMAKE_SOURCE_DIR}/src/Globals.h + ${CMAKE_SOURCE_DIR}/src/StringCompression.h + ${CMAKE_SOURCE_DIR}/src/StringUtils.h + + ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h + + ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h + ${CMAKE_SOURCE_DIR}/src/Generating/PieceGenerator.h + ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h + ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h + ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h + ${CMAKE_SOURCE_DIR}/src/Generating/VerticalStrategy.h + + ${CMAKE_SOURCE_DIR}/src/Noise/Noise.h + + ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/File.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h + + ${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.h + ${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h +) + +set (SRCS + SchematicFileSerializerTest.cpp + Stubs.cpp +) + + +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=conversion -Wno-error=old-style-cast") + add_flags_cxx("-Wno-error=global-constructors") + add_flags_cxx("-Wno-error=switch-enum") +endif() + + +if (MSVC) + # Add the MSVC-specific LeakFinder sources: + list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp) + list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h ${CMAKE_SOURCE_DIR}/src/StackWalker.h) +endif() + +source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) +source_group("Sources" FILES ${SRCS}) +add_executable(SchematicFileSerializer-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS}) +target_link_libraries(SchematicFileSerializer-exe zlib) +add_test(NAME SchematicFileSerializer-test WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND SchematicFileSerializer-exe) + + + + +# Put the projects into solution folders (MSVC): +set_target_properties( + SchematicFileSerializer-exe + PROPERTIES FOLDER Tests +) diff --git a/tests/SchematicFileSerializer/SchematicFileSerializerTest.cpp b/tests/SchematicFileSerializer/SchematicFileSerializerTest.cpp new file mode 100644 index 000000000..fc18daf93 --- /dev/null +++ b/tests/SchematicFileSerializer/SchematicFileSerializerTest.cpp @@ -0,0 +1,43 @@ + +// SchematicFileSerializerTest.cpp + +// Implements the SchematicFileSerializer test main entrypoint + +#include "Globals.h" +#include "WorldStorage/SchematicFileSerializer.h" + + + + + +static void DoTest(void) +{ + cBlockArea ba; + ba.Create(21, 256, 21); + ba.RelLine(0, 0, 0, 9, 8, 7, cBlockArea::baTypes | cBlockArea::baMetas, E_BLOCK_WOODEN_STAIRS, 1); + AString Schematic; + if (!cSchematicFileSerializer::SaveToSchematicString(ba, Schematic)) + { + assert_test(!"Schematic failed to save!"); + } + cBlockArea ba2; + if (!cSchematicFileSerializer::LoadFromSchematicString(ba2, Schematic)) + { + assert_test(!"Schematic failed to load!"); + } +} + + + + + +int main(int argc, char * argv[]) +{ + DoTest(); + LOG("SchematicFileSerializer test done."); + return 0; +} + + + + diff --git a/tests/SchematicFileSerializer/Stubs.cpp b/tests/SchematicFileSerializer/Stubs.cpp new file mode 100644 index 000000000..2fb500436 --- /dev/null +++ b/tests/SchematicFileSerializer/Stubs.cpp @@ -0,0 +1,193 @@ + +// Stubs.cpp + +// Implements stubs of various Cuberite methods that are needed for linking but not for runtime +// This is required so that we don't bring in the entire Cuberite via dependencies + +#include "Globals.h" +#include "BlockInfo.h" +#include "Blocks/BlockHandler.h" + + + + + +cBlockInfo::~cBlockInfo() +{ +} + + + + + +void cBlockInfo::Initialize(cBlockInfo::cBlockInfoArray & a_BlockInfos) +{ + // The piece-loading code uses the handlers for rotations, so we need valid handlers + // Insert dummy handlers: + for (size_t i = 0; i < ARRAYCOUNT(a_BlockInfos); i++) + { + a_BlockInfos[i].m_Handler = new cBlockHandler(static_cast(i)); + } +} + + + + + +cBlockHandler::cBlockHandler(BLOCKTYPE a_BlockType) +{ +} + + + + + +bool cBlockHandler::GetPlacementBlockTypeMeta( + cChunkInterface & a_ChunkInterface, cPlayer * a_Player, + int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_BlockFace, + int a_CursorX, int a_CursorY, int a_CursorZ, + BLOCKTYPE & a_BlockType, NIBBLETYPE & a_BlockMeta +) +{ + return true; +} + + + + + +void cBlockHandler::OnUpdate(cChunkInterface & cChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_PluginInterface, cChunk & a_Chunk, int a_BlockX, int a_BlockY, int a_BlockZ) +{ +} + + + + + +void cBlockHandler::OnPlacedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, const sSetBlock & a_BlockChange) +{ +} + + + + + +void cBlockHandler::OnDestroyedByPlayer(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cPlayer * a_Player, int a_BlockX, int a_BlockY, int a_BlockZ) +{ +} + + + + + +void cBlockHandler::OnPlaced(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) +{ +} + + + + + +void cBlockHandler::OnDestroyed(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, int a_BlockX, int a_BlockY, int a_BlockZ) +{ +} + + + + + +void cBlockHandler::NeighborChanged(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ, eBlockFace a_WhichNeighbor) +{ +} + + + + + +void cBlockHandler::ConvertToPickups(cItems & a_Pickups, NIBBLETYPE a_BlockMeta) +{ +} + + + + + +void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterface & a_WorldInterface, cBlockPluginInterface & a_BlockPluginInterface, cEntity * a_Digger, int a_BlockX, int a_BlockY, int a_BlockZ, bool a_CanDrop) +{ +} + + + + + +bool cBlockHandler::CanBeAt(cChunkInterface & a_ChunkInterface, int a_BlockX, int a_BlockY, int a_BlockZ, const cChunk & a_Chunk) +{ + return true; +} + + + + + +bool cBlockHandler::IsUseable() +{ + return false; +} + + + + + +bool cBlockHandler::IsClickedThrough(void) +{ + return false; +} + + + + + +bool cBlockHandler::DoesIgnoreBuildCollision(void) +{ + return (m_BlockType == E_BLOCK_AIR); +} + + + + + +bool cBlockHandler::DoesDropOnUnsuitable(void) +{ + return true; +} + + + + + +void cBlockHandler::Check(cChunkInterface & a_ChunkInterface, cBlockPluginInterface & a_PluginInterface, int a_RelX, int a_RelY, int a_RelZ, cChunk & a_Chunk) +{ +} + + + + + +ColourID cBlockHandler::GetMapBaseColourID(NIBBLETYPE a_Meta) +{ + return 0; +} + + + + + +bool cBlockHandler::IsInsideBlock(const Vector3d & a_Position, const BLOCKTYPE a_BlockType, const NIBBLETYPE a_BlockMeta) +{ + return true; +} + + + + + -- cgit v1.2.3 From 75a81cf75310fd6b9d8510acc3add59d41f0732a Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 19:25:37 +0100 Subject: SelfTests: Moved BoundingBox test to a separate project. --- src/BoundingBox.cpp | 66 ------------------------------ tests/BoundingBox/BoundingBoxTest.cpp | 77 +++++++++++++++++++++++++++++++++++ tests/BoundingBox/CMakeLists.txt | 47 +++++++++++++++++++++ tests/CMakeLists.txt | 1 + 4 files changed, 125 insertions(+), 66 deletions(-) create mode 100644 tests/BoundingBox/BoundingBoxTest.cpp create mode 100644 tests/BoundingBox/CMakeLists.txt diff --git a/src/BoundingBox.cpp b/src/BoundingBox.cpp index bd236bbd7..ecf810fa8 100644 --- a/src/BoundingBox.cpp +++ b/src/BoundingBox.cpp @@ -5,72 +5,6 @@ #include "Globals.h" #include "BoundingBox.h" #include "Defines.h" -#include "SelfTests.h" - - - - - -#ifdef SELF_TEST - -/** A simple self-test that is executed on program start, used to verify bbox functionality */ -static class SelfTest_BoundingBox -{ -public: - SelfTest_BoundingBox(void) - { - cSelfTests::Get().Register(cSelfTests::SelfTestFunction(&Test), "Bounding box intersections"); - } - - static void Test(void) - { - Vector3d Min(1, 1, 1); - Vector3d Max(2, 2, 2); - Vector3d LineDefs[] = - { - Vector3d(1.5, 4, 1.5), Vector3d(1.5, 3, 1.5), // Should intersect at 2, face 1 (YP) - Vector3d(1.5, 0, 1.5), Vector3d(1.5, 4, 1.5), // Should intersect at 0.25, face 0 (YM) - Vector3d(0, 0, 0), Vector3d(2, 2, 2), // Should intersect at 0.5, face 0, 3 or 5 (anyM) - Vector3d(0.999, 0, 1.5), Vector3d(0.999, 4, 1.5), // Should not intersect - Vector3d(1.999, 0, 1.5), Vector3d(1.999, 4, 1.5), // Should intersect at 0.25, face 0 (YM) - Vector3d(2.001, 0, 1.5), Vector3d(2.001, 4, 1.5), // Should not intersect - } ; - bool Results[] = {true, true, true, false, true, false}; - double LineCoeffs[] = {2, 0.25, 0.5, 0, 0.25, 0}; - - for (size_t i = 0; i < ARRAYCOUNT(LineDefs) / 2; i++) - { - double LineCoeff; - eBlockFace Face; - Vector3d Line1 = LineDefs[2 * i]; - Vector3d Line2 = LineDefs[2 * i + 1]; - bool res = cBoundingBox::CalcLineIntersection(Min, Max, Line1, Line2, LineCoeff, Face); - if (res != Results[i]) - { - LOGERROR("LineIntersection({%.02f, %.02f, %.02f}, {%.02f, %.02f, %.02f}) -> %d, %.05f, %d", - Line1.x, Line1.y, Line1.z, - Line2.x, Line2.y, Line2.z, - res ? 1 : 0, LineCoeff, Face - ); - abort(); - } - if (res) - { - if (LineCoeff != LineCoeffs[i]) - { - LOGERROR("LineIntersection({%.02f, %.02f, %.02f}, {%.02f, %.02f, %.02f}) -> %d, %.05f, %d", - Line1.x, Line1.y, Line1.z, - Line2.x, Line2.y, Line2.z, - res ? 1 : 0, LineCoeff, Face - ); - abort(); - } - } - } // for i - LineDefs[] - } -} g_BoundingBoxTest; - -#endif diff --git a/tests/BoundingBox/BoundingBoxTest.cpp b/tests/BoundingBox/BoundingBoxTest.cpp new file mode 100644 index 000000000..e3df95efa --- /dev/null +++ b/tests/BoundingBox/BoundingBoxTest.cpp @@ -0,0 +1,77 @@ + +// ByteBufferTest.cpp + +// Implements the main app entrypoint for the cByteBuffer class test + +#include "Globals.h" +#include "BoundingBox.h" + + + + + +/** Runs the tests, returns the number of failed tests. */ +static int Test(void) +{ + int NumFailed = 0; + Vector3d Min(1, 1, 1); + Vector3d Max(2, 2, 2); + Vector3d LineDefs[] = + { + Vector3d(1.5, 4, 1.5), Vector3d(1.5, 3, 1.5), // Should intersect at 2, face 1 (YP) + Vector3d(1.5, 0, 1.5), Vector3d(1.5, 4, 1.5), // Should intersect at 0.25, face 0 (YM) + Vector3d(0, 0, 0), Vector3d(2, 2, 2), // Should intersect at 0.5, face 0, 3 or 5 (anyM) + Vector3d(0.999, 0, 1.5), Vector3d(0.999, 4, 1.5), // Should not intersect + Vector3d(1.999, 0, 1.5), Vector3d(1.999, 4, 1.5), // Should intersect at 0.25, face 0 (YM) + Vector3d(2.001, 0, 1.5), Vector3d(2.001, 4, 1.5), // Should not intersect + } ; + bool Results[] = {true, true, true, false, true, false}; + double LineCoeffs[] = {2, 0.25, 0.5, 0, 0.25, 0}; + + for (size_t i = 0; i < ARRAYCOUNT(LineDefs) / 2; i++) + { + double LineCoeff; + eBlockFace Face; + Vector3d Line1 = LineDefs[2 * i]; + Vector3d Line2 = LineDefs[2 * i + 1]; + bool res = cBoundingBox::CalcLineIntersection(Min, Max, Line1, Line2, LineCoeff, Face); + if (res != Results[i]) + { + LOGERROR("LineIntersection({%.02f, %.02f, %.02f}, {%.02f, %.02f, %.02f}) -> %d, %.05f, %d", + Line1.x, Line1.y, Line1.z, + Line2.x, Line2.y, Line2.z, + res ? 1 : 0, LineCoeff, Face + ); + NumFailed += 1; + } + if (res) + { + if (LineCoeff != LineCoeffs[i]) + { + LOGERROR("LineIntersection({%.02f, %.02f, %.02f}, {%.02f, %.02f, %.02f}) -> %d, %.05f, %d", + Line1.x, Line1.y, Line1.z, + Line2.x, Line2.y, Line2.z, + res ? 1 : 0, LineCoeff, Face + ); + NumFailed += 1; + } + } + } // for i - LineDefs[] + return 0; +} + + + + + +int main(int argc, char * argv[]) +{ + auto NumFailed = Test(); + LOG("BoundingBox test finished, number of failed tests: %d", NumFailed); + return NumFailed; +} + + + + + diff --git a/tests/BoundingBox/CMakeLists.txt b/tests/BoundingBox/CMakeLists.txt new file mode 100644 index 000000000..30cacc447 --- /dev/null +++ b/tests/BoundingBox/CMakeLists.txt @@ -0,0 +1,47 @@ +cmake_minimum_required (VERSION 2.6) + +enable_testing() +add_definitions(-DTEST_GLOBALS=1) + +include_directories(${CMAKE_SOURCE_DIR}/src/) + +add_definitions(-DTEST_GLOBALS=1) + +set (SHARED_SRCS + ${CMAKE_SOURCE_DIR}/src/BoundingBox.cpp + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp +) + +set (SHARED_HDRS + ${CMAKE_SOURCE_DIR}/src/BoundingBox.h + ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h +) + +set (SRCS + BoundingBoxTest.cpp +) + +if (MSVC) + # Add the MSVC-specific LeakFinder / StackTracer sources: + list (APPEND SHARED_SRCS ${CMAKE_SOURCE_DIR}/src/LeakFinder.cpp ${CMAKE_SOURCE_DIR}/src/StackWalker.cpp) + list (APPEND SHARED_HDRS ${CMAKE_SOURCE_DIR}/src/LeakFinder.h ${CMAKE_SOURCE_DIR}/src/StackWalker.h) +endif() + +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_flags_cxx("-Wno-error=float-equal") +endif() + +source_group("Shared" FILES ${SHARED_SRCS} ${SHARED_HDRS}) +source_group("Sources" FILES ${SRCS}) +add_executable(BoundingBox-exe ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS}) +add_test(NAME BoundingBox-test COMMAND BoundingBox-exe) + + + + + +# Put the projects into solution folders (MSVC): +set_target_properties( + BoundingBox-exe + PROPERTIES FOLDER Tests +) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 17ad2baa4..052a31835 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,6 +8,7 @@ endif() # include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +add_subdirectory(BoundingBox) add_subdirectory(ByteBuffer) add_subdirectory(ChunkData) add_subdirectory(CompositeChat) -- cgit v1.2.3 From 82e81c01a279547fc97d63fb69ba7018f2eb632d Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 19:39:51 +0100 Subject: SelfTests: Fixed missing override keyword in EchoServer. --- tests/Network/EchoServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Network/EchoServer.cpp b/tests/Network/EchoServer.cpp index 2a420fbac..fb5b06110 100644 --- a/tests/Network/EchoServer.cpp +++ b/tests/Network/EchoServer.cpp @@ -75,7 +75,7 @@ class cEchoLinkCallbacks: class cEchoServerCallbacks: public cNetwork::cListenCallbacks { - virtual cTCPLink::cCallbacksPtr OnIncomingConnection(const AString & a_RemoteIPAddress, UInt16 a_RemotePort) + virtual cTCPLink::cCallbacksPtr OnIncomingConnection(const AString & a_RemoteIPAddress, UInt16 a_RemotePort) override { LOGD("New incoming connection(%s:%d).", a_RemoteIPAddress.c_str(), a_RemotePort); return std::make_shared(); -- cgit v1.2.3 From aa4b3ebf2f0165a20e636c9fba940649abadcb18 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 13 Mar 2016 19:57:25 +0100 Subject: SelfTests: Fixed HTTPMessageParser tests for out-of-source builds. --- tests/HTTP/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/HTTP/CMakeLists.txt b/tests/HTTP/CMakeLists.txt index 55552c095..76f768945 100644 --- a/tests/HTTP/CMakeLists.txt +++ b/tests/HTTP/CMakeLists.txt @@ -44,19 +44,19 @@ add_executable(HTTPMessageParser_file-exe HTTPMessageParser_file.cpp) target_link_libraries(HTTPMessageParser_file-exe HTTP) # 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 HTTPResponse1.data 2) +add_test(NAME HTTPMessageParser_file-test1-2 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPResponse1.data 2) # Test parsing the response file in 128-byte chunks (should parse response line and part of headers in one step, the rest in another step): -add_test(NAME HTTPMessageParser_file-test1-128 COMMAND HTTPMessageParser_file-exe HTTPResponse1.data 128) +add_test(NAME HTTPMessageParser_file-test1-128 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPResponse1.data 128) # Test parsing a chunked-encoding response: -add_test(NAME HTTPMessageParser_file-test2 COMMAND HTTPMessageParser_file-exe HTTPResponse2.data) +add_test(NAME HTTPMessageParser_file-test2 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPResponse2.data) # Test parsing the request file in 2-byte chunks (should go from request line parsing through headers parsing to body parsing, each within a different step): -add_test(NAME HTTPMessageParser_file-test3-2 COMMAND HTTPMessageParser_file-exe HTTPRequest1.data 2) +add_test(NAME HTTPMessageParser_file-test3-2 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPRequest1.data 2) # 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 HTTPRequest1.data 512) +add_test(NAME HTTPMessageParser_file-test4-512 COMMAND HTTPMessageParser_file-exe ${CMAKE_CURRENT_SOURCE_DIR}/HTTPRequest1.data 512) -- cgit v1.2.3 From 36eefbf0f25c93ed30bcff9d7abbb8b8696964df Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 10 Jun 2016 20:18:49 +0200 Subject: SelfTests: Removed the unneeded cSelfTests class. --- src/CMakeLists.txt | 2 - src/Generating/PieceGenerator.cpp | 1 - src/Generating/PrefabPiecePool.cpp | 1 - src/OSSupport/NetworkInterfaceEnum.cpp | 1 - src/Root.cpp | 6 --- src/SelfTests.cpp | 71 ---------------------------------- src/SelfTests.h | 51 ------------------------ tests/LoadablePieces/Stubs.cpp | 28 -------------- 8 files changed, 161 deletions(-) delete mode 100644 src/SelfTests.cpp delete mode 100644 src/SelfTests.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5c57be1c9..76a18801d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -63,7 +63,6 @@ SET (SRCS RCONServer.cpp Root.cpp Scoreboard.cpp - SelfTests.cpp Server.cpp SetChunkData.cpp SpawnPrepare.cpp @@ -140,7 +139,6 @@ SET (HDRS RCONServer.h Root.h Scoreboard.h - SelfTests.h Server.h SetChunkData.h SettingsRepositoryInterface.h diff --git a/src/Generating/PieceGenerator.cpp b/src/Generating/PieceGenerator.cpp index d6204ce85..842ac349b 100644 --- a/src/Generating/PieceGenerator.cpp +++ b/src/Generating/PieceGenerator.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "PieceGenerator.h" -#include "../SelfTests.h" #include "VerticalStrategy.h" #include "VerticalLimit.h" diff --git a/src/Generating/PrefabPiecePool.cpp b/src/Generating/PrefabPiecePool.cpp index e1bb9f684..417f8ce7e 100644 --- a/src/Generating/PrefabPiecePool.cpp +++ b/src/Generating/PrefabPiecePool.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "PrefabPiecePool.h" #include "../Bindings/LuaState.h" -#include "SelfTests.h" #include "WorldStorage/SchematicFileSerializer.h" #include "VerticalStrategy.h" #include "../StringCompression.h" diff --git a/src/OSSupport/NetworkInterfaceEnum.cpp b/src/OSSupport/NetworkInterfaceEnum.cpp index c7339c408..d3a254c23 100644 --- a/src/OSSupport/NetworkInterfaceEnum.cpp +++ b/src/OSSupport/NetworkInterfaceEnum.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "Network.h" #include "event2/util.h" -#include "../SelfTests.h" #ifdef _WIN32 #include diff --git a/src/Root.cpp b/src/Root.cpp index bd8e026f3..1eca73cb2 100644 --- a/src/Root.cpp +++ b/src/Root.cpp @@ -22,7 +22,6 @@ #include "IniFile.h" #include "SettingsRepositoryInterface.h" #include "OverridesSettingsRepository.h" -#include "SelfTests.h" #include "Logger.h" #include @@ -128,11 +127,6 @@ void cRoot::Start(std::unique_ptr a_OverridesRepo) LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME); #endif - // Run the self-tests registered previously via cSelfTests::Register(): - #ifdef SELF_TEST - cSelfTests::ExecuteAll(); - #endif - cDeadlockDetect dd; auto BeginTime = std::chrono::steady_clock::now(); diff --git a/src/SelfTests.cpp b/src/SelfTests.cpp deleted file mode 100644 index 7e35e675e..000000000 --- a/src/SelfTests.cpp +++ /dev/null @@ -1,71 +0,0 @@ - -// SelfTests.h - -// Implements the cSelfTests class representing the singleton used for registering self-tests -// This class is only declared if SELF_TEST macro is defined. - -#include "Globals.h" -#include "SelfTests.h" - - - - - -#ifdef SELF_TEST - cSelfTests::cSelfTests(void): - m_AllowRegistering(true) - { - } - - - - - - cSelfTests & cSelfTests::Get(void) - { - static cSelfTests singleton; - return singleton; - } - - - - - - void cSelfTests::Register(cSelfTests::SelfTestFunction a_FnToExecute, const AString & a_TestName) - { - ASSERT(Get().m_AllowRegistering); - Get().m_SelfTests.push_back(std::make_pair(a_FnToExecute, a_TestName)); - } - - - - - - void cSelfTests::ExecuteAll(void) - { - Get().m_AllowRegistering = false; - LOG("--- Performing self-tests ---"); - for (auto & test: Get().m_SelfTests) - { - LOG("Performing self-test: %s", test.second.c_str()); - try - { - test.first(); - } - catch (const std::exception & exc) - { - LOGWARNING("Exception in test %s: %s", test.second.c_str(), exc.what()); - } - catch (...) - { - LOGWARNING("Unknown exception in test %s", test.second.c_str()); - } - } // for test - m_SelfTests[] - LOG("--- Self-tests finished ---"); - } - -#endif // SELF_TEST - - - - diff --git a/src/SelfTests.h b/src/SelfTests.h deleted file mode 100644 index 03a3b5faa..000000000 --- a/src/SelfTests.h +++ /dev/null @@ -1,51 +0,0 @@ - -// SelfTests.h - -// Declares the cSelfTests class representing the singleton used for registering self-tests -// This class is only declared if SELF_TEST macro is defined. - - - - - -#pragma once - - - - - -#ifdef SELF_TEST - /** Singleton containing registered self-tests. - Used to schedule self-tests to run after the logging framework is initialized (#2228). */ - class cSelfTests - { - public: - /** Returns the singleton instance of this class. */ - static cSelfTests & Get(void); - - // typedef void (* SelfTestFunction)(void); - typedef std::function SelfTestFunction; - - /** Registers a self-test to be executed once the logging framework is initialized. */ - static void Register(SelfTestFunction a_FnToExecute, const AString & a_TestName); - - /** Executes all the registered self-tests. */ - static void ExecuteAll(void); - - protected: - typedef std::vector> SelfTestFunctions; - - /** Functions (registered self-tests) to call once the logging framework is initialized. */ - SelfTestFunctions m_SelfTests; - - /** If true, tests may be registered. Set to false once the tests are executed, to detect tests that are registered too late. */ - bool m_AllowRegistering; - - - cSelfTests(void); - }; -#endif // SELF_TEST - - - - diff --git a/tests/LoadablePieces/Stubs.cpp b/tests/LoadablePieces/Stubs.cpp index 5fbd7b599..717b5679c 100644 --- a/tests/LoadablePieces/Stubs.cpp +++ b/tests/LoadablePieces/Stubs.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "BlockInfo.h" -#include "SelfTests.h" #include "Bindings.h" #include "Bindings/DeprecatedBindings.h" #include "Bindings/LuaJson.h" @@ -272,30 +271,3 @@ cBlockEntity * cBlockEntity::CreateByBlockType(BLOCKTYPE a_BlockType, NIBBLETYPE - -cSelfTests::cSelfTests(void): - m_AllowRegistering(true) -{ -} - - - - - -cSelfTests & cSelfTests::Get(void) -{ - static cSelfTests singleton; - return singleton; -} - - - - - -void cSelfTests::Register(cSelfTests::SelfTestFunction a_TestFn, const AString & a_TestName) -{ -} - - - - -- cgit v1.2.3 From ea47247dc72a7ee44f97628e45c5b6867f46bedf Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 16 Jun 2016 17:34:17 +0200 Subject: SelfTests: Print a quick message on test start. --- tests/BoundingBox/BoundingBoxTest.cpp | 3 +++ tests/ByteBuffer/ByteBufferTest.cpp | 8 ++++++++ tests/ChunkData/ArraytoCoord.cpp | 2 ++ tests/ChunkData/Coordinates.cpp | 2 ++ tests/ChunkData/Copies.cpp | 2 ++ tests/ChunkData/CopyBlocks.cpp | 2 ++ tests/ChunkData/creatable.cpp | 2 ++ tests/CompositeChat/CompositeChatTest.cpp | 12 ++++++++++++ tests/HTTP/HTTPMessageParser_file.cpp | 2 +- tests/LoadablePieces/LoadablePieces.cpp | 2 ++ tests/Network/EnumInterfaces.cpp | 1 + tests/Network/Google.cpp | 3 +++ tests/Network/NameLookup.cpp | 5 +++++ 13 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tests/BoundingBox/BoundingBoxTest.cpp b/tests/BoundingBox/BoundingBoxTest.cpp index e3df95efa..988a2181e 100644 --- a/tests/BoundingBox/BoundingBoxTest.cpp +++ b/tests/BoundingBox/BoundingBoxTest.cpp @@ -66,6 +66,9 @@ static int Test(void) int main(int argc, char * argv[]) { + LOGD("Test started"); + + LOGD("Running test"); auto NumFailed = Test(); LOG("BoundingBox test finished, number of failed tests: %d", NumFailed); return NumFailed; diff --git a/tests/ByteBuffer/ByteBufferTest.cpp b/tests/ByteBuffer/ByteBufferTest.cpp index 98a802554..ddfe9e1d2 100644 --- a/tests/ByteBuffer/ByteBufferTest.cpp +++ b/tests/ByteBuffer/ByteBufferTest.cpp @@ -68,9 +68,17 @@ static void TestWrap(void) int main(int argc, char * argv[]) { + LOGD("Test started"); + + LOGD("Testing reads"); TestRead(); + + LOGD("Testing writes"); TestWrite(); + + LOGD("Testing wraps"); TestWrap(); + LOG("ByteBuffer test finished."); } diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp index 9d0ca6c8c..19f7ef105 100644 --- a/tests/ChunkData/ArraytoCoord.cpp +++ b/tests/ChunkData/ArraytoCoord.cpp @@ -6,6 +6,8 @@ int main(int argc, char** argv) { + LOGD("Test started"); + class cMockAllocationPool : public cAllocationPool { diff --git a/tests/ChunkData/Coordinates.cpp b/tests/ChunkData/Coordinates.cpp index 1aabb5374..384af7e03 100644 --- a/tests/ChunkData/Coordinates.cpp +++ b/tests/ChunkData/Coordinates.cpp @@ -6,6 +6,8 @@ int main(int argc, char** argv) { + LOGD("Test started"); + class cMockAllocationPool : public cAllocationPool { diff --git a/tests/ChunkData/Copies.cpp b/tests/ChunkData/Copies.cpp index 440819e91..6353d7273 100644 --- a/tests/ChunkData/Copies.cpp +++ b/tests/ChunkData/Copies.cpp @@ -6,6 +6,8 @@ int main(int argc, char** argv) { + LOGD("Test started"); + class cMockAllocationPool : public cAllocationPool { diff --git a/tests/ChunkData/CopyBlocks.cpp b/tests/ChunkData/CopyBlocks.cpp index 99f416e94..b76b2d420 100644 --- a/tests/ChunkData/CopyBlocks.cpp +++ b/tests/ChunkData/CopyBlocks.cpp @@ -16,6 +16,8 @@ int main(int argc, char ** argv) { + LOGD("Test started"); + // Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02: class cMockAllocationPool : public cAllocationPool diff --git a/tests/ChunkData/creatable.cpp b/tests/ChunkData/creatable.cpp index fc786f688..a879c3dd7 100644 --- a/tests/ChunkData/creatable.cpp +++ b/tests/ChunkData/creatable.cpp @@ -4,6 +4,8 @@ int main(int argc, char** argv) { + LOGD("Test started"); + class cMockAllocationPool : public cAllocationPool { diff --git a/tests/CompositeChat/CompositeChatTest.cpp b/tests/CompositeChat/CompositeChatTest.cpp index 12d9de673..65d05b6f1 100644 --- a/tests/CompositeChat/CompositeChatTest.cpp +++ b/tests/CompositeChat/CompositeChatTest.cpp @@ -98,11 +98,23 @@ static void TestParser5(void) int main(int argc, char * argv[]) { + LOGD("Test started."); + + LOGD("Running tests: 1"); TestParser1(); + + LOGD("Running tests: 2"); TestParser2(); + + LOGD("Running tests: 3"); TestParser3(); + + LOGD("Running tests: 4"); TestParser4(); + + LOGD("Running tests: 5"); TestParser5(); + LOG("CompositeChat test finished."); } diff --git a/tests/HTTP/HTTPMessageParser_file.cpp b/tests/HTTP/HTTPMessageParser_file.cpp index cd6dfa605..8675dd2a5 100644 --- a/tests/HTTP/HTTPMessageParser_file.cpp +++ b/tests/HTTP/HTTPMessageParser_file.cpp @@ -71,7 +71,7 @@ public: int main(int argc, char * argv[]) { - printf("HTTPMessageParser_file beginning\n"); + LOGD("Test started"); // Open the input file: if (argc <= 1) diff --git a/tests/LoadablePieces/LoadablePieces.cpp b/tests/LoadablePieces/LoadablePieces.cpp index cce43eee1..c4c44e3db 100644 --- a/tests/LoadablePieces/LoadablePieces.cpp +++ b/tests/LoadablePieces/LoadablePieces.cpp @@ -41,6 +41,8 @@ static int DoTest(void) int main(int argc, char * argv[]) { + LOGD("Test started"); + // Print the current directory for reference: char folder[FILENAME_MAX]; GetCurrentFolder(folder, sizeof(folder)); diff --git a/tests/Network/EnumInterfaces.cpp b/tests/Network/EnumInterfaces.cpp index a24158c62..e4c6be219 100644 --- a/tests/Network/EnumInterfaces.cpp +++ b/tests/Network/EnumInterfaces.cpp @@ -15,6 +15,7 @@ int main(int argc, char * argv[]) { // Initialize the cNetwork subsystem: + LOGD("Initializing cNetwork..."); cNetworkSingleton::Get().Initialise(); // Enumerate all the addresses: diff --git a/tests/Network/Google.cpp b/tests/Network/Google.cpp index 23017d23b..4332828d6 100644 --- a/tests/Network/Google.cpp +++ b/tests/Network/Google.cpp @@ -118,7 +118,10 @@ static void DoTest(void) int main() { + LOGD("Initializing cNetwork...\n"); cNetworkSingleton::Get().Initialise(); + + LOGD("Testing..."); DoTest(); cNetworkSingleton::Get().Terminate(); diff --git a/tests/Network/NameLookup.cpp b/tests/Network/NameLookup.cpp index 4781a59ec..2904a0199 100644 --- a/tests/Network/NameLookup.cpp +++ b/tests/Network/NameLookup.cpp @@ -79,7 +79,12 @@ static void DoTest(void) int main() { + LOGD("Initializing cNetwork..."); + cNetworkSingleton::Get().Initialise(); + + LOGD("Running test..."); DoTest(); + cNetworkSingleton::Get().Terminate(); LOGD("Network test finished"); return 0; -- cgit v1.2.3 From 96034810dfae37ec0b489ae5d3feb5b756e34e67 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 17 Jun 2016 13:43:58 +0200 Subject: Flush immediately after each line when running tests. --- src/Globals.h | 109 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 54 deletions(-) diff --git a/src/Globals.h b/src/Globals.h index dd331cd34..25d2f740e 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -255,72 +255,73 @@ template class SizeChecker; #ifndef TEST_GLOBALS -// These fiunctions are defined in Logger.cpp, but are declared here to avoid including all of logger.h -extern void LOG (const char * a_Format, ...) FORMATSTRING(1, 2); -extern void LOGINFO (const char * a_Format, ...) FORMATSTRING(1, 2); -extern void LOGWARNING(const char * a_Format, ...) FORMATSTRING(1, 2); -extern void LOGERROR (const char * a_Format, ...) FORMATSTRING(1, 2); - - - - + // These functions are defined in Logger.cpp, but are declared here to avoid including all of logger.h + extern void LOG (const char * a_Format, ...) FORMATSTRING(1, 2); + extern void LOGINFO (const char * a_Format, ...) FORMATSTRING(1, 2); + extern void LOGWARNING(const char * a_Format, ...) FORMATSTRING(1, 2); + extern void LOGERROR (const char * a_Format, ...) FORMATSTRING(1, 2); + + // In debug builds, translate LOGD to LOG, otherwise leave it out altogether: + #ifdef _DEBUG + #define LOGD LOG + #else + #define LOGD(...) + #endif // _DEBUG -// In debug builds, translate LOGD to LOG, otherwise leave it out altogether: -#ifdef _DEBUG - #define LOGD LOG -#else - #define LOGD(...) -#endif // _DEBUG + #define LOGWARN LOGWARNING -#define LOGWARN LOGWARNING #else // Logging functions -void inline LOGERROR(const char * a_Format, ...) FORMATSTRING(1, 2); + void inline LOGERROR(const char * a_Format, ...) FORMATSTRING(1, 2); -void inline LOGERROR(const char * a_Format, ...) -{ - va_list argList; - va_start(argList, a_Format); - vprintf(a_Format, argList); - putchar('\n'); - va_end(argList); -} + void inline LOGERROR(const char * a_Format, ...) + { + va_list argList; + va_start(argList, a_Format); + vprintf(a_Format, argList); + putchar('\n'); + fflush(stdout); + va_end(argList); + } -void inline LOGWARNING(const char * a_Format, ...) FORMATSTRING(1, 2); + void inline LOGWARNING(const char * a_Format, ...) FORMATSTRING(1, 2); -void inline LOGWARNING(const char * a_Format, ...) -{ - va_list argList; - va_start(argList, a_Format); - vprintf(a_Format, argList); - putchar('\n'); - va_end(argList); -} + void inline LOGWARNING(const char * a_Format, ...) + { + va_list argList; + va_start(argList, a_Format); + vprintf(a_Format, argList); + putchar('\n'); + fflush(stdout); + va_end(argList); + } -void inline LOGD(const char * a_Format, ...) FORMATSTRING(1, 2); + void inline LOGD(const char * a_Format, ...) FORMATSTRING(1, 2); -void inline LOGD(const char * a_Format, ...) -{ - va_list argList; - va_start(argList, a_Format); - vprintf(a_Format, argList); - putchar('\n'); - va_end(argList); -} + void inline LOGD(const char * a_Format, ...) + { + va_list argList; + va_start(argList, a_Format); + vprintf(a_Format, argList); + putchar('\n'); + fflush(stdout); + va_end(argList); + } -void inline LOG(const char * a_Format, ...) FORMATSTRING(1, 2); + void inline LOG(const char * a_Format, ...) FORMATSTRING(1, 2); -void inline LOG(const char * a_Format, ...) -{ - va_list argList; - va_start(argList, a_Format); - vprintf(a_Format, argList); - putchar('\n'); - va_end(argList); -} + void inline LOG(const char * a_Format, ...) + { + va_list argList; + va_start(argList, a_Format); + vprintf(a_Format, argList); + putchar('\n'); + fflush(stdout); + va_end(argList); + } -#define LOGINFO LOG -#define LOGWARN LOGWARNING + #define LOGINFO LOG + #define LOGWARN LOGWARNING #endif -- cgit v1.2.3 From 4d9769a4840791659e1588b3afa2ef396c181b37 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 17 Jun 2016 13:44:16 +0200 Subject: SelfTests: More logging for EnumInterfaces. --- tests/Network/EnumInterfaces.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Network/EnumInterfaces.cpp b/tests/Network/EnumInterfaces.cpp index e4c6be219..0b716acff 100644 --- a/tests/Network/EnumInterfaces.cpp +++ b/tests/Network/EnumInterfaces.cpp @@ -23,13 +23,14 @@ int main(int argc, char * argv[]) auto IPs = cNetwork::EnumLocalIPAddresses(); for (auto & ip: IPs) { - printf(" %s\n", ip.c_str()); + LOGD(" %s", ip.c_str()); } - printf("Done.\n"); + LOGD("All addresses enumerated."); // Terminate the cNetwork subsystem: cNetworkSingleton::Get().Terminate(); + LOGD("Test finished."); return 0; } -- cgit v1.2.3 From 8610083a8e8ad66806c66d0199d0d8a900ceb358 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Fri, 17 Jun 2016 16:25:31 +0200 Subject: cNetwork: Fixed possible hang when terminating immediately after init. --- src/OSSupport/NetworkSingleton.cpp | 21 +++++++++++++++++++-- src/OSSupport/NetworkSingleton.h | 8 ++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/OSSupport/NetworkSingleton.cpp b/src/OSSupport/NetworkSingleton.cpp index c16f92c5a..d0abafcbd 100644 --- a/src/OSSupport/NetworkSingleton.cpp +++ b/src/OSSupport/NetworkSingleton.cpp @@ -6,7 +6,6 @@ #include "Globals.h" #include "NetworkSingleton.h" -#include #include #include #include @@ -91,8 +90,11 @@ void cNetworkSingleton::Initialise(void) } // Create the event loop thread: - m_EventLoopThread = std::thread(RunEventLoop, this); m_HasTerminated = false; + m_StartupEvent.reset(new cEvent); + m_EventLoopThread = std::thread(RunEventLoop, this); + m_StartupEvent->Wait(); // Wait for the LibEvent loop to actually start running (otherwise calling Terminate too soon would hang, see #3228) + m_StartupEvent.reset(); // Don't need the cEvent any more, release all its resources } @@ -153,6 +155,9 @@ void cNetworkSingleton::LogCallback(int a_Severity, const char * a_Msg) void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self) { + auto timer = evtimer_new(a_Self->m_EventBase, SignalizeStartup, a_Self); + timeval timeout{}; // Zero timeout - execute immediately + evtimer_add(timer, &timeout); event_base_loop(a_Self->m_EventBase, EVLOOP_NO_EXIT_ON_EMPTY); } @@ -160,6 +165,18 @@ void cNetworkSingleton::RunEventLoop(cNetworkSingleton * a_Self) +void cNetworkSingleton::SignalizeStartup(evutil_socket_t a_Socket, short a_Events, void * a_Self) +{ + auto self = reinterpret_cast(a_Self); + ASSERT(self != nullptr); + ASSERT(self->m_StartupEvent != nullptr); + self->m_StartupEvent->Set(); +} + + + + + void cNetworkSingleton::AddHostnameLookup(cHostnameLookupPtr a_HostnameLookup) { ASSERT(!m_HasTerminated); diff --git a/src/OSSupport/NetworkSingleton.h b/src/OSSupport/NetworkSingleton.h index c72df38ec..75713d261 100644 --- a/src/OSSupport/NetworkSingleton.h +++ b/src/OSSupport/NetworkSingleton.h @@ -13,6 +13,7 @@ #pragma once +#include #include "Network.h" #include "CriticalSection.h" #include "Event.h" @@ -127,11 +128,18 @@ protected: /** The thread in which the main LibEvent loop runs. */ std::thread m_EventLoopThread; + /** Event that is signalled once the startup is finished and the LibEvent loop is running. */ + UniquePtr m_StartupEvent; + + /** Converts LibEvent-generated log events into log messages in MCS log. */ static void LogCallback(int a_Severity, const char * a_Msg); /** Implements the thread that runs LibEvent's event dispatcher loop. */ static void RunEventLoop(cNetworkSingleton * a_Self); + + /** Callback called by LibEvent when the event loop is started. */ + static void SignalizeStartup(evutil_socket_t a_Socket, short a_Events, void * a_Self); }; -- cgit v1.2.3