From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Wed, 15 May 2019 04:28:57 +0000 (+0200)
Subject: Fix general_data_storage test
X-Git-Tag: v9.2.0-rc1~1495^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=458048da0b44ef4e50845c93a38bbed676df7e78;p=dealii.git

Fix general_data_storage test
---

diff --git a/include/deal.II/algorithms/general_data_storage.h b/include/deal.II/algorithms/general_data_storage.h
index 1c68fb38bb..6e58609b5d 100644
--- a/include/deal.II/algorithms/general_data_storage.h
+++ b/include/deal.II/algorithms/general_data_storage.h
@@ -363,7 +363,7 @@ template <typename Type>
 void
 GeneralDataStorage::add_unique_copy(const std::string &name, const Type &entry)
 {
-  Assert(!stores_object_with_name(name), ExcNameHasBeenFound(name));
+  AssertThrow(!stores_object_with_name(name), ExcNameHasBeenFound(name));
   add_or_overwrite_copy(name, entry);
 }
 
@@ -381,7 +381,7 @@ template <typename Type>
 void
 GeneralDataStorage::add_unique_reference(const std::string &name, Type &entry)
 {
-  Assert(!stores_object_with_name(name), ExcNameHasBeenFound(name));
+  AssertThrow(!stores_object_with_name(name), ExcNameHasBeenFound(name));
   add_or_overwrite_reference(name, entry);
 }
 
@@ -400,7 +400,7 @@ template <typename Type>
 Type &
 GeneralDataStorage::get_object_with_name(const std::string &name)
 {
-  Assert(stores_object_with_name(name), ExcNameNotFound(name));
+  AssertThrow(stores_object_with_name(name), ExcNameNotFound(name));
 
   Type *p = nullptr;
 
diff --git a/tests/algorithms/general_data_storage_01.debug.output b/tests/algorithms/general_data_storage_01.output
similarity index 100%
rename from tests/algorithms/general_data_storage_01.debug.output
rename to tests/algorithms/general_data_storage_01.output
diff --git a/tests/algorithms/general_data_storage_01.debug.output.2 b/tests/algorithms/general_data_storage_01.output.2
similarity index 100%
rename from tests/algorithms/general_data_storage_01.debug.output.2
rename to tests/algorithms/general_data_storage_01.output.2
diff --git a/tests/algorithms/general_data_storage_01.release.output b/tests/algorithms/general_data_storage_01.release.output
deleted file mode 100644
index 9384e0f746..0000000000
--- a/tests/algorithms/general_data_storage_01.release.output
+++ /dev/null
@@ -1,25 +0,0 @@
-
-DEAL::Add by copy
-DEAL::Size: 2
-DEAL::Add by reference
-DEAL::Size: 2
-DEAL::Add or construct
-DEAL::Size: 1
-DEAL::Merge
-DEAL::Data pre-merge:
-DEAL::value		double
-DEAL::Size: 1
-DEAL::Data 2 pre-merge:
-DEAL::value		double
-DEAL::value_2		double
-DEAL::Size: 2
-DEAL::Data post-merge:
-DEAL::value		double
-DEAL::value_2		double
-DEAL::Size: 2
-DEAL::Ambiguous construction
-DEAL::Try to overwrite existing entry: Copy
-DEAL::Try to overwrite existing entry: Reference
-DEAL::Fetch non-existing entry
-DEAL::Access removed entry (reference)
-DEAL::Access removed entry (copy)