From dae63048325e07ad7ccbb66e81c40c194067514e Mon Sep 17 00:00:00 2001
From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 15 Feb 2013 22:53:46 +0000
Subject: [PATCH] fix tests (throw in assert change)

git-svn-id: https://svn.dealii.org/trunk@28415 0785d39b-7218-0410-832d-ea1e28bc413d
---
 tests/bits/accessor_equality.cc                 |  9 +++++++--
 tests/bits/distorted_cells_07.cc                |  8 +++++++-
 tests/bits/distorted_cells_07/cmp/generic       |  3 ---
 tests/bits/distorted_mapped_cells_01.cc         | 13 ++++++++++---
 .../bits/distorted_mapped_cells_01/cmp/generic  |  2 +-
 tests/bits/distorted_mapped_cells_02.cc         |  8 +++++++-
 .../bits/distorted_mapped_cells_02/cmp/generic  |  3 +--
 tests/bits/sparse_matrix_add_entries_01.cc      | 17 +++++++++++++++--
 .../sparse_matrix_add_entries_01/cmp/generic    |  1 -
 9 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/tests/bits/accessor_equality.cc b/tests/bits/accessor_equality.cc
index 4a71b51142..0aa09409be 100644
--- a/tests/bits/accessor_equality.cc
+++ b/tests/bits/accessor_equality.cc
@@ -88,8 +88,13 @@ void test ()
   {
     DoFHandler<dim> dof_handler2 (tria);
     dof_handler2.distribute_dofs (fe);
-    Assert (! (dof_handler.begin_active() != dof_handler2.begin_active()),
-            ExcInternalError());
+    try 
+      {
+	(dof_handler.begin_active() != dof_handler2.begin_active());
+      }
+    catch (...)
+      {
+      }
   }
 }
 
diff --git a/tests/bits/distorted_cells_07.cc b/tests/bits/distorted_cells_07.cc
index f2486654a3..5d65d87f75 100644
--- a/tests/bits/distorted_cells_07.cc
+++ b/tests/bits/distorted_cells_07.cc
@@ -76,7 +76,13 @@ void check (const unsigned int testcase)
   QGauss<dim> quadrature(2);
   FEValues<dim> fe_values(dummy, quadrature, update_JxW_values);
   // should throw an assertion
-  fe_values.reinit(coarse_grid.begin());
+  try 
+    {
+      fe_values.reinit(coarse_grid.begin());
+    }
+  catch (...)
+    {
+    }
 }
 
 
diff --git a/tests/bits/distorted_cells_07/cmp/generic b/tests/bits/distorted_cells_07/cmp/generic
index 69c4e0c314..fcac661a7e 100644
--- a/tests/bits/distorted_cells_07/cmp/generic
+++ b/tests/bits/distorted_cells_07/cmp/generic
@@ -1,10 +1,7 @@
 
 DEAL::Twisted cell in 1d
 DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
 DEAL::Twisted cell in 2d
 DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
 DEAL::Twisted cell in 3d
 DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
diff --git a/tests/bits/distorted_mapped_cells_01.cc b/tests/bits/distorted_mapped_cells_01.cc
index dde1385ddc..db272f3690 100644
--- a/tests/bits/distorted_mapped_cells_01.cc
+++ b/tests/bits/distorted_mapped_cells_01.cc
@@ -60,9 +60,16 @@ void test()
     cell = tria.begin_active(), endc = tria.end();
   for ( ; cell != endc; ++cell)
     {
-      fe_val.reinit (cell);
-      for (unsigned int q=0; q<quad.size(); ++q)
-        integral += fe_val.JxW(q);
+      try
+	{
+	  fe_val.reinit (cell);
+	  for (unsigned int q=0; q<quad.size(); ++q)
+	    integral += fe_val.JxW(q);
+	}
+      catch (...)
+	{
+	}
+      
     }
   deallog << "Integral = " << integral << std::endl;
 }
diff --git a/tests/bits/distorted_mapped_cells_01/cmp/generic b/tests/bits/distorted_mapped_cells_01/cmp/generic
index c8640ad3ca..f3fc575303 100644
--- a/tests/bits/distorted_mapped_cells_01/cmp/generic
+++ b/tests/bits/distorted_mapped_cells_01/cmp/generic
@@ -1,3 +1,3 @@
 
 DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::Integral = -1.0000
+DEAL::Integral = 0
diff --git a/tests/bits/distorted_mapped_cells_02.cc b/tests/bits/distorted_mapped_cells_02.cc
index 2cf6374f6f..59c73437bf 100644
--- a/tests/bits/distorted_mapped_cells_02.cc
+++ b/tests/bits/distorted_mapped_cells_02.cc
@@ -43,9 +43,15 @@ void test()
     cell = tria.begin_active(), endc = tria.end();
   for ( ; cell != endc; ++cell)
     {
-      fe_val.reinit (cell);
+      try{
+	fe_val.reinit (cell);
       for (unsigned int q=0; q<quad.size(); ++q)
         integral += fe_val.JxW(q);
+      }
+      catch (...)
+	{
+	}
+      
     }
   deallog << "Integral = " << integral << std::endl;
 }
diff --git a/tests/bits/distorted_mapped_cells_02/cmp/generic b/tests/bits/distorted_mapped_cells_02/cmp/generic
index 3c0a20779d..f3fc575303 100644
--- a/tests/bits/distorted_mapped_cells_02/cmp/generic
+++ b/tests/bits/distorted_mapped_cells_02/cmp/generic
@@ -1,4 +1,3 @@
 
 DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::(typename Mapping<dim,spacedim>::ExcDistortedMappedCell(cell->center(), point))
-DEAL::Integral = 0.0757
+DEAL::Integral = 0
diff --git a/tests/bits/sparse_matrix_add_entries_01.cc b/tests/bits/sparse_matrix_add_entries_01.cc
index e995b8e9f1..9e40b81b11 100644
--- a/tests/bits/sparse_matrix_add_entries_01.cc
+++ b/tests/bits/sparse_matrix_add_entries_01.cc
@@ -71,8 +71,21 @@ void test ()
   deal_II_exceptions::disable_abort_on_exception();
   for (unsigned int i=0; i<m.m(); ++i)
     values[i] = 0.5*i - 1.5;
-  m.add(0,m.m(),&indices[0], &values[0], false, true);
-  m.add(m.m()-1,m.m(),&indices[0], &values[0], false, true);
+  try
+    {
+      m.add(0,m.m(),&indices[0], &values[0], false, true);
+    }
+  catch (...)
+    {
+    }
+
+  try
+    {
+      m.add(m.m()-1,m.m(),&indices[0], &values[0], false, true);
+    }
+  catch (...)
+    {
+    }
 
   deallog << "OK" << std::endl;
 }
diff --git a/tests/bits/sparse_matrix_add_entries_01/cmp/generic b/tests/bits/sparse_matrix_add_entries_01/cmp/generic
index a914d8019b..f1987379ee 100644
--- a/tests/bits/sparse_matrix_add_entries_01/cmp/generic
+++ b/tests/bits/sparse_matrix_add_entries_01/cmp/generic
@@ -1,5 +1,4 @@
 
-DEAL::ExcInvalidIndex(row,col_indices[i])
 DEAL::ExcInvalidIndex(row,col_indices[i])
 DEAL::ExcInvalidIndex(row,col_indices[i])
 DEAL::OK
-- 
2.39.5