[unit] convert all uses of BOOST_{WARN,CHECK,REQUIRE}_THROW to `BOO…

…ST_{WARN,CHECK,REQUIRE}_TA_ASSERT` so that unit tests can be built/run regardless of how `introduced `BOOST_{WARN,CHECK,REQUIRE}_TA_ASSERT` macros to use in place of ` is set
ValeevGroup · Nov 18, 2023 · 1ba4fbb · 1ba4fbb
1 parent 24e07eb
commit 1ba4fbb
Show file tree

Hide file tree

Showing 18 changed files with 150 additions and 152 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,6 +109,7 @@ include(LoadFetchContent)
 include(CMakeDependentOption)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
+include(CTest)  # testing, defined BUILD_TESTING
 
 set(MPI_CXX_SKIP_MPICXX TRUE CACHE BOOL "MPI_CXX_SKIP_MPICXX")
 
@@ -284,13 +285,6 @@ set_property(
   CACHE TA_ASSERT_POLICY PROPERTY
   STRINGS TA_ASSERT_THROW TA_ASSERT_ABORT TA_ASSERT_IGNORE)
 
-# if building unit tests default to throw to be able to test TA_ASSERT statements
-if (NOT (TA_ASSERT_POLICY STREQUAL TA_ASSERT_THROW))
-  if (BUILD_TESTING)
-    message(FATAL_ERROR "TA_ASSERT_POLICY=${TA_ASSERT_POLICY} requires BUILD_TESTING=OFF")
-  endif(BUILD_TESTING)
-endif()
-
 ##########################
 # Include source dirctories
 ##########################
@@ -368,14 +362,20 @@ add_subdirectory(doc)
 ##########################
 # checking/testing
 ##########################
-include(CTest)
+# N.B. CTest was included above
 if (BUILD_TESTING)
   set(_ctest_args -V -R "tiledarray/unit/run-np.*")
   set(_ctest_args_serial -V -R "tiledarray/unit/run-np-1")
   if (DEFINED TA_UT_CTEST_TIMEOUT)
     list(APPEND _ctest_args --timeout ${TA_UT_CTEST_TIMEOUT})
     list(APPEND _ctest_args_serial --timeout ${TA_UT_CTEST_TIMEOUT})
   endif(DEFINED TA_UT_CTEST_TIMEOUT)
+
+  # if building unit tests need to configure with TA_ASSERT_POLICY=TA_ASSERT_THROW to be able to test TA_ASSERT statements
+  if (NOT (TA_ASSERT_POLICY STREQUAL TA_ASSERT_THROW))
+    message(WARNING "BUILD_TESTING=ON requires configuring with TA_ASSERT_POLICY=TA_ASSERT_THROW to engage REQUIRE_THROWS() tests; will skip these tests")
+  endif()
+
   add_custom_target_subproject(tiledarray check USES_TERMINAL COMMAND ${CMAKE_CTEST_COMMAND} ${_ctest_args})
   add_custom_target_subproject(tiledarray check_serial USES_TERMINAL COMMAND ${CMAKE_CTEST_COMMAND} ${_ctest_args_serial})
   add_subdirectory(tests)

