Completed

src/main/java/HamletParser.java

@@ -15,7 +15,6 @@ public class HamletParser {
     private String hamletFile = "hamlet.txt";
 
     public HamletParser(){
-        // this.hamletData = loadFile(fileName);
     }
 
     public String getHamletFile() {
@@ -42,17 +41,18 @@ public class HamletParser {
     /**
      * Methods to print out to a new file
      */
-    public void openOutFile(String fileName){
+    public boolean openOutFile(String fileName){
         try {
             formatter = new Formatter(fileName);
+            return true;
         }
         catch (Exception e){
             System.out.println("Error writing to file.");
+            return false;
         }
     }
-    public String writeToFile(String output){
+    public void writeToFile(String output){
         formatter.format("%s", output);
-        return output;
     }
     public void closeOutFile(){
         formatter.close();
@@ -60,14 +60,9 @@ public class HamletParser {
 
     public String replaceHamletAndHoratio(String input) {
 
-        String returnString = input;
-        String[] replaceArr = {"Hamlet", "Horatio", "hamlet", "horatio", "HAMLET", "HORATIO"};
-        String[] changeToArr = {"Leon", "Tarik", "leon", "tarik", "LEON", "TARIK"};
-
-        for (int i = 0; i < replaceArr.length; i++){
-            returnString = returnString.replaceAll(replaceArr[i], changeToArr[i]);
-        }
-        return returnString;
+        String noHamlet = input.replaceAll("(?i)hamlet", "Leon");
+        String noHoratioOrHamlet = noHamlet.replaceAll("(?i)horatio", "Tarik");
+        return noHoratioOrHamlet;
     }
 
-}
+}

src/test/java/HamletParserTest.java

@@ -5,13 +5,11 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class HamletParserTest {
-    private String hamletText;
     private HamletParser hamletParser;
 
     @Before
     public void setUp() {
         this.hamletParser = new HamletParser();
-        this.hamletText = hamletParser.getHamletData();
     }
 
     @Test
@@ -19,88 +17,54 @@ public class HamletParserTest {
         //GIVEN
 
         //WHEN
-        String expected = "The Tragedy of Leon, Prince of Denmark\nTARIK\n";
+        String expected = "The Tragedy of Leon, Prince of Denmark\nTarik\n";
         //THEN
         String actual = hamletParser.loadFile("hamletTest.txt");
         Assert.assertEquals(expected, actual);
 
-        // the file to output, then test output for 'has hamlet or horatio
     }
 
-//    @Test
-//    public void testChangeHamletToLeon() {
-//        //GIVEN
-//
-//        //WHEN
-//        String expected = "Leon";
-//        //THEN
-//        String actual = hamletParser.changeHamletToLeon();
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void testChangeHoratioToTariq() {
-//        //GIVEN
-//
-//        //WHEN
-//        String expected = "Tariq";
-//        //THEN
-//        String actual = hamletParser.changeChangeHoratioToTariq();
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void testFindHoratio() {
-//        //GIVEN
-//        String input = "horatio";
-//        //WHEN
-//        boolean expected = true;
-//        //THEN
-//        boolean actual = hamletParser.findHoratio(input);
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void testFindHamlet() {
-//        //GIVEN
-//        String input = "HAMLET";
-//        //WHEN
-//        boolean expected = true;
-//        //THEN
-//        boolean actual = hamletParser.findHamlet(input);
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void testFindHoratio2() {
-//        //GIVEN
-//        String input = "nope";
-//        //WHEN
-//        boolean expected = false;
-//        //THEN
-//        boolean actual = hamletParser.findHoratio(input);
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void testFindHamlet2() {
-//        //GIVEN
-//        String input = "hhamlet";
-//        //WHEN
-//        boolean expected = false;
-//        //THEN
-//        boolean actual = hamletParser.findHamlet(input);
-//        Assert.assertEquals(expected, actual);
-//    }
-
     @Test
     public void hamletReplaceTest() {
         //GIVEN
         String input = "Hamlet Horatio hamlet horatio HAMLET HORATIO";
         //WHEN
-        String expected = "Leon Tarik leon tarik LEON TARIK";
+        String expected = "Leon Tarik Leon Tarik Leon Tarik";
         //THEN
         String actual = hamletParser.replaceHamletAndHoratio(input);
         Assert.assertEquals(expected, actual);
     }
-}
+
+    @Test
+    public void getHamletFile() {
+        //GIVEN
+
+        //WHEN
+        String expected = "hamlet.txt";
+        //THEN
+        String actual = hamletParser.getHamletFile();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void openOutFileTest() {
+        //GIVEN
+
+        //WHEN
+        boolean expected = true;
+        //THEN
+        boolean actual = hamletParser.openOutFile("text.txt");
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void openOutFileTest2() {
+        //GIVEN
+
+        //WHEN
+        boolean expected = false;
+        //THEN
+        boolean actual = hamletParser.openOutFile("");
+        Assert.assertEquals(expected, actual);
+    }
+}