From: heister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 15 Feb 2013 22:32:12 +0000 (+0000)
Subject: fix tests (throw in assert change)
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e2ef430098202b123e16bf806a6725cdd1e5e2b;p=dealii-svn.git

fix tests (throw in assert change)

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

diff --git a/tests/deal.II/user_data_01.cc b/tests/deal.II/user_data_01.cc
index cd305ce6c3..c334786c9b 100644
--- a/tests/deal.II/user_data_01.cc
+++ b/tests/deal.II/user_data_01.cc
@@ -168,7 +168,13 @@ user_pointers(Triangulation<dim>& tr)
 				   // Check if they are still the same
   check_user_pointers(tr);
 				   // Create two pointer index clashes here
-  tr.begin()->user_index();
+  try
+    {
+      tr.begin()->user_index();
+    }
+  catch (...)
+    {
+    }
   tr.begin()->user_pointer();
 
 
@@ -239,8 +245,15 @@ user_indices(Triangulation<dim>& tr)
 				   // Check if they are still the same
   check_user_indices(tr);
 				   // Create two pointer index clashes here
-  tr.begin()->user_pointer();
+  try
+    {
+      tr.begin()->user_pointer();
+    }
+  catch (...)
+    {
+    }
   tr.begin()->user_index();
+  
 
 
 				   // Check if save and load work
diff --git a/tests/deal.II/user_data_01/cmp/generic b/tests/deal.II/user_data_01/cmp/generic
index b870bcedca..ddcba3194a 100644
--- a/tests/deal.II/user_data_01/cmp/generic
+++ b/tests/deal.II/user_data_01/cmp/generic
@@ -4,7 +4,6 @@ DEAL::.....................cells
 DEAL::........................................................faces
 DEAL::lines
 DEAL::ExcPointerIndexClash()
-DEAL::ExcPointerIndexClash()
 DEAL::Save2D
 DEAL::Load2D
 DEAL::.....................cells
@@ -15,7 +14,6 @@ DEAL::.....................cells
 DEAL::........................................................faces
 DEAL::lines
 DEAL::ExcPointerIndexClash()
-DEAL::ExcPointerIndexClash()
 DEAL::Save2D
 DEAL::Load2D
 DEAL::.....................cells
@@ -26,7 +24,6 @@ DEAL::.........................................................................c
 DEAL::..........................................................................................................................................................................................................................................................................................faces
 DEAL::..............................................................................................................................................................................................................................................................................................................................................................................lines
 DEAL::ExcPointerIndexClash()
-DEAL::ExcPointerIndexClash()
 DEAL::Save3D
 DEAL::Load3D
 DEAL::.........................................................................cells
@@ -37,7 +34,6 @@ DEAL::.........................................................................c
 DEAL::..........................................................................................................................................................................................................................................................................................faces
 DEAL::..............................................................................................................................................................................................................................................................................................................................................................................lines
 DEAL::ExcPointerIndexClash()
-DEAL::ExcPointerIndexClash()
 DEAL::Save3D
 DEAL::Load3D
 DEAL::.........................................................................cells