Merge a0205240fff870968ec27c640523c44f80dc2971 into 99c0c83b2f011a8e58c86fca53df6bfa67c86565

src/main/java/HamletParser.java

@@ -1,6 +1,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Scanner;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Created by thook on 10/7/15.
@@ -8,31 +10,65 @@ import java.util.Scanner;
 public class HamletParser {
 
     private String hamletData;
+    private Pattern pattern;
+    private Matcher matcher;
 
-    public HamletParser(){
+    public HamletParser() {
         this.hamletData = loadFile();
     }
 
-    private String loadFile(){
+    public void changeHamletToLeon() {
+        String hamlet = "(Hamlet|HAMLET)";
+        this.hamletData = change(hamlet, "LEON");
+    }
+
+    public void changeHoratioToTariq() {
+        String horatio = "(Horatio|HORATIO)";
+        this.hamletData = change(horatio, "TARIQ");
+    }
+
+    public boolean findHoratio() {
+        String horatio = "(Horatio|HORATIO)";
+        return find(horatio);
+    }
+
+    public boolean findHamlet() {
+        String hamlet = "(Hamlet|HAMLET)";
+        return find(hamlet);
+    }
+
+    private boolean find(String aString) {
+        pattern = Pattern.compile(aString);
+        matcher = pattern.matcher(hamletData);
+        return matcher.find();
+    }
+
+    private String change(String original, String convertTo) {
+        pattern = Pattern.compile(original);
+        matcher = pattern.matcher(hamletData);
+        return matcher.replaceAll(convertTo);
+    }
+
+    private String loadFile() {
         ClassLoader classLoader = getClass().getClassLoader();
         File file = new File(classLoader.getResource("hamlet.txt").getFile());
         StringBuilder result = new StringBuilder("");
 
-        try(Scanner scanner = new Scanner(file)){
-            while(scanner.hasNextLine()){
+        try (Scanner scanner = new Scanner(file)) {
+            while (scanner.hasNextLine()) {
                 String line = scanner.nextLine();
                 result.append(line).append("\n");
             }
 
             scanner.close();
-        }catch(IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
 
         return result.toString();
     }
 
-    public String getHamletData(){
+    public String getHamletData() {
         return hamletData;
     }
 

src/test/java/HamletParserTest.java

@@ -1,3 +1,4 @@
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -15,17 +16,26 @@ public class HamletParserTest {
 
     @Test
     public void testChangeHamletToLeon() {
+        hamletParser.changeHamletToLeon();
+        System.out.println(hamletParser.getHamletData());
+        Assert.assertFalse(hamletParser.findHamlet());
     }
 
     @Test
     public void testChangeHoratioToTariq() {
+        hamletParser.changeHoratioToTariq();
+        System.out.println(hamletParser.getHamletData());
+        Assert.assertFalse(hamletParser.findHoratio());
     }
 
     @Test
     public void testFindHoratio() {
+        Assert.assertTrue(hamletParser.findHoratio());
+
     }
 
     @Test
     public void testFindHamlet() {
+        Assert.assertTrue(hamletParser.findHoratio());
     }
 }