Skip to content

Commit ac8e3db

Browse files
tomix26tomix26
authored
Merge pull request #285 from zonkyio/upgrade-test-suits
Fix compatibility with Flyway 10.17.1 and above
2 parents 4428bd1 + 27dedbf commit ac8e3db

8 files changed

+107
-26
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ The primary goal of this project is to make it easier to write Spring-powered in
77
## Supported Integrations
88

99
* Supports both `Spring` and `Spring Boot` frameworks
10-
* Spring `4.3.8` - `6.1.x`
11-
* Spring Boot `1.4.6` - `3.2.x`
10+
* Spring `4.3.8` - `6.2.x`
11+
* Spring Boot `1.4.6` - `3.4.x`
1212
* Supports multiple different databases
1313
* [PostgreSQL](#postgresql), [MSSQL](#microsoft-sql-server), [MySQL](#mysql), [MariaDB](#mariadb), [H2](#h2), [HSQLDB](#hsqldb), [Derby](#derby)
1414
* Supports multiple database providers

‎build.gradle

+17-13
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,12 @@ ext {
5353
[name: 'no_sb', liquibase: 'default']
5454
]],
5555
[name: 'postgres', versions: [
56-
[name: '12', postgres: '12.18', 'zonky-postgres': '12.18.0', opentable: 'default', yandex: 'default'],
57-
[name: '13', postgres: '13.14', 'zonky-postgres': '13.14.0', opentable: 'default', yandex: 'default'],
58-
[name: '14', postgres: '14.11', 'zonky-postgres': '14.11.0', opentable: 'default', yandex: 'default'],
59-
[name: '15', postgres: '15.6', 'zonky-postgres': '15.6.0', opentable: 'default', yandex: 'default'],
60-
[name: '16', postgres: '16.2', 'zonky-postgres': '16.2.0', opentable: 'default', yandex: 'default']
56+
[name: '12', postgres: '12.22', 'zonky-postgres': '12.22.0', opentable: 'default', yandex: 'default'],
57+
[name: '13', postgres: '13.18', 'zonky-postgres': '13.18.0', opentable: 'default', yandex: 'default'],
58+
[name: '14', postgres: '14.15', 'zonky-postgres': '14.15.0', opentable: 'default', yandex: 'default'],
59+
[name: '15', postgres: '15.10', 'zonky-postgres': '15.10.0', opentable: 'default', yandex: 'default'],
60+
[name: '16', postgres: '16.6', 'zonky-postgres': '16.6.0', opentable: 'default', yandex: 'default'],
61+
[name: '17', postgres: '17.2', 'zonky-postgres': '17.2.0', opentable: 'default', yandex: 'default']
6162
]],
6263
[name: 'mssql', versions: [
6364
[name: '2017', 'mssql': '2017-latest', 'mssql-driver': 'default'],
@@ -102,16 +103,19 @@ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
102103

103104
testSuites.find { it.name == 'flyway' }.versions += [
104105
[name: '9.9.0', flyway: '9.9.0', 'flyway-test': '9.5.0', spring: '6.0.14', 'spring-boot': '3.0.13', 'zonky-postgres': 'default'],
105-
[name: '9.16.3', flyway: '9.16.3', 'flyway-test': '9.5.0', spring: '6.0.18', 'spring-boot': '3.1.10', 'zonky-postgres': 'default'],
106-
[name: '9.22.3', flyway: '9.22.3', 'flyway-test': '9.5.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default'],
107-
[name: '10.0.1', flyway: '10.0.1', 'flyway-test': '10.0.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default'],
108-
[name: '10.11.0', flyway: '10.5.0', 'flyway-test': '10.0.0', spring: '6.1.5', 'spring-boot': '3.2.4', 'zonky-postgres': 'default']
106+
[name: '9.16.3', flyway: '9.16.3', 'flyway-test': '9.5.0', spring: '6.0.21', 'spring-boot': '3.1.12', 'zonky-postgres': 'default'],
107+
[name: '9.22.3', flyway: '9.22.3', 'flyway-test': '9.5.0', spring: '6.1.15', 'spring-boot': '3.2.12', 'zonky-postgres': 'default'],
108+
[name: '10.10.0', flyway: '10.10.0', 'flyway-test': '10.0.0', spring: '6.1.15', 'spring-boot': '3.3.6', 'zonky-postgres': 'default'],
109+
[name: '10.20.1', flyway: '10.20.1', 'flyway-test': '10.0.0', spring: '6.2.0', 'spring-boot': '3.4.0', 'zonky-postgres': 'default'],
110+
[name: '11.0.0', flyway: '11.0.0', 'flyway-test': '10.0.0', spring: '6.2.0', 'spring-boot': '3.4.0', 'zonky-postgres': 'default']
109111
]
110112

111113
testSuites.find { it.name == 'liquibase' }.versions += [
112114
[name: '4.17.2', liquibase: '4.17.2', spring: '6.0.14', 'spring-boot': '3.0.13'],
113-
[name: '4.20.0', liquibase: '4.20.0', spring: '6.0.18', 'spring-boot': '3.1.10'],
114-
[name: '4.24.0', liquibase: '4.24.0', spring: '6.1.5', 'spring-boot': '3.2.4']
115+
[name: '4.20.0', liquibase: '4.20.0', spring: '6.0.21', 'spring-boot': '3.1.12'],
116+
[name: '4.24.0', liquibase: '4.24.0', spring: '6.1.15', 'spring-boot': '3.2.12'],
117+
[name: '4.27.0', liquibase: '4.27.0', spring: '6.1.15', 'spring-boot': '3.3.6'],
118+
[name: '4.29.2', liquibase: '4.29.2', spring: '6.2.0', 'spring-boot': '3.4.0']
115119
]
116120
}
117121

@@ -258,7 +262,7 @@ project(':embedded-database-spring-test') {
258262
api 'org.testcontainers:mysql:1.18.3'
259263
api 'org.testcontainers:mariadb:1.18.3'
260264

261-
optImplementation 'io.zonky.test:embedded-postgres:2.0.7'
265+
optImplementation 'io.zonky.test:embedded-postgres:2.1.0'
262266
optImplementation 'com.opentable.components:otj-pg-embedded:0.13.4'
263267
optImplementation 'ru.yandex.qatools.embed:postgresql-embedded:2.10'
264268

@@ -319,7 +323,7 @@ project(':embedded-database-spring-test') {
319323
"testRuntimeClasspath_${suite.name}_${version.name}" {
320324
extendsFrom testRuntimeClasspath
321325

322-
if (version.flyway != null && version.flyway.startsWith('10.')) {
326+
if (version.flyway != null && (version.flyway.startsWith('10.') || version.flyway.startsWith('11.'))) {
323327
dependencies.add(project.dependencies.create("org.flywaydb:flyway-database-postgresql:${version.flyway}"))
324328
}
325329

‎embedded-database-spring-test/src/main/java/io/zonky/test/db/flyway/FlywayWrapper.java

+18-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package io.zonky.test.db.flyway;
1818

1919
import com.google.common.collect.ImmutableList;
20+
import org.aopalliance.intercept.Interceptor;
2021
import org.aopalliance.intercept.MethodInterceptor;
2122
import org.flywaydb.core.Flyway;
2223
import org.flywaydb.core.api.resolver.MigrationResolver;
@@ -113,8 +114,7 @@ public Collection<ResolvedMigration> getMigrations() {
113114
if (flywayVersion.isGreaterThanOrEqualTo("9")) {
114115
return invokeMethod(resolver, "resolveMigrations", config);
115116
} else if (flywayVersion.isGreaterThanOrEqualTo("5.2")) {
116-
Class<?> contextType = ClassUtils.forName("org.flywaydb.core.api.resolver.Context", classLoader);
117-
Object contextInstance = ProxyFactory.getProxy(contextType, (MethodInterceptor) invocation ->
117+
Object contextInstance = createMock("org.flywaydb.core.api.resolver.Context", (MethodInterceptor) invocation ->
118118
"getConfiguration".equals(invocation.getMethod().getName()) ? config : invocation.proceed());
119119
return invokeMethod(resolver, "resolveMigrations", contextInstance);
120120
} else {
@@ -126,7 +126,17 @@ public Collection<ResolvedMigration> getMigrations() {
126126
}
127127

128128
private MigrationResolver createMigrationResolver(Flyway flyway) throws ClassNotFoundException {
129-
if (flywayVersion.isGreaterThanOrEqualTo("8")) {
129+
if (flywayVersion.isGreaterThanOrEqualTo("10.17.1")) {
130+
Object executor = getField(flyway, "flywayExecutor");
131+
Object providers = invokeMethod(executor, "createResourceAndClassProviders", true);
132+
Object resourceProvider = getField(providers, "left");
133+
Object classProvider = getField(providers, "right");
134+
Object sqlScript = createMock("org.flywaydb.core.internal.sqlscript.SqlScript", (MethodInterceptor) invocation -> false);
135+
Object sqlScriptFactory = createMock("org.flywaydb.core.internal.sqlscript.SqlScriptFactory", (MethodInterceptor) invocation -> sqlScript);
136+
Object sqlScriptExecutorFactory = createMock("org.flywaydb.core.internal.sqlscript.SqlScriptExecutorFactory");
137+
Object parsingContext = invokeConstructor("org.flywaydb.core.internal.parser.ParsingContext");
138+
return invokeMethod(executor, "createMigrationResolver", resourceProvider, classProvider, sqlScriptExecutorFactory, sqlScriptFactory, parsingContext, null);
139+
} else if (flywayVersion.isGreaterThanOrEqualTo("8")) {
130140
Object executor = getField(flyway, "flywayExecutor");
131141
Object providers = invokeMethod(executor, "createResourceAndClassProviders", true);
132142
Object resourceProvider = getField(providers, "left");
@@ -493,4 +503,9 @@ private static Object createMock(String className) throws ClassNotFoundException
493503
Class<?> proxyInterface = ClassUtils.forName(className, classLoader);
494504
return ProxyFactory.getProxy(proxyInterface, (MethodInterceptor) invocation -> null);
495505
}
506+
507+
private static Object createMock(String className, Interceptor interceptor) throws ClassNotFoundException {
508+
Class<?> proxyInterface = ClassUtils.forName(className, classLoader);
509+
return ProxyFactory.getProxy(proxyInterface, interceptor);
510+
}
496511
}

‎embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/OpenTableProviderWithConfigurationIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.opentable.db.postgres.embedded.EmbeddedPostgres;
2020
import io.zonky.test.category.PostgresTestSuite;
2121
import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
22+
import io.zonky.test.support.TestSocketUtils;
2223
import org.junit.Test;
2324
import org.junit.experimental.categories.Category;
2425
import org.junit.runner.RunWith;
@@ -28,7 +29,6 @@
2829
import org.springframework.context.annotation.Configuration;
2930
import org.springframework.test.context.ContextConfiguration;
3031
import org.springframework.test.context.junit4.SpringRunner;
31-
import org.springframework.util.SocketUtils;
3232

3333
import javax.sql.DataSource;
3434
import java.sql.SQLException;
@@ -49,7 +49,7 @@ static class Config {
4949

5050
@Bean
5151
public Integer randomPort() {
52-
return SocketUtils.findAvailableTcpPort();
52+
return TestSocketUtils.findAvailableTcpPort();
5353
}
5454

5555
@Bean

‎embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/ZonkyProviderWithConfigurationIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.zonky.test.category.PostgresTestSuite;
2020
import io.zonky.test.db.AutoConfigureEmbeddedDatabase;
2121
import io.zonky.test.db.postgres.embedded.EmbeddedPostgres;
22+
import io.zonky.test.support.TestSocketUtils;
2223
import org.junit.Test;
2324
import org.junit.experimental.categories.Category;
2425
import org.junit.runner.RunWith;
@@ -28,7 +29,6 @@
2829
import org.springframework.context.annotation.Configuration;
2930
import org.springframework.test.context.ContextConfiguration;
3031
import org.springframework.test.context.junit4.SpringRunner;
31-
import org.springframework.util.SocketUtils;
3232

3333
import javax.sql.DataSource;
3434
import java.sql.SQLException;
@@ -49,7 +49,7 @@ static class Config {
4949

5050
@Bean
5151
public Integer randomPort() {
52-
return SocketUtils.findAvailableTcpPort();
52+
return TestSocketUtils.findAvailableTcpPort();
5353
}
5454

5555
@Bean

‎embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/postgres/OpenTablePostgresDatabaseProviderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.zonky.test.db.preparer.DatabasePreparer;
2121
import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
2222
import io.zonky.test.db.support.TestDatabasePreparer;
23+
import io.zonky.test.support.TestSocketUtils;
2324
import org.junit.Before;
2425
import org.junit.Test;
2526
import org.junit.runner.RunWith;
@@ -29,7 +30,6 @@
2930
import org.springframework.beans.factory.ObjectProvider;
3031
import org.springframework.jdbc.core.JdbcTemplate;
3132
import org.springframework.mock.env.MockEnvironment;
32-
import org.springframework.util.SocketUtils;
3333

3434
import javax.sql.DataSource;
3535
import java.sql.SQLException;
@@ -93,7 +93,7 @@ public void testGetDatabase() throws Exception {
9393

9494
@Test
9595
public void testDatabaseCustomizers() throws Exception {
96-
int randomPort = SocketUtils.findAvailableTcpPort();
96+
int randomPort = TestSocketUtils.findAvailableTcpPort();
9797
when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(randomPort)));
9898

9999
DatabasePreparer preparer = TestDatabasePreparer.empty();

‎embedded-database-spring-test/src/test/java/io/zonky/test/db/provider/postgres/ZonkyPostgresDatabaseProviderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.zonky.test.db.preparer.DatabasePreparer;
2121
import io.zonky.test.db.provider.support.BlockingDatabaseWrapper;
2222
import io.zonky.test.db.support.TestDatabasePreparer;
23+
import io.zonky.test.support.TestSocketUtils;
2324
import org.junit.Before;
2425
import org.junit.Test;
2526
import org.junit.runner.RunWith;
@@ -29,7 +30,6 @@
2930
import org.springframework.beans.factory.ObjectProvider;
3031
import org.springframework.jdbc.core.JdbcTemplate;
3132
import org.springframework.mock.env.MockEnvironment;
32-
import org.springframework.util.SocketUtils;
3333

3434
import javax.sql.DataSource;
3535
import java.sql.SQLException;
@@ -93,7 +93,7 @@ public void testGetDatabase() throws Exception {
9393

9494
@Test
9595
public void testDatabaseCustomizers() throws Exception {
96-
int randomPort = SocketUtils.findAvailableTcpPort();
96+
int randomPort = TestSocketUtils.findAvailableTcpPort();
9797
when(databaseCustomizers.getIfAvailable()).thenReturn(Collections.singletonList(builder -> builder.setPort(randomPort)));
9898

9999
DatabasePreparer preparer = TestDatabasePreparer.empty();

‎embedded-database-spring-test/src/test/java/io/zonky/test/support/TestSocketUtils.java

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/*
2+
* Copyright 2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package io.zonky.test.support;
18+
19+
import org.springframework.util.Assert;
20+
21+
import javax.net.ServerSocketFactory;
22+
import java.net.InetAddress;
23+
import java.net.ServerSocket;
24+
import java.util.Random;
25+
26+
public class TestSocketUtils {
27+
28+
private static final int PORT_RANGE_MIN = 1024;
29+
private static final int PORT_RANGE_MAX = 65535;
30+
private static final int PORT_RANGE_PLUS_ONE = PORT_RANGE_MAX - PORT_RANGE_MIN + 1;
31+
private static final int MAX_ATTEMPTS = 1_000;
32+
33+
private static final Random random = new Random(System.nanoTime());
34+
35+
private TestSocketUtils() {}
36+
37+
public static int findAvailableTcpPort() {
38+
int candidatePort;
39+
int searchCounter = 0;
40+
do {
41+
Assert.state(++searchCounter <= MAX_ATTEMPTS, () -> String.format(
42+
"Could not find an available TCP port in the range [%d, %d] after %d attempts",
43+
PORT_RANGE_MIN, PORT_RANGE_MAX, MAX_ATTEMPTS));
44+
candidatePort = PORT_RANGE_MIN + random.nextInt(PORT_RANGE_PLUS_ONE);
45+
}
46+
while (!isPortAvailable(candidatePort));
47+
48+
return candidatePort;
49+
}
50+
51+
private static boolean isPortAvailable(int port) {
52+
try {
53+
ServerSocket serverSocket = ServerSocketFactory.getDefault()
54+
.createServerSocket(port, 1, InetAddress.getByName("localhost"));
55+
serverSocket.close();
56+
return true;
57+
}
58+
catch (Exception ex) {
59+
return false;
60+
}
61+
}
62+
}

0 commit comments

Comments
 (0)