svn commit: r1630000 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java

[my...@apache.org]

Author: myrnavl
Date: Wed Oct  8 01:08:01 2014
New Revision: 1630000

URL: http://svn.apache.org/r1630000
Log:
DERBY-6610; suites.All cannot be run with classes without failures
  returning an empty compatibility suite if the classes are not loaded from jar files.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java?rev=1630000&r1=1629999&r2=1630000&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/_Suite.java Wed Oct  8 01:08:01 2014
@@ -125,6 +125,12 @@ public class _Suite
             println(msg);
             return new BaseTestSuite(msg);
         }
+        // DERBY-6610: the compatibility tests don't run with classes;
+        // return an empty suite rather than hit the IllegalStateException
+        // from VersionCombinationConfigurator.getJarDirectoryOf
+        if (!TestConfiguration.loadingFromJars())
+            return new BaseTestSuite("Compatibility tests skipped becasue " +
+                                 "they need to run from jars");
         if (!Derby.hasClient() || !Derby.hasServer()) {
             return new BaseTestSuite("Compatibility tests skipped because " +
                                  "client or server is missing");