From b167e364c5d44dfefe2dc399e659a5fa86013c93 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 15 Feb 2019 17:46:15 +0100 Subject: [PATCH] Sets the generated test sources under java source set or groovy for Spock; fixes gh-888 --- .../contract/verifier/plugin/GenerateServerTestsTask.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy index 4a86bdb72a..e52d338c58 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.groovy @@ -23,6 +23,7 @@ import org.gradle.api.tasks.TaskAction import org.springframework.cloud.contract.spec.ContractVerifierException import org.springframework.cloud.contract.verifier.TestGenerator import org.springframework.cloud.contract.verifier.config.ContractVerifierConfigProperties +import org.springframework.cloud.contract.verifier.config.TestFramework import static org.springframework.cloud.contract.verifier.plugin.SpringCloudContractVerifierGradlePlugin.COPY_CONTRACTS_TASK_NAME /** @@ -53,7 +54,10 @@ class GenerateServerTestsTask extends ConventionTask { project.logger.info("Contracts are unpacked to [${contractsDslDir}]") project.logger.info("Included contracts are [${props.includedContracts}]") - project.sourceSets.test.groovy { + def sourceSetType = getConfigProperties().getTestFramework() == TestFramework.SPOCK ? + "groovy" : "java" + + project.sourceSets.test."${sourceSetType}" { project.logger.info("Registering ${getConfigProperties().generatedTestSourcesDir} as test source directory") srcDir getConfigProperties().generatedTestSourcesDir }