From d0149353c02f4a6222b83878e536799f52d4555a Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 25 Jan 2017 16:43:03 +0100 Subject: [PATCH 1/2] Fixed missing @Ignored import fixes #200 --- README.adoc | 1 + .../cloud/contract/maven/verifier/PluginUnitTest.java | 6 ++++-- .../basic/src/test/resources/contracts/WithList.groovy | 1 + .../contract/verifier/builder/SingleTestGenerator.groovy | 4 +++- .../verifier/builder/SingleTestGeneratorSpec.groovy | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index de570bc6a8..3b170f6325 100644 --- a/README.adoc +++ b/README.adoc @@ -1315,6 +1315,7 @@ Example of a `pom.xml` inside the `server` folder. 1.8 1.0.4.BUILD-SNAPSHOT Camden.BUILD-SNAPSHOT + true diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java index 65181df743..84f9f8dd29 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/java/org/springframework/cloud/contract/maven/verifier/PluginUnitTest.java @@ -72,8 +72,10 @@ public class PluginUnitTest { public void shouldGenerateContractSpecificationInDefaultLocation() throws Exception { File basedir = this.resources.getBasedir("basic"); this.maven.executeMojo(basedir, "generateTests", newParameter("testFramework", "SPOCK")); - assertFilesPresent(basedir, - "target/generated-test-sources/contracts/org/springframework/cloud/contract/verifier/tests/ContractVerifierSpec.groovy"); + String path = "target/generated-test-sources/contracts/org/springframework/cloud/contract/verifier/tests/ContractVerifierSpec.groovy"; + assertFilesPresent(basedir, path); + File test = new File(basedir, path); + then(FileUtils.readFileToString(test)).contains("spock.lang.Ignore"); } @Test diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy index fe5ca5748a..4232f274d5 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/test/projects/basic/src/test/resources/contracts/WithList.groovy @@ -15,6 +15,7 @@ * limitations under the License. */ org.springframework.cloud.contract.spec.Contract.make { + ignored() request { method 'POST' url('/users') { diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy index b0c0e0a2d6..6eb57db7e4 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy @@ -108,7 +108,9 @@ class SingleTestGenerator { addMessagingRelatedEntries(clazz) } conditionalImportsAdded = true - toIgnore = toIgnore ? true: key.groovyDsl.ignored + toIgnore = toIgnore ? true : key.groovyDsl.ignored + } else { + toIgnore = key.groovyDsl.ignored } clazz.addMethod(MethodBuilder.createTestMethod(key.contract, key.stubsFile, key.groovyDsl, configProperties)) } diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy index 23fa61522e..aadd7d7ece 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGeneratorSpec.groovy @@ -212,6 +212,7 @@ class SingleTestGeneratorSpec extends Specification { File secondFile = tmpFolder.newFile() secondFile.write(""" org.springframework.cloud.contract.spec.Contract.make { + ignored() label 'some_label' input { messageFrom('delete') From e10a752c451f4bd066387532bdd888d63c66e8ef Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 25 Jan 2017 16:51:59 +0100 Subject: [PATCH 2/2] Polish --- .../contract/verifier/builder/SingleTestGenerator.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy index 6eb57db7e4..1092d5b8e0 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/SingleTestGenerator.groovy @@ -108,10 +108,8 @@ class SingleTestGenerator { addMessagingRelatedEntries(clazz) } conditionalImportsAdded = true - toIgnore = toIgnore ? true : key.groovyDsl.ignored - } else { - toIgnore = key.groovyDsl.ignored } + toIgnore = toIgnore ? true : key.groovyDsl.ignored clazz.addMethod(MethodBuilder.createTestMethod(key.contract, key.stubsFile, key.groovyDsl, configProperties)) }