SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the build

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-08-12 16:02:36 +02:00
parent 3aa8482f95
commit cd946fe01c
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/standalone/dsl/http-server/src/test/resources/contracts/test/MyHttpContract.java
View File

@@ -27,6 +27,7 @@ class MyHttpContract implements Supplier<Contract> {
c.request(r -> {
r.method(r.GET());
r.url("/example");
r.body(r.file("request.json"));
});
c.response(r -> {
r.status(r.OK());

1
samples/standalone/dsl/http-server/src/test/resources/contracts/test/request.json Normal file
View File

@@ -0,0 +1 @@
{ "hello" : "world" }

4
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/ContractVerifierDslConverter.groovy
View File

@@ -141,7 +141,7 @@ class ContractVerifierDslConverter implements ContractConverter<Collection<Contr
}
private static Object parseJavaFile(ClassLoader cl, File dsl) {
Constructor<?> 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<Collection<Contr
return supplier.get()
}
private static Constructor<?> classConstructor(ClassLoader cl, File dsl) {
private static Constructor<?> classConstructor(File dsl) {
String classText = dsl.text
String fqn = fqn(classText)
CompilationResult compilationResult = COMPILER

13
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/converter/JavaContractConverterSpec.groovy
View File

@@ -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<Contract> contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractFile)
Collection<Contract> 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<Contract> contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractBodyFile)
Collection<Contract> 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<Contract> contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), contractBodyBytesFile)
Collection<Contract> 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<Contract> contracts = ContractVerifierDslConverter.convertAsCollection(new File("/"), docsFile)
Collection<Contract> contracts = ContractVerifierDslConverter.convertAsCollection(docsFile.parentFile, docsFile)
then:
contracts.size() == 1
}