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

Merge pull request #1657 from spring-cloud/jdk16_boot_2_5

Browse Source 
Works with JDK16
This commit is contained in:
Spencer Gibb
2021-07-09 15:33:33 -04:00
committed by GitHub
parent 185d5794d7 01a4c9a23c
commit 8b0efe44e0
37 changed files with 201 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/builder/NameProvider.java
View File

@@ -51,14 +51,14 @@ class NameProvider {
else if (contractMetadata.getConvertedContract().size() > 1) {
int index = findIndexOf(contractMetadata.getConvertedContract(), stubContent);
String name = camelCasedMethodFromFileName(stubsFile) + "_" + index;
if (log.isDebugEnabled()) {
log.debug("Scenario found. The method name will be [" + name + "]");
if (log.isTraceEnabled()) {
log.trace("Scenario found. The method name will be [" + name + "]");
}
return name;
}
String name = camelCasedMethodFromFileName(stubsFile);
if (StringUtils.hasText(name) && log.isDebugEnabled()) {
log.debug("The method name will be [" + name + "]");
if (StringUtils.hasText(name) && log.isTraceEnabled()) {
log.trace("The method name will be [" + name + "]");
}
return name;
}

6
spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/file/SingleContractMetadata.java
View File

@@ -212,17 +212,17 @@ public class SingleContractMetadata {
private String calculateMethodName() {
if (!isEmpty(contract.getName())) {
String name = camelCase(convertIllegalPackageChars(contract.getName()));
log.debug("Overriding the default test name with [{}]", name);
log.trace("Overriding the default test name with [{}]", name);
return name;
}
if (allContracts.size() > 1) {
int index = allContracts.indexOf(getContract());
String name = String.format("%s_%d", camelCasedMethodFromFileName(stubsPath), index);
log.debug("Scenario found. The method name will be [{}]", name);
log.trace("Scenario found. The method name will be [{}]", name);
return name;
}
String name = camelCasedMethodFromFileName(stubsPath);
log.debug("The method name will be [{}]", name);
log.trace("The method name will be [{}]", name);
return name;
}

3
spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/builder/JaxRsClientMethodBuilderSpec.groovy
View File

@@ -484,7 +484,8 @@ class JaxRsClientMethodBuilderSpec extends Specification implements WireMockStub
}
}
def "should generate regex assertions for map objects in response body with #methodBodyName"() {
@Unroll
def "should generate regex assertions for map objects in response body with #methodBuilderName"() {
given:
Contract contractDsl = Contract.make {
request {

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

@@ -20,6 +20,7 @@ import java.util.function.Function
import groovy.json.JsonSlurper
import spock.lang.Issue
import spock.lang.Shared
import spock.lang.Specification
import org.springframework.cloud.contract.spec.Contract
@@ -95,157 +96,157 @@ class WireMockResponseStubStrategySpec extends Specification {
assert body.get("double") instanceof BigDecimal
}
def "should convert patterns to proper value"() {
given:
def contract = Contract.make {
request {
method(GET())
urlPath(value(regex("/info/[0-9]"))) {
queryParameters {
parameter 'limit': $(consumer(equalTo('20')), producer(equalTo('10')))
parameter 'offset': $(consumer(containing("20")), producer(equalTo('20')))
parameter 'filter': 'email'
parameter 'sort': equalTo("name")
parameter 'age': $(consumer(notMatching("^\\w*\$")), producer('99'))
parameter 'name': $(consumer(matching('John.*')), producer('John.Doe'))
parameter 'email': 'bob@email.com'
parameter 'hello': $(consumer(matching('John.*')), producer(absent()))
parameter 'hello2': absent()
}
}
headers {
contentType(applicationJson())
header([
second: "value", third: $(anyAlphaNumeric())
])
}
body([
foo1 : $(c(regex("[0-9]")), p(1)),
foo2 : $(c(regex("[0-9]"))),
foo3 : $(anyAlphaNumeric()),
foo4 : value(regex(aDouble())),
foo5 : value(anyDouble()),
foo6 : "concrete",
duck : 123,
alpha : 'abc',
number : 123,
aBoolean : true,
date : '2017-01-01',
dateTime : '2017-01-01T01:23:45',
time : '01:02:34',
valueWithoutAMatcher: 'foo',
valueWithTypeMatch : 'string',
key : [
'complex.key': 'foo'
]
])
bodyMatchers {
jsonPath('$.duck', byRegex("[0-9]{3}"))
jsonPath('$.duck', byEquality())
jsonPath('$.alpha', byRegex(onlyAlphaUnicode()))
jsonPath('$.alpha', byEquality())
jsonPath('$.number', byRegex(number()))
jsonPath('$.aBoolean', byRegex(anyBoolean()))
jsonPath('$.date', byDate())
jsonPath('$.dateTime', byTimestamp())
jsonPath('$.time', byTime())
jsonPath("\$.['key'].['complex.key']", byEquality())
}
}
response {
status(OK())
headers {
contentType(applicationJson())
header([
second: "value", third: $(anyAlphaNumeric())
])
}
body([
foo1 : $(p(regex("[0-9]")), c(1)),
foo2 : $(p(regex("[0-9]"))),
foo3 : $(anyAlphaNumeric()),
foo4 : value(regex(aDouble())),
foo5 : value(anyDouble()),
foo6 : "concrete",
duck : 123,
alpha : 'abc',
number : 123,
positiveInteger : 1234567890,
negativeInteger : -1234567890,
positiveDecimalNumber: 123.4567890,
negativeDecimalNumber: -123.4567890,
aBoolean : true,
date : '2017-01-01',
dateTime : '2017-01-01T01:23:45',
time : "01:02:34",
valueWithoutAMatcher : 'foo',
valueWithTypeMatch : 'string',
valueWithMin : [
1, 2, 3
],
valueWithMax : [
1, 2, 3
],
valueWithMinMax : [
1, 2, 3
],
valueWithMinEmpty : [],
valueWithMaxEmpty : [],
key : [
'complex.key': 'foo'
],
nullValue : null
])
bodyMatchers {
// asserts the jsonpath value against manual regex
jsonPath('$.duck', byRegex("[0-9]{3}"))
// asserts the jsonpath value against the provided value
jsonPath('$.duck', byEquality())
// asserts the jsonpath value against some default regex
jsonPath('$.alpha', byRegex(onlyAlphaUnicode()))
jsonPath('$.alpha', byEquality())
jsonPath('$.number', byRegex(number()))
jsonPath('$.positiveInteger', byRegex(anInteger()))
jsonPath('$.negativeInteger', byRegex(anInteger()))
jsonPath('$.positiveDecimalNumber', byRegex(aDouble()))
jsonPath('$.negativeDecimalNumber', byRegex(aDouble()))
jsonPath('$.aBoolean', byRegex(anyBoolean()))
// asserts vs inbuilt time related regex
jsonPath('$.date', byDate())
jsonPath('$.dateTime', byTimestamp())
jsonPath('$.time', byTime())
// asserts that the resulting type is the same as in response body
jsonPath('$.valueWithTypeMatch', byType())
jsonPath('$.valueWithMin', byType {
// results in verification of size of array (min 1)
minOccurrence(1)
})
jsonPath('$.valueWithMax', byType {
// results in verification of size of array (max 3)
maxOccurrence(3)
})
jsonPath('$.valueWithMinMax', byType {
// results in verification of size of array (min 1 & max 3)
minOccurrence(1)
maxOccurrence(3)
})
jsonPath('$.valueWithMinEmpty', byType {
// results in verification of size of array (min 0)
minOccurrence(0)
})
jsonPath('$.valueWithMaxEmpty', byType {
// results in verification of size of array (max 0)
maxOccurrence(0)
})
// will execute a method `assertThatValueIsANumber`
jsonPath('$.duck', byCommand('assertThatValueIsANumber($it)'))
jsonPath("\$.['key'].['complex.key']", byEquality())
jsonPath('$.nullValue', byNull())
}
@Shared def patternsContract = Contract.make {
request {
method(GET())
urlPath(value(regex("/info/[0-9]"))) {
queryParameters {
parameter 'limit': $(consumer(equalTo('20')), producer(equalTo('10')))
parameter 'offset': $(consumer(containing("20")), producer(equalTo('20')))
parameter 'filter': 'email'
parameter 'sort': equalTo("name")
parameter 'age': $(consumer(notMatching("^\\w*\$")), producer('99'))
parameter 'name': $(consumer(matching('John.*')), producer('John.Doe'))
parameter 'email': 'bob@email.com'
parameter 'hello': $(consumer(matching('John.*')), producer(absent()))
parameter 'hello2': absent()
}
}
headers {
contentType(applicationJson())
header([
second: "value", third: $(anyAlphaNumeric())
])
}
body([
foo1 : $(c(regex("[0-9]")), p(1)),
foo2 : $(c(regex("[0-9]"))),
foo3 : $(anyAlphaNumeric()),
foo4 : value(regex(aDouble())),
foo5 : value(anyDouble()),
foo6 : "concrete",
duck : 123,
alpha : 'abc',
number : 123,
aBoolean : true,
date : '2017-01-01',
dateTime : '2017-01-01T01:23:45',
time : '01:02:34',
valueWithoutAMatcher: 'foo',
valueWithTypeMatch : 'string',
key : [
'complex.key': 'foo'
]
])
bodyMatchers {
jsonPath('$.duck', byRegex("[0-9]{3}"))
jsonPath('$.duck', byEquality())
jsonPath('$.alpha', byRegex(onlyAlphaUnicode()))
jsonPath('$.alpha', byEquality())
jsonPath('$.number', byRegex(number()))
jsonPath('$.aBoolean', byRegex(anyBoolean()))
jsonPath('$.date', byDate())
jsonPath('$.dateTime', byTimestamp())
jsonPath('$.time', byTime())
jsonPath("\$.['key'].['complex.key']", byEquality())
}
}
response {
status(OK())
headers {
contentType(applicationJson())
header([
second: "value", third: $(anyAlphaNumeric())
])
}
body([
foo1 : $(p(regex("[0-9]")), c(1)),
foo2 : $(p(regex("[0-9]"))),
foo3 : $(anyAlphaNumeric()),
foo4 : value(regex(aDouble())),
foo5 : value(anyDouble()),
foo6 : "concrete",
duck : 123,
alpha : 'abc',
number : 123,
positiveInteger : 1234567890,
negativeInteger : -1234567890,
positiveDecimalNumber: 123.4567890,
negativeDecimalNumber: -123.4567890,
aBoolean : true,
date : '2017-01-01',
dateTime : '2017-01-01T01:23:45',
time : "01:02:34",
valueWithoutAMatcher : 'foo',
valueWithTypeMatch : 'string',
valueWithMin : [
1, 2, 3
],
valueWithMax : [
1, 2, 3
],
valueWithMinMax : [
1, 2, 3
],
valueWithMinEmpty : [],
valueWithMaxEmpty : [],
key : [
'complex.key': 'foo'
],
nullValue : null
])
bodyMatchers {
// asserts the jsonpath value against manual regex
jsonPath('$.duck', byRegex("[0-9]{3}"))
// asserts the jsonpath value against the provided value
jsonPath('$.duck', byEquality())
// asserts the jsonpath value against some default regex
jsonPath('$.alpha', byRegex(onlyAlphaUnicode()))
jsonPath('$.alpha', byEquality())
jsonPath('$.number', byRegex(number()))
jsonPath('$.positiveInteger', byRegex(anInteger()))
jsonPath('$.negativeInteger', byRegex(anInteger()))
jsonPath('$.positiveDecimalNumber', byRegex(aDouble()))
jsonPath('$.negativeDecimalNumber', byRegex(aDouble()))
jsonPath('$.aBoolean', byRegex(anyBoolean()))
// asserts vs inbuilt time related regex
jsonPath('$.date', byDate())
jsonPath('$.dateTime', byTimestamp())
jsonPath('$.time', byTime())
// asserts that the resulting type is the same as in response body
jsonPath('$.valueWithTypeMatch', byType())
jsonPath('$.valueWithMin', byType {
// results in verification of size of array (min 1)
minOccurrence(1)
})
jsonPath('$.valueWithMax', byType {
// results in verification of size of array (max 3)
maxOccurrence(3)
})
jsonPath('$.valueWithMinMax', byType {
// results in verification of size of array (min 1 & max 3)
minOccurrence(1)
maxOccurrence(3)
})
jsonPath('$.valueWithMinEmpty', byType {
// results in verification of size of array (min 0)
minOccurrence(0)
})
jsonPath('$.valueWithMaxEmpty', byType {
// results in verification of size of array (max 0)
maxOccurrence(0)
})
// will execute a method `assertThatValueIsANumber`
jsonPath('$.duck', byCommand('assertThatValueIsANumber($it)'))
jsonPath("\$.['key'].['complex.key']", byEquality())
jsonPath('$.nullValue', byNull())
}
}
}
def "should convert patterns to proper value"() {
when:
def subject = new WireMockRequestStubStrategy(contract, null) {
def subject = new WireMockRequestStubStrategy(patternsContract, null) {
@Override
protected ContentType contentType(SingleContractMetadata singleContractMetadata) {
return ContentType.JSON
@@ -255,7 +256,7 @@ class WireMockResponseStubStrategySpec extends Specification {
then:
noExceptionThrown()
when:
def response = new WireMockResponseStubStrategy(contract, null) {
def response = new WireMockResponseStubStrategy(patternsContract, null) {
@Override
protected ContentType contentType(SingleContractMetadata singleContractMetadata) {
return ContentType.JSON

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

@@ -75,7 +75,7 @@ class XmlToXPathsConverterSpec extends Specification {
}
@Unroll
def "should remove elements to [#expectedValue] for xPath [#value]"() {
def "should remove elements to [#result] for xPath [#xpath]"() {
given:
BodyMatchers m = new BodyMatchers()
m.xPath(xpath, m.byEquality())