Skip to content

Commit 713bac1

Browse files
cliffg-softwarelibrecliffg-softwarelibre
committed
More progress on major reorg
1 parent cd8a6ef commit 713bac1

17 files changed

+101
-149
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ add_library ( chops::chops_net_ip ALIAS chops_net_ip )
2727

2828
# thread support specified in Asio download
2929

30+
include ( cmake/download_cpm.cmake )
31+
CPMAddPackage ( "gh:connectivecpp/[email protected]"
32+
3033
include ( cmake/download_asio_cpm.cmake )
3134

3235
# configure library target

‎test/main_test.cpp

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎test/net_ip/basic_io_interface_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c basic_io_interface class template.
44
*
5-
* @brief Test scenarios for @c basic_io_interface class template.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2017-2024 by Cliff Green
88
*
9-
* Copyright (c) 2017-2018 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include <memory> // std::shared_ptr
1917
#include <set>

‎test/net_ip/basic_io_output_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c basic_io_output class template.
44
*
5-
* @brief Test scenarios for @c basic_io_output class template.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2018-2024 by Cliff Green
88
*
9-
* Copyright (c) 2018-2019 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include <memory> // std::shared_ptr
1917
#include <set>

‎test/net_ip/detail/io_common_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c io_common detail class.
44
*
5-
* @brief Test scenarios for @c io_common detail class.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2017-2024 by Cliff Green
88
*
9-
* Copyright (c) 2017-2019 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include <vector>
1917
#include <cassert>

‎test/net_ip/detail/net_entity_common_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c net_entity_common detail class.
44
*
5-
* @brief Test scenarios for @c net_entity_common detail class.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2018-2024 by Cliff Green
88
*
9-
* Copyright (c) 2018-2019 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include <memory> // std::shared_ptr
1917
#include <system_error> // std::error_code

‎test/net_ip/detail/output_queue_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c output_queue detail class.
44
*
5-
* @brief Test scenarios for @c output_queue detail class.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2017-2024 by Cliff Green
88
*
9-
* Copyright (c) 2017-2018 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include <vector>
1917
#include <cassert>

‎test/net_ip/detail/tcp_acceptor_test.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c tcp_acceptor detail class.
44
*
5-
* @brief Test scenarios for @c tcp_acceptor detail class.
5+
* This test is similar to the tcp_io_test code, with a little bit less
6+
* internal plumbing, and allowing multiple connector threads to be started.
7+
* The TCP acceptor is the Chops Net IP class, but the connector threads are
8+
* using blocking Asio connects and io.
69
*
7-
* This test is similar to the tcp_io_test code, with a little bit less
8-
* internal plumbing, and allowing multiple connector threads to be started.
9-
* The TCP acceptor is the Chops Net IP class, but the connector threads are
10-
* using blocking Asio connects and io.
10+
* @author Cliff Green
1111
*
12-
* @author Cliff Green
12+
* @copyright (c) 2018-2024 by Cliff Green
1313
*
14-
* Copyright (c) 2018-2019 by Cliff Green
15-
*
16-
* Distributed under the Boost Software License, Version 1.0.
17-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
14+
* Distributed under the Boost Software License, Version 1.0.
15+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1816
*
1917
*/
2018

21-
#include "catch2/catch.hpp"
19+
#include "catch2/catch_test_macros.hpp"
2220

2321
#include "asio/ip/tcp.hpp"
2422
#include "asio/write.hpp"

‎test/net_ip/detail/tcp_io_test.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c tcp_io detail class.
44
*
5-
* @brief Test scenarios for @c tcp_io detail class.
5+
* @author Cliff Green
66
*
7-
* @author Cliff Green
7+
* @copyright (c) 2017-2024 by Cliff Green
88
*
9-
* Copyright (c) 2017-2018 by Cliff Green
10-
*
11-
* Distributed under the Boost Software License, Version 1.0.
12-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
9+
* Distributed under the Boost Software License, Version 1.0.
10+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1311
*
1412
*/
1513

16-
#include "catch2/catch.hpp"
14+
#include "catch2/catch_test_macros.hpp"
1715

1816
#include "asio/ip/tcp.hpp"
1917
#include "asio/connect.hpp"

‎test/net_ip/detail/udp_entity_io_test.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
/** @file
22
*
3-
* @ingroup test_module
3+
* @brief Test scenarios for @c udp_entity_io detail class.
44
*
5-
* @brief Test scenarios for @c udp_entity_io detail class.
5+
* This test design is different in a few respects from the tcp_io, tcp_acceptor,
6+
* and tcp_connector tests. In particular, multiple UDP senders are sending to one
7+
* UDP receiver, so an empty message shutdown sequence won't work the same as with
8+
* TCP connections (which are always one-to-one).
69
*
7-
* This test design is different in a few respects from the tcp_io, tcp_acceptor,
8-
* and tcp_connector tests. In particular, multiple UDP senders are sending to one
9-
* UDP receiver, so an empty message shutdown sequence won't work the same as with
10-
* TCP connections (which are always one-to-one).
10+
* @author Cliff Green
1111
*
12-
* @author Cliff Green
12+
* @copyright (c) 2018-2024 by Cliff Green
1313
*
14-
* Copyright (c) 2018-2019 by Cliff Green
15-
*
16-
* Distributed under the Boost Software License, Version 1.0.
17-
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
14+
* Distributed under the Boost Software License, Version 1.0.
15+
* (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
1816
*
1917
*/
2018

21-
#include "catch2/catch.hpp"
19+
#include "catch2/catch_test_macros.hpp"
2220

2321
#include "asio/ip/udp.hpp"
2422
#include "asio/io_context.hpp"

0 commit comments

Comments
 (0)