diff --git a/tests/annotation.cpp b/tests/annotation.cpp
@@ -201,7 +201,7 @@ BOOST_AUTO_TEST_SUITE(split_index_fxn)
 
 BOOST_AUTO_TEST_CASE(invalid_idx) {
   if (TiledArray::get_default_world().nproc() == 1)
-    BOOST_CHECK_THROW(split_index("i,"), TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT(split_index("i,"), TiledArray::Exception);
 }
 
 BOOST_AUTO_TEST_CASE(non_tot) {

diff --git a/tests/bipartite_index_list.cpp b/tests/bipartite_index_list.cpp
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE(default_ctor) {
  */
 BOOST_AUTO_TEST_CASE(string_ctor) {
   if (world.nproc() == 1) {
-    BOOST_CHECK_THROW(BipartiteIndexList("i,"), TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT(BipartiteIndexList("i,"), TiledArray::Exception);
   }
 
   for (auto&& [str, idx] : idxs) {
@@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE(copy_assignment) {
 BOOST_AUTO_TEST_CASE(string_assignment) {
   if (world.nproc() == 1) {
     BipartiteIndexList v1;
-    BOOST_CHECK_THROW(v1.operator=("i,"), TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT(v1.operator=("i,"), TiledArray::Exception);
   }
 
   for (auto&& [str, idx] : idxs) {
@@ -282,7 +282,7 @@ BOOST_AUTO_TEST_CASE(permute_in_place) {
   if (world.nproc() == 1) {
     BipartiteIndexList v0;
     Permutation p{0, 1};
-    BOOST_CHECK_THROW(v0 *= p, TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT(v0 *= p, TiledArray::Exception);
   }
 
   Permutation p({1, 2, 3, 0});
@@ -335,13 +335,13 @@ BOOST_AUTO_TEST_CASE(end_itr) {
 BOOST_AUTO_TEST_CASE(at_member) {
   for (auto&& [str, idx] : idxs) {
     if (world.nproc() == 1) {
-    BOOST_CHECK_THROW(idx.at(idx.size()),
+      BOOST_CHECK_TA_ASSERT(idx.at(idx.size()),
 #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
-                        std::out_of_range
+                            std::out_of_range
 #else
-        boost::container::out_of_range
+                            boost::container::out_of_range
 #endif
-                            );
+      );
     }
     auto [outer, inner] = detail::split_index(str);
     for (size_type i = 0; i < outer.size(); ++i)
@@ -498,23 +498,23 @@ BOOST_AUTO_TEST_CASE(permutation_fxn) {
 
     {  // not both ToT
       BipartiteIndexList v1("i;j");
-      BOOST_CHECK_THROW(v1.permutation(v0), TiledArray::Exception);
+      BOOST_CHECK_TA_ASSERT(v1.permutation(v0), TiledArray::Exception);
     }
 
     {  // wrong size
       BipartiteIndexList v1("i");
-      BOOST_CHECK_THROW(v1.permutation(v0), TiledArray::Exception);
+      BOOST_CHECK_TA_ASSERT(v1.permutation(v0), TiledArray::Exception);
     }
 
     {  // not a permutation
       BipartiteIndexList v1("i, a");
-      BOOST_CHECK_THROW(v1.permutation(v0), TiledArray::Exception);
+      BOOST_CHECK_TA_ASSERT(v1.permutation(v0), TiledArray::Exception);
     }
 
     {  // ToTs mix outer and inner
       BipartiteIndexList v1("i,j;k,l");
       BipartiteIndexList v2("i,k;j,l");
-      BOOST_CHECK_THROW(v1.permutation(v2), TiledArray::Exception);
+      BOOST_CHECK_TA_ASSERT(v1.permutation(v2), TiledArray::Exception);
     }
   }
 

diff --git a/tests/bitset.cpp b/tests/bitset.cpp
@@ -102,8 +102,8 @@ BOOST_AUTO_TEST_CASE(accessor) {
 
   // Check that exceptions are thrown when accessing an element that is out of
   // range.
-  BOOST_CHECK_THROW(set[set.size()], Exception);
-  BOOST_CHECK_THROW(set[set.size() + 1], Exception);
+  BOOST_CHECK_TA_ASSERT(set[set.size()], Exception);
+  BOOST_CHECK_TA_ASSERT(set[set.size() + 1], Exception);
 }
 
 BOOST_AUTO_TEST_CASE(set_bit) {

diff --git a/tests/conversions.cpp b/tests/conversions.cpp
@@ -530,12 +530,12 @@ BOOST_AUTO_TEST_CASE(concat) {
       }
     }
     // ranges of non-concatted dims must match
-    BOOST_CHECK_THROW((TiledArray::concat<Tensor, Policy>(
-                          {a, b_t}, std::vector<bool>{false, true})),
-                      TiledArray::Exception);
-    BOOST_CHECK_THROW((TiledArray::concat<Tensor, Policy>(
-                          {a, b_t}, std::vector<bool>{true, false})),
-                      TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT((TiledArray::concat<Tensor, Policy>(
+                              {a, b_t}, std::vector<bool>{false, true})),
+                          TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT((TiledArray::concat<Tensor, Policy>(
+                              {a, b_t}, std::vector<bool>{true, false})),
+                          TiledArray::Exception);
   };
 
   do_test(static_cast<TArrayI*>(nullptr));

diff --git a/tests/cyclic_pmap.cpp b/tests/cyclic_pmap.cpp
@@ -60,28 +60,28 @@ BOOST_AUTO_TEST_CASE(constructor) {
 
   ProcessID size = GlobalFixture::world->size();
 
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(*GlobalFixture::world,
-                                                        0ul, 10ul, 1, 1),
-                    TiledArray::Exception);
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(*GlobalFixture::world,
-                                                        10ul, 0ul, 1, 1),
-                    TiledArray::Exception);
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(*GlobalFixture::world,
-                                                        10ul, 10ul, 0, 1),
-                    TiledArray::Exception);
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(*GlobalFixture::world,
-                                                        10ul, 10ul, 1, 0),
-                    TiledArray::Exception);
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(
-                        *GlobalFixture::world, 10ul, 10ul, size * 2, 1),
-                    TiledArray::Exception);
-  BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(
-                        *GlobalFixture::world, 10ul, 10ul, 1, size * 2),
-                    TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 0ul, 10ul, 1, 1),
+                        TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 10ul, 0ul, 1, 1),
+                        TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 10ul, 10ul, 0, 1),
+                        TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 10ul, 10ul, 1, 0),
+                        TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 10ul, 10ul, size * 2, 1),
+                        TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                            *GlobalFixture::world, 10ul, 10ul, 1, size * 2),
+                        TiledArray::Exception);
   if (size > 1) {
-    BOOST_CHECK_THROW(TiledArray::detail::CyclicPmap pmap(
-                          *GlobalFixture::world, 10ul, 10ul, size, size),
-                      TiledArray::Exception);
+    BOOST_CHECK_TA_ASSERT(TiledArray::detail::CyclicPmap pmap(
+                              *GlobalFixture::world, 10ul, 10ul, size, size),
+                          TiledArray::Exception);
   }
 }
 

diff --git a/tests/dist_op_group.cpp b/tests/dist_op_group.cpp
@@ -56,14 +56,14 @@ BOOST_AUTO_TEST_CASE(constructor_empty) {
 
 #if defined(MADNESS_ASSERTIONS_THROW)
   // Check that accessing group data throws exceptions for an empty group.
-  BOOST_CHECK_THROW(empty_group.id(), madness::MadnessException);
-  BOOST_CHECK_THROW(empty_group.get_world(), madness::MadnessException);
-  BOOST_CHECK_THROW(empty_group.rank(), madness::MadnessException);
-  BOOST_CHECK_THROW(empty_group.rank(0), madness::MadnessException);
-  BOOST_CHECK_THROW(empty_group.world_rank(0), madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.id(), madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.get_world(), madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.rank(), madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.rank(0), madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.world_rank(0), madness::MadnessException);
   ProcessID parent, child1, child2;
-  BOOST_CHECK_THROW(empty_group.make_tree(0, parent, child1, child2),
-                    madness::MadnessException);
+  BOOST_CHECK_TA_ASSERT(empty_group.make_tree(0, parent, child1, child2),
+                        madness::MadnessException);
 #endif  // MADNESS_ASSERTIONS_THROW
 }
 

diff --git a/tests/distributed_storage.cpp b/tests/distributed_storage.cpp
@@ -79,8 +79,8 @@ BOOST_AUTO_TEST_CASE(set_value) {
   BOOST_CHECK_EQUAL(n, t.max_size());
 
   // Check throw for an out-of-range set.
-  BOOST_CHECK_THROW(t.set(t.max_size(), 1), TiledArray::Exception);
-  BOOST_CHECK_THROW(t.set(t.max_size() + 2, 1), TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(t.set(t.max_size(), 1), TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(t.set(t.max_size() + 2, 1), TiledArray::Exception);
 }
 
 BOOST_AUTO_TEST_CASE(array_operator) {
@@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(array_operator) {
   BOOST_CHECK_EQUAL(n, t.max_size());
 
   // Check throw for an out-of-range set.
-  BOOST_CHECK_THROW(t.get(t.max_size()), TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(t.get(t.max_size()), TiledArray::Exception);
   BOOST_CHECK_THROW(t.get(t.max_size() + 2), TiledArray::Exception);
 }
 

diff --git a/tests/index_list.cpp b/tests/index_list.cpp
@@ -135,11 +135,11 @@ BOOST_AUTO_TEST_CASE(accessors) {
   BOOST_CHECK_EQUAL(v.at(3), "d");  // check last variable access
   BOOST_CHECK_EQUAL(v[0], "a");     // check 1st variable access
   BOOST_CHECK_EQUAL(v[3], "d");     // check last variable access
-  BOOST_CHECK_THROW(v.at(4),
+  BOOST_CHECK_TA_ASSERT(v.at(4),
 #ifdef BOOST_CONTAINER_USE_STD_EXCEPTIONS
-                    std::out_of_range
+                        std::out_of_range
 #else
-                    boost::container::out_of_range
+                        boost::container::out_of_range
 #endif
   );  // check for out of range throw.
 }
@@ -175,11 +175,11 @@ BOOST_AUTO_TEST_CASE(constructor) {
   BOOST_CHECK_EQUAL(v10.at(2), "c");
   BOOST_CHECK_EQUAL(v10.at(3), "d");
 
-  BOOST_CHECK_THROW(IndexList v3(",a,b,c"),
-                    Exception);  // check invalid input
-  BOOST_CHECK_THROW(IndexList v4("a,,b,c"), Exception);
-  BOOST_CHECK_THROW(IndexList v5(" ,a,b"), Exception);
-  BOOST_CHECK_THROW(IndexList v6("a,  b,   , c"), Exception);
+  BOOST_CHECK_TA_ASSERT(IndexList v3(",a,b,c"),
+                        Exception);  // check invalid input
+  BOOST_CHECK_TA_ASSERT(IndexList v4("a,,b,c"), Exception);
+  BOOST_CHECK_TA_ASSERT(IndexList v5(" ,a,b"), Exception);
+  BOOST_CHECK_TA_ASSERT(IndexList v6("a,  b,   , c"), Exception);
 
   IndexList v7(" a , b, c, d , e e ,f f, g10,h, i ");  // check input with
                                                        // various spacings.
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE(constructor) {
   BOOST_CHECK_EQUAL(v7.at(7), "h");
   BOOST_CHECK_EQUAL(v7.at(8), "i");
 
-  BOOST_REQUIRE_THROW(
+  BOOST_REQUIRE_TA_ASSERT(
       IndexList v11(""),
       TiledArray::Exception);  // Empty string is not permitted constructor
 }

diff --git a/tests/initializer_list.cpp b/tests/initializer_list.cpp
@@ -198,7 +198,7 @@ BOOST_AUTO_TEST_CASE(scalar) {
 BOOST_AUTO_TEST_CASE(empty_vector) {
   vector_il<double> il{};
   if (world.rank() == 0)  // only rank 0 does the work
-    BOOST_CHECK_THROW(tiled_range_from_il(il), Exception);
+    BOOST_CHECK_TA_ASSERT(tiled_range_from_il(il), Exception);
 }
 
 BOOST_AUTO_TEST_CASE(vector) {

diff --git a/tests/perm_index.cpp b/tests/perm_index.cpp
@@ -49,8 +49,7 @@ const std::array<std::size_t, 4> PermIndexFixture::start = {
 const std::array<std::size_t, 4> PermIndexFixture::finish = {
     {3ul, 5ul, 7ul, 11ul}};
 
-BOOST_FIXTURE_TEST_SUITE(perm_index_suite, PermIndexFixture,
-                         TA_UT_LABEL_SERIAL)
+BOOST_FIXTURE_TEST_SUITE(perm_index_suite, PermIndexFixture, TA_UT_LABEL_SERIAL)
 
 BOOST_AUTO_TEST_CASE(default_constructor) {
   BOOST_CHECK_NO_THROW(PermIndex x;);
@@ -61,7 +60,7 @@ BOOST_AUTO_TEST_CASE(default_constructor) {
   BOOST_CHECK(!x.data());
 
   // Check that an exception is thrown when using a default constructed object
-  BOOST_CHECK_THROW(x(0), TiledArray::Exception);
+  BOOST_CHECK_TA_ASSERT(x(0), TiledArray::Exception);
 }
 
 BOOST_AUTO_TEST_CASE(constructor) {

diff --git a/tests/range.cpp b/tests/range.cpp
@@ -344,8 +344,8 @@ BOOST_AUTO_TEST_CASE(constructors) {
     BOOST_CHECK_EQUAL(r2.volume(), 48);
   }
 #else   // TA_SIGNED_1INDEX_TYPE
-  BOOST_REQUIRE_THROW(Range r2({{-1, 1}, {-2, 2}, {0, 6}}),
-                      TiledArray::Exception);
+  BOOST_REQUIRE_TA_ASSERT(Range r2({{-1, 1}, {-2, 2}, {0, 6}}),
+                          TiledArray::Exception);
 #endif  // TA_SIGNED_1INDEX_TYPE
 
   // Copy Constructor