Skip to content

Commit

Permalink
test: Migrate deprecated Gradle configuration in integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
DevDavido committed Oct 10, 2024
1 parent 111137f commit 34fb11d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
10 changes: 4 additions & 6 deletions src/test/groovy/com/intershop/gradle/jaxb/SamplesKtsSpec.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ class SamplesKtsSpec extends AbstractIntegrationKotlinSpec {
`java`
id("com.intershop.gradle.jaxb")
}
buildDir = file("target")
jaxb {
javaGen {
Expand Down Expand Up @@ -312,10 +310,10 @@ class SamplesKtsSpec extends AbstractIntegrationKotlinSpec {
result.task(":jaxbJavaGenTest").outcome == SUCCESS
result.task(":compileJava").outcome == SUCCESS

fileExists("target/generated/jaxb/java/test/generated/Foo.java")
fileExists("target/generated/jaxb/java/test/generated/ObjectFactory.java")
fileExists("target/classes/java/main/generated/Foo.class")
fileExists("target/classes/java/main/generated/ObjectFactory.class")
fileExists("build/generated/jaxb/java/test/generated/Foo.java")
fileExists("build/generated/jaxb/java/test/generated/ObjectFactory.java")
fileExists("build/classes/java/main/generated/Foo.class")
fileExists("build/classes/java/main/generated/ObjectFactory.class")

where:
gradleVersion << supportedGradleVersions
Expand Down
10 changes: 4 additions & 6 deletions src/test/groovy/com/intershop/gradle/jaxb/SamplesSpec.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ class SamplesSpec extends AbstractIntegrationGroovySpec {
id 'java'
id 'com.intershop.gradle.jaxb'
}
buildDir = file('target')
jaxb {
javaGen {
Expand Down Expand Up @@ -312,10 +310,10 @@ class SamplesSpec extends AbstractIntegrationGroovySpec {
result.task(':jaxbJavaGenTest').outcome == SUCCESS
result.task(':compileJava').outcome == SUCCESS

fileExists('target/generated/jaxb/java/test/generated/Foo.java')
fileExists('target/generated/jaxb/java/test/generated/ObjectFactory.java')
fileExists('target/classes/java/main/generated/Foo.class')
fileExists('target/classes/java/main/generated/ObjectFactory.class')
fileExists('build/generated/jaxb/java/test/generated/Foo.java')
fileExists('build/generated/jaxb/java/test/generated/ObjectFactory.java')
fileExists('build/classes/java/main/generated/Foo.class')
fileExists('build/classes/java/main/generated/ObjectFactory.class')

where:
gradleVersion << supportedGradleVersions
Expand Down

0 comments on commit 34fb11d

Please sign in to comment.