From cd946fe01cae83f3f039fa3779b98a27d8c352bb Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 12 Aug 2019 16:02:36 +0200 Subject: [PATCH] Fixed the build --- .../resources/contracts/test/MyHttpContract.java | 1 + .../src/test/resources/contracts/test/request.json | 1 + .../util/ContractVerifierDslConverter.groovy | 4 ++-- .../converter/JavaContractConverterSpec.groovy | 13 ++++--------- 4 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 samples/standalone/dsl/http-server/src/test/resources/contracts/test/request.json diff --git a/samples/standalone/dsl/http-server/src/test/resources/contracts/test/MyHttpContract.java b/samples/standalone/dsl/http-server/src/test/resources/contracts/test/MyHttpContract.java index 315470a7b7..ac4be51258 100644 --- a/samples/standalone/dsl/http-server/src/test/resources/contracts/test/MyHttpContract.java +++ b/samples/standalone/dsl/http-server/src/test/resources/contracts/test/MyHttpContract.java @@ -27,6 +27,7 @@ class MyHttpContract implements Supplier { c.request(r -> { r.method(r.GET()); r.url("/example"); + r.body(r.file("request.json")); }); c.response(r -> { r.status(r.OK()); diff --git a/samples/standalone/dsl/http-server/src/test/resources/contracts/test/request.json b/samples/standalone/dsl/http-server/src/test/resources/contracts/test/request.json new file mode 100644 index 0000000000..7cef5bbd05 --- /dev/null +++ b/samples/standalone/dsl/http-server/src/test/resources/contracts/test/request.json @@ -0,0 +1 @@ +{ "hello" : "world" } \ No newline at end of file diff --git a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy index a75c2cde8a..f5590a8159 100644 --- a/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy +++ b/spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy @@ -141,7 +141,7 @@ class ContractVerifierDslConverter implements ContractConverter constructor = classConstructor(cl, dsl) + Constructor constructor = classConstructor(dsl) Object newInstance = constructor.newInstance() if (!newInstance instanceof Supplier) { if (log.isDebugEnabled()) { @@ -153,7 +153,7 @@ class ContractVerifierDslConverter implements ContractConverter classConstructor(ClassLoader cl, File dsl) { + private static Constructor classConstructor(File dsl) { String classText = dsl.text String fqn = fqn(classText) CompilationResult compilationResult = COMPILER diff --git a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/JavaContractConverterSpec.groovy b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/JavaContractConverterSpec.groovy index 310037f93b..a6f5b6b520 100644 --- a/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/JavaContractConverterSpec.groovy +++ b/spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/JavaContractConverterSpec.groovy @@ -17,7 +17,6 @@ package org.springframework.cloud.contract.verifier.converter import groovy.json.JsonSlurper -import spock.lang.Ignore import spock.lang.Shared import spock.lang.Specification @@ -64,7 +63,7 @@ class JavaContractConverterSpec extends Specification { def "should convert Java DSL with REST to DSL for [#contractFile]"() { when: - Collection contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractFile) + Collection contracts = ContractVerifierDslConverter.convertAsCollection(contractFile.parentFile, contractFile) then: Contract contract = contracts.first() contract.description == "Some description" @@ -119,11 +118,9 @@ class JavaContractConverterSpec extends Specification { contractFile << [javaRestFile, javaRestWithTagsFile] } - //TODO: Fix Me - @Ignore def "should convert java with REST with body from file"() { when: - Collection contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractBodyFile) + Collection contracts = ContractVerifierDslConverter.convertAsCollection(contractBodyFile.parentFile, contractBodyFile) then: contracts.size() == 1 Contract contract = contracts.first() @@ -134,11 +131,9 @@ class JavaContractConverterSpec extends Specification { new JsonSlurper().parseText('''{ "hello" : "response" }''') } - //TODO: Fix Me - @Ignore def "should convert java with REST with body as bytes"() { when: - Collection contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractBodyBytesFile) + Collection contracts = ContractVerifierDslConverter.convertAsCollection(contractBodyBytesFile.parentFile, contractBodyBytesFile) then: contracts.size() == 1 Contract contract = contracts.first() @@ -149,7 +144,7 @@ class JavaContractConverterSpec extends Specification { def "should convert java with REST for docs"() { when: - Collection contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), docsFile) + Collection contracts = ContractVerifierDslConverter.convertAsCollection(docsFile.parentFile, docsFile) then: contracts.size() == 1 }