Also support Boost 1.65 and fix tester

Somehow the runner was segfaulting with the CMake steps. Didn't want to
find out why, instead used the default runner main with auto test
suites/cases.

CMakeLists.txt

@@ -12,11 +12,11 @@ FIND_PACKAGE(Threads REQUIRED)
 SET(Boost_USE_MULTITHREAD ON)
 SET(Boost_USE_STATIC_LIBS OFF)
 
-FIND_PACKAGE(Boost 1.70.0
+FIND_PACKAGE(Boost 1.65.0
     COMPONENTS system thread unit_test_framework test_exec_monitor
     REQUIRED)
 
-#LINK_LIBRARIES(${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
+LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 # https://cmake.org/cmake/help/latest/prop_tgt/CXX_STANDARD.html
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

containers/issue1

@@ -0,0 +1,11 @@
+FROM ubuntu:18.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN \
+        apt update; \
+        apt -qqyy install build-essential git cmake libboost-all-dev
+
+RUN git clone https://github.com/sehe/msghub --depth 1 -b cmake
+WORKDIR /msghub
+RUN cmake . && make
+
+CMD ["/bin/bash", "-c", "(./examples/server & ./examples/client ; kill %1; wait)"]

src/CMakeLists.txt

@@ -9,7 +9,6 @@ SET(MSGHUB_SRC
 ADD_LIBRARY(msghub STATIC ${MSGHUB_SRC})
 TARGET_COMPILE_DEFINITIONS(msghub PUBLIC "-DBOOST_BIND_NO_PLACEHOLDERS=1")
 TARGET_INCLUDE_DIRECTORIES(msghub SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
-TARGET_LINK_DIRECTORIES(msghub PUBLIC ${Boost_LIBRARY_DIRS})
 TARGET_LINK_LIBRARIES(msghub Threads::Threads)
 TARGET_LINK_LIBRARIES(msghub ${Boost_SYSTEM_LIBRARY})
 TARGET_LINK_LIBRARIES(msghub ${Boost_THREAD_LIBRARY})

test/CMakeLists.txt

@@ -1,3 +1,4 @@
+ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
 ADD_EXECUTABLE(tester
     client_onserverfailure.cpp
     connect.cpp

test/connect.cpp

@@ -4,10 +4,10 @@
 #include <string>
 
 #include <boost/asio.hpp>
-#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
 
-void test_connect()
-{
+BOOST_AUTO_TEST_SUITE(message_hub)
+BOOST_AUTO_TEST_CASE(test_connect) {
 	{
 		boost::asio::io_service io_service;
 
@@ -17,4 +17,6 @@ void test_connect()
 		BOOST_CHECK(msghub1.connect("localhost", 0xBEE));
 		io_service.stop();
 	}
-}
+}
+
+BOOST_AUTO_TEST_SUITE_END()

test/create.cpp

@@ -4,9 +4,11 @@
 #include <string>
 
 #include <boost/asio.hpp>
-#include <boost/test/test_tools.hpp>
+#include <boost/test/unit_test.hpp>
 
-void test_create()
+BOOST_AUTO_TEST_SUITE(message_hub)
+
+BOOST_AUTO_TEST_CASE(test_create)
 {
 	// Create 2 instances with same address and port, second shoul fail
 	{
@@ -28,4 +30,6 @@ void test_create()
 		//io_service2.stop();
 	}
 
-}
+}
+
+BOOST_AUTO_TEST_SUITE_END()

test/main.cpp

@@ -1,32 +1,4 @@
-#include <boost/test/unit_test.hpp>
-
-using namespace boost;
-using namespace unit_test;
-
-void test_create();
-void test_connect();
-
-void test_subscribe();
-void test_unsubscribe();
-
-void test_client_onserverfailure();
-void test_server_oncleintfailure();
+#define BOOST_TEST_MAIN                                                                               [0/18287]
+#define BOOST_TEST_MODULE msghub
 
-void test_toobigmsg();
-void test_emptymsg();
-
-test_suite* init_unit_test_suite(int, char**)
-{
-	test_suite *test = BOOST_TEST_SUITE("messagehub test");
-
-	test->add(BOOST_TEST_CASE(&test_create));
-	test->add(BOOST_TEST_CASE(&test_connect));
-	test->add(BOOST_TEST_CASE(&test_subscribe));
-	//test->add(BOOST_TEST_CASE(&test_unsubscribe));
-	//test->add(BOOST_TEST_CASE(&test_client_onserverfailure));
-	//test->add(BOOST_TEST_CASE(&test_server_oncleintfailure));
-	//test->add(BOOST_TEST_CASE(&test_toobigmsg));
-	//test->add(BOOST_TEST_CASE(&test_emptymsg));
-
-	return test;
-}
+#include <boost/test/unit_test.hpp>

test/subscribe.cpp

@@ -5,14 +5,18 @@
 
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>
+#include <boost/test/unit_test_suite.hpp>
 #include <boost/test/unit_test_monitor.hpp>
 #include <boost/test/test_tools.hpp>
 
-std::mutex mutant;
-std::condition_variable newmessage;
-bool goodmessage = false;
+BOOST_AUTO_TEST_SUITE(message_hub)
+
+static std::mutex mutant;
+static std::condition_variable newmessage;
+static bool goodmessage = false;
 
 using namespace boost::unit_test;
+
 void test_create_on_message(const std::string& topic, std::vector<char> const& message)
 {
 	std::unique_lock<std::mutex> lock(mutant);
@@ -32,7 +36,7 @@ bool publish_message(msghub& msghub)
 	return true;
 }
 
-void test_subscribe()
+BOOST_AUTO_TEST_CASE(test_subscribe)
 {
 	boost::asio::io_service io_service;
 	msghub msghub(io_service);
@@ -46,3 +50,5 @@ void test_subscribe()
 	io_service.stop();
 	//io_service1.stop();
 }
+
+BOOST_AUTO_TEST_SUITE_END()