feedc0de/boost_array
1
0
Fork 0
forked from boostorg/array
Code Pull Requests Activity

Replace Boost.Test with lightweight_test from Boost.Core. Modified version of https://github.com/boostorg/array/pull/6. Thanks to mloskot for the patch.

Browse Source
This commit is contained in:
Marshall Clow
2019-07-10 15:25:46 -07:00
parent b279a9005b
commit 453cf59eb9
8 changed files with 55 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/Jamfile.v2
View File

@ -2,24 +2,17 @@
#~ Distributed under the Boost Software License, Version 1.0. #~ 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) #~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
import testing ;
alias unit_test_framework
: # sources
/boost//unit_test_framework
;
test-suite array : test-suite array :
[ run array0.cpp unit_test_framework : : : : array0 ] [ run array0.cpp ]
[ run array1.cpp ] [ run array1.cpp ]
[ run array2.cpp ] [ run array2.cpp ]
[ run array3.cpp ] [ run array3.cpp ]
[ run array4.cpp ] [ run array4.cpp ]
[ run array5.cpp ] [ run array5.cpp ]
[ run array6.cpp unit_test_framework : : : : array6 ] [ run array6.cpp ]
[ run array7.cpp unit_test_framework : : : : array7 ] [ run array7.cpp ]
# [ run array_constexpr.cpp unit_test_framework : : : : array_constexpr ] # [ run array_constexpr.cpp ]
[ compile-fail array_getfail1.cpp ] [ compile-fail array_getfail1.cpp ]
[ compile-fail array_getfail2.cpp ] [ compile-fail array_getfail2.cpp ]
[ run array_hash.cpp unit_test_framework : : : : array_hash ] [ run array_hash.cpp ]
; ;

28
test/array0.cpp
View File

@ -9,15 +9,14 @@
#include <iostream> #include <iostream>
#include <boost/array.hpp> #include <boost/array.hpp>
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
template< class T > template< class T >
void BadValue( const T & ) void BadValue( const T & )
{ {
BOOST_CHECK ( false ); BOOST_TEST ( false );
} }
template< class T > template< class T >
@ -33,19 +32,19 @@ void RunTests()
// front/back and operator[] must compile, but calling them is undefined // front/back and operator[] must compile, but calling them is undefined
// Likewise, all tests below should evaluate to false, avoiding undefined behaviour // Likewise, all tests below should evaluate to false, avoiding undefined behaviour
BOOST_CHECK ( test_case.empty()); BOOST_TEST ( test_case.empty());
BOOST_CHECK ( const_test_case.empty()); BOOST_TEST ( const_test_case.empty());
BOOST_CHECK ( test_case.size() == 0 ); BOOST_TEST ( test_case.size() == 0 );
BOOST_CHECK ( const_test_case.size() == 0 ); BOOST_TEST ( const_test_case.size() == 0 );
// Assert requirements of TR1 6.2.2.4 // Assert requirements of TR1 6.2.2.4
BOOST_CHECK ( test_case.begin() == test_case.end()); BOOST_TEST ( test_case.begin() == test_case.end());
BOOST_CHECK ( test_case.cbegin() == test_case.cend()); BOOST_TEST ( test_case.cbegin() == test_case.cend());
BOOST_CHECK ( const_test_case.begin() == const_test_case.end()); BOOST_TEST ( const_test_case.begin() == const_test_case.end());
BOOST_CHECK ( const_test_case.cbegin() == const_test_case.cend()); BOOST_TEST ( const_test_case.cbegin() == const_test_case.cend());
BOOST_CHECK ( test_case.begin() != const_test_case.begin() ); BOOST_TEST ( test_case.begin() != const_test_case.begin() );
if( test_case.data() == const_test_case.data() ) { if( test_case.data() == const_test_case.data() ) {
// Value of data is unspecified in TR1, so no requirement this test pass or fail // Value of data is unspecified in TR1, so no requirement this test pass or fail
// However, it must compile! // However, it must compile!
@ -79,11 +78,12 @@ void RunTests()
} }
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
RunTests< bool >(); RunTests< bool >();
RunTests< void * >(); RunTests< void * >();
RunTests< long double >(); RunTests< long double >();
RunTests< std::string >(); RunTests< std::string >();
}
return boost::report_errors();
}

17
test/array6.cpp
View File

