Skip to content

Commit e8b17fe

Browse files
committed
Ruy Vilão suggestions: no point in declaring the variables for the match result, let's put them directly in the assert (to be fixed in both tutorial and code).
1 parent d6d8eff commit e8b17fe

2 files changed

Lines changed: 15 additions & 22 deletions

File tree

core-java-modules/core-java-11/src/test/java/com/baeldung/pattern/PatternJava11UnitTest.java

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@
1313

1414
public class PatternJava11UnitTest {
1515

16-
private static final String VALID_NAME = "Fabio Silva";
17-
private static final String INVALID_NAME = "Fabio Luis Silva";
18-
private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
19-
private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
20-
2116
@Test
2217
public void givenPreCompiledPattern_whenCallAsMatchPredicate_thenReturnMatchPredicateToMatchesThePatternInTheListElements() {
23-
Predicate<String> patternAsMatchPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asMatchPredicate();
24-
List<String> validatedNames = NAMES_TO_VALIDATE.stream()
18+
List<String> namesToValidate = Arrays.asList("Fabio Silva", "Fabio Luis Silva");
19+
Pattern firstLastNamePreCompiledPattern = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
20+
21+
Predicate<String> patternAsMatchPredicate = firstLastNamePreCompiledPattern.asMatchPredicate();
22+
List<String> validatedNames = namesToValidate.stream()
2523
.filter(patternAsMatchPredicate)
2624
.collect(Collectors.toList());
2725

28-
assertTrue(validatedNames.contains(VALID_NAME));
29-
assertFalse(validatedNames.contains(INVALID_NAME));
26+
assertTrue(validatedNames.contains("Fabio Silva"));
27+
assertFalse(validatedNames.contains("Fabio Luis Silva"));
3028
}
3129
}

core-java-modules/core-java-text/src/test/java/com/baeldung/pattern/PatternUnitTest.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,12 @@
1515
public class PatternUnitTest {
1616

1717
private static final Pattern FIRST_LAST_NAME_PRE_COMPILED_PATTERN = Pattern.compile("[a-zA-Z]{3,} [a-zA-Z]{3,}");
18-
private static final String VALID_NAME = "Fabio Silva";
19-
private static final String INVALID_NAME = "Mr. Silva";
20-
private static final List<String> NAMES_TO_VALIDATE = Arrays.asList(VALID_NAME, INVALID_NAME);
21-
2218
private static final Pattern SPLIT_PRE_COMPILED_PATTERN = Pattern.compile("__");
23-
private static final String TEXT_TO_SPLIT = "My_Name__is__Fabio_Silva";
2419

2520
@Test
2621
public void givenPreCompiledPattern_whenCallMatcher_thenReturnAMatcherToMatches() {
27-
Matcher matcherName1 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(VALID_NAME);
28-
Matcher matcherName2 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher(INVALID_NAME);
22+
Matcher matcherName1 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher("Fabio Silva");
23+
Matcher matcherName2 = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.matcher("Mr. Silva");
2924

3025
boolean matchesName1 = matcherName1.matches();
3126
boolean matchesName2 = matcherName2.matches();
@@ -36,19 +31,20 @@ public void givenPreCompiledPattern_whenCallMatcher_thenReturnAMatcherToMatches(
3631

3732
@Test
3833
public void givenPreCompiledPattern_whenCallAsPredicate_thenReturnPredicateToFindThePatternInTheListElements() {
34+
List<String> namesToValidate = Arrays.asList("Fabio Silva", "Mr. Silva");
3935
Predicate<String> patternsAsPredicate = FIRST_LAST_NAME_PRE_COMPILED_PATTERN.asPredicate();
4036

41-
List<String> validNames = NAMES_TO_VALIDATE.stream()
37+
List<String> validNames = namesToValidate.stream()
4238
.filter(patternsAsPredicate)
4339
.collect(Collectors.toList());
4440

45-
assertEquals(1,validNames.size());
46-
assertTrue(validNames.contains(VALID_NAME));
41+
assertEquals(1, validNames.size());
42+
assertTrue(validNames.contains("Fabio Silva"));
4743
}
4844

4945
@Test
5046
public void givenPreCompiledPattern_whenCallSplit_thenReturnArrayWithValuesSplitByThePattern() {
51-
String[] textSplit = SPLIT_PRE_COMPILED_PATTERN.split(TEXT_TO_SPLIT);
47+
String[] textSplit = SPLIT_PRE_COMPILED_PATTERN.split("My_Name__is__Fabio_Silva");
5248

5349
assertEquals("My_Name", textSplit[0]);
5450
assertEquals("is", textSplit[1]);
@@ -57,12 +53,11 @@ public void givenPreCompiledPattern_whenCallSplit_thenReturnArrayWithValuesSplit
5753

5854
@Test
5955
public void givenPreCompiledPattern_whenCallSplitAsStream_thenReturnArrayWithValuesSplitByThePattern() {
60-
Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream(TEXT_TO_SPLIT);
56+
Stream<String> textSplitAsStream = SPLIT_PRE_COMPILED_PATTERN.splitAsStream("My_Name__is__Fabio_Silva");
6157
String[] textSplit = textSplitAsStream.toArray(String[]::new);
6258

6359
assertEquals("My_Name", textSplit[0]);
6460
assertEquals("is", textSplit[1]);
6561
assertEquals("Fabio_Silva", textSplit[2]);
6662
}
67-
6863
}

0 commit comments

Comments
 (0)