* reworked testing setup

* now generates a large binary which
  executes all tests for the github
  action

Author: lpcvoid

CMakeLists.txt

@@ -1,12 +1,26 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.15)
 project(netlib)
 set(CMAKE_CXX_STANDARD 20)
 
-set(NETLIB_SRC src/netlib.hpp src/socket.hpp src/error.hpp src/client.hpp
-        src/server.hpp src/service_resolver.hpp
-        src/endpoint_accessor.hpp src/thread_pool.hpp)
+set(NETLIB_SRC
+        src/netlib.hpp
+        src/socket.hpp
+        src/error.hpp
+        src/client.hpp
+        src/server.hpp
+        src/service_resolver.hpp
+        src/endpoint_accessor.hpp
+        src/thread_pool.hpp)
 
-# doctest
-include_directories(3rdparty)
-add_subdirectory(tests)
-add_subdirectory(examples)
+option(BUILD_TESTS "Build tests" ON)
+option(BUILD_EXAMPLES "Build example programs" ON)
+
+if(BUILD_TESTS)
+    # doctest
+    include_directories(3rdparty)
+    add_subdirectory(tests)
+endif()
+
+if (BUILD_EXAMPLES)
+    add_subdirectory(examples)
+endif()

README.md

@@ -18,9 +18,20 @@ after trying ASIO, which I found way to heavy for my tastes.
 ### How?
 
 You can just add this repo as a git submodule, which at this point is
-probably (IMO) the best way to handle C++ dependencies. Just `#include "netlib.hpp"`
-somewhere.
+probably (IMO) the best way to handle C++ dependencies.
 
+```shell
+git submodule add https://github.com/lpcvoid/cpp-net-lib.git extern/cpp-net-lib
+```
+
+This will check out the lib as a submodule within your project. Now just `#include "extern/netlib.hpp"` somewhere.
+
+There are some cmake flags you can use:
+
+| Option | Default | Description  |
+|---|---|---|
+| __BUILD_TESTS__ | __ON__ | Builds tests using `doctest`,which is then introduced as a dependency.  |
+| __BUILD_EXAMPLES__ | __ON__  | Builds some small example programs. |
 
 ### Short introduction
 

tests/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TEST_SOURCES test_client_examplecom.cpp test_client_server.cpp test_client_server_disconnect.cpp)
 
-foreach (testsource ${TEST_SOURCES})
-    string(REPLACE ".cpp" "" testname ${testsource})
-    add_executable(${testname} ${testsource})
-endforeach (testsource ${TEST_SOURCES})
+enable_testing()
+add_executable(test_libnetcpp test_main.cpp ${TEST_SOURCES})
+target_link_libraries(test_libnetcpp pthread)
+add_test(test_libnetcpp test_libnetcpp)

tests/test_client_examplecom.cpp

@@ -1,4 +1,3 @@
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "../3rdparty/doctest/doctest/doctest.h"
 #include "../src/netlib.hpp"
 

tests/test_client_server.cpp

@@ -1,13 +1,19 @@
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "../3rdparty/doctest/doctest/doctest.h"
 #include "../src/netlib.hpp"
+#include <random>
+#include <sstream>
 
 using namespace std::chrono_literals;
 
 static const std::string hello_msg = "hello!";
 static const std::vector<uint8_t> client_message = {1,2,3};
 static const std::vector<uint8_t> server_response_message = {1, 3, 3, 7};
-static const uint16_t test_port = 8888;
+
+std::random_device rd;
+std::mt19937 gen(rd());
+std::uniform_int_distribution<> distr(10000, 65000);
+
+static uint16_t test_port = distr(gen);
 
 std::string to_hex_array(const std::vector<uint8_t> &data) {
   std::stringstream stream;

tests/test_client_server_disconnect.cpp

@@ -1,4 +1,3 @@
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "../3rdparty/doctest/doctest/doctest.h"
 #include "../src/netlib.hpp"
 

tests/test_main.cpp

@@ -0,0 +1,8 @@
+#define DOCTEST_CONFIG_IMPLEMENT
+#include "../3rdparty/doctest/doctest/doctest.h"
+
+int main(int argc, char** argv) {
+  doctest::Context context;
+  context.applyCommandLine(argc, argv);
+  return context.run();
+}