forked from eclipse-vertx/vertx-sql-client
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate Postgresql tests on Testcontainers
The unix socket test has not been migrated (4 tests in UnixDomainSocketTest). see eclipse-vertx#385 The original PGRule has been modified to automatically ignore unix socket tests on PG versions unsupported by yandex EmbeddedPostgres. This done with ExternalResource#apply to prevent the db from throwing error at startup (vs junit Assume). A new travis job for PG 11 has been added. Signed-off-by: zorglub <b.wiart@ubik-ingenierie.com>
- Loading branch information
Showing
20 changed files
with
277 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
vertx-pg-client/src/test/java/io/vertx/pgclient/junit/ContainerPgRule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| * Copyright (C) 2017 Julien Viet | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
| package io.vertx.pgclient.junit; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileInputStream; | ||
| import java.io.InputStream; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.StandardCopyOption; | ||
|
|
||
| import org.junit.rules.ExternalResource; | ||
| import org.testcontainers.containers.PostgreSQLContainer; | ||
| import org.testcontainers.utility.MountableFile; | ||
|
|
||
| import io.vertx.pgclient.PgConnectOptions; | ||
|
|
||
| public class ContainerPgRule extends ExternalResource { | ||
|
|
||
| private static final String connectionUri = System.getProperty("connection.uri"); | ||
| private static final String tlsConnectionUri = System.getProperty("tls.connection.uri"); | ||
|
|
||
| private PostgreSQLContainer server; | ||
| private PgConnectOptions options; | ||
| private String databaseVersion; | ||
| private boolean ssl; | ||
| private boolean minimumV10; | ||
|
|
||
|
|
||
| public ContainerPgRule ssl(boolean ssl) { | ||
| this.ssl = ssl; | ||
| return this; | ||
| } | ||
|
|
||
| public ContainerPgRule minimumV10(boolean minimumV10) { | ||
| this.minimumV10 = minimumV10; | ||
| return this; | ||
| } | ||
|
|
||
| public PgConnectOptions options() { | ||
| return new PgConnectOptions(options); | ||
| } | ||
|
|
||
| private void initServer(String version) throws Exception { | ||
| File setupFile = getTestResource("resources" + File.separator + "create-postgres.sql"); | ||
|
|
||
| server = (PostgreSQLContainer) new PostgreSQLContainer("postgres:" + version) | ||
| .withDatabaseName("postgres") | ||
| .withUsername("postgres") | ||
| .withPassword("postgres") | ||
| .withCopyFileToContainer(MountableFile.forHostPath(setupFile.toPath()), "/docker-entrypoint-initdb.d/create-postgres.sql"); | ||
| if(ssl) { | ||
| server.withCopyFileToContainer(MountableFile.forHostPath(getTestResource("resources" +File.separator + "server.crt").toPath()), "/server.crt") | ||
| .withCopyFileToContainer(MountableFile.forHostPath(getTestResource("resources" +File.separator + "server.key").toPath()), "/server.key") | ||
| .withCopyFileToContainer(MountableFile.forHostPath(getTestResource("ssl.sh").toPath()), "/docker-entrypoint-initdb.d/ssl.sh"); | ||
| } | ||
| } | ||
|
|
||
| private static File getTestResource(String name) throws Exception { | ||
| File file = null; | ||
| try(InputStream in = new FileInputStream(new File("docker" + File.separator + "postgres" + File.separator + name))) { | ||
| Path path = Files.createTempFile("pg-client", ".tmp"); | ||
| Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING); | ||
| file = path.toFile(); | ||
| file.deleteOnExit(); | ||
| } | ||
| return file; | ||
| } | ||
|
|
||
| public static boolean isTestingWithExternalDatabase() { | ||
| return isSystemPropertyValid(connectionUri) || isSystemPropertyValid(tlsConnectionUri); | ||
| } | ||
|
|
||
| private static boolean isSystemPropertyValid(String systemProperty) { | ||
| return systemProperty != null && !systemProperty.isEmpty(); | ||
| } | ||
|
|
||
| public synchronized PgConnectOptions startServer(String databaseVersion) throws Exception { | ||
| initServer(databaseVersion); | ||
| server.start(); | ||
|
|
||
| return new PgConnectOptions() | ||
| .setPort(server.getMappedPort(PostgreSQLContainer.POSTGRESQL_PORT)) | ||
| .setHost(server.getContainerIpAddress()) | ||
| .setDatabase("postgres") | ||
| .setUser("postgres") | ||
| .setPassword("postgres"); | ||
| } | ||
|
|
||
|
|
||
| private static String getPostgresVersion() { | ||
| String specifiedVersion = System.getProperty("embedded.postgres.version"); | ||
| String version; | ||
| if (specifiedVersion == null || specifiedVersion.isEmpty()) { | ||
| // if version is not specified then V10.10 will be used by default | ||
| version = "10.10"; | ||
| } else { | ||
| version = specifiedVersion; | ||
| } | ||
|
|
||
| return version; | ||
| } | ||
|
|
||
| public synchronized void stopServer() throws Exception { | ||
| if (server != null) { | ||
| try { | ||
| server.stop(); | ||
| } finally { | ||
| server = null; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void before() throws Throwable { | ||
| // use an external database for testing | ||
| if (isTestingWithExternalDatabase()) { | ||
|
|
||
| if (ssl) { | ||
| options = PgConnectOptions.fromUri(tlsConnectionUri); | ||
| } | ||
| else { | ||
| options = PgConnectOptions.fromUri(connectionUri); | ||
| } | ||
|
|
||
| return; | ||
| } | ||
|
|
||
| // We do not need to launch another server if it's a shared instance | ||
| if (this.server != null) { | ||
| return; | ||
| } | ||
|
|
||
| this.databaseVersion = getPostgresVersion(); | ||
| options = startServer(databaseVersion); | ||
| } | ||
|
|
||
| public static boolean isAtLeastPg10() { | ||
| // hackish ;-) | ||
| return !getPostgresVersion().startsWith("9."); | ||
| } | ||
|
|
||
| @Override | ||
| protected void after() { | ||
| if (!isTestingWithExternalDatabase()) { | ||
| try { | ||
| stopServer(); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.