Skip to content

Commit 0031ae3

Browse files
committed
Run tests agains latest Gradle with project isolation turned on
1 parent 1e560a4 commit 0031ae3

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/AbstractFunctionalTest.groovy

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,8 @@ abstract class AbstractFunctionalTest extends Specification {
556556
}
557557
558558
tasks.named("run") {
559-
doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
559+
inputs.files(configurations.runtimeClasspath)
560+
doLast { println(inputs.files.map { it.name }) }
560561
}
561562
"""
562563

@@ -612,11 +613,12 @@ abstract class AbstractFunctionalTest extends Specification {
612613
}
613614
614615
tasks.named("run") {
615-
doLast {
616+
inputs.files(configurations.runtimeClasspath.get().filter {
617+
it.name == "qpid-broker-core-8.0.6-module.jar"
618+
}.elements.map { zipTree(it.single()) })
619+
doLast {
616620
println(
617-
zipTree(configurations.runtimeClasspath.get().files.find {
618-
it.name == "qpid-broker-core-8.0.6-module.jar"
619-
}).find {
621+
inputs.files.find {
620622
it.path.endsWith("/META-INF/services/org.apache.qpid.server.plugin.ConfiguredObjectRegistration")
621623
}!!.readText()
622624
)

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/CombinationWithOtherPluginsFunctionalTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class CombinationWithOtherPluginsFunctionalTest extends Specification {
1616
settingsFile << 'rootProject.name = "test-project"'
1717
}
1818

19-
@IgnoreIf({ GradleBuild.gradleVersionUnderTest?.startsWith('6.') })
19+
@IgnoreIf({ !GradleBuild.gradleVersionUnderTest?.startsWith('7.') })
2020
def "works in combination with shadow plugin"() {
2121
def shadowJar = file("app/build/libs/app-all.jar")
2222

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/EdgeCasesFunctionalTest.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ class EdgeCasesFunctionalTest extends Specification {
8484
}
8585
8686
tasks.named("build") {
87-
doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
87+
inputs.files(configurations.runtimeClasspath)
88+
doLast { println(inputs.files.map { it.name }) }
8889
}
8990
"""
9091

@@ -130,15 +131,16 @@ class EdgeCasesFunctionalTest extends Specification {
130131
}
131132
132133
tasks.named("run") {
133-
doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
134+
inputs.files(configurations.runtimeClasspath)
135+
doLast { println(inputs.files.map { it.name }) }
134136
}
135137
"""
136138

137139
when:
138140
def result = run()
139141

140142
then:
141-
result.output.contains('[jsr305-3.0.2-module.jar]')
143+
result.output.contains('jsr305-3.0.2-module.jar')
142144
}
143145

144146
def "can automatically export all packages of a multi-release legacy Jar"() {

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/RequireAllDefinedDependenciesFunctionalTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ class RequireAllDefinedDependenciesFunctionalTest extends Specification {
102102
}
103103
104104
tasks.register("resolveRuntimeClasspath") {
105-
doLast { configurations.runtimeClasspath.get().resolve() }
105+
inputs.files(configurations.runtimeClasspath)
106+
doLast { println(inputs.files.map { it.name }) }
106107
}
107108
108109
extraJavaModuleInfo {

src/test/groovy/org/gradlex/javamodule/moduleinfo/test/fixture/GradleBuild.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,15 @@ class GradleBuild {
5757
buildFile << '\njava.modularity.inferModulePath.set(true)'
5858
}
5959
}
60+
List<String> latestFeaturesArgs = gradleVersionUnderTest ? [] : [
61+
'--configuration-cache',
62+
'-Dorg.gradle.unsafe.isolated-projects=true',
63+
]
6064
GradleRunner.create()
6165
.forwardOutput()
6266
.withPluginClasspath()
6367
.withProjectDir(projectDir)
64-
.withArguments(Arrays.asList(args) + '-s')
68+
.withArguments(Arrays.asList(args) + latestFeaturesArgs + '-s')
6569
.withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("-agentlib:jdwp")).with {
6670
gradleVersionUnderTest ? it.withGradleVersion(gradleVersionUnderTest) : it
6771
}

0 commit comments

Comments
 (0)