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

bug: fix validations for xml #1494 (#1495)

Browse Source
This commit is contained in:
Javier Alejandro Miño
2020-09-07 02:07:20 -05:00
committed by GitHub
parent 8cfff1caa3
commit 0f338ca5a0
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-verifier/src/main/groovy/org/springframework/cloud/contract/verifier/util/xml/XmlToXPathsConverter.groovy
View File

@@ -220,7 +220,7 @@ class XmlToXPathsConverter {
private static List<Node> addValueNodes(Node node, List<List<Node>> valueNodes, List<Node> attributes) {
getChildNodesAsList(node).each {
attributes.addAll(getAttributesAsList(node))
attributes.addAll(getAttributesAsList(it))
if (isValueNode(it) && !isBlank(it.nodeValue)) {
valueNodes << withParents(it)
}

5
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/dsl/wiremock/WireMockXmlStubStrategySpec.groovy
View File

@@ -312,6 +312,11 @@ class WireMockXmlStubStrategySpec extends Specification implements WireMockStubV
"expression": "/test/alpha/text()",
"equalTo": "abc"
}
}, {
"matchesXPath" : {
"expression" : "/test/duck/@type",
"equalTo" : "xtype"
}
}, {
"matchesXPath": {
"expression": "/test/duck/text()",

18
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/xml/XmlToXPathsConverterSpec.groovy
View File

@@ -17,6 +17,12 @@ class XmlToXPathsConverterSpec extends Specification {
String unnamedXml = '''<customer>
<email>customer@test.com</email>
</customer>
'''
@Shared
String attributesInChildXml = '''<customer first_custom_attribute="first_value">
<email second_custom_attribute="second_value" >customer@test.com</email>
<address third_custom_attribute="third_value"/>
</customer>
'''
@Unroll
@@ -39,6 +45,18 @@ class XmlToXPathsConverterSpec extends Specification {
e.message.contains('Prefix must resolve to a namespace: ns1')
}
@Unroll
def "should generate matched path [#expectedValue] for xPath [#value]"() {
expect:
value == expectedValue
where:
value || expectedValue
XmlToXPathsConverter.mapToMatchers(attributesInChildXml).get(0).path() || '''/customer/email/text()'''
XmlToXPathsConverter.mapToMatchers(attributesInChildXml).get(1).path() || '''/customer/@first_custom_attribute'''
XmlToXPathsConverter.mapToMatchers(attributesInChildXml).get(2).path() || '''/customer/email/@second_custom_attribute'''
XmlToXPathsConverter.mapToMatchers(attributesInChildXml).get(3).path() || '''/customer/address/@third_custom_attribute'''
}
@Unroll
def "should remove elements to [#expectedValue] for xPath [#value]"() {
given: