More progress on major reorg

connectivecpp · Jun 1, 2024 · 713bac1 · 713bac1
1 parent cd8a6ef
commit 713bac1
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 149 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,6 +27,9 @@ add_library ( chops::chops_net_ip ALIAS chops_net_ip )
 
 # thread support specified in Asio download
 
+include ( cmake/download_cpm.cmake )
+CPMAddPackage ( "gh:connectivecpp/shared_buffer@v1.0.0"
+
 include ( cmake/download_asio_cpm.cmake )
 
 # configure library target

diff --git a/test/main_test.cpp b/test/main_test.cpp
diff --git a/test/net_ip/basic_io_interface_test.cpp b/test/net_ip/basic_io_interface_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c basic_io_interface class template.
  *
- *  @brief Test scenarios for @c basic_io_interface class template.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2017-2024 by Cliff Green
  *
- *  Copyright (c) 2017-2018 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <memory> // std::shared_ptr
 #include <set>

diff --git a/test/net_ip/basic_io_output_test.cpp b/test/net_ip/basic_io_output_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c basic_io_output class template.
  *
- *  @brief Test scenarios for @c basic_io_output class template.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <memory> // std::shared_ptr
 #include <set>

diff --git a/test/net_ip/detail/io_common_test.cpp b/test/net_ip/detail/io_common_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c io_common detail class.
  *
- *  @brief Test scenarios for @c io_common detail class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2017-2024 by Cliff Green
  *
- *  Copyright (c) 2017-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <vector>
 #include <cassert>

diff --git a/test/net_ip/detail/net_entity_common_test.cpp b/test/net_ip/detail/net_entity_common_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c net_entity_common detail class.
  *
- *  @brief Test scenarios for @c net_entity_common detail class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <memory> // std::shared_ptr
 #include <system_error> // std::error_code

diff --git a/test/net_ip/detail/output_queue_test.cpp b/test/net_ip/detail/output_queue_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c output_queue detail class.
  *
- *  @brief Test scenarios for @c output_queue detail class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2017-2024 by Cliff Green
  *
- *  Copyright (c) 2017-2018 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <vector>
 #include <cassert>

diff --git a/test/net_ip/detail/tcp_acceptor_test.cpp b/test/net_ip/detail/tcp_acceptor_test.cpp
@@ -1,24 +1,22 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c tcp_acceptor detail class.
  *
- *  @brief Test scenarios for @c tcp_acceptor detail class.
+ * This test is similar to the tcp_io_test code, with a little bit less
+ * internal plumbing, and allowing multiple connector threads to be started. 
+ * The TCP acceptor is the Chops Net IP class, but the connector threads are 
+ * using blocking Asio connects and io.
  *
- *  This test is similar to the tcp_io_test code, with a little bit less
- *  internal plumbing, and allowing multiple connector threads to be started. 
- *  The TCP acceptor is the Chops Net IP class, but the connector threads are 
- *  using blocking Asio connects and io.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "asio/ip/tcp.hpp"
 #include "asio/write.hpp"

diff --git a/test/net_ip/detail/tcp_io_test.cpp b/test/net_ip/detail/tcp_io_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c tcp_io detail class.
  *
- *  @brief Test scenarios for @c tcp_io detail class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2017-2024 by Cliff Green
  *
- *  Copyright (c) 2017-2018 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "asio/ip/tcp.hpp"
 #include "asio/connect.hpp"

diff --git a/test/net_ip/detail/udp_entity_io_test.cpp b/test/net_ip/detail/udp_entity_io_test.cpp
@@ -1,24 +1,22 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c udp_entity_io detail class.
  *
- *  @brief Test scenarios for @c udp_entity_io detail class.
+ * This test design is different in a few respects from the tcp_io, tcp_acceptor,
+ * and tcp_connector tests. In particular, multiple UDP senders are sending to one
+ * UDP receiver, so an empty message shutdown sequence won't work the same as with
+ * TCP connections (which are always one-to-one).
  *
- *  This test design is different in a few respects from the tcp_io, tcp_acceptor,
- *  and tcp_connector tests. In particular, multiple UDP senders are sending to one
- *  UDP receiver, so an empty message shutdown sequence won't work the same as with
- *  TCP connections (which are always one-to-one).
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "asio/ip/udp.hpp"
 #include "asio/io_context.hpp"

diff --git a/test/net_ip/detail/wp_access_test.cpp b/test/net_ip/detail/wp_access_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c wp_access and @c wp_access_void function templates.
  *
- *  @brief Test scenarios for @c wp_access and @c wp_access_void function templates.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2019-2024 by Cliff Green
  *
- *  Copyright (c) 2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <memory> // std::shared_ptr, std::weak_ptr
 #include <cstddef> // std::size_t

diff --git a/test/net_ip/endpoints_resolver_test.cpp b/test/net_ip/endpoints_resolver_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c make_endpoints functions.
  *
- *  @brief Test scenarios for @c make_endpoints functions.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include "asio/ip/tcp.hpp"
 #include "asio/ip/udp.hpp"

diff --git a/test/net_ip/net_entity_test.cpp b/test/net_ip/net_entity_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c net_entity class.
  *
- *  @brief Test scenarios for @c net_entity class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <memory> // std::shared_ptr
 #include <functional> // std::ref

diff --git a/test/net_ip/net_ip_error_test.cpp b/test/net_ip/net_ip_error_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c net_ip error and exception code.
  *
- *  @brief Test scenarios for @c net_ip error and exception code.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2017-2024 by Cliff Green
  *
- *  Copyright (c) 2017-2018 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <system_error>
 

diff --git a/test/net_ip/net_ip_test.cpp b/test/net_ip/net_ip_test.cpp
@@ -1,19 +1,17 @@
 /** @file
  *
- *  @ingroup test_module
+ * @brief Test scenarios for @c net_ip class.
  *
- *  @brief Test scenarios for @c net_ip class.
+ * @author Cliff Green
  *
- *  @author Cliff Green
+ * @copyright (c) 2018-2024 by Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
- *
- *  Distributed under the Boost Software License, Version 1.0. 
- *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ * Distributed under the Boost Software License, Version 1.0. 
+ * (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
  *
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 
 #include <system_error> // std::error_code
 #include <cstddef> // std::size_t