Skip to content

Use testFixtures #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Use testFixtures #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spring-boot-starter/spring-boot-starter-web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies {
// TODO use spotbugs instead and also apply to all modules?
implementation(libs.find.bugs)

testImplementation project(':test:test-utils')
testImplementation project(':test:openapi-web')
testImplementation(testFixtures(project(':test:test-utils')))
testImplementation(testFixtures(project(':test:openapi-web')))
testImplementation 'org.springframework:spring-web'
testImplementation 'org.springframework:spring-webmvc'
testImplementation 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter/spring-boot-starter-webflux/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ dependencies {
// TODO use spotbugs instead and also apply to all modules?
implementation(libs.find.bugs)

testImplementation project(':test:test-utils')
testImplementation project(':test:openapi-webflux')
testImplementation(testFixtures(project(':test:test-utils')))
testImplementation(testFixtures(project(':test:openapi-webflux')))
testImplementation 'org.springframework.boot:spring-boot-starter-webflux'
testImplementation 'io.projectreactor:reactor-test'
testImplementation 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
Expand Down
28 changes: 15 additions & 13 deletions test/openapi-web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,37 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'java-library'
id 'java-test-fixtures'
alias(libs.plugins.spring.boot) apply false
alias(libs.plugins.openapi.generator)
}

dependencies {
implementation platform(SpringBootPlugin.BOM_COORDINATES)
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)

compileOnly project(':openapi-validation-api')
compileOnly project(':openapi-validation-core')
testFixturesCompileOnly project(':openapi-validation-api')
testFixturesCompileOnly project(':openapi-validation-core')

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework:spring-web'
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
testFixturesCompileOnly 'org.springframework:spring-web'

// TODO use spotbugs instead and also apply to all modules?
implementation(libs.find.bugs)
testFixturesImplementation(libs.find.bugs)

api 'org.springframework.boot:spring-boot-starter-test'
testFixturesApi platform(SpringBootPlugin.BOM_COORDINATES)
testFixturesApi 'org.springframework.boot:spring-boot-starter-test'
// For openapi generated code
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation(libs.openapi.tools.jacksonDatabindNullable)
implementation(libs.jakarta.validation.api)
implementation(libs.swagger.annotations)
api 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
testFixturesApi 'org.springframework.boot:spring-boot-starter-validation'
testFixturesApi(libs.openapi.tools.jacksonDatabindNullable)
testFixturesApi(libs.jakarta.validation.api)
testFixturesApi(libs.swagger.annotations)
testFixturesApi 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
}


def generatedSourceDirectory = "$buildDir/generated/openapi"
sourceSets {
main {
testFixtures {
java {
srcDir generatedSourceDirectory + '/src/main/java'
}
Expand Down
28 changes: 15 additions & 13 deletions test/openapi-webflux/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,37 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'java-library'
id 'java-test-fixtures'
alias(libs.plugins.spring.boot) apply false
alias(libs.plugins.openapi.generator)
}

dependencies {
implementation platform(SpringBootPlugin.BOM_COORDINATES)
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)

compileOnly project(':openapi-validation-api')
compileOnly project(':openapi-validation-core')
testFixturesCompileOnly project(':openapi-validation-api')
testFixturesCompileOnly project(':openapi-validation-core')

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework:spring-webflux'
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
testFixturesCompileOnly 'org.springframework:spring-webflux'

// TODO use spotbugs instead and also apply to all modules?
implementation(libs.find.bugs)
testFixturesImplementation(libs.find.bugs)

api 'org.springframework.boot:spring-boot-starter-test'
testFixturesApi platform(SpringBootPlugin.BOM_COORDINATES)
testFixturesApi 'org.springframework.boot:spring-boot-starter-test'
// For openapi generated code
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation(libs.openapi.tools.jacksonDatabindNullable)
implementation(libs.jakarta.validation.api)
implementation(libs.swagger.annotations)
api 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
testFixturesApi 'org.springframework.boot:spring-boot-starter-validation'
testFixturesApi(libs.openapi.tools.jacksonDatabindNullable)
testFixturesApi(libs.jakarta.validation.api)
testFixturesApi(libs.swagger.annotations)
testFixturesApi 'org.apache.tomcat.embed:tomcat-embed-core' // For jakarta.servlet.ServletContext
}


def generatedSourceDirectory = "$buildDir/generated/openapi"
sourceSets {
main {
testFixtures {
java {
srcDir generatedSourceDirectory + '/src/main/java'
}
Expand Down
16 changes: 10 additions & 6 deletions test/test-utils/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,22 @@ import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'java-library'
id 'java-test-fixtures'
alias(libs.plugins.spring.boot) apply false
}

dependencies {
implementation platform(SpringBootPlugin.BOM_COORDINATES)
testFixturesImplementation platform(SpringBootPlugin.BOM_COORDINATES)

compileOnly project(':openapi-validation-api')
compileOnly project(':openapi-validation-core')
testFixturesCompileOnly(libs.lombok)
testFixturesAnnotationProcessor(libs.lombok)

testFixturesCompileOnly project(':openapi-validation-api')
testFixturesCompileOnly project(':openapi-validation-core')

// TODO use spotbugs instead and also apply to all modules?
implementation(libs.find.bugs)
testFixturesImplementation(libs.find.bugs)

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework:spring-web'
testFixturesCompileOnly 'org.springframework.boot:spring-boot-starter'
testFixturesCompileOnly 'org.springframework:spring-web'
}
0 ...t/DefaultSpringBootTestConfiguration.java → ...t/DefaultSpringBootTestConfiguration.java
View file
Open in desktop
File renamed without changes.
0 .../validation/test/TestViolationLogger.java → .../validation/test/TestViolationLogger.java
View file
Open in desktop
File renamed without changes.
0 ...xception/WithResponseStatusException.java → ...xception/WithResponseStatusException.java
View file
Open in desktop
File renamed without changes.
0 ...ption/WithoutResponseStatusException.java → ...ption/WithoutResponseStatusException.java
View file
Open in desktop
File renamed without changes.
Loading