db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1628334 - in /db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting: functionTests/tests/compatibility/VersionCombinationConfigurator.java junit/DerbyVersion.java
Date Mon, 29 Sep 2014 22:58:03 GMT
Author: myrnavl
Date: Mon Sep 29 22:58:03 2014
New Revision: 1628334

URL: http://svn.apache.org/r1628334
Log:
DERBY-6739; test failure in 10.10 compatibility.ClientCompatibilityRunControl after adding
10.11.1.1
   Making the test skip when the version is higher than 10.10.*

Modified:
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/DerbyVersion.java

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java?rev=1628334&r1=1628333&r2=1628334&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/VersionCombinationConfigurator.java
Mon Sep 29 22:58:03 2014
@@ -256,6 +256,13 @@ public class VersionCombinationConfigura
                 println(version.toString() + " in exclude list");
                 continue;
             }
+            // After 10.10, the compatibility suite has been rewritten,
+            // so we get missing class files - see DERBY-6739.
+            // Also, all files are build with a higher level and we'd need
+            // Java 1.6 or higher. 
+            // Just don't run against any versions past the 10.10 branch.
+            if (version.atMaxatMajorMinor(10, 10))
+                continue;
 
             qualifiedDists.add(dist);
         }

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/DerbyVersion.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/DerbyVersion.java?rev=1628334&r1=1628333&r2=1628334&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/DerbyVersion.java
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/junit/DerbyVersion.java
Mon Sep 29 22:58:03 2014
@@ -201,6 +201,24 @@ public class DerbyVersion
     public boolean atMajorMinor(int major, int minor) {
         return this.major == major && this.minor == minor;
     }
+    
+    /**
+     * Checks if this version has at max a certain level
+     * 
+     * @param major major level to compare with
+     * @param minor minor level to compare with
+     * @return {@code true} if we're at the major.minor version or higher, 
+     *         {@code false} otherwise.
+     */
+    public boolean atMaxatMajorMinor(int major, int minor) {
+        if (this.major > major){
+            return true;
+        }
+        else if (this.major == major && this.minor > minor)
+            return true;
+        else 
+            return false;
+    }
 
     /**
      * Checks if this version is at the same major and minor level as the other



Mime
View raw message