fileReader needs fix for apostrophe

Crypto/src/Main/CryptFileReader.java

@@ -1,42 +0,0 @@
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.PrintWriter;
-import java.io.IOException;
-
-public class CryptFileReader extends ROT13 {
-    private File file;
-    StringBuffer stringBuffer = new StringBuffer();
-
-    public CryptFileReader(Character cs, Character cf) {
-        super(cs, cf);
-    }
-
-    public CryptFileReader(File file) {
-        this.file = file;
-    }
-
-    public CryptFileReader() {
-    }
-
-    public void fileCryptReader() {
-        try {
-            FileReader fileReader = new FileReader(file);
-            BufferedReader bufferedReader = new BufferedReader(fileReader);
-            String line;
-            while ((line = bufferedReader.readLine()) != null) {
-                stringBuffer.append(line);
-                stringBuffer.append("\n");
-            }
-            fileReader.close();
-
-            File fileOut = new File("sonnet18.enc");
-            // fileOut.
-            this.crypt(stringBuffer.toString(), 13);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-}

Crypto/src/Main/FileCrypter.java

@@ -0,0 +1,110 @@
+import java.io.File;
+import java.lang.*;
+import java.util.*;
+
+public class FileCrypter extends ROT13 {
+
+    private Formatter formatter;
+    private Scanner scanner;
+    private String fileToString;
+    private String fileIn;
+    private String fileOut;
+    private String encryptedString;
+
+    FileCrypter(){
+        fileIn = "Sonnet18.txt";
+        fileOut = "Sonnet18.enc";
+    }
+
+    public String getFileIn() {
+        return fileIn;
+    }
+
+    public void setFileIn(String fileIn) {
+        this.fileIn = fileIn;
+    }
+
+    public String getFileOut() {
+        return fileOut;
+    }
+
+    public void setFileOut(String fileOut) {
+        this.fileOut = fileOut;
+    }
+
+    /**
+     * Methods to read in from an existing file
+     */
+    public void connectToFile(){
+        try {
+            scanner = new Scanner(new File(fileIn));
+        }
+        catch (Exception e){
+            System.out.println("File not found.");
+        }
+    }
+
+    public String readFile(){
+        StringBuilder builder = new StringBuilder();
+        while (scanner.hasNextLine()){
+            builder.append(scanner.nextLine() + "\n");
+        }
+        fileToString = builder.toString();
+        return builder.toString();
+    }
+
+    /**
+     * Methods to print out to a new file
+     */
+    public void openFile(){
+        try {
+            formatter = new Formatter(fileOut);
+        }
+        catch (Exception e){
+            System.out.println("Error writing to file.");
+        }
+    }
+
+    public String addRecords(String encryptedStr){
+        formatter.format("%s", encryptedStr);
+        return encryptedStr;
+    }
+
+    public void closeFile(){
+        formatter.close();
+        scanner.close();
+    }
+
+    public void encryptFile(){
+        ROT13 rot13 = new ROT13('a', 'n');
+        connectToFile();
+        encryptedString = rot13.encrypt(readFile());
+
+        /**
+         * Create/ overwrite and output to file
+         */
+        openFile();
+        addRecords(encryptedString);
+        closeFile();
+    }
+
+
+
+    public static void main(String[] args) {
+        FileCrypter fileCrypter = new FileCrypter();
+        ROT13 rot13 = new ROT13('a', 'n');
+
+        fileCrypter.connectToFile();
+        fileCrypter.encryptedString = rot13.encrypt(fileCrypter.readFile());
+
+        /**
+         * Create/ overwrite and output to file
+         */
+        fileCrypter.openFile();
+        fileCrypter.addRecords(fileCrypter.encryptedString);
+        fileCrypter.closeFile();
+
+
+    }
+
+}

Crypto/src/Main/Scrap/CryptFileReader.java

@@ -0,0 +1,44 @@
+//package Scrap;
+//
+//import java.io.BufferedReader;
+//import java.io.File;
+//import java.io.FileReader;
+//import java.io.FileWriter;
+//import java.io.PrintWriter;
+//import java.io.IOException;
+//
+//public class CryptFileReader extends ROT13 {
+//    private File file;
+//    StringBuffer stringBuffer = new StringBuffer();
+//
+//    public CryptFileReader(Character cs, Character cf) {
+//        super(cs, cf);
+//    }
+//
+//    public CryptFileReader(File file) {
+//        this.file = file;
+//    }
+//
+//    public CryptFileReader() {
+//    }
+//
+//    public void fileCryptReader() {
+//        try {
+//            FileReader fileReader = new FileReader(file);
+//            BufferedReader bufferedReader = new BufferedReader(fileReader);
+//            String line;
+//            while ((line = bufferedReader.readLine()) != null) {
+//                stringBuffer.append(line);
+//                stringBuffer.append("\n");
+//            }
+//            fileReader.close();
+//
+//            File fileOut = new File("sonnet18.enc");
+//            // fileOut.
+//            this.crypt(stringBuffer.toString(), 13);
+//
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+//    }
+//}

Crypto/src/Test/fileCrypterTest.java

@@ -0,0 +1,30 @@
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
+public class fileCrypterTest {
+
+    @Test
+    public void cryptTest1() {
+        // Given
+        FileCrypter fileCrypter = new FileCrypter();
+        fileCrypter.setFileIn("Sonnet18.txt");
+
+        fileCrypter.connectToFile();
+        String expected = fileCrypter.readFile();
+        System.out.println(fileCrypter.getFileIn());
+
+        // When
+        fileCrypter.encryptFile();
+        fileCrypter.setFileIn("Sonnet18.enc");
+        fileCrypter.encryptFile();
+        fileCrypter.connectToFile();
+        String actual = fileCrypter.readFile();
+        System.out.println();
+        System.out.println(fileCrypter.getFileIn());
+
+        // Then
+        assertTrue(actual.equals(expected));
+
+    }
+}