From 2c011a11be2323b011ec07ced4c69a461b3136c7 Mon Sep 17 00:00:00 2001 From: Stefan Slapeta Date: Thu, 3 Feb 2005 12:38:58 +0000 Subject: [PATCH] Replaced BOOST_TEST [SVN r27051] --- test/access.cpp | 8 ++--- test/assign.cpp | 2 +- test/assign_to_array.cpp | 2 +- test/compare.cpp | 46 ++++++++++++++--------------- test/constructors.cpp | 28 +++++++++--------- test/idxgen1.cpp | 14 ++++----- test/index_bases.cpp | 24 +++++++-------- test/iterators.cpp | 10 +++---- test/range1.cpp | 64 ++++++++++++++++++++-------------------- test/reshape.cpp | 12 ++++---- test/resize.cpp | 4 +-- test/slice.cpp | 8 ++--- test/stl_interaction.cpp | 6 ++-- test/storage_order.cpp | 8 ++--- 14 files changed, 118 insertions(+), 118 deletions(-) diff --git a/test/access.cpp b/test/access.cpp index 1b3c8c8..72efbbd 100644 --- a/test/access.cpp +++ b/test/access.cpp @@ -42,8 +42,8 @@ void access(Array& A, const const_array_tag&) { for (index i = idx0; i != idx0+2; ++i) for (index j = idx1; j != idx1+3; ++j) for (index k = idx2; k != idx2+4; ++k) { - BOOST_TEST(A[i][j][k] == cnum++); - BOOST_TEST(CA[i][j][k] == A[i][j][k]); + BOOST_CHECK(A[i][j][k] == cnum++); + BOOST_CHECK(CA[i][j][k] == A[i][j][k]); } // operator() @@ -52,8 +52,8 @@ void access(Array& A, const const_array_tag&) { for (index k2 = 0; k2 != 4; ++k2) { boost::array indices; indices[0] = i2; indices[1] = j2; indices[2] = k2; - BOOST_TEST(A(indices) == A[i2][j2][k2]); - BOOST_TEST(CA(indices) == A(indices)); + BOOST_CHECK(A(indices) == A[i2][j2][k2]); + BOOST_CHECK(CA(indices) == A(indices)); } ++tests_run; } diff --git a/test/assign.cpp b/test/assign.cpp index ac84b20..dc78f57 100644 --- a/test/assign.cpp +++ b/test/assign.cpp @@ -59,7 +59,7 @@ void access(Array& A, const mutable_array_tag&) { A = filler; - BOOST_TEST(equal(A,filler)); + BOOST_CHECK(equal(A,filler)); ++tests_run; } diff --git a/test/assign_to_array.cpp b/test/assign_to_array.cpp index f89ed5a..8aab5d2 100644 --- a/test/assign_to_array.cpp +++ b/test/assign_to_array.cpp @@ -50,7 +50,7 @@ template void access(Array& A, const const_array_tag&) { typedef boost::multi_array array3; array3 acopy(A); - BOOST_TEST(equal(acopy,A)); + BOOST_CHECK(equal(acopy,A)); ++tests_run; } diff --git a/test/compare.cpp b/test/compare.cpp index 26fcdee..22b556f 100644 --- a/test/compare.cpp +++ b/test/compare.cpp @@ -34,9 +34,9 @@ test_main(int, char*[]) std::vector vals(num_elements, 4.5); A.assign(vals.begin(),vals.end()); array B(A); - BOOST_TEST(A == B); - BOOST_TEST(B == A); - BOOST_TEST(A[0] == B[0]); + BOOST_CHECK(A == B); + BOOST_CHECK(B == A); + BOOST_CHECK(A[0] == B[0]); } // Assignment Operator { @@ -44,15 +44,15 @@ test_main(int, char*[]) std::vector vals(num_elements, 4.5); A.assign(vals.begin(),vals.end()); B = A; - BOOST_TEST(A == B); - BOOST_TEST(B == A); - BOOST_TEST(B[0] == A[0]); + BOOST_CHECK(A == B); + BOOST_CHECK(B == A); + BOOST_CHECK(B[0] == A[0]); typedef array::index_range range; array::index_gen indices; array::array_view<2>::type C = A[indices[2][range()][range()]]; array::array_view<2>::type D = B[indices[2][range()][range()]]; - BOOST_TEST(C == D); + BOOST_CHECK(C == D); } // Different Arrays { @@ -62,15 +62,15 @@ test_main(int, char*[]) A.assign(valsA.begin(),valsA.end()); B.assign(valsB.begin(),valsB.end()); - BOOST_TEST(A != B); - BOOST_TEST(B != A); - BOOST_TEST(A[0] != B[0]); + BOOST_CHECK(A != B); + BOOST_CHECK(B != A); + BOOST_CHECK(A[0] != B[0]); typedef array::index_range range; array::index_gen indices; array::array_view<2>::type C = A[indices[2][range()][range()]]; array::array_view<2>::type D = B[indices[2][range()][range()]]; - BOOST_TEST(C != D); + BOOST_CHECK(C != D); } // Comparisons galore! @@ -108,30 +108,30 @@ test_main(int, char*[]) A.assign(valsA,valsA+num_elements); B.assign(valsB,valsB+num_elements); - BOOST_TEST(B < A); - BOOST_TEST(A > B); + BOOST_CHECK(B < A); + BOOST_CHECK(A > B); - BOOST_TEST(B <= A); - BOOST_TEST(A >= B); + BOOST_CHECK(B <= A); + BOOST_CHECK(A >= B); - BOOST_TEST(B[0] == A[0]); - BOOST_TEST(B[2] < A[2]); + BOOST_CHECK(B[0] == A[0]); + BOOST_CHECK(B[2] < A[2]); array C = A; - BOOST_TEST(C <= A); - BOOST_TEST(C >= A); + BOOST_CHECK(C <= A); + BOOST_CHECK(C >= A); - BOOST_TEST(!(C < A)); - BOOST_TEST(!(C > A)); + BOOST_CHECK(!(C < A)); + BOOST_CHECK(!(C > A)); typedef array::index_range range; array::index_gen indices; array::array_view<2>::type D = A[indices[2][range()][range()]]; array::array_view<2>::type E = B[indices[2][range()][range()]]; - BOOST_TEST(E < D); - BOOST_TEST(E <= D); + BOOST_CHECK(E < D); + BOOST_CHECK(E <= D); } diff --git a/test/constructors.cpp b/test/constructors.cpp index 65bf80f..96b2263 100644 --- a/test/constructors.cpp +++ b/test/constructors.cpp @@ -30,10 +30,10 @@ void check_shape(const Array& A, int* strides, unsigned int num_elements) { - BOOST_TEST(A.num_elements() == num_elements); - BOOST_TEST(A.size() == *sizes); - BOOST_TEST(std::equal(sizes, sizes + A.num_dimensions(), A.shape())); - BOOST_TEST(std::equal(strides, strides + A.num_dimensions(), A.strides())); + BOOST_CHECK(A.num_elements() == num_elements); + BOOST_CHECK(A.size() == *sizes); + BOOST_CHECK(std::equal(sizes, sizes + A.num_dimensions(), A.shape())); + BOOST_CHECK(std::equal(strides, strides + A.num_dimensions(), A.strides())); check_shape(A[0], ++sizes, ++strides, num_elements / A.size()); } @@ -132,20 +132,20 @@ test_main(int, char*[]) A.assign(vals.begin(),vals.end()); boost::multi_array B(A); check_shape(B, &sizes[0], strides, num_elements); - BOOST_TEST(equal(A, B)); + BOOST_CHECK(equal(A, B)); double ptr[27]; boost::multi_array_ref C(ptr,sizes); A.assign(vals.begin(),vals.end()); boost::multi_array_ref D(C); check_shape(D, &sizes[0], strides, num_elements); - BOOST_TEST(C.data() == D.data()); + BOOST_CHECK(C.data() == D.data()); const double* cptr = ptr; boost::const_multi_array_ref E(cptr,sizes); boost::const_multi_array_ref F(E); check_shape(F, &sizes[0], strides, num_elements); - BOOST_TEST(E.data() == F.data()); + BOOST_CHECK(E.data() == F.data()); } @@ -161,15 +161,15 @@ test_main(int, char*[]) boost::const_multi_array_ref C(A); check_shape(B, &sizes[0], strides, num_elements); check_shape(C, &sizes[0], strides, num_elements); - BOOST_TEST(B.data() == A.data()); - BOOST_TEST(C.data() == A.data()); + BOOST_CHECK(B.data() == A.data()); + BOOST_CHECK(C.data() == A.data()); double ptr[27]; boost::multi_array_ref D(ptr,sizes); D.assign(vals.begin(),vals.end()); boost::const_multi_array_ref E(D); check_shape(E, &sizes[0], strides, num_elements); - BOOST_TEST(E.data() == D.data()); + BOOST_CHECK(E.data() == D.data()); } // Assignment Operator @@ -182,7 +182,7 @@ test_main(int, char*[]) A.assign(vals.begin(),vals.end()); B = A; check_shape(B, &sizes[0], strides, num_elements); - BOOST_TEST(equal(A, B)); + BOOST_CHECK(equal(A, B)); double ptr1[27]; double ptr2[27]; @@ -190,7 +190,7 @@ test_main(int, char*[]) C.assign(vals.begin(),vals.end()); D = C; check_shape(D, &sizes[0], strides, num_elements); - BOOST_TEST(equal(C,D)); + BOOST_CHECK(equal(C,D)); } @@ -209,8 +209,8 @@ test_main(int, char*[]) subarray::value_type C = B[0]; // should comparisons between the types work? - BOOST_TEST(equal(A[1][0],C)); - BOOST_TEST(equal(B[0],C)); + BOOST_CHECK(equal(A[1][0],C)); + BOOST_CHECK(equal(B[0],C)); } return boost::exit_success; } diff --git a/test/idxgen1.cpp b/test/idxgen1.cpp index 8f1b86f..c4dd05d 100644 --- a/test/idxgen1.cpp +++ b/test/idxgen1.cpp @@ -64,18 +64,18 @@ test_main(int,char*[]) { boost::detail::multi_array::index_gen<3,3> is1 = indices[range(0,1,2)][range(1,2,3)][range(2,3,4)]; - BOOST_TEST(is1.ranges_[0] == range(0,1,2)); - BOOST_TEST(is1.ranges_[1] == range(1,2,3)); - BOOST_TEST(is1.ranges_[2] == range(2,3,4)); + BOOST_CHECK(is1.ranges_[0] == range(0,1,2)); + BOOST_CHECK(is1.ranges_[1] == range(1,2,3)); + BOOST_CHECK(is1.ranges_[2] == range(2,3,4)); } { boost::detail::multi_array::index_gen<3,2> is2 = indices[range(0,1,2)][2][range(2,3,4)]; - BOOST_TEST(is2.ranges_[0] == range(0,1,2)); - BOOST_TEST(is2.ranges_[1] == range(2)); - BOOST_TEST(is2.ranges_[1].is_degenerate()); - BOOST_TEST(is2.ranges_[2] == range(2,3,4)); + BOOST_CHECK(is2.ranges_[0] == range(0,1,2)); + BOOST_CHECK(is2.ranges_[1] == range(2)); + BOOST_CHECK(is2.ranges_[1].is_degenerate()); + BOOST_CHECK(is2.ranges_[2] == range(2,3,4)); } return boost::exit_success; diff --git a/test/index_bases.cpp b/test/index_bases.cpp index 41841f4..95a45e2 100644 --- a/test/index_bases.cpp +++ b/test/index_bases.cpp @@ -63,11 +63,11 @@ test_main(int,char*[]) for (size_type a = 0; a < A.shape()[0]; ++a) for (size_type b = 0; b < A.shape()[1]; ++b) for (size_type c = 0; c < A[b].size(); ++c) { - BOOST_TEST(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); - BOOST_TEST(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); - BOOST_TEST(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); // Test that E does not inherit A's index_base - BOOST_TEST(E[a][b][c] == B[a][b][c]); + BOOST_CHECK(E[a][b][c] == B[a][b][c]); } } @@ -100,10 +100,10 @@ test_main(int,char*[]) for (size_type a = 0; a < A.shape()[0]; ++a) for (size_type b = 0; b < A.shape()[1]; ++b) for (size_type c = 0; c < A.shape()[2]; ++c) { - BOOST_TEST(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); - BOOST_TEST(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); - BOOST_TEST(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); - BOOST_TEST(E[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(A[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(C[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(D[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); + BOOST_CHECK(E[a+bases[0]][b+bases[1]][c+bases[2]] == B[a][b][c]); } } @@ -134,10 +134,10 @@ test_main(int,char*[]) for (size_type a = 0; a < A.shape()[0]; ++a) for (size_type b = 0; b < A.shape()[1]; ++b) for (size_type c = 0; c < A.shape()[2]; ++c) { - BOOST_TEST(A[a+1][b+1][c+1] == B[a][b][c]); - BOOST_TEST(C[a+1][b+1][c+1] == B[a][b][c]); - BOOST_TEST(D[a+1][b+1][c+1] == B[a][b][c]); - BOOST_TEST(E[a+1][b+1][c+1] == B[a][b][c]); + BOOST_CHECK(A[a+1][b+1][c+1] == B[a][b][c]); + BOOST_CHECK(C[a+1][b+1][c+1] == B[a][b][c]); + BOOST_CHECK(D[a+1][b+1][c+1] == B[a][b][c]); + BOOST_CHECK(E[a+1][b+1][c+1] == B[a][b][c]); } } diff --git a/test/iterators.cpp b/test/iterators.cpp index 3e1fef7..5686c2b 100644 --- a/test/iterators.cpp +++ b/test/iterators.cpp @@ -107,8 +107,8 @@ void test_iterators(Array& A, const IterTraits&) { typedef typename IterTraits::iterator3 iterator; iterator i1 = A.begin(); iterator i2 = A.end(); - BOOST_TEST(i1 < i2); - BOOST_TEST((i2 - i1) == typename iterator::difference_type(2)); + BOOST_CHECK(i1 < i2); + BOOST_CHECK((i2 - i1) == typename iterator::difference_type(2)); } // Standard Array Iteration @@ -121,7 +121,7 @@ void test_iterators(Array& A, const IterTraits&) { for (iterator3 i = A.begin(); i != A.end(); ++i) for(iterator2 ii = (*i).begin(); ii != (*i).end(); ++ii) for(iterator1 iii = (*ii).begin(); iii != (*ii).end(); ++iii) - BOOST_TEST(*iii == vals++); + BOOST_CHECK(*iii == vals++); } // Using operator->() on iterators @@ -134,7 +134,7 @@ void test_iterators(Array& A, const IterTraits&) { for (iterator3 i = A.begin(); i != A.end(); ++i) for(iterator2 ii = i->begin(); ii != i->end(); ++ii) for(iterator1 iii = ii->begin(); iii != ii->end(); ++iii) - BOOST_TEST(*iii == vals++); + BOOST_CHECK(*iii == vals++); } // Reverse Iterator Hierarchy Test @@ -148,7 +148,7 @@ void test_iterators(Array& A, const IterTraits&) { for(riterator2 ii = (*i).rbegin(); ii != (riterator2)(*i).rend(); ++ii) for(riterator1 iii = (*ii).rbegin(); iii != (riterator1)(*ii).rend(); ++iii) - BOOST_TEST(*iii == check_iter_val--); + BOOST_CHECK(*iii == check_iter_val--); } ++tests_run; } diff --git a/test/range1.cpp b/test/range1.cpp index 00a204e..414d63a 100644 --- a/test/range1.cpp +++ b/test/range1.cpp @@ -30,75 +30,75 @@ test_main(int,char*[]) { // typical range creation and extraction range r1(-3,5); - BOOST_TEST(r1.start() == -3); - BOOST_TEST(r1.finish() == 5); - BOOST_TEST(r1.stride() == 1); - BOOST_TEST(!r1.is_degenerate()); - BOOST_TEST(r1.get_start(0) == -3); - BOOST_TEST(r1.get_finish(100) == 5); + BOOST_CHECK(r1.start() == -3); + BOOST_CHECK(r1.finish() == 5); + BOOST_CHECK(r1.stride() == 1); + BOOST_CHECK(!r1.is_degenerate()); + BOOST_CHECK(r1.get_start(0) == -3); + BOOST_CHECK(r1.get_finish(100) == 5); } { range r2(-3,5,2); - BOOST_TEST(r2.start() == -3); - BOOST_TEST(r2.finish() == 5); - BOOST_TEST(r2.stride() == 2); - BOOST_TEST(!r2.is_degenerate()); + BOOST_CHECK(r2.start() == -3); + BOOST_CHECK(r2.finish() == 5); + BOOST_CHECK(r2.stride() == 2); + BOOST_CHECK(!r2.is_degenerate()); } { // degenerate creation range r3(5); - BOOST_TEST(r3.start() == 5); - BOOST_TEST(r3.finish() == 5); - BOOST_TEST(r3.stride() == 1); - BOOST_TEST(r3.is_degenerate()); + BOOST_CHECK(r3.start() == 5); + BOOST_CHECK(r3.finish() == 5); + BOOST_CHECK(r3.stride() == 1); + BOOST_CHECK(r3.is_degenerate()); } { // default range creation range r4; - BOOST_TEST(r4.get_start(0) == 0); - BOOST_TEST(r4.get_finish(100) == 100); - BOOST_TEST(r4.stride() == 1); + BOOST_CHECK(r4.get_start(0) == 0); + BOOST_CHECK(r4.get_finish(100) == 100); + BOOST_CHECK(r4.stride() == 1); } { // create a range using the setter methods range r5 = range().stride(2).start(-3).finish(7); - BOOST_TEST(r5.start() == -3); - BOOST_TEST(r5.stride() == 2); - BOOST_TEST(r5.finish() == 7); + BOOST_CHECK(r5.start() == -3); + BOOST_CHECK(r5.stride() == 2); + BOOST_CHECK(r5.finish() == 7); } // try out all the comparison operators { range r6 = -3 <= range().stride(2) < 7; - BOOST_TEST(r6.start() == -3); - BOOST_TEST(r6.stride() == 2); - BOOST_TEST(r6.finish() == 7); + BOOST_CHECK(r6.start() == -3); + BOOST_CHECK(r6.stride() == 2); + BOOST_CHECK(r6.finish() == 7); } { range r7 = -3 < range() <= 7; - BOOST_TEST(r7.start() == -2); - BOOST_TEST(r7.stride() == 1); - BOOST_TEST(r7.finish() == 8); + BOOST_CHECK(r7.start() == -2); + BOOST_CHECK(r7.stride() == 1); + BOOST_CHECK(r7.finish() == 8); } // arithmetic operators { range r8 = range(0,5) + 2; - BOOST_TEST(r8.start() == 2); - BOOST_TEST(r8.stride() == 1); - BOOST_TEST(r8.finish() == 7); + BOOST_CHECK(r8.start() == 2); + BOOST_CHECK(r8.stride() == 1); + BOOST_CHECK(r8.finish() == 7); } { range r9 = range(0,5) - 2; - BOOST_TEST(r9.start() == -2); - BOOST_TEST(r9.stride() == 1); - BOOST_TEST(r9.finish() == 3); + BOOST_CHECK(r9.start() == -2); + BOOST_CHECK(r9.stride() == 1); + BOOST_CHECK(r9.finish() == 3); } return boost::exit_success; diff --git a/test/reshape.cpp b/test/reshape.cpp index 9de2b43..a65f75e 100644 --- a/test/reshape.cpp +++ b/test/reshape.cpp @@ -52,9 +52,9 @@ test_main(int,char*[]) for (array::index i = 0; i != 4; ++i) for (array::index j = 0; j != 3; ++j) for (array::index k = 0; k != 2; ++k) { - BOOST_TEST(A[i][j][k] == *ptr); - BOOST_TEST(B[i][j][k] == *ptr); - BOOST_TEST(C[i][j][k] == *ptr++); + BOOST_CHECK(A[i][j][k] == *ptr); + BOOST_CHECK(B[i][j][k] == *ptr); + BOOST_CHECK(C[i][j][k] == *ptr++); } } @@ -80,9 +80,9 @@ test_main(int,char*[]) for (array::index i = 0; i != 4; ++i) for (array::index j = 1; j != 4; ++j) for (array::index k = -1; k != 1; ++k) { - BOOST_TEST(A[i][j][k] == *ptr); - BOOST_TEST(B[i][j][k] == *ptr); - BOOST_TEST(C[i][j][k] == *ptr++); + BOOST_CHECK(A[i][j][k] == *ptr); + BOOST_CHECK(B[i][j][k] == *ptr); + BOOST_CHECK(C[i][j][k] == *ptr++); } } diff --git a/test/resize.cpp b/test/resize.cpp index f566c82..866511c 100644 --- a/test/resize.cpp +++ b/test/resize.cpp @@ -60,13 +60,13 @@ int test_main(int,char*[]) { 0,0 }; - BOOST_TEST(std::equal(A_resize,A_resize+(4*3*2),A.data())); + BOOST_CHECK(std::equal(A_resize,A_resize+(4*3*2),A.data())); { marray defaultA; defaultA.resize(boost::extents[2][3][4]); - BOOST_TEST(std::accumulate(defaultA.data(), + BOOST_CHECK(std::accumulate(defaultA.data(), defaultA.data()+(2*3*4),0) == 0); } return boost::exit_success; diff --git a/test/slice.cpp b/test/slice.cpp index 4cec840..b6ff77a 100644 --- a/test/slice.cpp +++ b/test/slice.cpp @@ -71,10 +71,10 @@ void test_views(Array& A, const ViewTraits&) { for (index i = 0; i != 2; ++i) for (index j = 0; j != 2; ++j) for (index k = 0; k != 2; ++k) { - BOOST_TEST(B[i][j][k] == A[idx0+i][idx1+j+1][idx2+k*2]); + BOOST_CHECK(B[i][j][k] == A[idx0+i][idx1+j+1][idx2+k*2]); boost::array elmts; elmts[0]=i; elmts[1]=j; elmts[2]=k; - BOOST_TEST(B(elmts) == A[idx0+i][idx1+j+1][idx2+k*2]); + BOOST_CHECK(B(elmts) == A[idx0+i][idx1+j+1][idx2+k*2]); } } // Degenerate dimensions @@ -84,10 +84,10 @@ void test_views(Array& A, const ViewTraits&) { for (index i = 0; i != 2; ++i) for (index j = 0; j != 2; ++j) { - BOOST_TEST(B[i][j] == A[idx0+i][idx1+1][idx2+j*2]); + BOOST_CHECK(B[i][j] == A[idx0+i][idx1+1][idx2+j*2]); boost::array elmts; elmts[0]=i; elmts[1]=j; - BOOST_TEST(B(elmts) == A[idx0+i][idx1+1][idx2+j*2]); + BOOST_CHECK(B(elmts) == A[idx0+i][idx1+1][idx2+j*2]); } } ++tests_run; diff --git a/test/stl_interaction.cpp b/test/stl_interaction.cpp index 3c6a12a..e6424c8 100644 --- a/test/stl_interaction.cpp +++ b/test/stl_interaction.cpp @@ -51,7 +51,7 @@ test_main(int, char*[]) myarray.assign(data,data+data_size); array3vec myvec(5,myarray); - BOOST_TEST(myarray == myvec[1]); + BOOST_CHECK(myarray == myvec[1]); array3::array_view<2>::type myview = myarray[indices[1][range(0,2)][range(1,3)]]; @@ -65,8 +65,8 @@ test_main(int, char*[]) myvec.push_back(myarray); - BOOST_TEST(myarray != myvec[1]); - BOOST_TEST(myarray == myvec[5]); + BOOST_CHECK(myarray != myvec[1]); + BOOST_CHECK(myarray == myvec[5]); return boost::exit_success; } diff --git a/test/storage_order.cpp b/test/storage_order.cpp index e632ecc..16fe28f 100644 --- a/test/storage_order.cpp +++ b/test/storage_order.cpp @@ -67,7 +67,7 @@ test_main(int,char*[]) for (array::index i = 0; i != 2; ++i) for (array::index j = 0; j != 3; ++j) for (array::index k = 0; k != 4; ++k) - BOOST_TEST(A[i][j][k] == *num++); + BOOST_CHECK(A[i][j][k] == *num++); } // Mimic fortran_storage_order using @@ -88,7 +88,7 @@ test_main(int,char*[]) for (array::index i = 0; i != 2; ++i) for (array::index j = 0; j != 3; ++j) for (array::index k = 0; k != 4; ++k) - BOOST_TEST(A[i][j][k] == *num++); + BOOST_CHECK(A[i][j][k] == *num++); } // general_storage_order with arbitrary storage order @@ -119,7 +119,7 @@ test_main(int,char*[]) for (array::index i = 0; i != 2; ++i) for (array::index j = 0; j != 3; ++j) for (array::index k = 0; k != 4; ++k) - BOOST_TEST(A[i][j][k] == *num++); + BOOST_CHECK(A[i][j][k] == *num++); } @@ -152,7 +152,7 @@ test_main(int,char*[]) for (array::index i = 0; i != 2; ++i) for (array::index j = 0; j != 3; ++j) for (array::index k = 0; k != 4; ++k) - BOOST_TEST(A[i][j][k] == *num++); + BOOST_CHECK(A[i][j][k] == *num++); } return boost::exit_success;