svn commit: r1453856 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java

[ka...@apache.org]

Author: kahatlen
Date: Thu Mar  7 13:19:59 2013
New Revision: 1453856

URL: http://svn.apache.org/r1453856
Log:
DERBY-6100: Upgrade tests fail on compact2

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java?rev=1453856&r1=1453855&r2=1453856&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java Thu Mar  7 13:19:59 2013
@@ -24,6 +24,7 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.JDBC;
@@ -110,6 +111,15 @@ public class OldVersions
                 continue;
             }
 
+            // DERBY-6100: Data sources from Derby versions prior to 10.10
+            // cannot be loaded on platforms that don't support JNDI.
+            if (JDBC.vmSupportsJDBC3() && !JDBC.vmSupportsJNDI() &&
+                    UpgradeRun.lessThan(old[i], new int[] {10, 10, 0, 0})) {
+                traceit("Skipping " + Arrays.toString(old[i]) +
+                        " because JNDI is not available");
+                continue;
+            }
+
             // otherwise, it's a supported version
             list.add( old[ i ] );
         }