Skip to content

Commit c173e80

Browse files
committed
Convert buildSrc to JUnit 5
Closes gh-9467
1 parent 5cf40ab commit c173e80

27 files changed

+465
-604
lines changed

buildSrc/build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,19 @@ dependencies {
8787
implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.9.10'
8888
implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
8989

90-
testImplementation 'junit:junit:4.12'
90+
testImplementation platform('org.junit:junit-bom:5.7.2')
91+
testImplementation "org.junit.jupiter:junit-jupiter-api"
92+
testImplementation "org.junit.jupiter:junit-jupiter-params"
93+
testImplementation "org.junit.jupiter:junit-jupiter-engine"
9194
testImplementation 'org.apache.commons:commons-io:1.3.2'
9295
testImplementation 'org.assertj:assertj-core:3.13.2'
93-
testImplementation 'org.mockito:mockito-core:3.0.0'
94-
testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5'
96+
testImplementation 'org.mockito:mockito-core:3.11.2'
97+
testImplementation 'org.mockito:mockito-junit-jupiter:3.11.2'
9598
testImplementation "com.squareup.okhttp3:mockwebserver:3.14.9"
9699
}
97100

98101

99-
test.onlyIf { !project.hasProperty("buildSrc.skipTests") }
102+
test {
103+
onlyIf { !project.hasProperty("buildSrc.skipTests") }
104+
useJUnitPlatform()
105+
}

buildSrc/src/test/groovy/io/spring/gradle/convention/DependencySetPluginITest.groovy

Lines changed: 0 additions & 37 deletions
This file was deleted.

buildSrc/src/test/groovy/io/spring/gradle/convention/DocsPluginITest.groovy

Lines changed: 0 additions & 95 deletions
This file was deleted.

buildSrc/src/test/groovy/io/spring/gradle/convention/IntegrationTestPluginITest.groovy

Lines changed: 0 additions & 63 deletions
This file was deleted.

buildSrc/src/test/groovy/io/spring/gradle/convention/JacocoPluginITest.groovy

Lines changed: 0 additions & 39 deletions
This file was deleted.

buildSrc/src/test/groovy/io/spring/gradle/convention/JavadocApiPluginITest.groovy

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)