Skip to content

Update profile configuration for integration tests #47759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2025
Merged

Update profile configuration for integration tests #47759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4e13fc
Polish DefaultDockerInitContext
geoand May 8, 2025
555f72c
Update profile configuration for integration tests
geoand May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,10 @@ public interface TestConfig {
@WithDefault("false")
boolean flatClassPath();

/**
* The profile to use when testing the native image
*/
@WithDefault("prod")
String nativeImageProfile();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for dropping this one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This the deprecated property that is being removed


/**
* The profile to use when testing using {@code @QuarkusIntegrationTest}
*/
@WithDefault("prod")
@WithDefault("${quarkus.profile:prod}")
String integrationTestProfile();

/**
Expand Down
5 changes: 4 additions & 1 deletion ...framework/junit5/src/main/java/io/quarkus/test/junit/QuarkusIntegrationTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ private QuarkusTestExtensionState doProcessStart(Properties quarkusArtifactPrope
// propagate Quarkus properties set from the build tool
Properties existingSysProps = System.getProperties();
for (String name : existingSysProps.stringPropertyNames()) {
if (name.startsWith("quarkus.")) {
if (name.startsWith("quarkus.")
// don't include 'quarkus.profile' as that has already been taken into account when determining the launch profile
// so we don't want this to end up in multiple launch arguments
&& !name.equals("quarkus.profile")) {
additionalProperties.put(name, existingSysProps.getProperty(name));
}
}
Expand Down
5 changes: 4 additions & 1 deletion ...ework/junit5/src/main/java/io/quarkus/test/junit/QuarkusMainIntegrationTestExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ private ArtifactLauncher.LaunchResult doProcessStart(ExtensionContext context, S
// propagate Quarkus properties set from the build tool
Properties existingSysProps = System.getProperties();
for (String name : existingSysProps.stringPropertyNames()) {
if (name.startsWith("quarkus.")) {
if (name.startsWith("quarkus.")
// don't include 'quarkus.profile' as that has already been taken into account when determining the launch profile
// so we don't want this to end up in multiple launch arguments
&& !name.equals("quarkus.profile")) {
additionalProperties.put(name, existingSysProps.getProperty(name));
}
}
Expand Down
4 changes: 2 additions & 2 deletions .../junit5/src/main/java/io/quarkus/test/junit/launcher/DockerContainerLauncherProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ static class DefaultDockerInitContext extends DefaultInitContextBase
private final Map<Integer, Integer> additionalExposedPorts;
private final Optional<String> entryPoint;
private final List<String> programArgs;
private Map<String, String> labels;
private Map<String, String> volumeMounts;
private final Map<String, String> labels;
private final Map<String, String> volumeMounts;

public DefaultDockerInitContext(int httpPort, int httpsPort, Duration waitTime, String testProfile,
List<String> argLine, Map<String, String> env,
Expand Down
2 changes: 1 addition & 1 deletion ...work/junit5/src/main/java/io/quarkus/test/junit/launcher/NativeImageLauncherProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public NativeImageLauncher create(CreateContext context) {
config.getValue("quarkus.http.test-port", OptionalInt.class).orElse(DEFAULT_PORT),
config.getValue("quarkus.http.test-ssl-port", OptionalInt.class).orElse(DEFAULT_HTTPS_PORT),
testConfig.waitTime(),
testConfig.nativeImageProfile(),
testConfig.integrationTestProfile(),
TestConfigUtil.argLineValues(testConfig.argLine().orElse("")),
testConfig.env(),
context.devServicesLaunchResult(),
Expand Down
Loading