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

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-11-08 14:23:27 +01:00
parent ba91fcf524 7326dec3d1
commit 29e8ffe76d
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsRequestHeadersWhen.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.contract.verifier.builder;
import java.util.Iterator;
import java.util.Set;
import org.springframework.cloud.contract.spec.internal.ExecutionProperty;
import org.springframework.cloud.contract.spec.internal.Header;
import org.springframework.cloud.contract.spec.internal.MatchingStrategy;
import org.springframework.cloud.contract.spec.internal.Request;
@@ -47,9 +48,7 @@ class JaxRsRequestHeadersWhen implements When {
.filter(header -> !headerToIgnore(header)).iterator();
while (iterator.hasNext()) {
Header header = iterator.next();
String text = ".header(\"" + header.getName() + "\", "
+ this.bodyParser.quotedLongText(MapConverter
.getTestSideValuesForNonBody(header.getServerValue()))
String text = ".header(\"" + header.getName() + "\", " + headerValue(header)
+ ")";
if (iterator.hasNext()) {
this.blockBuilder.addLine(text);
@@ -60,6 +59,15 @@ class JaxRsRequestHeadersWhen implements When {
}
}
private String headerValue(Header header) {
Object headerServerValue = header.getServerValue();
if (headerServerValue instanceof ExecutionProperty) {
return ((ExecutionProperty) headerServerValue).getExecutionCommand();
}
return this.bodyParser.quotedLongText(
MapConverter.getTestSideValuesForNonBody(header.getServerValue()));
}
private boolean headerToIgnore(Header header) {
return contentTypeOrAccept(header) || headerOfAbsentType(header);
}

41
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/SpringTestMethodBodyBuildersSpec.groovy
View File

@@ -3161,4 +3161,45 @@ DocumentContext parsedJson = JsonPath.parse(json);
"junit" | { properties.testFramework = TestFramework.JUNIT }
"junit5" | { properties.testFramework = TestFramework.JUNIT5 }
}
@Issue('#1252')
def 'should call execute in headers instead of quoting it [#methodBuilderName]'() {
given:
Contract contractDsl = Contract.make {
request {
method PUT()
url '/frauds/name'
headers {
header(authorization(), value(client(anyNonBlankString()), server(execute("toString()"))))
}
}
response {
status OK()
headers {
header(contentType(), "${fromRequest().header(contentType())}")
}
}
}
methodBuilder()
when:
String test = singleTestGenerator(contractDsl)
then:
SyntaxChecker.tryToCompile(methodBuilderName, test)
then:
!test.contains('''"toString()"''')
!test.contains("""'toString()'""")
where:
methodBuilderName | methodBuilder
"spock" | { properties.testFramework = TestFramework.SPOCK }
"testng" | { properties.testFramework = TestFramework.TESTNG }
"mockmvc" | { properties.testMode = TestMode.MOCKMVC }
"jaxrs-spock" | {
properties.testFramework = TestFramework.SPOCK; properties.testMode = TestMode.JAXRSCLIENT
}
"jaxrs" | {
properties.testFramework = TestFramework.JUNIT; properties.testMode = TestMode.JAXRSCLIENT
}
"webclient" | { properties.testMode = TestMode.WEBTESTCLIENT }
}
}