@ -10,8 +10,7 @@
#include <boost/array.hpp> #include <boost/array.hpp>
#include <algorithm> #include <algorithm>
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
template< class T > template< class T >
@ -22,38 +21,40 @@ namespace {
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
arr &aRef = get_c_array ( test_case ); arr &aRef = get_c_array ( test_case );
BOOST_CHECK ( &*test_case.begin () == &aRef[0] ); BOOST_TEST ( &*test_case.begin () == &aRef[0] );
const arr &caRef = get_c_array ( test_case ); const arr &caRef = get_c_array ( test_case );
typename test_type::const_iterator iter = test_case.begin (); typename test_type::const_iterator iter = test_case.begin ();
BOOST_CHECK ( &*iter == &caRef[0] ); BOOST_TEST ( &*iter == &caRef[0] );
// Confirm at() throws the std lib defined exception // Confirm at() throws the std lib defined exception
try { try {
test_case.at( test_case.size()); test_case.at( test_case.size());
BOOST_CHECK(false); BOOST_TEST(false);
} }
catch ( const std::out_of_range & ) {} catch ( const std::out_of_range & ) {}
try { try {
test_case.at( test_case.size() + 1); test_case.at( test_case.size() + 1);
BOOST_CHECK(false); BOOST_TEST(false);
} }
catch ( const std::out_of_range & ) {} catch ( const std::out_of_range & ) {}
try { try {
test_case.at( test_case.size() + 100); test_case.at( test_case.size() + 100);
BOOST_CHECK(false); BOOST_TEST(false);
} }
catch ( const std::out_of_range & ) {} catch ( const std::out_of_range & ) {}
} }
} }
BOOST_AUTO_TEST_CASE( test_main ) int main ()
{ {
RunTests< bool >(); RunTests< bool >();
RunTests< void * >(); RunTests< void * >();
RunTests< long double >(); RunTests< long double >();
RunTests< std::string >(); RunTests< std::string >();
return boost::report_errors();
} }

17
test/array7.cpp
View File

@ -13,8 +13,7 @@
#include <array> #include <array>
#endif #endif
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
@ -23,14 +22,13 @@ namespace {
void RunStdTests() void RunStdTests()
{ {
typedef boost::array< T, 5 > test_type; typedef boost::array< T, 5 > test_type;
typedef T arr[5];
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
T &aRef = std::get<0> ( test_case ); T &aRef = std::get<0> ( test_case );
BOOST_CHECK ( &*test_case.begin () == &aRef ); BOOST_TEST ( &*test_case.begin () == &aRef );
const T &caRef = std::get<0> ( test_case ); const T &caRef = std::get<0> ( test_case );
BOOST_CHECK ( &*test_case.cbegin () == &caRef ); BOOST_TEST ( &*test_case.cbegin () == &caRef );
} }
#endif #endif
@ -38,19 +36,18 @@ namespace {
void RunBoostTests() void RunBoostTests()
{ {
typedef boost::array< T, 5 > test_type; typedef boost::array< T, 5 > test_type;
typedef T arr[5];
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
T &aRef = boost::get<0> ( test_case ); T &aRef = boost::get<0> ( test_case );
BOOST_CHECK ( &*test_case.begin () == &aRef ); BOOST_TEST ( &*test_case.begin () == &aRef );
const T &caRef = boost::get<0> ( test_case ); const T &caRef = boost::get<0> ( test_case );
BOOST_CHECK ( &*test_case.cbegin () == &caRef ); BOOST_TEST ( &*test_case.cbegin () == &caRef );
} }
} }
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
RunBoostTests< bool >(); RunBoostTests< bool >();
RunBoostTests< void * >(); RunBoostTests< void * >();
@ -63,5 +60,7 @@ BOOST_AUTO_TEST_CASE( test_main )
RunStdTests< long double >(); RunStdTests< long double >();
RunStdTests< std::string >(); RunStdTests< std::string >();
#endif #endif
return boost::report_errors();
} }

7
test/array_constexpr.cpp
View File

