Skip to content
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

Jump to bottom

test: Ensure to use a compatible Java version for Gradle projects #9262

Merged
merged 1 commit into from
Oct 9, 2024
Merged

test: Ensure to use a compatible Java version for Gradle projects #9262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions plugins/package-managers/gradle/src/funTest/kotlin/GradleAndroidFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class GradleAndroidFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-android/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-android-expected-output-root.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
Copy link
Member

Choose a reason for hiding this comment

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

Should we factor out createGradle() so these can be kept one-liners ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I have a slight preference for seeing the configuration explicitly in each test, as Java requirements might change on a per-test basis. Also, I'd like to keep this aligned with the respective GI tests as much as possible for now.

.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -42,7 +43,8 @@ class GradleAndroidFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-android/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-android-expected-output-app.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -51,7 +53,8 @@ class GradleAndroidFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-android/lib/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-android-expected-output-lib.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -60,7 +63,8 @@ class GradleAndroidFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-android-cyclic/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-android-cyclic-expected-output-app.yml")

val result = create("Gradle").resolveDependencies(listOf(definitionFile), emptyMap())
val result = create("Gradle", "javaVersion" to "17")
.resolveDependencies(listOf(definitionFile), emptyMap())

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
3 changes: 2 additions & 1 deletion plugins/package-managers/gradle/src/funTest/kotlin/GradleBomFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class GradleBomFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-bom/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-bom-expected-output.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
3 changes: 2 additions & 1 deletion plugins/package-managers/gradle/src/funTest/kotlin/GradleCompositeFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class GradleCompositeFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-composite/project1/build.gradle.kts")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-composite-expected-output.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
20 changes: 13 additions & 7 deletions plugins/package-managers/gradle/src/funTest/kotlin/GradleFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-root.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -78,7 +79,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-app.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -87,7 +89,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle/lib/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-lib.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -96,7 +99,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle/lib-without-repo/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-lib-without-repo.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

patchActualResult(result.toYaml()) should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -105,7 +109,7 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-scopes-excludes.yml")

val result = create("Gradle", excludedScopes = setOf("test.*"))
val result = create("Gradle", "javaVersion" to "17", excludedScopes = setOf("test.*"))
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
Expand All @@ -119,7 +123,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/gradle-unsupported-version/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-unsupported-version.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down Expand Up @@ -171,7 +176,8 @@ class GradleFunTest : StringSpec() {
val definitionFile = getAssetFile("projects/synthetic/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-expected-output-app$suffix.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
9 changes: 6 additions & 3 deletions plugins/package-managers/gradle/src/funTest/kotlin/GradleKotlinScriptFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class GradleKotlinScriptFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/multi-kotlin-project/build.gradle.kts")
val expectedResultFile = getAssetFile("projects/synthetic/multi-kotlin-project-expected-output-root.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -42,7 +43,8 @@ class GradleKotlinScriptFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/multi-kotlin-project/core/build.gradle.kts")
val expectedResultFile = getAssetFile("projects/synthetic/multi-kotlin-project-expected-output-core.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -51,7 +53,8 @@ class GradleKotlinScriptFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/multi-kotlin-project/cli/build.gradle.kts")
val expectedResultFile = getAssetFile("projects/synthetic/multi-kotlin-project-expected-output-cli.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
9 changes: 6 additions & 3 deletions plugins/package-managers/gradle/src/funTest/kotlin/GradleLibraryFunTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class GradleLibraryFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-library/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-library-expected-output-root.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -42,7 +43,8 @@ class GradleLibraryFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-library/app/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-library-expected-output-app.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand All @@ -51,7 +53,8 @@ class GradleLibraryFunTest : StringSpec({
val definitionFile = getAssetFile("projects/synthetic/gradle-library/lib/build.gradle")
val expectedResultFile = getAssetFile("projects/synthetic/gradle-library-expected-output-lib.yml")

val result = create("Gradle").resolveSingleProject(definitionFile, resolveScopes = true)
val result = create("Gradle", "javaVersion" to "17")
.resolveSingleProject(definitionFile, resolveScopes = true)

result.toYaml() should matchExpectedResult(expectedResultFile, definitionFile)
}
Expand Down
Loading