Use dev services instead of docker-maven-plugin for Postgresql #51066
+118
−447
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| quarkus.datasource.jdbc.max-size=8 | ||
|
|
||
| quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql.defaultpu | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| quarkus.datasource.jdbc.max-size=8 | ||
|
|
||
| quarkus.hibernate-orm.packages=io.quarkus.it.jpa.postgresql.defaultpu | ||
|
|
||
This file contains hidden or 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,43 @@ | ||
| package io.quarkus.it.jpa.postgresql; | ||
|
|
||
| import static org.hamcrest.Matchers.is; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import io.quarkus.test.junit.QuarkusTest; | ||
| import io.quarkus.test.junit.QuarkusTestProfile; | ||
| import io.quarkus.test.junit.TestProfile; | ||
| import io.restassured.RestAssured; | ||
|
|
||
| /* Exercises OverrideJdbcUrlBuildTimeConfigSource, which cannot coexist with dev services. */ | ||
| @TestProfile(ConfigOverrideTest.Profile.class) | ||
| @QuarkusTest | ||
| public class ConfigOverrideTest { | ||
|
|
||
| @Test | ||
| public void base() { | ||
| RestAssured.when().get("/jpa/testfunctionality/base").then().body(is("OK")); | ||
| } | ||
|
|
||
| public static class Profile implements QuarkusTestProfile { | ||
| @Override | ||
| public Map<String, String> getConfigOverrides() { | ||
| // Disable dev services so we know we're connecting to the right database | ||
| return Map.of("quarkus.devservices.enabled", "false"); | ||
| } | ||
|
|
||
| @Override | ||
| public String getConfigProfile() { | ||
| return "someotherprofile"; | ||
| } | ||
|
|
||
| @Override | ||
| public List<TestResourceEntry> testResources() { | ||
| return Collections.singletonList(new TestResourceEntry(PostgresTestResourceLifecycleManager.class)); | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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,35 @@ | ||
| package io.quarkus.it.jpa.postgresql; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.testcontainers.containers.PostgreSQLContainer; | ||
|
|
||
| import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; | ||
|
|
||
| public class PostgresTestResourceLifecycleManager implements QuarkusTestResourceLifecycleManager { | ||
|
|
||
| private static PostgreSQLContainer<?> postgres; | ||
|
|
||
| @SuppressWarnings("resource") | ||
| @Override | ||
| public Map<String, String> start() { | ||
| postgres = new PostgreSQLContainer<>("postgres:14") // the exact value doesn't really matter here | ||
| .withDatabaseName("testdb") | ||
| .withUsername("test") | ||
| .withPassword("test"); | ||
|
|
||
| postgres.start(); | ||
|
|
||
| return Map.of("quarkus.datasource.jdbc.url", postgres.getJdbcUrl(), "quarkus.datasource.username", "test", | ||
| "quarkus.datasource.password", "test"); | ||
| } | ||
|
|
||
| @Override | ||
| public void stop() { | ||
|
|
||
| if (postgres != null) { | ||
| postgres.stop(); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed this in your other PRs... but I think it's incorrect?
postgres.urlis no longer mentioned in the configuration of this integration test, so I don't think setting it will do anything.In order for this to be true, I think you'd need to keep the line
quarkus.datasource.jdbc.url=${postgres.url}inapplication.properties. And set the default value ofpostgres.urlto an empty string inpom.xml, so that by default the configuration will look likequarkus.datasource.jdbc.url=(no value), which means dev services will kick in.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That, or we remove this part of the README and expect people to always use dev services to run these tests. Which is perfectly fine IMO, but others might disagree -- @gsmet maybe?