Browse Source

Split gradle test support into a separate module

See gh-25824
pull/27405/head
Scott Frederick 4 years ago
parent
commit
a0b32251eb
  1. 1
      settings.gradle
  2. 1
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
  3. 22
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/build.gradle
  4. 0
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/Dsl.java
  5. 1
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java
  6. 0
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuildExtension.java
  7. 0
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java
  8. 20
      spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/package-info.java
  9. 10
      spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle
  10. 9
      spring-boot-system-tests/spring-boot-image-tests/build.gradle
  11. 1
      src/checkstyle/checkstyle-suppressions.xml

1
settings.gradle

@ -55,6 +55,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform" @@ -55,6 +55,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"
include "spring-boot-project:spring-boot-tools:spring-boot-configuration-metadata"
include "spring-boot-project:spring-boot-tools:spring-boot-configuration-processor"
include "spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin"
include "spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"
include "spring-boot-project:spring-boot-tools:spring-boot-jarmode-layertools"
include "spring-boot-project:spring-boot-tools:spring-boot-loader"
include "spring-boot-project:spring-boot-tools:spring-boot-loader-tools"

1
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle

@ -25,6 +25,7 @@ dependencies { @@ -25,6 +25,7 @@ dependencies {
optional("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"))
testImplementation("org.assertj:assertj-core")
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-core")

22
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/build.gradle

@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
plugins {
id "java-library"
id "org.springframework.boot.conventions"
}
description = "Spring Boot Gradle Testing Support"
dependencies {
compileOnly("org.junit.jupiter:junit-jupiter")
implementation(gradleTestKit())
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
implementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
implementation("io.spring.gradle:dependency-management-plugin")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-compiler-runner:$kotlinVersion")
implementation("org.jetbrains.kotlin:kotlin-daemon-client:$kotlinVersion")
implementation("org.apache.commons:commons-compress")
implementation("org.assertj:assertj-core")
}

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/Dsl.java → spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/Dsl.java

1
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java → spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java

@ -65,6 +65,7 @@ import static org.assertj.core.api.Assertions.assertThat; @@ -65,6 +65,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* A {@code GradleBuild} is used to run a Gradle build using {@link GradleRunner}.
*
* @author Andy Wilkinson
* @author Scott Frederick
*/
public class GradleBuild {

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuildExtension.java → spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuildExtension.java

0
spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java → spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleVersions.java

20
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/package-info.java

@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
/*
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* Classes for testing with Gradle.
*/
package org.springframework.boot.testsupport.gradle.testkit;

10
spring-boot-project/spring-boot-tools/spring-boot-test-support/build.gradle

@ -20,16 +20,6 @@ dependencies { @@ -20,16 +20,6 @@ dependencies {
compileOnly("org.springframework.data:spring-data-redis")
compileOnly("org.testcontainers:testcontainers")
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
compileOnly(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
compileOnly("io.spring.gradle:dependency-management-plugin")
compileOnly(gradleTestKit())
compileOnly("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
compileOnly("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
compileOnly("org.jetbrains.kotlin:kotlin-compiler-runner:$kotlinVersion")
compileOnly("org.jetbrains.kotlin:kotlin-daemon-client:$kotlinVersion")
compileOnly("org.apache.commons:commons-compress")
implementation("org.apache.maven.resolver:maven-resolver-connector-basic")
implementation("org.apache.maven.resolver:maven-resolver-impl")
implementation("org.apache.maven:maven-resolver-provider")

9
spring-boot-system-tests/spring-boot-image-tests/build.gradle

@ -26,16 +26,9 @@ dependencies { @@ -26,16 +26,9 @@ dependencies {
}
systemTestImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-gradle-test-support"))
systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-buildpack-platform"))
systemTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-loader-tools"))
systemTestImplementation("io.spring.gradle:dependency-management-plugin")
systemTestImplementation(gradleTestKit())
systemTestImplementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
systemTestImplementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
systemTestImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:$kotlinVersion")
systemTestImplementation("org.jetbrains.kotlin:kotlin-compiler-runner:$kotlinVersion")
systemTestImplementation("org.jetbrains.kotlin:kotlin-daemon-client:$kotlinVersion")
systemTestImplementation("org.assertj:assertj-core")
systemTestImplementation("org.testcontainers:junit-jupiter")
systemTestImplementation("org.testcontainers:testcontainers")

1
src/checkstyle/checkstyle-suppressions.xml

@ -46,6 +46,7 @@ @@ -46,6 +46,7 @@
<suppress files="[\\/]spring-boot-smoke-tests[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]spring-boot-smoke-tests[\\/]spring-boot-smoke-test-testng[\\/]" checks="SpringJUnit5" />
<suppress files="[\\/]spring-boot-test-support[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]spring-boot-gradle-test-support[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]src[\\/]intTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="[\\/]src[\\/]systemTest[\\/]java[\\/]" checks="SpringJavadoc" message="\@since" />
<suppress files="LinuxDomainSocket" checks="FinalClass" message="SockaddrUn" />

Loading…
Cancel
Save