FileChooser separated from FileManager and added file-tests

src/main/java/eu/tankernn/accounts/AccountManager.java

@@ -34,8 +34,7 @@ public class AccountManager {
 	 * Initializes the account list using the last file opened, if available.
 	 * Otherwise creates an empty list.
 	 * 
-	 * @param refresh
-	 *            A runnable that gets called when the account list changes.
+	 * @param refresh A runnable that gets called when the account list changes.
 	 */
 	public static void init(Runnable refresh, boolean openLast) {
 		AccountManager.refresh = refresh;
@@ -53,9 +52,8 @@ public class AccountManager {
 		lastPassword = null;
 		while (true)
 			try {
-				jsonString = FileManager.openFile(lastPassword);
-				lastPassword = PasswordDialog
-						.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
+				jsonString = FileManager.openFile(CachedFileChooser.selectFile(false), lastPassword);
+				lastPassword = PasswordDialog.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
 				break;
 			} catch (InvalidPasswordException e) {
 				continue;
@@ -77,7 +75,7 @@ public class AccountManager {
 		if (!closeFile())
 			return;
 
-		FileManager.writeLastFileToCache(null);
+		CachedFileChooser.clearCache();
 
 		lastPassword = null;
 		accounts.clear();
@@ -88,24 +86,22 @@ public class AccountManager {
 	/**
 	 * Saves the current list of accounts to a file.
 	 * 
-	 * @param saveAs
-	 *            Determines whether the user should be prompted to specify a
-	 *            new filename, or if the last filename should be used.
+	 * @param saveAs Determines whether the user should be prompted to specify a
+	 *        new filename, or if the last filename should be used.
 	 */
 	public static void saveFile(boolean saveAs) {
 		String data = exportJSON();
 		if (saveWithEncryption) {
 			while (lastPassword == null || lastPassword.length < 5) {
 				try {
-					lastPassword = PasswordDialog.showPasswordDialog(
-							"Select a password to encrypt the account file with. (At least 5 characters, preferrably longer)");
+					lastPassword = PasswordDialog.showPasswordDialog("Select a password to encrypt the account file with. (At least 5 characters, preferrably longer)");
 				} catch (CancellationException ex) {
 					return;
 				}
 			}
-			FileManager.saveFile(data, saveAs, lastPassword);
+			FileManager.saveFile(CachedFileChooser.selectFile(saveAs), data, lastPassword);
 		} else {
-			FileManager.saveFile(data, saveAs);
+			FileManager.saveFile(CachedFileChooser.selectFile(saveAs), data);
 		}
 		lastJSONString = data;
 	}
@@ -118,17 +114,16 @@ public class AccountManager {
 	 */
 	public static boolean closeFile() {
 		if (AccountManager.hasUnsavedChanges()) {
-			int option = JOptionPane.showOptionDialog(null, "Would you like to save changes before exit?",
-					"Save changes", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, 0);
+			int option = JOptionPane.showOptionDialog(null, "Would you like to save changes before exit?", "Save changes", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, 0);
 
 			switch (option) {
-			case JOptionPane.YES_OPTION:
-				saveFile(false);
-				break;
-			case JOptionPane.NO_OPTION:
-				break;
-			default:
-				return false;
+				case JOptionPane.YES_OPTION:
+					saveFile(false);
+					break;
+				case JOptionPane.NO_OPTION:
+					break;
+				default:
+					return false;
 			}
 		}
 		accounts.clear();
@@ -158,8 +153,7 @@ public class AccountManager {
 	/**
 	 * Adds the specified account to the list and refreshes the window instance.
 	 * 
-	 * @param account
-	 *            The <code>Account</code> to be added to the list
+	 * @param account The <code>Account</code> to be added to the list
 	 */
 	public static void addAccount(Account account) {
 		accounts.add(account);
@@ -170,13 +164,11 @@ public class AccountManager {
 	 * Searches the list of accounts for ones matching the search string by name
 	 * or account number.
 	 * 
-	 * @param s
-	 *            The search string
+	 * @param s The search string
 	 * @return The list of matching accounts
 	 */
 	public static List<Account> search(String s) {
-		return accounts.stream().filter(a -> a.accountNumber.toLowerCase().contains(s.toLowerCase())
-				|| a.toString().toLowerCase().contains(s.toLowerCase())).collect(Collectors.toList());
+		return accounts.stream().filter(a -> a.accountNumber.toLowerCase().contains(s.toLowerCase()) || a.toString().toLowerCase().contains(s.toLowerCase())).collect(Collectors.toList());
 
 	}
 

src/main/java/eu/tankernn/accounts/CachedFileChooser.java

@@ -0,0 +1,53 @@
+package eu.tankernn.accounts;
+
+import java.io.File;
+import java.io.IOException;
+
+import javax.swing.JFileChooser;
+
+public class CachedFileChooser {
+	public static final JFileChooser FILE_CHOOSER = new JFileChooser("data/");
+
+	private static final File lastFilenameCache = new File(System.getProperty("user.home") + File.separator + "accountmanager" + File.separator + "lastFile.txt");
+
+	public static File selectFile(boolean saveAs) {
+		if (getLastFileFromCache() == null)
+			saveAs = true;
+		if (saveAs)
+			FILE_CHOOSER.showSaveDialog(null);
+		return saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache();
+	}
+
+	private static File getLastFileFromCache() {
+		// Open last file
+		try {
+			// Create file to cache last filename
+			if (!lastFilenameCache.exists()) {
+				lastFilenameCache.getParentFile().mkdirs();
+				lastFilenameCache.createNewFile();
+				return null;
+			}
+			String lastFilePath = FileManager.readFileAsString(lastFilenameCache);
+			File f = new File(lastFilePath);
+			FILE_CHOOSER.setSelectedFile(f);
+			return f;
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	static void writeLastFileToCache(File file) {
+		if (file == null)
+			lastFilenameCache.delete();
+		// Remember this filename
+		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
+			FileManager.saveFile(lastFilenameCache, file.getAbsolutePath());
+			FILE_CHOOSER.setSelectedFile(file);
+		}
+	}
+	
+	static void clearCache() {
+		writeLastFileToCache(null);
+	}
+}

src/main/java/eu/tankernn/accounts/FileManager.java

@@ -10,7 +10,6 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamException;
 
-import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
 import eu.tankernn.accounts.util.encryption.EncryptedComplex;
@@ -18,18 +17,7 @@ import eu.tankernn.accounts.util.encryption.Encryption;
 import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
 
 public class FileManager {
-	public static final JFileChooser FILE_CHOOSER = new JFileChooser("data/");
-
-	private static final File lastFilenameCache = new File(
-			System.getProperty("user.home") + File.separator + "accountmanager" + File.separator + "lastFile.txt");
-
-	private static File selectFile(boolean saveAs) {
-		if (getLastFileFromCache() == null)
-			saveAs = true;
-		if (saveAs)
-			FILE_CHOOSER.showSaveDialog(null);
-		return saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache();
-	}
+	
 
 	/**
 	 * Loads the accounts in the file specified.
@@ -37,8 +25,7 @@ public class FileManager {
 	 * @return A JSON-string containing the account information.
 	 * @throws InvalidPasswordException 
 	 */
-	public static String openFile(char[] password) throws IOException, InvalidPasswordException {
-		File file = getLastFileFromCache();
+	public static String openFile(File file, char[] password) throws IOException, InvalidPasswordException {
 		Object data = null;
 		try {
 			// Try to read the file as a byte[][]
@@ -62,54 +49,11 @@ public class FileManager {
 		return jsonString;
 	}
 
-	public static void saveFile(String data, boolean saveAs, char[] password) {
-		saveFile(Encryption.encryptEncoded(data, password), saveAs);
-	}
-
-	/**
-	 * Saves the current list of accounts to a file.
-	 * 
-	 * @param saveAs
-	 *            Determines whether the user should be prompted to specify a
-	 *            new filename, or if the last filename should be used.
-	 */
-	public static void saveFile(String data, boolean saveAs) {
-		writeStringToFile(selectFile(saveAs), data);
+	public static void saveFile(File file, String data, char[] password) {
+		saveFile(file, Encryption.encryptEncoded(data, password));
 	}
 
-	private static File getLastFileFromCache() {
-		// Open last file
-		try {
-			// Create file to cache last filename
-			if (!lastFilenameCache.exists()) {
-				lastFilenameCache.getParentFile().mkdirs();
-				lastFilenameCache.createNewFile();
-				return null;
-			}
-			String lastFilePath = readFileAsString(lastFilenameCache);
-			File f = new File(lastFilePath);
-			FILE_CHOOSER.setSelectedFile(f);
-			return f;
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	static void writeLastFileToCache(File file) {
-		if (file == null)
-			lastFilenameCache.delete();
-		// Remember this filename
-		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
-			writeStringToFile(lastFilenameCache, file.getAbsolutePath());
-			FILE_CHOOSER.setSelectedFile(file);
-		}
-
-	}
-
-	private static String readFileAsString(File file) throws IOException {
-		writeLastFileToCache(file);
-
+	static String readFileAsString(File file) throws IOException {
 		BufferedReader reader = new BufferedReader(new FileReader(file));
 		StringBuilder builder = new StringBuilder();
 
@@ -120,8 +64,11 @@ public class FileManager {
 
 		return builder.toString();
 	}
-
-	private static void writeStringToFile(File file, String contents) {
+	
+	/**
+	 * Writes a string to a file.
+	 */
+	public static void saveFile(File file, String contents) {
 		writeBytesToFile(file, contents.getBytes());
 	}
 
@@ -141,14 +88,9 @@ public class FileManager {
 
 	public static <T> T readObjectFromFile(File file, Class<T> class1)
 			throws ClassNotFoundException, FileNotFoundException, IOException {
-		if (file == null) {
-			FILE_CHOOSER.showOpenDialog(null);
-			file = FILE_CHOOSER.getSelectedFile();
-		}
 		ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
 		T obj = class1.cast(in.readObject());
 		in.close();
-		writeLastFileToCache(file);
 		return obj;
 	}
 }

src/test/java/eu/tankernn/accounts/test/FileManagerTest.java

@@ -0,0 +1,28 @@
+package eu.tankernn.accounts.test;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import eu.tankernn.accounts.FileManager;
+import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
+
+public class FileManagerTest {
+	@Test
+	public void readingStringShouldReturnEqualString() {
+		String testData = "VeryNice2123..----__...'¨´+<<><";
+		
+		File testFile = new File("test.txt");
+		
+		try {
+			FileManager.saveFile(testFile, testData);
+			String read = FileManager.openFile(testFile, null);
+			Assert.assertEquals(testData, read);
+		} catch (IOException | InvalidPasswordException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+}