@ -13,9 +13,6 @@
#include <array> #include <array>
#endif #endif
#define BOOST_TEST_MAIN
#include <boost/test/unit_test.hpp>
#ifndef BOOST_NO_CXX11_CONSTEXPR #ifndef BOOST_NO_CXX11_CONSTEXPR
constexpr boost::array<int, 10> arr {{ 0,1,2,3,4,5,6,7,8,9 }}; constexpr boost::array<int, 10> arr {{ 0,1,2,3,4,5,6,7,8,9 }};
constexpr std::array<int, 10> arr_std {{ 0,1,2,3,4,5,6,7,8,9 }}; constexpr std::array<int, 10> arr_std {{ 0,1,2,3,4,5,6,7,8,9 }};
@ -26,7 +23,7 @@ void sink ( T t ) {}
template <typename T, size_t N> template <typename T, size_t N>
void sink ( boost::array<T,N> &arr ) {} void sink ( boost::array<T,N> &arr ) {}
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
// constexpr int two = arr_std.at (2); // constexpr int two = arr_std.at (2);
constexpr int three = arr.at (3); constexpr int three = arr.at (3);
@ -36,7 +33,7 @@ BOOST_AUTO_TEST_CASE( test_main )
} }
#else // no constexpr means no constexpr tests! #else // no constexpr means no constexpr tests!
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
} }
#endif #endif

9
test/array_getfail1.cpp
View File

@ -16,8 +16,7 @@
#include <array> #include <array>
#endif #endif
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
@ -30,13 +29,13 @@ namespace {
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
T &aRef = std::get<5> ( test_case ); // should fail to compile T &aRef = std::get<5> ( test_case ); // should fail to compile
BOOST_CHECK ( &*test_case.begin () == &aRef ); BOOST_TEST ( &*test_case.begin () == &aRef );
} }
#endif #endif
} }
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
#ifndef BOOST_NO_CXX11_HDR_ARRAY #ifndef BOOST_NO_CXX11_HDR_ARRAY
RunStdTests< bool >(); RunStdTests< bool >();
@ -46,4 +45,6 @@ BOOST_AUTO_TEST_CASE( test_main )
#else #else
BOOST_STATIC_ASSERT ( false ); // fail on C++03 systems. BOOST_STATIC_ASSERT ( false ); // fail on C++03 systems.
#endif #endif
return boost::report_errors();
} }

13
test/array_getfail2.cpp
View File

@ -13,8 +13,7 @@
#include <array> #include <array>
#endif #endif
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
@ -27,10 +26,10 @@ namespace {
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
T &aRef = std::get<0> ( test_case ); T &aRef = std::get<0> ( test_case );
BOOST_CHECK ( &*test_case.begin () == &aRef ); BOOST_TEST ( &*test_case.begin () == &aRef );
const T &caRef = std::get<0> ( test_case ); const T &caRef = std::get<0> ( test_case );
BOOST_CHECK ( &*test_case.cbegin () == &caRef ); BOOST_TEST ( &*test_case.cbegin () == &caRef );
} }
#endif #endif
@ -42,12 +41,12 @@ namespace {
test_type test_case; // = { 1, 1, 2, 3, 5 }; test_type test_case; // = { 1, 1, 2, 3, 5 };
T &aRef = boost::get<5> ( test_case ); T &aRef = boost::get<5> ( test_case );
BOOST_CHECK ( &*test_case.begin () == &aRef ); BOOST_TEST ( &*test_case.begin () == &aRef );
} }
} }
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
RunBoostTests< bool >(); RunBoostTests< bool >();
RunBoostTests< void * >(); RunBoostTests< void * >();
@ -60,5 +59,7 @@ BOOST_AUTO_TEST_CASE( test_main )
RunStdTests< long double >(); RunStdTests< long double >();
RunStdTests< std::string >(); RunStdTests< std::string >();
#endif #endif
return boost::report_errors();
} }

9
test/array_hash.cpp
View File

@ -11,8 +11,7 @@
#include <algorithm> #include <algorithm>
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#define BOOST_TEST_MAIN #include <boost/core/lightweight_test_trait.hpp>
#include <boost/test/unit_test.hpp>
namespace { namespace {
@ -29,15 +28,17 @@ namespace {
std::size_t bhash = boost::hash<barr> () ( test_barr ); std::size_t bhash = boost::hash<barr> () ( test_barr );
std::size_t ahash = boost::hash<arr> () ( test_arr ); std::size_t ahash = boost::hash<arr> () ( test_arr );
BOOST_CHECK ( ahash == bhash ); BOOST_TEST ( ahash == bhash );
} }
} }
BOOST_AUTO_TEST_CASE( test_main ) int main()
{ {
RunTests< int >(); RunTests< int >();
RunTests< long >(); RunTests< long >();
RunTests< long double >(); RunTests< long double >();
return boost::report_errors();
} }