diff --git a/docs/src/main/asciidoc/verifier/rest.adoc b/docs/src/main/asciidoc/verifier/rest.adoc index a6b43c790a..997f10d76c 100644 --- a/docs/src/main/asciidoc/verifier/rest.adoc +++ b/docs/src/main/asciidoc/verifier/rest.adoc @@ -93,7 +93,7 @@ Default Gradle Plugin setup creates the following Gradle part of the build (it's [source,groovy,indent=0] ---- -contractVerifier { +contracts { targetFramework = 'JUNIT' testMode = 'MockMvc' generatedTestSourcesDir = project.file("${project.buildDir}/generated-test-sources/contracts") @@ -104,7 +104,7 @@ contractVerifier { tasks.create(type: Jar, name: 'verifierStubsJar', dependsOn: 'generateWireMockClientStubs') { baseName = project.name - classifier = contractVerifier.stubsSuffix + classifier = contracts.stubsSuffix from contractVerifier.stubsOutputDir } @@ -113,8 +113,8 @@ project.artifacts { } tasks.create(type: Copy, name: 'copyContracts') { - from contractVerifier.contractsDslDir - into contractVerifier.stubsOutputDir + from contracts.contractsDslDir + into contracts.stubsOutputDir } verifierStubsJar.dependsOn 'copyContracts' @@ -131,11 +131,11 @@ publishing { ===== Configure plugin -To change default configuration just add `contractVerifier` snippet to your Gradle config +To change default configuration just add `contracts` snippet to your Gradle config [source,groovy,indent=0] ---- -contractVerifier { +contracts { testMode = 'MockMvc' baseClassForTests = 'org.mycompany.tests' generatedTestSourcesDir = project.file('src/generatedContract') diff --git a/samples/standalone/http-server/build.gradle b/samples/standalone/http-server/build.gradle index 0867a1e41c..922b0a0157 100644 --- a/samples/standalone/http-server/build.gradle +++ b/samples/standalone/http-server/build.gradle @@ -39,7 +39,7 @@ dependencyManagement { } } -contractVerifier { +contracts { baseClassForTests = 'com.example.fraud.MvcTest' } diff --git a/samples/standalone/stream-source/build.gradle b/samples/standalone/stream-source/build.gradle index 98decfe675..95f66bca4c 100644 --- a/samples/standalone/stream-source/build.gradle +++ b/samples/standalone/stream-source/build.gradle @@ -41,7 +41,7 @@ ext { stubsOutputDirRoot = file("${project.buildDir}/stubs/") } -contractVerifier { +contracts { baseClassForTests = 'com.example.source.SensorSourceTestBase' stubsOutputDir = stubsOutputDirRoot } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy index 763f54fe01..b2e2a02633 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy @@ -52,7 +52,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { private static final Class IDEA_PLUGIN_CLASS = org.gradle.plugins.ide.idea.IdeaPlugin private static final String GROUP_NAME = "Verification" - private static final String EXTENSION_NAME = 'contractVerifier' + private static final String EXTENSION_NAME = 'contracts' private Project project diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy index 0172f4e352..66482da503 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy @@ -31,6 +31,11 @@ import static java.nio.charset.StandardCharsets.UTF_8 abstract class ContractVerifierIntegrationSpec extends Specification { + public static final String SPOCK = "targetFramework = 'Spock'" + public static final String JUNIT = "targetFramework = 'JUnit'" + public static final String MVC_SPEC = "baseClassForTests = 'org.springframework.cloud.MvcSpec'" + public static final String MVC_TEST = "baseClassForTests = 'org.springframework.cloud.MvcTest'" + File testProjectDir def setup() { @@ -40,21 +45,12 @@ abstract class ContractVerifierIntegrationSpec extends Specification { testProjectDir = testFolder } - public static final String SPOCK = "targetFramework = 'Spock'" - public static final String JUNIT = "targetFramework = 'JUnit'" - public static final String MVC_SPEC = "baseClassForTests = 'org.springframework.cloud.MvcSpec'" - public static final String MVC_TEST = "baseClassForTests = 'org.springframework.cloud.MvcTest'" - protected void setupForProject(String projectRoot) { copyResourcesToRoot(projectRoot) String gradlePluginSysProp = System.getProperty("contract-gradle-plugin-libs-dir") String gradlePluginLibsDir = (gradlePluginSysProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\') - String messagingLibDirProp = System.getProperty("messaging-libs-dir") - String messagingLibDir = (messagingLibDirProp ?: new File("build/").absolutePath.toString()).replace('\\', '\\\\') buildFile.write """ - ext.messagingLibsDir = '$messagingLibDir' - buildscript { dependencies { classpath fileTree(dir: '$gradlePluginLibsDir', include: '*.jar') @@ -97,6 +93,7 @@ abstract class ContractVerifierIntegrationSpec extends Specification { return GradleRunner.create() .withProjectDir(testProjectDir) .withArguments(tasks) + .withDebug(true) .forwardOutput() .build() } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle index 8e862cf447..70f95560f5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/bootSimple/build.gradle @@ -47,7 +47,7 @@ dependencies { testCompile "ch.qos.logback:logback-classic:1.1.2" } -contractVerifier { +contracts { baseClassForTests = 'org.springframework.cloud.contract.verifier.twitter.places.BaseMockMvcSpec' basePackageForTests = 'contracts' contractsDslDir = contractsDir diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle index 510c192c1a..8a9f2ebf0d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/build.gradle @@ -60,7 +60,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") } - contractVerifier { + contracts { targetFramework = 'Spock' testMode = 'JaxRsClient' baseClassForTests = 'org.springframework.cloud.MvcSpec' diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle index dfe219c272..1175bf9684 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/build.gradle @@ -60,7 +60,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') stubsOutputDirRoot = file("${project.buildDir}/production/${project.name}-stubs/") } - contractVerifier { + contracts { targetFramework = 'Spock' testMode = 'MockMvc' baseClassForTests = 'org.springframework.cloud.MvcSpec' diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle index ee26b9cae0..fd426813da 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/build.gradle @@ -76,7 +76,7 @@ configure([project(':fraudDetectionService'), project(':loanApplicationService') } // end::jar_setup[] - contractVerifier { + contracts { // tag::target_framework[] targetFramework = 'Spock' // end::target_framework[]