Adapt tests and build system to new exception system interface

lazyten · Apr 9, 2016 · db13da3 · db13da3
1 parent 38eadb7
commit db13da3
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 22 deletions.
diff --git a/src/linalgwrap/CMakeLists.txt b/src/linalgwrap/CMakeLists.txt
@@ -25,6 +25,7 @@
 set(LINALGWRAP_SOURCES
 	ParameterMap.cc
 	ExceptionBase.cc
+	ExceptionSystem.cc
 	version.cc
 )	
 

diff --git a/tests/ArmadilloMatrixTests.cc b/tests/ArmadilloMatrixTests.cc
@@ -35,7 +35,7 @@ using namespace rc;
 #ifdef LINALGWRAP_HAVE_ARMADILLO
 TEST_CASE("ArmadilloMatrix class", "[ArmadilloMatrix]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // The type of matrix we wish to test.
     typedef ArmadilloMatrix<double> matrix_type;

diff --git a/tests/ArmadilloVectorTests.cc b/tests/ArmadilloVectorTests.cc
@@ -29,7 +29,7 @@ using namespace rc;
 #ifdef LINALGWRAP_HAVE_ARMADILLO
 TEST_CASE("ArmadilloVector class", "[ArmadilloVector]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // The type of vector we wish to test.
     typedef ArmadilloVector<double> vector_type;

diff --git a/tests/BlockDiagonalMatrixTests.cc b/tests/BlockDiagonalMatrixTests.cc
@@ -29,7 +29,7 @@ using namespace rc;
 
 TEST_CASE("BlockDiagonalMatrix class", "[BlockDiagonalMatrix]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     typedef double scalar_type;
     typedef SmallMatrix<scalar_type> stored_matrix_type;

diff --git a/tests/BlockViewTests.cc b/tests/BlockViewTests.cc
@@ -27,7 +27,7 @@ using namespace rc;
 
 TEST_CASE("BlockView", "[BlockView]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // Define the types we use for the test:
     struct TestTypes {

diff --git a/tests/ExceptionTests.cc b/tests/ExceptionTests.cc
@@ -27,8 +27,7 @@ using namespace rc;
 
 TEST_CASE("Exception system", "[exception]") {
     // Make sure that the program does not get aborted
-    linalgwrap::exceptions::assert_dbg_effect =
-          linalgwrap::exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     SECTION("Test throw or raise mechanism") {
 #ifdef DEBUG
@@ -46,10 +45,10 @@ TEST_CASE("Exception system", "[exception]") {
 
         // Test if an ExcNotImplemented exception would be thrown:
         REQUIRE_THROWS_AS(assert_throw(false, ExcNotImplemented()),
-                          exceptions::ExcNotImplemented);
+                          ExcNotImplemented);
 
         // Test if an ExcIO exception would be thrown:
-        REQUIRE_THROWS_AS(assert_throw(false, ExcIO()), exceptions::ExcIO);
+        REQUIRE_THROWS_AS(assert_throw(false, ExcIO()), ExcIO);
     }
 
     //

diff --git a/tests/LazyMatrixProductTests.cc b/tests/LazyMatrixProductTests.cc
@@ -30,8 +30,7 @@ using namespace rc;
 
 TEST_CASE("LazyMatrixProduct", "[LazyMatrixProduct]") {
     // Make sure that the program does not get aborted
-    linalgwrap::exceptions::assert_dbg_effect =
-          linalgwrap::exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // TODO  Test swap function
     // TODO  Test constructors

diff --git a/tests/LazyMatrixSumTests.cc b/tests/LazyMatrixSumTests.cc
@@ -28,8 +28,7 @@ using namespace rc;
 
 TEST_CASE("LazyMatrixSum", "[LazyMatrixSum]") {
     // Make sure that the program does not get aborted
-    linalgwrap::exceptions::assert_dbg_effect =
-          linalgwrap::exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // TODO  Test swap function
     // TODO  Test constructors

diff --git a/tests/LazyMatrixWrapperTests.cc b/tests/LazyMatrixWrapperTests.cc
@@ -31,7 +31,7 @@ TEST_CASE("LazyMatrixWrapper class", "[LazyMatrixWrapper]") {
     // Test swapping
 
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     typedef double scalar_type;
     typedef SmallMatrix<scalar_type> stored_matrix_type;

diff --git a/tests/LazyMatrix_i_Tests.cc b/tests/LazyMatrix_i_Tests.cc
@@ -58,9 +58,8 @@ class SimpleLazyMatrix : public LazyMatrix_i<StoredMatrix> {
 
 TEST_CASE("LazyMatrix_i abstract class", "[LazyMatrix_i]") {
     using namespace lazymatrix_i_tests;
-
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // Test constructor
     // Test swapping

diff --git a/tests/ParameterMapTests.cc b/tests/ParameterMapTests.cc
@@ -29,7 +29,7 @@ using namespace rc;
 
 TEST_CASE("ParameterMap tests", "[parametermap]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // Some data:
     int i = 5;

diff --git a/tests/RangeTests.cc b/tests/RangeTests.cc
@@ -141,7 +141,7 @@ TEST_CASE("Range tests", "[range]") {
     using namespace range_tests;
 
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     SECTION("Range construction") {
         REQUIRE(rc::check("Range construction (size_t)",

diff --git a/tests/ScaleViewTests.cc b/tests/ScaleViewTests.cc
@@ -28,7 +28,7 @@ using namespace rc;
 
 TEST_CASE("ScaleView", "[ScaleView]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // Define the types we use for the test:
     struct TestTypes {

diff --git a/tests/SubscriptionTests.cc b/tests/SubscriptionTests.cc
@@ -998,10 +998,8 @@ struct AssignRemovePointer
 TEST_CASE("Subscription and SubscriptionPointer system", "[subscription]") {
     using namespace subscription_tests;
 
-#ifdef DEBUG
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
-#endif
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     SECTION("SubscriptionPointer  gets the data from Subscribable") {
         SimpleSubscribable s{};

diff --git a/tests/TransposeViewTests.cc b/tests/TransposeViewTests.cc
@@ -27,7 +27,7 @@ using namespace rc;
 
 TEST_CASE("TransposeView", "[TransposeView]") {
     // Make sure that the program does not get aborted
-    exceptions::assert_dbg_effect = exceptions::ExceptionEffect::THROW;
+    AssertDbgEffect::set(ExceptionEffect::THROW);
 
     // Define the types we use for the test:
     struct TestTypes {