From 6c446d694d356df4d496f62e8526c353b9639dcc Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 13 Jul 2023 07:46:23 -0400 Subject: [PATCH] Fix tests --- include/deal.II/lac/sparse_matrix_tools.h | 2 +- tests/parameter_handler/parameter_handler_25.output | 4 ++-- tests/parameter_handler/parameter_handler_26.output | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/deal.II/lac/sparse_matrix_tools.h b/include/deal.II/lac/sparse_matrix_tools.h index b355c6c954..1e004c275f 100644 --- a/include/deal.II/lac/sparse_matrix_tools.h +++ b/include/deal.II/lac/sparse_matrix_tools.h @@ -343,7 +343,7 @@ namespace SparseMatrixTools SparseMatrixType2 & system_matrix_out, SparsityPatternType2 &sparsity_pattern_out) { - Assert(index_set_1.size() || index_set_0.size() == index_set_1.size(), + Assert(index_set_1.size() == 0 || index_set_0.size() == index_set_1.size(), ExcInternalError()); auto index_set_1_cleared = index_set_1; diff --git a/tests/parameter_handler/parameter_handler_25.output b/tests/parameter_handler/parameter_handler_25.output index 26d844de58..d139d9cf5d 100644 --- a/tests/parameter_handler/parameter_handler_25.output +++ b/tests/parameter_handler/parameter_handler_25.output @@ -4,7 +4,7 @@ DEAL::successful DEAL:: -------------------------------------------------------- An error occurred in file in function - void dealii::ParameterHandler::set(const string&, const string&) + void dealii::ParameterHandler::set(const std::string &, const std::string &) The violated condition was: false Additional information: @@ -16,7 +16,7 @@ DEAL:: An error occurred in file in function void dealii::ParameterHandler::assert_that_entries_have_been_set() const The violated condition was: - entries_wrongly_not_set.size() == 0 + entries_wrongly_not_set.empty() Additional information: Not all entries of the parameter handler that were declared with `has_to_be_set = true` have been set. The following parameters diff --git a/tests/parameter_handler/parameter_handler_26.output b/tests/parameter_handler/parameter_handler_26.output index ce3d2c5069..d1a3ad63cc 100644 --- a/tests/parameter_handler/parameter_handler_26.output +++ b/tests/parameter_handler/parameter_handler_26.output @@ -6,7 +6,7 @@ DEAL:: An error occurred in file in function void dealii::ParameterHandler::assert_that_entries_have_been_set() const The violated condition was: - entries_wrongly_not_set.size() == 0 + entries_wrongly_not_set.empty() Additional information: Not all entries of the parameter handler that were declared with `has_to_be_set = true` have been set. The following parameters @@ -26,7 +26,7 @@ DEAL:: An error occurred in file in function void dealii::ParameterHandler::assert_that_entries_have_been_set() const The violated condition was: - entries_wrongly_not_set.size() == 0 + entries_wrongly_not_set.empty() Additional information: Not all entries of the parameter handler that were declared with `has_to_be_set = true` have been set. The following parameters -- 2.39.5