Merge branch 'issue-89-test-stream-cancellation-support' of github.com:MungoG/beast2 into issue-89-test-stream-cancellation-support

Author: MungoG

include/boost/beast2/test/impl/stream.hpp

@@ -178,7 +178,7 @@ class basic_stream<Executor>::read_op : public detail::stream_op_base
                 base::wg2_.get_executor(),
                 asio::append(std::move(base::h_), ec, bytes_transferred));
             base::wg2_.reset();
-            sp->rop.release();
+            sp->rop.reset(nullptr);
         }
 
         template<class Handler_>
@@ -260,7 +260,7 @@ class basic_stream<Executor>::write_op : public detail::stream_op_base
                 base::wg2_.get_executor(),
                 asio::append(std::move(base::h_), ec, bytes_transferred));
             base::wg2_.reset();
-            isp->wop.release();
+            isp->wop.reset(nullptr);
         }
 
         template<class Handler_>

test/unit/CMakeLists.txt

@@ -7,7 +7,9 @@
 # Official repository: https://github.com/cppalliance/beast2
 #
 
-add_subdirectory(../../../url/extra/test_suite test_suite)
+if(NOT TARGET boost_url_test_suite)
+    add_subdirectory(../../../url/extra/test_suite test_suite)
+endif()
 
 file(GLOB_RECURSE PFILES CONFIGURE_DEPENDS *.cpp *.hpp)
 list(APPEND PFILES

test/unit/write.cpp

@@ -165,10 +165,10 @@ class write_test
 
         // async_write_some cancellation
         {
-            boost::array<asio::cancellation_type, 3> ctypes(
+            boost::array<asio::cancellation_type, 3> ctypes{
                 { asio::cancellation_type::total,
                   asio::cancellation_type::partial,
-                  asio::cancellation_type::terminal });
+                  asio::cancellation_type::terminal }};
 
             for(auto ctype : ctypes)
             {
@@ -270,10 +270,10 @@ class write_test
 
         // async_write cancellation
         {
-            boost::array<asio::cancellation_type, 3> ctypes(
+            boost::array<asio::cancellation_type, 3> ctypes{
                 { asio::cancellation_type::total,
                   asio::cancellation_type::partial,
-                  asio::cancellation_type::terminal });
+                  asio::cancellation_type::terminal }};
 
             for(auto ctype : ctypes)
             {