db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r542984 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
Date Thu, 31 May 2007 00:06:24 GMT
Author: myrnavl
Date: Wed May 30 17:06:23 2007
New Revision: 542984

URL: http://svn.apache.org/viewvc?view=rev&rev=542984
Log:
DERBY-2645; failures in upgrade test with J2ME/JSR169 when upgrading from 10.0 because 10.0
did not have support for JSR169. Disabling that part of the test.

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java?view=diff&rev=542984&r1=542983&r2=542984
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/_Suite.java
Wed May 30 17:06:23 2007
@@ -24,6 +24,7 @@
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.JDBC;
 
 /**
  * Run the full upgrade suite. This is the only
@@ -125,6 +126,10 @@
         TestSuite suite = new TestSuite("Upgrade Suite");       
 
         for (int i = 0; i < OLD_VERSIONS.length; i++) {
+            // JSR169 support was only added with 10.1, so don't
+            // run 10.0 to later upgrade if that's what our jvm is supporting.
+            if (!(JDBC.vmSupportsJSR169() && 
+                (OLD_VERSIONS[i][0]==10) && (OLD_VERSIONS[i][1]==0))); 
             suite.addTest(UpgradeRun.suite(OLD_VERSIONS[i]));
         }
         



Mime
View raw message