Fix tests to pass on 6.0.0.523

FirebirdSQL · Nov 11, 2024 · 351bf4a · 351bf4a
1 parent a58604b
commit 351bf4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/org/firebirdsql/util/FirebirdSupportInfo.java b/src/main/org/firebirdsql/util/FirebirdSupportInfo.java
@@ -730,8 +730,7 @@ public OdsVersion getDefaultOdsVersion() {
             case 3 -> OdsVersion.of(12, 0);
             case 4 -> OdsVersion.of(13, 0);
             case 5 -> OdsVersion.of(13, 1);
-            // Might change before final release?
-            case 6 -> OdsVersion.of(13, 2);
+            case 6 -> OdsVersion.of(14, 0);
             default -> throw new IllegalArgumentException("Unsupported version: " + serverVersion);
         };
     }
@@ -757,12 +756,11 @@ public boolean supportsOds(int major, int minor) {
             };
             case 12 -> isVersionEqualOrAbove(3) && isVersionBelow(4);
             case 13 -> switch (minor) {
-                case 0 -> isVersionEqualOrAbove(4) && isVersionBelow(7);
-                case 1 -> isVersionEqualOrAbove(5) && isVersionBelow(7);
-                // TODO Might change before release of Firebird 6
-                case 2 -> isVersionEqualOrAbove(6) && isVersionBelow(7);
+                case 0 -> isVersionEqualOrAbove(4) && isVersionBelow(6);
+                case 1 -> isVersionEqualOrAbove(5) && isVersionBelow(6);
                 default -> false;
             };
+            case 14 -> isVersionEqualOrAbove(6) && isVersionBelow(7);
             default -> false;
         };
     }

diff --git a/src/test/org/firebirdsql/management/FBMaintenanceManagerTest.java b/src/test/org/firebirdsql/management/FBMaintenanceManagerTest.java
@@ -551,6 +551,7 @@ void testUpgradeOds() {
     @Test
     void testUpgradeOds_machineSpecific(@TempDir Path tempDir) throws Exception {
         assumeTrue(getDefaultSupportInfo().supportsUpgradeOds(), "test requires upgrade ODS support");
+        assumeTrue(getDefaultSupportInfo().supportsOds(13, 0), "Test requires ODS 13.0 support (DB to be upgraded)");
         assumeTrue(EnvironmentRequirement.DB_LOCAL_FS.isMet(), "Requires DB on local file system");
         // In the future, this may need to declare an upper version limit, or select DB based on the actual version
         Path fb4DbPath;