From 23bc2db643ff723e4c2d899c7dd0d1c008dc3454 Mon Sep 17 00:00:00 2001
From: sergio41 <sergiorr41@gmail.com>
Date: Thu, 30 Apr 2020 18:44:05 +0200
Subject: [PATCH] [BAEL-3944] Minor changes on examples and identations

---
 .../PhoneNumbersRegexUnitTest.java            | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/phonenumbers/PhoneNumbersRegexUnitTest.java b/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/phonenumbers/PhoneNumbersRegexUnitTest.java
index f7a9d70850..ec0380c450 100644
--- a/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/phonenumbers/PhoneNumbersRegexUnitTest.java
+++ b/core-java-modules/core-java-regex/src/test/java/com/baeldung/regex/phonenumbers/PhoneNumbersRegexUnitTest.java
@@ -15,37 +15,38 @@ public class PhoneNumbersRegexUnitTest {
         Matcher matcher = pattern.matcher("2055550125");
         assertTrue(matcher.matches());
     }
-    
+
     @Test
-    public void whenMatchesTenDigitsNumberWhitespacesHyphen_thenCorrect() {
-        Pattern pattern = Pattern.compile("^(\\d{3}[- ]?){2}\\d{4}$");
+    public void whenMatchesTenDigitsNumberWhitespacesDotHyphen_thenCorrect() {
+        Pattern pattern = Pattern.compile("^(\\d{3}[- .]?){2}\\d{4}$");
         Matcher matcher = pattern.matcher("202 555 0125");
         assertTrue(matcher.matches());
     }
-    
+
     @Test
     public void whenMatchesTenDigitsNumberParenthesis_thenCorrect() {
-        Pattern pattern = Pattern.compile("^\\(?\\d{3}\\)?[- ]?\\d{3}[- ]?\\d{4}$");
-        Matcher matcher = pattern.matcher("(202)-555-0125");
+        Pattern pattern = Pattern.compile("^((\\(\\d{3}\\))|\\d{3})[- .]?\\d{3}[- .]?\\d{4}$");
+        Matcher matcher = pattern.matcher("(202) 555-0125");
         assertTrue(matcher.matches());
     }
-    
+
     @Test
     public void whenMatchesTenDigitsNumberPrefix_thenCorrect() {
-        Pattern pattern = Pattern.compile("^(\\+\\d{1,3}( )?)?\\(?\\d{3}\\)?[- ]?\\d{3}[- ]?\\d{4}$");
-        Matcher matcher = pattern.matcher("+111 (202)-555-0125");
+        Pattern pattern = Pattern.compile("^(\\+\\d{1,3}( )?)?((\\(\\d{3}\\))|\\d{3})[- .]?\\d{3}[- .]?\\d{4}$");
+        Matcher matcher = pattern.matcher("+111 (202) 555-0125");
         assertTrue(matcher.matches());
     }
-    
+
     @Test
     public void whenMatchesPhoneNumber_thenCorrect() {
-        String patterns = "^(\\+\\d{1,3}( )?)?\\(?\\d{3}\\)?[- ]?\\d{3}[- ]?\\d{4}$" + 
-                         "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?){2}\\d{3}$" + 
-                         "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?)(\\d{2}[ ]?){2}\\d{2}$";
-        
-        String[] validPhoneNumbers = {"2055550125","202 555 0125", "(202)-555-0125", "+111 (202)-555-0125",
-                                      "636 856 789", "+111 636 856 789", "636 85 67 89", "+111 636 85 67 89"};
-        
+        String patterns 
+          = "^(\\+\\d{1,3}( )?)?((\\(\\d{3}\\))|\\d{3})[- .]?\\d{3}[- .]?\\d{4}$"
+          + "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?){2}\\d{3}$" 
+          + "|^(\\+\\d{1,3}( )?)?(\\d{3}[ ]?)(\\d{2}[ ]?){2}\\d{2}$";
+
+        String[] validPhoneNumbers 
+        = {"2055550125","202 555 0125", "(202) 555-0125", "+111 (202) 555-0125", "636 856 789", "+111 636 856 789", "636 85 67 89", "+111 636 85 67 89"};
+
         Pattern pattern = Pattern.compile(patterns);
         for(String phoneNumber : validPhoneNumbers) {
             Matcher matcher = pattern.matcher(phoneNumber);