DERBY-7031: Adjust the upgrade test to handle 10.15 (and later) as starting points for the upgrade tests; commit derby-7031-01-aa-adjustFor10.15.diff.
git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1852567 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
index d014182..fbc1cfd 100644
--- a/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
+++ b/java/org.apache.derby.tests/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
@@ -171,11 +171,17 @@
* affected Derby 10.2 - 10.7, and it is needed to make the old engine
* classes eligible for garbage collection.
*/
- private void deregisterDriver() throws Exception {
- boolean isAffectedVersion =
+ private void deregisterDriver() throws Exception
+ {
+ boolean isBetween10_2and10_8 =
UpgradeRun.lessThan(new int[] {10,2,0,0}, version) &&
UpgradeRun.lessThan(version, new int[] {10,8,0,0});
+ boolean isAtLeast10_15 =
+ UpgradeRun.lessThan(new int[] {10,15,0,0}, version);
+
+ boolean isAffectedVersion = isBetween10_2and10_8 || isAtLeast10_15;
+
if (JDBC.vmSupportsJDBC3()) {
// DriverManager only allows deregistering of drivers from classes
// that live in a class loader that is able to load the driver. So
