diff --git a/CMakeLists.txt b/CMakeLists.txt index 2860325c..b084040b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,14 +40,17 @@ macro(GroupSources curdir) endforeach() endmacro() +include_directories (extras) include_directories (include) file(GLOB_RECURSE BEAST_INCLUDES ${PROJECT_SOURCE_DIR}/include/beast/*.hpp ${PROJECT_SOURCE_DIR}/include/beast/*.ipp + ${PROJECT_SOURCE_DIR}/extras/beast/*.hpp + ${PROJECT_SOURCE_DIR}/extras/beast/*.ipp ) -add_subdirectory (test) add_subdirectory (examples) +add_subdirectory (test) #enable_testing() diff --git a/Jamroot b/Jamroot index 67283bde..5013bd00 100644 --- a/Jamroot +++ b/Jamroot @@ -64,6 +64,7 @@ variant asan project beast : requirements . + ./extras ./include #/boost//headers /boost/system//boost_system diff --git a/extras/README.md b/extras/README.md new file mode 100644 index 00000000..ea6ffce9 --- /dev/null +++ b/extras/README.md @@ -0,0 +1,3 @@ +# Extras + +These are not part of the official public Beast interface but they are used by the tests and some third party programs. diff --git a/include/beast/detail/const_container.hpp b/extras/beast/detail/const_container.hpp similarity index 100% rename from include/beast/detail/const_container.hpp rename to extras/beast/detail/const_container.hpp diff --git a/include/beast/detail/stream/abstract_ostream.hpp b/extras/beast/unit_test/abstract_ostream.hpp similarity index 66% rename from include/beast/detail/stream/abstract_ostream.hpp rename to extras/beast/unit_test/abstract_ostream.hpp index 43a3c223..8a41841a 100644 --- a/include/beast/detail/stream/abstract_ostream.hpp +++ b/extras/beast/unit_test/abstract_ostream.hpp @@ -5,18 +5,16 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_STREAM_ABSTRACT_OSTREAM_HPP -#define BEAST_DETAIL_STREAM_ABSTRACT_OSTREAM_HPP +#ifndef BEAST_UNIT_TEST_ABSTRACT_OSTREAM_HPP +#define BEAST_UNIT_TEST_ABSTRACT_OSTREAM_HPP -#include +#include namespace beast { -namespace detail { /** An abstract ostream for `char`. */ using abstract_ostream = basic_abstract_ostream ; -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/amount.hpp b/extras/beast/unit_test/amount.hpp similarity index 89% rename from include/beast/detail/unit_test/amount.hpp rename to extras/beast/unit_test/amount.hpp index c07b4cad..b4c1f72e 100644 --- a/include/beast/detail/unit_test/amount.hpp +++ b/extras/beast/unit_test/amount.hpp @@ -5,17 +5,14 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_AMOUNT_HPP -#define BEAST_DETAIL_UNIT_TEST_AMOUNT_HPP +#ifndef BEAST_UNIT_TEST_AMOUNT_HPP +#define BEAST_UNIT_TEST_AMOUNT_HPP #include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { /** Utility for producing nicely composed output of amounts with units. */ @@ -53,7 +50,6 @@ operator<< (std::ostream& s, amount const& t) } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/stream/basic_abstract_ostream.hpp b/extras/beast/unit_test/basic_abstract_ostream.hpp similarity index 89% rename from include/beast/detail/stream/basic_abstract_ostream.hpp rename to extras/beast/unit_test/basic_abstract_ostream.hpp index 098886a2..6a3a7222 100644 --- a/include/beast/detail/stream/basic_abstract_ostream.hpp +++ b/extras/beast/unit_test/basic_abstract_ostream.hpp @@ -5,16 +5,15 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_STREAM_BASIC_ABSTRACT_OSTREAM_HPP -#define BEAST_DETAIL_STREAM_BASIC_ABSTRACT_OSTREAM_HPP +#ifndef BEAST_UNIT_TEST_BASIC_ABSTRACT_OSTREAM_HPP +#define BEAST_UNIT_TEST_BASIC_ABSTRACT_OSTREAM_HPP -#include +#include #include #include #include namespace beast { -namespace detail { /** Abstraction for an output stream similar to std::basic_ostream. */ template < @@ -81,7 +80,6 @@ public: } }; -} // detail } // beast #endif diff --git a/include/beast/detail/stream/basic_scoped_ostream.hpp b/extras/beast/unit_test/basic_scoped_ostream.hpp similarity index 95% rename from include/beast/detail/stream/basic_scoped_ostream.hpp rename to extras/beast/unit_test/basic_scoped_ostream.hpp index 262f3cd4..c8283a52 100644 --- a/include/beast/detail/stream/basic_scoped_ostream.hpp +++ b/extras/beast/unit_test/basic_scoped_ostream.hpp @@ -5,8 +5,8 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_STREAM_BASIC_SCOPED_OSTREAM_HPP -#define BEAST_DETAIL_STREAM_BASIC_SCOPED_OSTREAM_HPP +#ifndef BEAST_UNIT_TEST_BASIC_SCOPED_OSTREAM_HPP +#define BEAST_UNIT_TEST_BASIC_SCOPED_OSTREAM_HPP #include #include @@ -24,7 +24,6 @@ #endif namespace beast { -namespace detail { template < class CharT, @@ -132,7 +131,6 @@ public: } }; -} // detail } // beast #endif diff --git a/include/beast/detail/stream/basic_std_ostream.hpp b/extras/beast/unit_test/basic_std_ostream.hpp similarity index 86% rename from include/beast/detail/stream/basic_std_ostream.hpp rename to extras/beast/unit_test/basic_std_ostream.hpp index 91734212..62b21966 100644 --- a/include/beast/detail/stream/basic_std_ostream.hpp +++ b/extras/beast/unit_test/basic_std_ostream.hpp @@ -5,14 +5,13 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_STREAM_BASIC_STD_OSTREAM_H_INCLUDED -#define BEAST_DETAIL_STREAM_BASIC_STD_OSTREAM_H_INCLUDED +#ifndef BEAST_UNIT_TEST_BASIC_STD_OSTREAM_HPP +#define BEAST_UNIT_TEST_BASIC_STD_OSTREAM_HPP -#include +#include #include namespace beast { -namespace detail { /** Wraps an existing std::basic_ostream as an abstract_ostream. */ template < @@ -56,7 +55,6 @@ make_std_ostream (std::basic_ostream & stream) return basic_std_ostream (stream); } -} // detail } // beast #endif diff --git a/include/beast/detail/stream/debug_ostream.hpp b/extras/beast/unit_test/debug_ostream.hpp similarity index 89% rename from include/beast/detail/stream/debug_ostream.hpp rename to extras/beast/unit_test/debug_ostream.hpp index 1f3bc465..60d19f8e 100644 --- a/include/beast/detail/stream/debug_ostream.hpp +++ b/extras/beast/unit_test/debug_ostream.hpp @@ -5,10 +5,10 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_STREAM_DEBUG_OSTREAM_HPP -#define BEAST_DETAIL_STREAM_DEBUG_OSTREAM_HPP +#ifndef BEAST_UNIT_TEST_DEBUG_OSTREAM_HPP +#define BEAST_UNIT_TEST_DEBUG_OSTREAM_HPP -#include +#include #include #ifdef _MSC_VER @@ -28,7 +28,6 @@ #endif namespace beast { -namespace detail { #ifdef _MSC_VER /** A basic_abstract_ostream that redirects output to an attached debugger. */ @@ -74,7 +73,6 @@ public: #endif -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/global_suites.hpp b/extras/beast/unit_test/global_suites.hpp similarity index 84% rename from include/beast/detail/unit_test/global_suites.hpp rename to extras/beast/unit_test/global_suites.hpp index c7a7d8a3..c1f85252 100644 --- a/include/beast/detail/unit_test/global_suites.hpp +++ b/extras/beast/unit_test/global_suites.hpp @@ -5,15 +5,12 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_GLOBAL_SUITES_HPP -#define BEAST_DETAIL_UNIT_TEST_GLOBAL_SUITES_HPP +#ifndef BEAST_UNIT_TEST_GLOBAL_SUITES_HPP +#define BEAST_UNIT_TEST_GLOBAL_SUITES_HPP -#include +#include namespace beast { -namespace detail { - -inline namespace unit_test { namespace detail { @@ -54,7 +51,6 @@ global_suites() } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/match.hpp b/extras/beast/unit_test/match.hpp similarity index 95% rename from include/beast/detail/unit_test/match.hpp rename to extras/beast/unit_test/match.hpp index 664bae8a..9137fd0e 100644 --- a/include/beast/detail/unit_test/match.hpp +++ b/extras/beast/unit_test/match.hpp @@ -5,16 +5,13 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_MATCH_HPP -#define BEAST_DETAIL_UNIT_TEST_MATCH_HPP +#ifndef BEAST_UNIT_TEST_MATCH_HPP +#define BEAST_UNIT_TEST_MATCH_HPP -#include +#include #include namespace beast { -namespace detail { - -inline namespace unit_test { // Predicate for implementing matches @@ -171,7 +168,6 @@ match_library (std::string const& name) } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/print.hpp b/extras/beast/unit_test/print.hpp similarity index 80% rename from include/beast/detail/unit_test/print.hpp rename to extras/beast/unit_test/print.hpp index 04957db5..30f68919 100644 --- a/include/beast/detail/unit_test/print.hpp +++ b/extras/beast/unit_test/print.hpp @@ -5,21 +5,18 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_PRINT_H_INCLUDED -#define BEAST_DETAIL_UNIT_TEST_PRINT_H_INCLUDED +#ifndef BEAST_UNIT_TEST_PRINT_H_INCLUDED +#define BEAST_UNIT_TEST_PRINT_H_INCLUDED -#include -#include -#include -#include +#include +#include +#include +#include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { /** Write test results to the specified output stream. */ @@ -65,7 +62,6 @@ print (results const& r, std::ostream& stream = std::cout) } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/recorder.hpp b/extras/beast/unit_test/recorder.hpp similarity index 88% rename from include/beast/detail/unit_test/recorder.hpp rename to extras/beast/unit_test/recorder.hpp index 8c711cf8..e17e9a01 100644 --- a/include/beast/detail/unit_test/recorder.hpp +++ b/extras/beast/unit_test/recorder.hpp @@ -5,16 +5,13 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_RECORDER_HPP -#define BEAST_DETAIL_UNIT_TEST_RECORDER_HPP +#ifndef BEAST_UNIT_TEST_RECORDER_HPP +#define BEAST_UNIT_TEST_RECORDER_HPP -#include -#include +#include +#include namespace beast { -namespace detail { - -inline namespace unit_test { /** A test runner that stores the results. */ @@ -90,7 +87,6 @@ private: }; } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/reporter.hpp b/extras/beast/unit_test/reporter.hpp similarity index 92% rename from include/beast/detail/unit_test/reporter.hpp rename to extras/beast/unit_test/reporter.hpp index 93a0f960..b5e27ef4 100644 --- a/include/beast/detail/unit_test/reporter.hpp +++ b/extras/beast/unit_test/reporter.hpp @@ -5,13 +5,13 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_REPORTER_HPP -#define BEAST_DETAIL_UNIT_TEST_REPORTER_HPP +#ifndef BEAST_UNIT_TEST_REPORTER_HPP +#define BEAST_UNIT_TEST_REPORTER_HPP -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -23,9 +23,6 @@ #include namespace beast { -namespace detail { - -inline namespace unit_test { namespace detail { @@ -87,7 +84,7 @@ private: }; boost::optional std_ostream_; - std::reference_wrapper stream_; + std::reference_wrapper stream_; results results_; suite_results suite_results_; case_results case_results_; @@ -102,7 +99,7 @@ public: reporter (std::ostream& stream = std::cout); explicit - reporter (beast::detail::abstract_ostream& stream); + reporter (beast::abstract_ostream& stream); private: static @@ -229,7 +226,7 @@ reporter<_>::~reporter() template reporter<_>::reporter ( - beast::detail::abstract_ostream& stream) + abstract_ostream& stream) : stream_ (stream) { } @@ -318,7 +315,6 @@ reporter<_>::on_log ( using reporter = detail::reporter<>; } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/results.hpp b/extras/beast/unit_test/results.hpp similarity index 92% rename from include/beast/detail/unit_test/results.hpp rename to extras/beast/unit_test/results.hpp index 75231fa8..74ebb76a 100644 --- a/include/beast/detail/unit_test/results.hpp +++ b/extras/beast/unit_test/results.hpp @@ -5,8 +5,8 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_RESULTS_HPP -#define BEAST_DETAIL_UNIT_TEST_RESULTS_HPP +#ifndef BEAST_UNIT_TEST_RESULTS_HPP +#define BEAST_UNIT_TEST_RESULTS_HPP #include @@ -14,9 +14,6 @@ #include namespace beast { -namespace detail { - -inline namespace unit_test { /** Holds a set of test condition outcomes in a testcase. */ @@ -43,7 +40,7 @@ public: private: class tests_t - : public const_container > + : public beast::detail::const_container > { private: std::size_t failed_; @@ -85,7 +82,7 @@ private: }; class log_t - : public const_container > + : public beast::detail::const_container > { public: /** Insert a string into the log. */ @@ -122,7 +119,7 @@ public: /** Holds the set of testcase results in a suite. */ class suite_results - : public const_container > + : public beast::detail::const_container > { private: std::string name_; @@ -181,7 +178,7 @@ public: // VFALCO TODO Make this a template class using scoped allocators /** Holds the results of running a set of testsuites. */ class results - : public const_container > + : public beast::detail::const_container > { private: std::size_t m_cases; @@ -240,7 +237,6 @@ public: }; } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/runner.hpp b/extras/beast/unit_test/runner.hpp similarity index 95% rename from include/beast/detail/unit_test/runner.hpp rename to extras/beast/unit_test/runner.hpp index 6f467745..1ff085df 100644 --- a/include/beast/detail/unit_test/runner.hpp +++ b/extras/beast/unit_test/runner.hpp @@ -5,19 +5,16 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_RUNNER_H_INCLUDED -#define BEAST_DETAIL_UNIT_TEST_RUNNER_H_INCLUDED +#ifndef BEAST_UNIT_TEST_RUNNER_H_INCLUDED +#define BEAST_UNIT_TEST_RUNNER_H_INCLUDED -#include -#include +#include +#include #include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { /** Unit test runner interface. @@ -28,7 +25,7 @@ class runner { private: // Reroutes log output to the runner - class stream_t : public beast::detail::abstract_ostream + class stream_t : public abstract_ostream { private: runner& owner_; @@ -332,7 +329,6 @@ runner::log (std::string const& s) } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/suite.hpp b/extras/beast/unit_test/suite.hpp similarity index 97% rename from include/beast/detail/unit_test/suite.hpp rename to extras/beast/unit_test/suite.hpp index 3732224e..8d0e81f1 100644 --- a/include/beast/detail/unit_test/suite.hpp +++ b/extras/beast/unit_test/suite.hpp @@ -5,17 +5,14 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_SUITE_HPP -#define BEAST_DETAIL_UNIT_TEST_SUITE_HPP +#ifndef BEAST_UNIT_TEST_SUITE_HPP +#define BEAST_UNIT_TEST_SUITE_HPP -#include +#include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { class thread; @@ -537,7 +534,6 @@ suite::run (runner& r) } } // unit_test -} // detail } // beast //------------------------------------------------------------------------------ @@ -545,7 +541,7 @@ suite::run (runner& r) // detail: // This inserts the suite with the given manual flag #define BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \ - static beast::detail::unit_test::detail::insert_suite \ + static beast::unit_test::detail::insert_suite \ Library ## Module ## Class ## _test_instance ( \ #Class, #Module, #Library, manual); @@ -593,7 +589,7 @@ suite::run (runner& r) #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) #else -#include +#include #define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \ BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false) #define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \ diff --git a/include/beast/detail/unit_test/suite_info.hpp b/extras/beast/unit_test/suite_info.hpp similarity index 94% rename from include/beast/detail/unit_test/suite_info.hpp rename to extras/beast/unit_test/suite_info.hpp index 2176bb82..530ac008 100644 --- a/include/beast/detail/unit_test/suite_info.hpp +++ b/extras/beast/unit_test/suite_info.hpp @@ -5,17 +5,14 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_SUITE_INFO_HPP -#define BEAST_DETAIL_UNIT_TEST_SUITE_INFO_HPP +#ifndef BEAST_UNIT_TEST_SUITE_INFO_HPP +#define BEAST_UNIT_TEST_SUITE_INFO_HPP #include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { class runner; @@ -113,7 +110,6 @@ make_suite_info (std::string const& name, std::string const& module, } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/suite_list.hpp b/extras/beast/unit_test/suite_list.hpp similarity index 86% rename from include/beast/detail/unit_test/suite_list.hpp rename to extras/beast/unit_test/suite_list.hpp index 1393d406..48d2f6e2 100644 --- a/include/beast/detail/unit_test/suite_list.hpp +++ b/extras/beast/unit_test/suite_list.hpp @@ -5,10 +5,10 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_SUITE_LIST_HPP -#define BEAST_DETAIL_UNIT_TEST_SUITE_LIST_HPP +#ifndef BEAST_UNIT_TEST_SUITE_LIST_HPP +#define BEAST_UNIT_TEST_SUITE_LIST_HPP -#include +#include #include #include #include @@ -16,14 +16,11 @@ #include namespace beast { -namespace detail { - -inline namespace unit_test { /** A container of test suites. */ class suite_list - : public const_container > + : public detail::const_container > { private: #ifndef NDEBUG @@ -68,7 +65,6 @@ suite_list::insert (char const* name, char const* module, char const* library, } } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/thread.hpp b/extras/beast/unit_test/thread.hpp similarity index 93% rename from include/beast/detail/unit_test/thread.hpp rename to extras/beast/unit_test/thread.hpp index a684abd3..5e8364b8 100644 --- a/include/beast/detail/unit_test/thread.hpp +++ b/extras/beast/unit_test/thread.hpp @@ -5,18 +5,15 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -#ifndef BEAST_DETAIL_UNIT_TEST_THREAD_HPP -#define BEAST_DETAIL_UNIT_TEST_THREAD_HPP +#ifndef BEAST_UNIT_TEST_THREAD_HPP +#define BEAST_UNIT_TEST_THREAD_HPP -#include +#include #include #include #include namespace beast { -namespace detail { - -inline namespace unit_test { /** Replacement for std::thread that handles exceptions in unit tests. */ @@ -122,7 +119,6 @@ private: }; } // unit_test -} // detail } // beast #endif diff --git a/include/beast/detail/unit_test/define_print.cpp b/include/beast/detail/unit_test/define_print.cpp deleted file mode 100644 index 6540d4dc..00000000 --- a/include/beast/detail/unit_test/define_print.cpp +++ /dev/null @@ -1,90 +0,0 @@ -// -// Copyright (c) 2013-2016 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// - -#include -#include -#include -#include - -// Include this .cpp in your project to gain access to the printing suite - -namespace beast { -namespace detail { - -inline -namespace unit_test { -namespace detail { - -/** A suite that prints the list of globally defined suites. */ -class print_test : public suite -{ -private: - template - void - do_run(); - -public: - template - static - std::string - prefix (suite_info const& s); - - template - void - print (suite_list &c); - - void - run() - { - do_run(); - } -}; - -template -void -print_test::do_run() -{ - log << "------------------------------------------"; - print (global_suites()); - log << "------------------------------------------"; - pass(); -} - -template -std::string -print_test::prefix (suite_info const& s) -{ - if (s.manual()) - return "|M| "; - return " "; -} - -template -void -print_test::print (suite_list &c) -{ - std::size_t manual (0); - for (auto const& s : c) - { - log << - prefix (s) << - s.full_name(); - if (s.manual()) - ++manual; - } - log << - amount (c.size(), "suite") << " total, " << - amount (manual, "manual suite") - ; -} - -BEAST_DEFINE_TESTSUITE_MANUAL(print,unit_test,beast); - -} // detail -} // unit_test -} // detail -} // beast diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d98ade1d..2559f1fb 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,6 +1,7 @@ # Part of Beast GroupSources(include/beast) +GroupSources(extras) GroupSources(test) add_executable (core-tests diff --git a/test/basic_streambuf.cpp b/test/basic_streambuf.cpp index b3594167..22a606ef 100644 --- a/test/basic_streambuf.cpp +++ b/test/basic_streambuf.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -136,7 +136,7 @@ public: } }; -class basic_streambuf_test : public beast::detail::unit_test::suite +class basic_streambuf_test : public beast::unit_test::suite { public: template diff --git a/test/bind_handler.cpp b/test/bind_handler.cpp index 2a643567..b89fe47c 100644 --- a/test/bind_handler.cpp +++ b/test/bind_handler.cpp @@ -8,12 +8,12 @@ // Test that header file is self-contained. #include -#include +#include #include namespace beast { -class bind_handler_test : public detail::unit_test::suite +class bind_handler_test : public unit_test::suite { public: static void foo (int) diff --git a/test/buffer_cat.cpp b/test/buffer_cat.cpp index ee3a2cdc..efa8955c 100644 --- a/test/buffer_cat.cpp +++ b/test/buffer_cat.cpp @@ -8,7 +8,7 @@ // Test that header file is self-contained. #include -#include +#include #include #include #include @@ -17,7 +17,7 @@ namespace beast { -class buffer_cat_test : public detail::unit_test::suite +class buffer_cat_test : public unit_test::suite { public: template< class Iterator > diff --git a/test/buffers_adapter.cpp b/test/buffers_adapter.cpp index 980f2d27..a258da58 100644 --- a/test/buffers_adapter.cpp +++ b/test/buffers_adapter.cpp @@ -9,14 +9,14 @@ #include #include -#include +#include #include #include #include namespace beast { -class buffers_adapter_test : public detail::unit_test::suite +class buffers_adapter_test : public unit_test::suite { public: template diff --git a/test/consuming_buffers.cpp b/test/consuming_buffers.cpp index 5bef21ef..080d2c8d 100644 --- a/test/consuming_buffers.cpp +++ b/test/consuming_buffers.cpp @@ -8,13 +8,13 @@ // Test that header file is self-contained. #include -#include +#include #include #include namespace beast { -class consuming_buffers_test : public beast::detail::unit_test::suite +class consuming_buffers_test : public beast::unit_test::suite { public: template diff --git a/test/detail/base64.cpp b/test/detail/base64.cpp index 2667ce25..f49d4531 100644 --- a/test/detail/base64.cpp +++ b/test/detail/base64.cpp @@ -6,12 +6,12 @@ // #include -#include +#include namespace beast { namespace detail { -class base64_test : public beast::detail::unit_test::suite +class base64_test : public beast::unit_test::suite { public: void diff --git a/test/detail/empty_base_optimization.cpp b/test/detail/empty_base_optimization.cpp index 3fbeaa76..617d65b3 100644 --- a/test/detail/empty_base_optimization.cpp +++ b/test/detail/empty_base_optimization.cpp @@ -6,13 +6,13 @@ // #include -#include +#include namespace beast { namespace detail { class empty_base_optimization_test - : public beast::detail::unit_test::suite + : public beast::unit_test::suite { public: template diff --git a/test/detail/sha1.cpp b/test/detail/sha1.cpp index 64083a12..aee02c8a 100644 --- a/test/detail/sha1.cpp +++ b/test/detail/sha1.cpp @@ -6,13 +6,13 @@ // #include -#include +#include #include namespace beast { namespace detail { -class sha1_test : public beast::detail::unit_test::suite +class sha1_test : public beast::unit_test::suite { public: static diff --git a/test/handler_alloc.cpp b/test/handler_alloc.cpp index e1ca1300..b1034e49 100644 --- a/test/handler_alloc.cpp +++ b/test/handler_alloc.cpp @@ -8,12 +8,12 @@ // Test that header file is self-contained. #include -#include +#include #include namespace beast { -class to_string_test : public beast::detail::unit_test::suite +class to_string_test : public beast::unit_test::suite { public: void run() diff --git a/test/http/basic_headers.cpp b/test/http/basic_headers.cpp index 40949cbc..cfde613c 100644 --- a/test/http/basic_headers.cpp +++ b/test/http/basic_headers.cpp @@ -8,12 +8,12 @@ // Test that header file is self-contained. #include -#include +#include namespace beast { namespace http { -class basic_headers_test : public beast::detail::unit_test::suite +class basic_headers_test : public beast::unit_test::suite { public: template diff --git a/test/http/basic_parser_v1.cpp b/test/http/basic_parser_v1.cpp index c3b0b00c..e7feff8d 100644 --- a/test/http/basic_parser_v1.cpp +++ b/test/http/basic_parser_v1.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,7 +27,7 @@ namespace beast { namespace http { -class basic_parser_v1_test : public beast::detail::unit_test::suite +class basic_parser_v1_test : public beast::unit_test::suite { public: struct cb_req_checker diff --git a/test/http/message_v1.cpp b/test/http/message_v1.cpp index ff1df9cc..2ed945b2 100644 --- a/test/http/message_v1.cpp +++ b/test/http/message_v1.cpp @@ -20,8 +20,8 @@ // Test that header file is self-contained. #include -#include -#include +#include +#include #include #include #include @@ -39,15 +39,15 @@ public: using socket_type = boost::asio::ip::tcp::socket; private: - beast::detail::unit_test::suite& suite_; + unit_test::suite& suite_; boost::asio::io_service ios_; socket_type sock_; boost::asio::ip::tcp::acceptor acceptor_; - beast::detail::unit_test::thread thread_; + unit_test::thread thread_; public: sync_echo_http_server( - endpoint_type ep, beast::detail::unit_test::suite& suite) + endpoint_type ep, unit_test::suite& suite) : suite_(suite) , sock_(ios_) , acceptor_(ios_) @@ -63,7 +63,7 @@ public: acceptor_.async_accept(sock_, std::bind(&sync_echo_http_server::on_accept, this, beast::asio::placeholders::error)); - thread_ = beast::detail::unit_test::thread(suite_, + thread_ = unit_test::thread(suite_, [&] { ios_.run(); @@ -132,7 +132,7 @@ private: } }; -class message_test : public beast::detail::unit_test::suite +class message_test : public beast::unit_test::suite { public: using endpoint_type = boost::asio::ip::tcp::endpoint; diff --git a/test/http/parser_bench.cpp b/test/http/parser_bench.cpp index c78acee1..8c040556 100644 --- a/test/http/parser_bench.cpp +++ b/test/http/parser_bench.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -18,7 +18,7 @@ namespace beast { namespace http { -class parser_bench_test : public beast::detail::unit_test::suite +class parser_bench_test : public beast::unit_test::suite { public: static std::size_t constexpr N = 2000; diff --git a/test/http/parser_v1.cpp b/test/http/parser_v1.cpp index 0514227a..238e1305 100644 --- a/test/http/parser_v1.cpp +++ b/test/http/parser_v1.cpp @@ -10,12 +10,12 @@ #include #include -#include +#include namespace beast { namespace http { -class parser_v1_test : public beast::detail::unit_test::suite +class parser_v1_test : public beast::unit_test::suite { public: void run() override diff --git a/test/http/read.cpp b/test/http/read.cpp index b73fae70..0cdde345 100644 --- a/test/http/read.cpp +++ b/test/http/read.cpp @@ -13,14 +13,14 @@ #include "../yield_to.hpp" #include -#include +#include #include namespace beast { namespace http { class read_test - : public beast::detail::unit_test::suite + : public beast::unit_test::suite , public test::enable_yield_to { public: diff --git a/test/http/rfc2616.cpp b/test/http/rfc2616.cpp index 6ae47dd5..346e838d 100644 --- a/test/http/rfc2616.cpp +++ b/test/http/rfc2616.cpp @@ -8,7 +8,7 @@ // Test that header file is self-contained. #include -#include +#include #include #include @@ -16,7 +16,7 @@ namespace beast { namespace rfc2616 { namespace test { -class rfc2616_test : public beast::detail::unit_test::suite +class rfc2616_test : public beast::unit_test::suite { public: void diff --git a/test/http/write.cpp b/test/http/write.cpp index 97b6b5ef..1634c758 100644 --- a/test/http/write.cpp +++ b/test/http/write.cpp @@ -16,14 +16,14 @@ #include #include #include -#include +#include #include #include namespace beast { namespace http { -class write_test : public beast::detail::unit_test::suite +class write_test : public beast::unit_test::suite { public: struct string_SyncStream diff --git a/test/main.cpp b/test/main.cpp index fd985f3f..8695cf06 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -17,12 +17,12 @@ */ //============================================================================== -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -40,9 +40,6 @@ #include namespace beast { -namespace detail { - -inline namespace unit_test { std::string @@ -82,7 +79,6 @@ print(Log& log) } } // unit_test -} // detail } // beast // Simple main used to produce stand @@ -90,7 +86,7 @@ print(Log& log) int main(int ac, char const* av[]) { using namespace std; - using namespace beast::detail::unit_test; + using namespace beast::unit_test; #ifdef _MSC_VER { @@ -113,7 +109,7 @@ int main(int ac, char const* av[]) po::store(po::parse_command_line(ac, av, desc), vm); po::notify(vm); - beast::detail::debug_ostream log; + beast::debug_ostream log; if(vm.count("help")) { diff --git a/test/prepare_buffers.cpp b/test/prepare_buffers.cpp index 4557280a..13897b4a 100644 --- a/test/prepare_buffers.cpp +++ b/test/prepare_buffers.cpp @@ -9,13 +9,13 @@ #include #include -#include +#include #include #include namespace beast { -class prepare_buffers_test : public beast::detail::unit_test::suite +class prepare_buffers_test : public beast::unit_test::suite { public: template diff --git a/test/static_streambuf.cpp b/test/static_streambuf.cpp index 0c07c995..ece8996a 100644 --- a/test/static_streambuf.cpp +++ b/test/static_streambuf.cpp @@ -8,13 +8,13 @@ // Test that header file is self-contained. #include -#include +#include #include #include namespace beast { -class static_streambuf_test : public beast::detail::unit_test::suite +class static_streambuf_test : public beast::unit_test::suite { public: template diff --git a/test/static_string.cpp b/test/static_string.cpp index 2749bfee..9ea71c42 100644 --- a/test/static_string.cpp +++ b/test/static_string.cpp @@ -8,11 +8,11 @@ // Test that header file is self-contained. #include -#include +#include namespace beast { -class static_string_test : public beast::detail::unit_test::suite +class static_string_test : public beast::unit_test::suite { public: void testMembers() diff --git a/test/streambuf_readstream.cpp b/test/streambuf_readstream.cpp index c0dbed7f..22a0d2fb 100644 --- a/test/streambuf_readstream.cpp +++ b/test/streambuf_readstream.cpp @@ -9,12 +9,12 @@ #include #include -#include +#include #include namespace beast { -class streambuf_readstream_test : public beast::detail::unit_test::suite +class streambuf_readstream_test : public beast::unit_test::suite { public: void testSpecial() diff --git a/test/websocket/stream.cpp b/test/websocket/stream.cpp index 610c98e0..1efee21e 100644 --- a/test/websocket/stream.cpp +++ b/test/websocket/stream.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include @@ -26,7 +26,7 @@ namespace beast { namespace websocket { class stream_test - : public beast::detail::unit_test::suite + : public beast::unit_test::suite , public test::enable_yield_to { public: diff --git a/test/websocket/utf8_checker.cpp b/test/websocket/utf8_checker.cpp index 39b96014..62a9d711 100644 --- a/test/websocket/utf8_checker.cpp +++ b/test/websocket/utf8_checker.cpp @@ -9,13 +9,13 @@ #include #include -#include +#include #include namespace beast { namespace websocket { -class utf8_checker_test : public beast::detail::unit_test::suite +class utf8_checker_test : public beast::unit_test::suite { public: void diff --git a/test/write_streambuf.cpp b/test/write_streambuf.cpp index 68290fbc..79fc8833 100644 --- a/test/write_streambuf.cpp +++ b/test/write_streambuf.cpp @@ -8,11 +8,11 @@ // Test that header file is self-contained. #include #include -#include +#include namespace beast { -class write_streambuf_test : public beast::detail::unit_test::suite +class write_streambuf_test : public beast::unit_test::suite { public: void run() override