From d03eda1c3aaa0eacdacd83236bf21a9b9d81cd62 Mon Sep 17 00:00:00 2001
From: adammurdoch <dev-null@apache.org>
Date: Sat, 2 Mar 2002 03:56:23 +0000
Subject: [PATCH] Fix exception checking in unit tests.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271666 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/myrmidon/AbstractMyrmidonTest.java    | 12 +++---------
 .../org/apache/myrmidon/AbstractMyrmidonTest.java    | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
index b833ffd5e..eb3240a19 100644
--- a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
+++ b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
@@ -10,7 +10,7 @@ package org.apache.myrmidon;
 import java.io.File;
 import java.io.IOException;
 import junit.framework.TestCase;
-import org.apache.avalon.framework.CascadingThrowable;
+import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.log.Hierarchy;
@@ -115,14 +115,8 @@ public abstract class AbstractMyrmidonTest
                 assertEquals( message, current.getMessage() );
             }
 
-            if( current instanceof CascadingThrowable )
-            {
-                current = ( (CascadingThrowable)current ).getCause();
-            }
-            else
-            {
-                current = null;
-            }
+            // Get the next exception in the chain
+            current = ExceptionUtil.getCause( current, true );
         }
     }
 
diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
index b833ffd5e..eb3240a19 100644
--- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
+++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
@@ -10,7 +10,7 @@ package org.apache.myrmidon;
 import java.io.File;
 import java.io.IOException;
 import junit.framework.TestCase;
-import org.apache.avalon.framework.CascadingThrowable;
+import org.apache.avalon.framework.ExceptionUtil;
 import org.apache.avalon.framework.logger.LogKitLogger;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.log.Hierarchy;
@@ -115,14 +115,8 @@ public abstract class AbstractMyrmidonTest
                 assertEquals( message, current.getMessage() );
             }
 
-            if( current instanceof CascadingThrowable )
-            {
-                current = ( (CascadingThrowable)current ).getCause();
-            }
-            else
-            {
-                current = null;
-            }
+            // Get the next exception in the chain
+            current = ExceptionUtil.getCause( current, true );
         }
     }