Browse Source
Fix exception checking in unit tests.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271666 13f79535-47bb-0310-9956-ffa450edef68master
adammurdoch
23 years ago
2 changed files with 6 additions and 18 deletions
Unified View
Diff Options
-
+3 -9proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
-
+3 -9proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
+ 3
- 9
proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java
View File
| @@ -10,7 +10,7 @@ package org.apache.myrmidon; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import junit.framework.TestCase; | 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.LogKitLogger; | ||||
| import org.apache.avalon.framework.logger.Logger; | import org.apache.avalon.framework.logger.Logger; | ||||
| import org.apache.log.Hierarchy; | import org.apache.log.Hierarchy; | ||||
| @@ -115,14 +115,8 @@ public abstract class AbstractMyrmidonTest | |||||
| assertEquals( message, current.getMessage() ); | 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 ); | |||||
| } | } | ||||
| } | } | ||||
+ 3
- 9
proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java
View File
| @@ -10,7 +10,7 @@ package org.apache.myrmidon; | |||||
| import java.io.File; | import java.io.File; | ||||
| import java.io.IOException; | import java.io.IOException; | ||||
| import junit.framework.TestCase; | 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.LogKitLogger; | ||||
| import org.apache.avalon.framework.logger.Logger; | import org.apache.avalon.framework.logger.Logger; | ||||
| import org.apache.log.Hierarchy; | import org.apache.log.Hierarchy; | ||||
| @@ -115,14 +115,8 @@ public abstract class AbstractMyrmidonTest | |||||
| assertEquals( message, current.getMessage() ); | 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 ); | |||||
| } | } | ||||
| } | } | ||||