From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Sun, 29 Aug 2010 19:58:11 +0000 (+0000)
Subject: Simplify testcase. No need to have a temporary file.
X-Git-Tag: v8.0.0~5629
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b50367d86ba153936de64f3277afb350fd88acb;p=dealii.git

Simplify testcase. No need to have a temporary file.


git-svn-id: https://svn.dealii.org/trunk@21780 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/tests/base/data_out_reader_01.cc b/tests/base/data_out_reader_01.cc
index 7972bf3a5f..024e5d23df 100644
--- a/tests/base/data_out_reader_01.cc
+++ b/tests/base/data_out_reader_01.cc
@@ -36,8 +36,7 @@ void cat_file(const char * filename)
 }
 
 template <int dim, int spacedim>
-void check(const char * name, DataOutBase::Deal_II_IntermediateFlags flags,
-	   std::ostream& out)
+void check()
 {
   const unsigned int np = 1;
   
@@ -53,16 +52,19 @@ void check(const char * name, DataOutBase::Deal_II_IntermediateFlags flags,
   names[4] = "i";
   std::vector<std_cxx1x::tuple<unsigned int, unsigned int, std::string> > vectors;
   
-  DataOutBase::write_deal_II_intermediate(patches, names, vectors, flags, out);
+  std::ostringstream old_data;
+  DataOutBase::write_deal_II_intermediate(patches, names, vectors, 
+					  DataOutBase::Deal_II_IntermediateFlags(),
+					  old_data);
 
   DataOutReader<dim,spacedim> data;
   {
-    std::ifstream input(name);    
+    std::istringstream input(old_data.str());
     data.read (input);
   }  
   DataOutReader<dim,spacedim> additional_data;
   {
-    std::ifstream input(name);
+    std::istringstream input(old_data.str());
     additional_data.read (input);
   }
    
@@ -77,29 +79,14 @@ void check(const char * name, DataOutBase::Deal_II_IntermediateFlags flags,
 }
 
 
-template<int dim, int spacedim>
-void check_all(std::ostream& log)
-{
-  char name[100];
-  const char* format = "data_out_reader_01/%d%d.d2";
-  DataOutBase::Deal_II_IntermediateFlags flags;
-    {
-      sprintf(name, format, dim, spacedim, "");
-
-      std::ofstream out(name);
-
-      check<dim,spacedim>(name, flags, out);
-    }
-}
-
 int main()
 {
   std::ofstream logfile("data_out_reader_01/output");
   deallog.attach(logfile);
 
-  //  check_all<1,1>(logfile);
-  //  check_all<1,2>(logfile);
-  check_all<2,2>(logfile);
-  //  check_all<2,3>(logfile);
-  //  check_all<3,3>(logfile);  
+  //  check<1,1>();
+  //  check<1,2>();
+  check<2,2>();
+  //  check<2,3>();
+  //  check<3,3>();  
 }