Shorten a test suite function.

diff --git a/tests/parameter_handler/parameter_acceptor_09.output b/tests/parameter_handler/parameter_acceptor_09.output
index f2d1ef7108043516c95a2f065f5510d582d12525..5dda9338fa39ef744a5d673c903b904f384c0674 100644 (file)
--- a/tests/parameter_handler/parameter_acceptor_09.output
+++ b/tests/parameter_handler/parameter_acceptor_09.output
@@ -11,7 +11,6 @@ end
 DEAL::Generate and read input.xml
 <?xml version="1.0" encoding="utf-8"?>
 <ParameterHandler><Test><A_20point><value>0, 0, 0</value><default_value>0, 0, 0</default_value><documentation/><pattern>1</pattern><pattern_description>[List of &lt;[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]&gt; of length 3...3 (inclusive)]</pattern_description><actions>0,1</actions></A_20point></Test></ParameterHandler>
-
 DEAL::Generate and read input.json
 {
     "Test":

diff --git a/tests/parameter_handler/parameter_handler_27.output b/tests/parameter_handler/parameter_handler_27.output
index ddc73783bd12e4f735bd6b2b0d21b4c25d914e3d..890ec1bca0e3668495e64b17d3bc21665955d602 100644 (file)
--- a/tests/parameter_handler/parameter_handler_27.output
+++ b/tests/parameter_handler/parameter_handler_27.output
@@ -15,7 +15,6 @@ DEAL::XML format:
 DEAL::========================================
 <?xml version="1.0" encoding="utf-8"?>
 <ParameterHandler><Testing><A_20bool><value>true</value><default_value>true</default_value><documentation/><pattern>1</pattern><pattern_description>[Bool]</pattern_description><actions>1</actions></A_20bool><A_20double><value>1</value><default_value>1</default_value><documentation/><pattern>0</pattern><pattern_description>[Double -MAX_DOUBLE...MAX_DOUBLE (inclusive)]</pattern_description><actions>0</actions></A_20double><A_20string><value>Ciao</value><default_value>Ciao</default_value><documentation/><pattern>2</pattern><pattern_description>[Anything]</pattern_description><actions>2</actions></A_20string></Testing></ParameterHandler>
-
 DEAL::JSON format: 
 DEAL::========================================
 {

diff --git a/tests/parameter_handler/parameter_handler_28.output b/tests/parameter_handler/parameter_handler_28.output
index 95b96fa3934cdc45c60fb70916071ebeec7ff4cc..2ed6063af129eaff2b7c3e29cd974bafb28ae74c 100644 (file)
--- a/tests/parameter_handler/parameter_handler_28.output
+++ b/tests/parameter_handler/parameter_handler_28.output
@@ -10,7 +10,6 @@ DEAL::ShortXML format:
 DEAL::========================================
 <?xml version="1.0" encoding="utf-8"?>
 <ParameterHandler><A_20double>1</A_20double><Section_20two><Another_20double>2</Another_20double></Section_20two></ParameterHandler>
-
 DEAL::ShortJSON format: 
 DEAL::========================================
 {

diff --git a/tests/tests.h b/tests/tests.h
index 660088d293ddd5f03cadb8ed586791e2260b7041..cde2db56e7eaa13b89ac9b833d01130f920cf4b0 100644 (file)
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -288,16 +288,11 @@ random_box(const double &min = 0.0, const double &max = 1.0)
 void
 cat_file(const char *filename)
 {
-  std::ifstream in(filename);
-  Assert(in, dealii::ExcIO());
-
-  while (in)
-    {
-      std::string s;
-      std::getline(in, s);
-      dealii::deallog.get_file_stream() << s << "\n";
-    }
-  in.close();
+  {
+    std::ifstream in(filename);
+    Assert(in, dealii::ExcIO());
+    deallog.get_file_stream() << in.rdbuf() << "\n";
+  }
 
   std::remove(filename);
 }