From 4586d471a1942834c8aaad8c0dd0681f3a91ba97 Mon Sep 17 00:00:00 2001
From: buddhini81 <buddhini81@users.noreply.github.com>
Date: Mon, 29 May 2017 17:55:10 +0530
Subject: [PATCH] BAEL-839 changes in all test methods

---
 .../baeldung/regexp/EscapingCharsTest.java    | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java
index 1e2293955a..49d349f69f 100644
--- a/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java
+++ b/core-java/src/test/java/com/baeldung/regexp/EscapingCharsTest.java
@@ -11,57 +11,59 @@ public class EscapingCharsTest {
     public void givenRegexWithDot_whenMatchingStr_thenMatches() {
         String strInput = "foof";
         String strRegex = "foo.";
-        EscapingChars e = new EscapingChars();
-
-        assertEquals(true, e.isMatching(strInput, strRegex));
+        
+        assertEquals(true, strInput.matches(strRegex));
     }
-
+    
     @Test
     public void givenRegexWithDotEsc_whenMatchingStr_thenNotMatching() {
         String strInput = "foof";
         String strRegex = "foo\\.";
-        EscapingChars e = new EscapingChars();
-
-        assertEquals(false, e.isMatching(strInput, strRegex));
+        
+        assertEquals(false, strInput.matches(strRegex));
     }
-
+    
     @Test
     public void givenRegexWithPipeEscaped_whenSplitStr_thenSplits() {
         String strInput = "foo|bar|hello|world";
         String strRegex = "\\Q|\\E";
-        EscapingChars e = new EscapingChars();
-
-        assertEquals(4, e.splitAndCountWords(strInput, strRegex));
+        
+        assertEquals(4, strInput.split(strRegex).length);
     }
-
+    
     @Test
     public void givenRegexWithPipeEscQuoteMeth_whenSplitStr_thenSplits() {
         String strInput = "foo|bar|hello|world";
         String strRegex = "|";
-        EscapingChars e = new EscapingChars();
-
-        assertEquals(4, e.splitAndCountWordsUsingQuoteMethod(strInput, strRegex));
+        
+        assertEquals(4,strInput.split(Pattern.quote(strRegex)).length);
     }
-
+    
     @Test
     public void givenRegexWithDollar_whenReplacing_thenNotReplace() {
-        String strInput = "I gave $50 to my brother.He bought candy for $35. Now he has $15 left.";
+        String strInput = "I gave $50 to my brother."
+                + "He bought candy for $35. Now he has $15 left.";
         String strRegex = "$";
-        String strReplacement = "�";
-        String output = "I gave �50 to my brother.He bought candy for �35. Now he has �15 left.";
-        EscapingChars e = new EscapingChars();
-
-        assertThat(output, not(equalTo(e.changeCurrencySymbol(strInput, strRegex, strReplacement))));
+        String strReplacement = "£";
+        String output = "I gave £50 to my brother."
+                + "He bought candy for £35. Now he has £15 left.";
+        Pattern p = Pattern.compile(strRegex);
+        Matcher m = p.matcher(strInput);
+        
+        assertThat(output, not(equalTo(m.replaceAll(strReplacement))));
     }
-
+    
     @Test
     public void givenRegexWithDollarEsc_whenReplacing_thenReplace() {
-        String strInput = "I gave $50 to my brother. He bought candy for $35. Now he has $15 left.";
+        String strInput = "I gave $50 to my brother."
+                + "He bought candy for $35. Now he has $15 left.";
         String strRegex = "\\$";
-        String strReplacement = "�";
-        String output = "I gave �50 to my brother. He bought candy for �35. Now he has �15 left.";
-        EscapingChars e = new EscapingChars();
-
-        assertEquals(output, e.changeCurrencySymbol(strInput, strRegex, strReplacement));
+        String strReplacement = "£";
+        String output = "I gave £50 to my brother."
+                + "He bought candy for £35. Now he has £15 left.";
+        Pattern p = Pattern.compile(strRegex);
+        Matcher m = p.matcher(strInput);
+        
+        assertEquals(output,m.replaceAll(strReplacement));
     }
 }