Skip to content

Commit 99eef6b

Browse files
committed
Adjust samples to rely on the new conventions
1 parent 526051f commit 99eef6b

File tree

3 files changed

+27
-35
lines changed

3 files changed

+27
-35
lines changed

samples/use-all-java-module-plugins/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,19 @@ javaModuleTesting.whitebox(
1313
}
1414
) {
1515
requires.add("org.junit.jupiter.api")
16-
opensTo.add("org.junit.platform.commons")
1716
}
1817

19-
javaModuleTesting.blackbox(
20-
testing.suites.create<JvmTestSuite>("integtest") {
21-
useJUnitJupiter("")
22-
testType.set("blackbox")
23-
dependencies {
24-
implementation(project.dependencies.platform(project(":platform")))
25-
}
26-
targets.all {
27-
testTask { jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error") }
28-
}
29-
tasks.check { dependsOn(targets) }
18+
testing.suites.create<JvmTestSuite>("integtest") {
19+
useJUnitJupiter("")
20+
testType.set("blackbox")
21+
dependencies {
22+
implementation(project.dependencies.platform(project(":platform")))
23+
}
24+
targets.all {
25+
testTask { jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error") }
3026
}
31-
)
27+
tasks.check { dependsOn(targets) }
28+
}
3229

3330
dependencies {
3431
implementation(platform(project(":platform")))

samples/use-only-java-module-testing-plugin/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@ javaModuleTesting.whitebox(
1313
}
1414
) {
1515
requires.add("org.junit.jupiter.api")
16-
opensTo.add("org.junit.platform.commons")
1716
}
1817

19-
javaModuleTesting.blackbox(
20-
testing.suites.create<JvmTestSuite>("integtest") {
21-
useJUnitJupiter("")
22-
testType.set("blackbox")
23-
dependencies {
24-
implementation(project.dependencies.platform(project(":platform")))
25-
}
26-
targets.all {
27-
testTask { jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error") }
28-
}
29-
tasks.check { dependsOn(targets) }
18+
testing.suites.create<JvmTestSuite>("integtest") {
19+
useJUnitJupiter("")
20+
testType.set("blackbox")
21+
dependencies {
22+
implementation(project.dependencies.platform(project(":platform")))
23+
}
24+
targets.all {
25+
testTask { jvmArgs("-Dorg.slf4j.simpleLogger.defaultLogLevel=error") }
3026
}
31-
)
27+
tasks.check { dependsOn(targets) }
28+
}
29+
3230

3331
dependencies {
3432
implementation(platform(project(":platform")))

samples/use-with-test-fixtures/build-logic/src/main/kotlin/org.my.gradle.java-module.gradle.kts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@ javaModuleTesting.whitebox(
1212
}
1313
) {
1414
requires.add("org.junit.jupiter.api")
15-
opensTo.add("org.junit.platform.commons")
1615
requires.add("org.my.lib.test.fixtures")
1716
}
1817

19-
javaModuleTesting.blackbox(
20-
testing.suites.create<JvmTestSuite>("integtest") {
21-
useJUnitJupiter()
22-
testType.set(TestSuiteType.INTEGRATION_TEST)
23-
targets.all { testTask { testLogging.showStandardStreams = true } }
24-
tasks.check { dependsOn(targets) }
25-
}
26-
)
18+
testing.suites.create<JvmTestSuite>("integtest") {
19+
useJUnitJupiter()
20+
testType.set(TestSuiteType.INTEGRATION_TEST)
21+
targets.all { testTask { testLogging.showStandardStreams = true } }
22+
tasks.check { dependsOn(targets) }
23+
}
2724

2825
dependencies {
2926
implementation(platform("com.fasterxml.jackson:jackson-bom:2.13.2"))

0 commit comments

Comments
 (0)