svn commit: r636268 - /db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java

[ka...@apache.org]

Author: kahatlen
Date: Wed Mar 12 02:50:59 2008
New Revision: 636268

URL: http://svn.apache.org/viewvc?rev=636268&view=rev
Log:
DERBY-3521: Functionality for skipping testsuites on certain platforms fails for the new management testsuite on phoneME advanced

Merged revision 636256 from trunk.

Modified:
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java?rev=636268&r1=636267&r2=636268&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/AllPackages.java Wed Mar 12 02:50:59 2008
@@ -20,6 +20,7 @@
  */
 package org.apache.derbyTesting.functionTests.suites;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import junit.framework.Test;
@@ -100,6 +101,14 @@
         } catch (LinkageError  e) {
             return new TestSuite("SKIPPED: " + className + " - " +
                     e.getMessage());
+        } catch (InvocationTargetException ite) {
+            Throwable cause = ite.getCause();
+            if (cause instanceof LinkageError) {
+               return new TestSuite("SKIPPED: " + className + " - " +
+                       cause.getMessage());
+            } else {
+               throw ite;
+            }
         }
     }