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

#1630 Fix assertion for Map<String, Set<String>> (#1710)

Browse Source 
fixes #1630
This commit is contained in:
Ravil Galeyev
2021-09-02 10:55:56 +02:00
committed by GitHub
parent a5cd597b20
commit c05c009b36
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/util/MapConverter.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.contract.verifier.util;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -41,6 +42,7 @@ import org.springframework.cloud.contract.verifier.template.TemplateProcessor;
*
* @author Marcin Grzejszczak
* @author Stessy Delcroix
* @author Ravil Galeyev
* @since 1.1.0
*/
public class MapConverter {
@@ -123,8 +125,8 @@ public class MapConverter {
else if (value instanceof Map) {
return convert((Map) value, function, parsingFunction);
}
else if (value instanceof List) {
return ((List) value).stream().map((v) -> transformValues(v, function, parsingFunction))
else if (value instanceof Collection) {
return ((Collection) value).stream().map((v) -> transformValues(v, function, parsingFunction))
.collect(Collectors.toList());
}
return transformValue(function, value, parsingFunction);

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

@@ -1934,6 +1934,41 @@ World.'''"""
"webclient" | { configProperties.testMode = TestMode.WEBTESTCLIENT }
}
@Issue('1630')
def 'should generate proper test code with top level map of sets using #methodBuilderName'() {
given:
Contract contractDsl = Contract.make {
description('get map')
name('assert map response')
request {
method 'GET'
urlPath '/some-path'
}
response {
status OK()
body(["key": ["value1", "value2"] as Set])
headers {
header('Content-Type': 'application/json;charset=UTF-8')
}
}
}
methodBuilder()
when:
String test = singleTestGenerator(contractDsl)
then:
test.contains("""assertThatJson(parsedJson).array("['key']").hasSize(2)""")
test.contains("""assertThatJson(parsedJson).array("['key']").arrayField().isEqualTo("value1").value()""")
test.contains("""assertThatJson(parsedJson).array("['key']").arrayField().isEqualTo("value2").value()""")
and:
SyntaxChecker.tryToCompile(methodBuilderName, test)
where:
methodBuilderName | methodBuilder
"spock" | { configProperties.testFramework = TestFramework.SPOCK }
"testng" | { configProperties.testFramework = TestFramework.TESTNG }
"mockmvc" | { configProperties.testMode = TestMode.MOCKMVC }
"webclient" | { configProperties.testMode = TestMode.WEBTESTCLIENT }
}
@Issue('47')
def 'should generate async body when async flag set in response'() {
given: