svn commit: r764952 - /db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java

[rh...@apache.org]

Author: rhillegas
Date: Tue Apr 14 21:02:02 2009
New Revision: 764952

URL: http://svn.apache.org/viewvc?rev=764952&view=rev
Log:
DERBY-4133: Port 764948 from the trunk to the 10.5 branch.

Modified:
    db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java

Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java?rev=764952&r1=764951&r2=764952&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java (original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/lang/DatabaseClassLoadingTest.java Tue Apr 14 21:02:02 2009
@@ -46,6 +46,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.derby.iapi.services.info.JVMInfo;
+
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
@@ -1000,6 +1002,10 @@
      */
     public void testTableFunctionInJar() throws SQLException, MalformedURLException
     {
+        // skip this test if vm is pre Java 5. This is because the jar file was
+        // compiled by a modern compiler and the jar file won't load on
+        // old vms.
+        if ( JVMInfo.J2ME || (JVMInfo.JDK_ID < JVMInfo.J2SE_15 ) ) { return; }
         
         String jarName = "EMC.DUMMY_VTI";