Skip to content

Commit 6f781d6

Browse files
pboospboos
authored
Use testFixtures (#154)
1 parent 0ec548c commit 6f781d6

File tree

9 files changed

+44
-36
lines changed

9 files changed

+44
-36
lines changed

‎spring-boot-starter/spring-boot-starter-web/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ dependencies {
2121
// TODO use spotbugs instead and also apply to all modules?
2222
implementation(libs.find.bugs)
2323

24-
testImplementation project(':test:test-utils')
25-
testImplementation project(':test:openapi-web')
24+
testImplementation(testFixtures(project(':test:test-utils')))
25+
testImplementation(testFixtures(project(':test:openapi-web')))
2626
testImplementation 'org.springframework:spring-web'
2727
testImplementation 'org.springframework:spring-webmvc'
2828
testImplementation 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext

‎spring-boot-starter/spring-boot-starter-webflux/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies {
2020
// TODO use spotbugs instead and also apply to all modules?
2121
implementation(libs.find.bugs)
2222

23-
testImplementation project(':test:test-utils')
24-
testImplementation project(':test:openapi-webflux')
23+
testImplementation(testFixtures(project(':test:test-utils')))
24+
testImplementation(testFixtures(project(':test:openapi-webflux')))
2525
testImplementation 'org.springframework.boot:spring-boot-starter-webflux'
2626
testImplementation 'io.projectreactor:reactor-test'
2727
testImplementation 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext

‎test/openapi-web/build.gradle

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,37 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id 'java-library'
5+
id 'java-test-fixtures'
56
alias(libs.plugins.spring.boot) apply false
67
alias(libs.plugins.openapi.generator)
78
}
89

910
dependencies {
10-
implementation platform(SpringBootPlugin.BOM_COORDINATES)
11+
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)
1112

12-
compileOnly project(':openapi-validation-api')
13-
compileOnly project(':openapi-validation-core')
13+
testFixturesCompileOnly project(':openapi-validation-api')
14+
testFixturesCompileOnly project(':openapi-validation-core')
1415

15-
compileOnly 'org.springframework.boot:spring-boot-starter'
16-
compileOnly 'org.springframework:spring-web'
16+
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
17+
testFixturesCompileOnly 'org.springframework:spring-web'
1718

1819
// TODO use spotbugs instead and also apply to all modules?
19-
implementation(libs.find.bugs)
20+
testFixturesImplementation(libs.find.bugs)
2021

21-
api 'org.springframework.boot:spring-boot-starter-test'
22+
testFixturesApi platform(SpringBootPlugin.BOM_COORDINATES)
23+
testFixturesApi 'org.springframework.boot:spring-boot-starter-test'
2224
// For openapi generated code
23-
implementation 'org.springframework.boot:spring-boot-starter-validation'
24-
implementation(libs.openapi.tools.jacksonDatabindNullable)
25-
implementation(libs.jakarta.validation.api)
26-
implementation(libs.swagger.annotations)
27-
api 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
25+
testFixturesApi 'org.springframework.boot:spring-boot-starter-validation'
26+
testFixturesApi(libs.openapi.tools.jacksonDatabindNullable)
27+
testFixturesApi(libs.jakarta.validation.api)
28+
testFixturesApi(libs.swagger.annotations)
29+
testFixturesApi 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
2830
}
2931

3032

3133
def generatedSourceDirectory = "$buildDir/generated/openapi"
3234
sourceSets {
33-
main {
35+
testFixtures {
3436
java {
3537
srcDir generatedSourceDirectory + '/src/main/java'
3638
}

‎test/openapi-webflux/build.gradle

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,37 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id 'java-library'
5+
id 'java-test-fixtures'
56
alias(libs.plugins.spring.boot) apply false
67
alias(libs.plugins.openapi.generator)
78
}
89

910
dependencies {
10-
implementation platform(SpringBootPlugin.BOM_COORDINATES)
11+
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)
1112

12-
compileOnly project(':openapi-validation-api')
13-
compileOnly project(':openapi-validation-core')
13+
testFixturesCompileOnly project(':openapi-validation-api')
14+
testFixturesCompileOnly project(':openapi-validation-core')
1415

15-
compileOnly 'org.springframework.boot:spring-boot-starter'
16-
compileOnly 'org.springframework:spring-webflux'
16+
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
17+
testFixturesCompileOnly 'org.springframework:spring-webflux'
1718

1819
// TODO use spotbugs instead and also apply to all modules?
19-
implementation(libs.find.bugs)
20+
testFixturesImplementation(libs.find.bugs)
2021

21-
api 'org.springframework.boot:spring-boot-starter-test'
22+
testFixturesApi platform(SpringBootPlugin.BOM_COORDINATES)
23+
testFixturesApi 'org.springframework.boot:spring-boot-starter-test'
2224
// For openapi generated code
23-
implementation 'org.springframework.boot:spring-boot-starter-validation'
24-
implementation(libs.openapi.tools.jacksonDatabindNullable)
25-
implementation(libs.jakarta.validation.api)
26-
implementation(libs.swagger.annotations)
27-
api 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
25+
testFixturesApi 'org.springframework.boot:spring-boot-starter-validation'
26+
testFixturesApi(libs.openapi.tools.jacksonDatabindNullable)
27+
testFixturesApi(libs.jakarta.validation.api)
28+
testFixturesApi(libs.swagger.annotations)
29+
testFixturesApi 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
2830
}
2931

3032

3133
def generatedSourceDirectory = "$buildDir/generated/openapi"
3234
sourceSets {
33-
main {
35+
testFixtures {
3436
java {
3537
srcDir generatedSourceDirectory + '/src/main/java'
3638
}

‎test/test-utils/build.gradle

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin
22

33
plugins {
44
id 'java-library'
5+
id 'java-test-fixtures'
56
alias(libs.plugins.spring.boot) apply false
67
}
78

89
dependencies {
9-
implementation platform(SpringBootPlugin.BOM_COORDINATES)
10+
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)
1011

11-
compileOnly project(':openapi-validation-api')
12-
compileOnly project(':openapi-validation-core')
12+
testFixturesCompileOnly(libs.lombok)
13+
testFixturesAnnotationProcessor(libs.lombok)
14+
15+
testFixturesCompileOnly project(':openapi-validation-api')
16+
testFixturesCompileOnly project(':openapi-validation-core')
1317

1418
// TODO use spotbugs instead and also apply to all modules?
15-
implementation(libs.find.bugs)
19+
testFixturesImplementation(libs.find.bugs)
1620

17-
compileOnly 'org.springframework.boot:spring-boot-starter'
18-
compileOnly 'org.springframework:spring-web'
21+
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
22+
testFixturesCompileOnly 'org.springframework:spring-web'
1923
}

‎test/test-utils/src/main/java/com/getyourguide/openapi/validation/test/DefaultSpringBootTestConfiguration.java renamed to ‎test/test-utils/src/testFixtures/java/com/getyourguide/openapi/validation/test/DefaultSpringBootTestConfiguration.java

File renamed without changes.

‎test/test-utils/src/main/java/com/getyourguide/openapi/validation/test/TestViolationLogger.java renamed to ‎test/test-utils/src/testFixtures/java/com/getyourguide/openapi/validation/test/TestViolationLogger.java

File renamed without changes.

‎test/test-utils/src/main/java/com/getyourguide/openapi/validation/test/exception/WithResponseStatusException.java renamed to ‎test/test-utils/src/testFixtures/java/com/getyourguide/openapi/validation/test/exception/WithResponseStatusException.java

File renamed without changes.

‎test/test-utils/src/main/java/com/getyourguide/openapi/validation/test/exception/WithoutResponseStatusException.java renamed to ‎test/test-utils/src/testFixtures/java/com/getyourguide/openapi/validation/test/exception/WithoutResponseStatusException.java

File renamed without changes.

0 commit comments

Comments
 (0)