Skip to content

Commit 52b2b5f

Browse files
committed
Run tests with 'Configuration Cache' and 'Project Isolation'
1 parent 671307b commit 52b2b5f

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

src/test/groovy/org/gradlex/javamodule/dependencies/test/CustomizationTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class CustomizationTest extends Specification {
6363
6464
appBuildFile << '''
6565
javaModuleDependencies {
66-
modulesProperties.set(rootProject.layout.projectDirectory.file(".hidden/modules.properties"))
66+
modulesProperties.set(File(rootDir,".hidden/modules.properties"))
6767
}
6868
'''
6969

src/test/groovy/org/gradlex/javamodule/dependencies/test/GroupMappingTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class GroupMappingTest extends Specification {
3434
'''
3535

3636
when:
37-
def result = runner('assemble').build()
37+
def result = runner(false, 'assemble').build()
3838

3939
then:
4040
result.task(":app:compileJava").outcome == TaskOutcome.SUCCESS

src/test/groovy/org/gradlex/javamodule/dependencies/test/LocalModuleMappingsTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ class LocalModuleMappingsTest extends Specification {
5151
'''
5252

5353
then:
54-
build()
54+
runner(false, 'build').build()
5555
}
5656
}

src/test/groovy/org/gradlex/javamodule/dependencies/test/RequiresRuntimeTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,13 @@ class RequiresRuntimeTest extends Specification {
157157
tasks.compileTestJava {
158158
classpath += sourceSets.main.get().output
159159
160+
val srcDir = sourceSets.test.get().java.sourceDirectories.first()
160161
options.compilerArgumentProviders.add {
161162
listOf(
162163
"--module-path",
163164
classpath.files.joinToString(":"),
164165
"--patch-module",
165-
"org.gradlex.test.app=" + sourceSets.test.get().java.sourceDirectories.first()
166+
"org.gradlex.test.app=" + srcDir
166167
)
167168
}
168169
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,12 @@ class GradleBuild {
4545
mainClass.set("org.gradlex.test.app.Main")
4646
}
4747
tasks.register("printRuntimeJars") {
48-
doLast { println(configurations.runtimeClasspath.get().files.map { it.name }) }
48+
inputs.files(configurations.runtimeClasspath)
49+
doLast { println(inputs.files.map { it.name }) }
4950
}
5051
tasks.register("printCompileJars") {
51-
doLast { println(configurations.compileClasspath.get().files.map { it.name }) }
52+
inputs.files(configurations.compileClasspath)
53+
doLast { println(inputs.files.map { it.name }) }
5254
}
5355
'''
5456
libBuildFile << '''
@@ -85,12 +87,18 @@ class GradleBuild {
8587
runner('build').buildAndFail()
8688
}
8789

88-
GradleRunner runner(String... args) {
90+
GradleRunner runner(boolean projectIsolation = true, String... args) {
91+
List<String> latestFeaturesArgs = gradleVersionUnderTest || !projectIsolation? [] : [
92+
'--configuration-cache',
93+
'-Dorg.gradle.unsafe.isolated-projects=true',
94+
// 'getGroup' in 'JavaModuleDependenciesExtension.create'
95+
'--configuration-cache-problems=warn', '-Dorg.gradle.configuration-cache.max-problems=3'
96+
]
8997
GradleRunner.create()
9098
.forwardOutput()
9199
.withPluginClasspath()
92100
.withProjectDir(projectDir)
93-
.withArguments(Arrays.asList(args) + '-s' + '--warning-mode' + 'all')
101+
.withArguments(Arrays.asList(args) + latestFeaturesArgs + '-s' + '--warning-mode=all')
94102
.withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("-agentlib:jdwp")).with {
95103
gradleVersionUnderTest ? it.withGradleVersion(gradleVersionUnderTest) : it
96104
}

0 commit comments

Comments
 (0)