From 26adf7788639dd52ac98c39273db416caa51c48c Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 28 Oct 2021 11:53:01 +0200 Subject: [PATCH] hotfix: Regex allowing | (pipe). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Tegnér --- src/main/java/dev/personnummer/Personnummer.java | 2 +- src/test/java/PersonnummerTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/dev/personnummer/Personnummer.java b/src/main/java/dev/personnummer/Personnummer.java index 59273ba..f1210e6 100644 --- a/src/main/java/dev/personnummer/Personnummer.java +++ b/src/main/java/dev/personnummer/Personnummer.java @@ -15,7 +15,7 @@ public final class Personnummer implements Comparable { private static final Pattern regexPattern; static { - regexPattern = Pattern.compile("^(\\d{2})?(\\d{2})(\\d{2})(\\d{2})([-|+]?)?((?!000)\\d{3})(\\d?)$"); + regexPattern = Pattern.compile("^(\\d{2})?(\\d{2})(\\d{2})(\\d{2})([-+]?)?((?!000)\\d{3})(\\d?)$"); } /** diff --git a/src/test/java/PersonnummerTest.java b/src/test/java/PersonnummerTest.java index 7ac0370..63a7f74 100644 --- a/src/test/java/PersonnummerTest.java +++ b/src/test/java/PersonnummerTest.java @@ -37,10 +37,10 @@ public void testConstructorCoord(PersonnummerData ssn) { @ParameterizedTest @MethodSource({"DataProvider#getInvalidPersonnummer", "DataProvider#getValidCoordinationNumbers"}) public void testConstructorInvalid(PersonnummerData ssn) { - assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.longFormat, new Options(false))); - assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.shortFormat, new Options(false))); - assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.separatedFormat, new Options(false))); - assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.separatedFormat, new Options(false))); + assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.longFormat, new Options(false)), ssn.longFormat); + assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.shortFormat, new Options(false)), ssn.shortFormat); + assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.separatedFormat, new Options(false)), ssn.separatedFormat); + assertThrows(PersonnummerException.class, () -> new Personnummer(ssn.separatedLong, new Options(false)), ssn.separatedLong); } @ParameterizedTest