Add tests for throw_line

test/Jamfile.v2

@@ -14,6 +14,10 @@ run throw_exception_no_both_test.cpp ;
 
 compile-fail throw_exception_fail.cpp ;
 
+run throw_exception_test2.cpp ;
+run throw_exception_test3.cpp ;
+run throw_exception_test4.cpp ;
+
 lib lib1_throw : lib1_throw.cpp : <define>LIB1_SOURCE=1 <link>shared:<define>LIB1_DYN_LINK=1 : : <link>shared:<define>LIB1_DYN_LINK=1 ;
 lib lib2_throw : lib2_throw.cpp : <define>LIB2_SOURCE=1 <link>shared:<define>LIB2_DYN_LINK=1 : : <link>shared:<define>LIB2_DYN_LINK=1 ;
 lib lib3_throw : lib3_throw.cpp : <define>LIB3_SOURCE=1 <link>shared:<define>LIB3_DYN_LINK=1 : : <link>shared:<define>LIB3_DYN_LINK=1 ;

test/throw_exception_test2.cpp

@@ -0,0 +1,28 @@
+// Copyright 2018 Peter Dimov
+//
+// 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 <boost/throw_exception.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    BOOST_TEST_THROWS( boost::throw_exception( my_exception() ), boost::exception );
+    BOOST_TEST_THROWS( boost::throw_exception( my_exception2() ), boost::exception );
+
+    BOOST_TEST_THROWS( BOOST_THROW_EXCEPTION( my_exception() ), boost::exception );
+    BOOST_TEST_THROWS( BOOST_THROW_EXCEPTION( my_exception2() ), boost::exception );
+
+    return boost::report_errors();
+}

test/throw_exception_test3.cpp

@@ -0,0 +1,71 @@
+// Copyright 2018 Peter Dimov
+//
+// 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 <boost/throw_exception.hpp>
+#include <boost/exception_ptr.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    try
+    {
+        boost::throw_exception( my_exception() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        boost::throw_exception( my_exception2() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception2 );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception2() );
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), my_exception2 );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    return boost::report_errors();
+}

test/throw_exception_test4.cpp

@@ -0,0 +1,47 @@
+// Copyright 2018 Peter Dimov
+//
+// 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 <boost/throw_exception.hpp>
+#include <boost/exception/get_error_info.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+class my_exception: public std::exception
+{
+};
+
+class my_exception2: public std::exception, public boost::exception
+{
+};
+
+int main()
+{
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception() );
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 24 );
+    }
+
+    try
+    {
+        BOOST_THROW_EXCEPTION( my_exception2() );
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 36 );
+    }
+
+    return boost::report_errors();
+}

test/throw_from_library_test.cpp

@@ -8,13 +8,72 @@
 #include "lib1_throw.hpp"
 #include "lib2_throw.hpp"
 #include "lib3_throw.hpp"
+#include <boost/exception/exception.hpp>
+#include <boost/exception_ptr.hpp>
+#include <boost/exception/get_error_info.hpp>
 #include <boost/core/lightweight_test.hpp>
 
-int main()
+void test_catch_by_type()
 {
     BOOST_TEST_THROWS( lib1::f(), lib1::exception );
     BOOST_TEST_THROWS( lib2::f(), lib2::exception );
     BOOST_TEST_THROWS( lib3::f(), lib3::exception );
+}
+
+void test_catch_by_exception()
+{
+    BOOST_TEST_THROWS( lib2::f(), boost::exception );
+    BOOST_TEST_THROWS( lib3::f(), boost::exception );
+}
+
+void test_exception_ptr()
+{
+    try
+    {
+        lib2::f();
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), lib2::exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+
+    try
+    {
+        lib3::f();
+    }
+    catch( ... )
+    {
+        boost::exception_ptr p = boost::current_exception();
+
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), lib3::exception );
+        BOOST_TEST_THROWS( boost::rethrow_exception( p ), boost::exception );
+    }
+}
+
+void test_throw_line()
+{
+    try
+    {
+        lib3::f();
+    }
+    catch( boost::exception const & x )
+    {
+        int const * line = boost::get_error_info<boost::throw_line>( x );
+
+        BOOST_TEST( line != 0 );
+        BOOST_TEST_EQ( *line, 13 );
+    }
+}
+
+int main()
+{
+    test_catch_by_type();
+    test_catch_by_exception();
+    test_exception_ptr();
+    test_throw_line();
 
     return boost::report_errors();
 }