From 902934f9e30bcdd9850ceebaeca1b52effd94e0b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 13 Feb 2017 17:32:47 +0100 Subject: [PATCH] Fixed the order of tasks without this change generate contract tests task wasn't forced to be before any test compilation tasks with this change that's fixed fixes #223 --- .../plugin/SpringCloudContractVerifierGradlePlugin.groovy | 1 + .../contract/verifier/plugin/SampleJerseyProjectSpec.groovy | 2 ++ .../resources/functionalTest/sampleJerseyProject/build.gradle | 2 ++ 3 files changed, 5 insertions(+) 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 007d1543ec..9c1eda169e 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 @@ -121,6 +121,7 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { configProperties = { extension } } task.dependsOn copyContracts + project.tasks.findByName("compileTestJava").dependsOn(task) } private void createAndConfigureGenerateWireMockClientStubsFromDslTask(ContractVerifierExtension extension, diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy index 7144f30a30..801deb3373 100755 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/SampleJerseyProjectSpec.groovy @@ -32,6 +32,7 @@ class SampleJerseyProjectSpec extends ContractVerifierIntegrationSpec { expect: runTasksSuccessfully(checkAndPublishToMavenLocal()) jarContainsContractVerifierContracts('fraudDetectionService/build/libs') + fileExists("fraudDetectionService/build/test-results/test/TEST-org.springframework.cloud.contract.verifier.tests.contracts.com.example.jersey.FraudDetectionServiceSpec.xml") } def "should pass basic flow for JUnit"() { @@ -41,6 +42,7 @@ class SampleJerseyProjectSpec extends ContractVerifierIntegrationSpec { expect: runTasksSuccessfully(checkAndPublishToMavenLocal()) jarContainsContractVerifierContracts('fraudDetectionService/build/libs') + fileExists("fraudDetectionService/build/test-results/test/TEST-org.springframework.cloud.contract.verifier.tests.contracts.com.example.jersey.FraudDetectionServiceTest.xml") } } 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 440aab9102..abc6e3006d 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 @@ -24,6 +24,8 @@ buildscript { } } +apply plugin: 'checkstyle' + allprojects { group = 'com.example.jersey' }