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

Fixing the iso format for regex patterns; fixes gh-1296

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-12-31 09:36:32 +01:00
parent 6bd0e8cc60
commit 630c03d02b
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-contract-spec/src/main/groovy/org/springframework/cloud/contract/spec/internal/RegexPatterns.groovy
View File

@@ -62,7 +62,7 @@ class RegexPatterns {
protected static final Pattern NON_EMPTY = Pattern.compile(/[\S\s]+/)
protected static final Pattern NON_BLANK = Pattern.compile(/^\s*\S[\S\s]*/)
protected static final Pattern ISO8601_WITH_OFFSET = Pattern.
compile(/([0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.\d{3})?(Z|[+-][01]\d:[0-5]\d)/)
compile(/([0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(\.\d{1,6})?(Z|[+-][01]\d:[0-5]\d)/)
protected static Pattern anyOf(String... values) {
return Pattern.compile(values.collect({ "^$it\$" }).join("|"))

24
spring-cloud-contract-spec/src/test/groovy/org/springframework/cloud/contract/spec/internal/RegexPatternsSpec.groovy
View File

@@ -313,13 +313,23 @@ class RegexPatternsSpec extends Specification {
expect:
shouldMatch == regexPatterns.iso8601WithOffset().matcher(textToMatch).matches()
where:
textToMatch || shouldMatch
'2014-03-01T12:23:45Z' || true
'2014-03-01T12:23:45+01:00' || true
'2014-03-01T12:23:45.123Z' || true
'2014-03-01T12:23:45.123+01:00' || true
'2014-03-01T12:23:45' || false
'2014-03-01T12:23:45.123' || false
textToMatch || shouldMatch
'2014-03-01T12:23:45Z' || true
'2014-03-01T12:23:45+01:00' || true
'2014-03-01T12:23:45.1Z' || true
'2014-03-01T12:23:45.12Z' || true
'2014-03-01T12:23:45.123Z' || true
'2014-03-01T12:23:45.1234Z' || true
'2014-03-01T12:23:45.12345Z' || true
'2014-03-01T12:23:45.123456Z' || true
'2014-03-01T12:23:45.1+01:00' || true
'2014-03-01T12:23:45.12+01:00' || true
'2014-03-01T12:23:45.123+01:00' || true
'2014-03-01T12:23:45.1234+01:00' || true
'2014-03-01T12:23:45.12345+01:00' || true
'2014-03-01T12:23:45.123456+01:00' || true
'2014-03-01T12:23:45' || false
'2014-03-01T12:23:45.123' || false
}
def "should generate a regex for a non blank string [#textToMatch] that should match [#shouldMatch]"() {