From e77e8c002500d50c21b27f12eaae73fa20adef6c Mon Sep 17 00:00:00 2001 From: cdjole Date: Wed, 22 Aug 2018 23:31:47 +0200 Subject: [PATCH] Bael 2139 update (#5037) * code formatted * Regex optimized. --- .../StringContainingCharactersUnitTest.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java b/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java index 3303ebffbe..be79103e6b 100644 --- a/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java +++ b/java-strings/src/test/java/com/baeldung/string/StringContainingCharactersUnitTest.java @@ -11,7 +11,7 @@ public class StringContainingCharactersUnitTest { private static final Pattern[] inputRegexes = new Pattern[4]; - private static final String regex = "^(?=.*?\\p{Lu})(?=.*?[\\p{L}&&[^\\p{Lu}]])(?=.*?\\d)" + "(?=.*?[`~!@#$%^&*()\\-_=+\\\\\\|\\[{\\]};:'\",<.>/?]).*$"; + private static final String regex = "^(?=.*?\\p{Lu})(?=.*?\\p{Ll})(?=.*?\\d)(?=.*?[`~!@#$%^&*()\\-_=+\\\\|\\[{\\]};:'\",<.>/?]).*$"; static { inputRegexes[0] = Pattern.compile(".*[A-Z].*"); @@ -101,21 +101,36 @@ public class StringContainingCharactersUnitTest { @Test public void givenSingleRegex_whenMatchingCorrectString_thenMatches() { String validInput = "Ab3;"; - assertTrue(Pattern.compile(regex).matcher(validInput).matches()); + assertTrue(Pattern + .compile(regex) + .matcher(validInput) + .matches()); } @Test public void givenSingleRegex_whenMatchingWrongStrings_thenNotMatching() { String invalidInput = "Ab3"; - assertFalse(Pattern.compile(regex).matcher(invalidInput).matches()); + assertFalse(Pattern + .compile(regex) + .matcher(invalidInput) + .matches()); invalidInput = "Ab;"; - assertFalse(Pattern.compile(regex).matcher(invalidInput).matches()); + assertFalse(Pattern + .compile(regex) + .matcher(invalidInput) + .matches()); invalidInput = "A3;"; - assertFalse(Pattern.compile(regex).matcher(invalidInput).matches()); + assertFalse(Pattern + .compile(regex) + .matcher(invalidInput) + .matches()); invalidInput = "b3;"; - assertFalse(Pattern.compile(regex).matcher(invalidInput).matches()); + assertFalse(Pattern + .compile(regex) + .matcher(invalidInput) + .matches()); } }