Skip to content

Commit ee208b9

Browse files
committed
Fix integration test property names and assertions
- Fix property names to match plugin parameters: - jdk_distro -> jdkDistribution - toolchain_jdk -> toolchainJdk - toolchain_jdk_distro -> toolchainJdkDistribution - jdk_update_policy -> jdkUpdatePolicy - Update test assertions to match corrected property names - All tests now use proper Maven plugin parameter names - jdk_distribution_corretto test now passes with correct Corretto distribution
1 parent cc0f363 commit ee208b9

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

maven-wrapper-plugin/src/it/projects/jdk_distribution_corretto/test.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
type=only-script
1919
maven=3.9.6
2020
jdk=17
21-
jdk_distro=corretto
21+
jdkDistribution=corretto

maven-wrapper-plugin/src/it/projects/jdk_distribution_corretto/verify.groovy

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,12 @@ wrapperProperties.withInputStream {
2929
}
3030

3131
// Verify JDK configuration is present in properties
32-
assert props.jdkDistributionUrl != null
33-
assert props.jdkDistributionUrl.contains("corretto")
32+
assert props.jdkVersion == "17"
33+
assert props.jdkDistribution == "corretto"
3434
assert props.distributionType == "only-script"
35+
// When using version-based resolution, jdkDistributionUrl should NOT be set
36+
// The URL resolution happens at runtime by the wrapper script using the Foojay API
37+
assert props.jdkDistributionUrl == null
3538

3639
log = new File(basedir, 'build.log').text
3740

maven-wrapper-plugin/src/it/projects/jdk_environment_variables/test.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
type=only-script
1919
maven=3.9.6
2020
jdk=17
21-
jdk_distro=temurin
21+
jdkDistribution=temurin

maven-wrapper-plugin/src/it/projects/jdk_skip_environment/test.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
type=only-script
1919
maven=3.9.6
2020
jdk=99
21-
jdk_distro=temurin
21+
jdkDistribution=temurin

maven-wrapper-plugin/src/it/projects/jdk_toolchain_support/test.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
type=only-script
1919
maven=3.9.6
2020
jdk=21
21-
jdk_distro=temurin
22-
toolchain_jdk=17
23-
toolchain_jdk_distro=corretto
21+
jdkDistribution=temurin
22+
toolchainJdk=17
23+
toolchainJdkDistribution=corretto

maven-wrapper-plugin/src/it/projects/jdk_update_policy/test.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ type=only-script
1919
maven=3.9.6
2020
# Use version-based JDK resolution to test update policy
2121
jdk=17
22-
jdk_distro=temurin
23-
jdk_update_policy=never
22+
jdkDistribution=temurin
23+
jdkUpdatePolicy=never

0 commit comments

Comments
 (0)