use static library version of Boost.Test

Author: jll63

test/test_compiler.cpp

@@ -12,7 +12,7 @@
 #include "test_util.hpp"
 
 #define BOOST_TEST_MODULE compiler
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost::openmethod;
 

test/test_core.cpp

@@ -7,7 +7,7 @@
 #include <type_traits>
 
 #define BOOST_TEST_MODULE core
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <boost/openmethod/registry.hpp>
 

test/test_custom_rtti.cpp

@@ -4,7 +4,7 @@
 // or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/utility/identity_type.hpp>
 
 #include <boost/openmethod.hpp>
@@ -448,7 +448,7 @@ struct custom_rtti : policies::deferred_static_rtti {
             if constexpr (is_polymorphic<T>) {
                 return type_id(T::static_type);
             } else {
-                return nullptr;
+                return type_id(0);
             }
         }
 
@@ -457,14 +457,14 @@ struct custom_rtti : policies::deferred_static_rtti {
             if constexpr (is_polymorphic<T>) {
                 return type_id(obj.type);
             } else {
-                return nullptr;
+                return type_id(0);
             }
         }
 
         template<class Stream>
         static void type_name(type_id type, Stream& stream) {
-            static const char* name[] = {"Animal", "Dog", "Cat"};
-            stream << (type == nullptr ? "?" : name[std::size_t(type)]);
+            static const char* name[] = {"?", "Animal", "Dog", "Cat"};
+            stream << name[std::size_t(type)];
         }
 
         static auto type_index(type_id type) {

test/test_dispatch.cpp

@@ -19,7 +19,7 @@
 #include "test_util.hpp"
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost::openmethod;
 

test/test_intrusive.cpp

@@ -19,8 +19,8 @@ struct test_registry
 #include <boost/openmethod/with_vptr.hpp>
 #include <boost/openmethod/compiler.hpp>
 
-#define BOOST_TEST_MODULE instrusive
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_MODULE intrusive
+#include <boost/test/unit_test.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 
 #include "test_util.hpp"

test/test_member_method.cpp

@@ -52,7 +52,7 @@ struct Payroll {
 BOOST_OPENMETHOD_REGISTER(Payroll::pay_functions);
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(member_method) {
     initialize();

test/test_n2216.cpp

@@ -18,7 +18,7 @@
 #include "test_util.hpp"
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost::openmethod;
 

test/test_pointer_to_method.cpp

@@ -9,7 +9,7 @@
 #include <string>
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using boost::openmethod::virtual_;
 

test/test_policies.cpp

@@ -6,8 +6,8 @@
 #include <iostream>
 #include <type_traits>
 
-#define BOOST_TEST_MODULE core
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_MODULE policies
+#include <boost/test/unit_test.hpp>
 
 #include <boost/openmethod/default_registry.hpp>
 

test/test_runtime_errors.cpp

@@ -14,7 +14,7 @@
 #include <sstream>
 
 #define BOOST_TEST_MODULE openmethod
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost::openmethod;
 using namespace test_matrices;
@@ -168,8 +168,8 @@ BOOST_OPENMETHOD_OVERRIDE(
 
 BOOST_AUTO_TEST_CASE(call_error) {
     auto report = initialize<registry>().report;
-    BOOST_TEST(report.not_implemented == 1);
-    BOOST_TEST(report.ambiguous == 1);
+    BOOST_TEST(report.not_implemented == 1u);
+    BOOST_TEST(report.ambiguous == 1u);
 
     {
         registry::capture capture;