@@ -122,7 +122,7 @@ void testGetTableStatistics() throws SQLException {
122122 void testGetDatabaseTransactionInfo_usingServiceConfig () throws SQLException {
123123 FirebirdSupportInfo supportInfo = getDefaultSupportInfo ();
124124 int oldest = getExpectedOldest (supportInfo );
125- int expectedNextOffset = supportInfo .isVersionEqualOrAbove (3 ) ? 1 : 2 ;
125+ int expectedNextOffset = supportInfo .isVersionEqualOrAbove (3 ) && supportInfo . isVersionBelow ( 6 ) ? 1 : 2 ;
126126 createTestTable ();
127127
128128 try (Connection conn = getConnectionViaDriverManager ()) {
@@ -204,7 +204,9 @@ private static void schemaTestSetup() throws SQLException {
204204 }
205205
206206 private int getExpectedOldest (FirebirdSupportInfo supportInfo ) {
207- if (supportInfo .isVersionEqualOrAbove (4 , 0 , 2 )) {
207+ if (supportInfo .isVersionEqualOrAbove (6 )) {
208+ return 5 ;
209+ } else if (supportInfo .isVersionEqualOrAbove (4 , 0 , 2 )) {
208210 return isEmbeddedType ().matches (GDS_TYPE ) ? 1 : 2 ;
209211 } else if (supportInfo .isVersionEqualOrAbove (4 , 0 )) {
210212 return 1 ;
@@ -228,7 +230,7 @@ void testGetDatabaseTransactionInfo_noDatabaseNameSpecified() {
228230 void testGetDatabaseTransactionInfo_usingConnection () throws SQLException {
229231 FirebirdSupportInfo supportInfo = getDefaultSupportInfo ();
230232 int oldest = getExpectedOldest (supportInfo );
231- int expectedNextOffset = supportInfo .isVersionEqualOrAbove (2 , 5 ) && supportInfo . isVersionBelow ( 3 ) ? 2 : 1 ;
233+ int expectedNextOffset = supportInfo .isVersionEqualOrAbove (3 ) ? 1 : 2 ;
232234 createTestTable ();
233235
234236 try (Connection conn = getConnectionViaDriverManager ()) {
0 commit comments