Improved file handling and more tests.

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

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Account {
-	
+
 	private String firstName, lastName, accountNumber;
 	private List<AccountEvent> history;
 
@@ -19,7 +19,7 @@ public class Account {
 		this.lastName = lastName;
 		this.history = new ArrayList<AccountEvent>();
 	}
-	
+
 	Account(String firstName, String lastName, String accountNumber, List<AccountEvent> history) {
 		this.firstName = firstName;
 		this.lastName = lastName;
@@ -34,7 +34,7 @@ public class Account {
 	public String getLastName() {
 		return lastName;
 	}
-	
+
 	public List<AccountEvent> getHistory() {
 		return history;
 	}
@@ -43,6 +43,15 @@ public class Account {
 		return accountNumber;
 	}
 
+	@Override
+	public boolean equals(Object obj) {
+		if (!(obj instanceof Account))
+			return false;
+		Account other = (Account) obj;
+		return firstName.equals(other.firstName) && lastName.equals(other.lastName)
+				&& accountNumber.equals(other.accountNumber);
+	}
+
 	public String toString() {
 		return firstName + " " + lastName;
 	}

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

@@ -15,7 +15,6 @@ import javax.swing.JOptionPane;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import eu.tankernn.accounts.frame.MainFrame;
 import eu.tankernn.accounts.frame.PasswordDialog;
 import eu.tankernn.accounts.util.encryption.EncryptedComplex;
 import eu.tankernn.accounts.util.encryption.Encryption;
@@ -30,25 +29,30 @@ public class AccountManager {
 	private static boolean saveWithEncryption = true;
 
 	private static List<Account> accounts;
-
-	private static MainFrame window;
+	
+	/**
+	 * Called when account list changes.
+	 */
+	private static Runnable refresh;
 
 	/**
 	 * Initializes the account list using the last file opened, if available.
 	 * Otherwise creates an empty list.
 	 * 
-	 * @param window
-	 *            The <code>MainFrame</code> instance that will be updated once
-	 *            the file has been loaded
+	 * @param refresh
+	 *            A runnable that gets called when the account list changes.
 	 */
-	public static void init(MainFrame window) {
-		AccountManager.window = window;
+	public static void init(Runnable refresh, boolean openLast) {
+		AccountManager.refresh = refresh;
 		accounts = new ArrayList<Account>();
-		File f = FileManager.getLastFileFromCache();
-		if (f != null)
-			openFile(f);
-		else
-			newFile();
+		File f = null;
+		if (openLast) {
+			f = FileManager.getLastFileFromCache();
+			if (f != null)
+				openFile(f);
+			else
+				newFile();
+		}
 	}
 
 	public static void openFile() {
@@ -104,7 +108,7 @@ public class AccountManager {
 
 		accounts = parseJSON(jsonString);
 		lastJSONString = jsonString;
-		window.refresh();
+		refresh.run();
 	}
 
 	/**
@@ -114,17 +118,13 @@ public class AccountManager {
 	public static void newFile() {
 		if (!closeFile())
 			return;
-
-		try {
-			FileManager.newFile();
-		} catch (IOException e) {
-			e.printStackTrace();
-			return;
-		}
-
+		
+		FileManager.writeLastFileToCache(null);
+		
+		lastPassword = null;
 		accounts.clear();
 		lastJSONString = exportJSON();
-		window.refresh();
+		refresh.run();
 	}
 
 	/**
@@ -183,7 +183,7 @@ public class AccountManager {
 			}
 		}
 		accounts.clear();
-		window.refresh();
+		refresh.run();
 		return true;
 	}
 
@@ -214,7 +214,7 @@ public class AccountManager {
 	 */
 	public static void addAccount(Account account) {
 		accounts.add(account);
-		window.refresh();
+		refresh.run();
 	}
 
 	/**

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

@@ -8,10 +8,8 @@ import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 
 import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
 
 public class FileManager {
 	public static final JFileChooser FILE_CHOOSER = new JFileChooser("data/");
@@ -38,7 +36,9 @@ public class FileManager {
 		return null;
 	}
 
-	private static void writeLastFileToCache(File file) {
+	public static void writeLastFileToCache(File file) {
+		if (file == null)
+			lastFilenameCache.delete();
 		// Remember this filename
 		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
 			try {
@@ -74,32 +74,9 @@ public class FileManager {
 		return builder.toString();
 	}
 
-	/**
-	 * Creates a new file.
-	 * 
-	 * @return The <code>File</code> object that represents the new file.
-	 * @throws IOException
-	 */
-	public static File newFile() throws IOException {
-		int result = FILE_CHOOSER.showDialog(null, "Create file");
-		if (result != JFileChooser.APPROVE_OPTION)
-			return null;
-
-		File newFile = FILE_CHOOSER.getSelectedFile();
-
-		if (newFile.exists()) {
-			JOptionPane.showMessageDialog(null, "That file already exists.");
-			return null;
-		}
-
-		newFile.createNewFile();
-
-		writeLastFileToCache(newFile);
-
-		return newFile;
-	}
-
 	public static void writeStringToFile(boolean saveAs, String contents) throws FileNotFoundException {
+		if (getLastFileFromCache() == null)
+			saveAs = true;
 		if (saveAs)
 			FILE_CHOOSER.showSaveDialog(null);
 		writeStringToFile(saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache(), contents);
@@ -143,16 +120,4 @@ public class FileManager {
 		writeLastFileToCache(file);
 		return obj;
 	}
-
-	public static <T> void writeObjectToFile(boolean saveAs, T contents) throws ClassNotFoundException, IOException {
-		if (saveAs)
-			FILE_CHOOSER.showSaveDialog(null);
-		writeObjectToFile(saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache(), contents);
-	}
-
-	public static <T> void writeObjectToFile(File file, T obj) throws IOException, ClassNotFoundException {
-		ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(file));
-		out.writeObject(obj);
-		out.close();
-	}
 }

src/main/java/eu/tankernn/accounts/frame/MainFrame.java

@@ -23,19 +23,19 @@ import eu.tankernn.accounts.frame.menu.MainMenuBar;
 import eu.tankernn.accounts.util.GUIUtils;
 
 public class MainFrame implements ListSelectionListener, DocumentListener {
-	
+
 	private JFrame frame;
 	private LayoutManager manager;
-	
+
 	// GUI components
-	
+
 	private MainMenuBar menubar;
-	
+
 	private JPanel listPanel;
 	private JTextField search;
 	private JList<Account> accounts;
 	private JScrollPane accountScrollPane;
-	
+
 	private AccountPanel accountPanel;
 
 	/**
@@ -45,17 +45,15 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 		// Weird hack to make the save dialog display on Cmd + q
 		System.setProperty("apple.eawt.quitStrategy", "CLOSE_ALL_WINDOWS");
 		
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
+		EventQueue.invokeLater(() -> {
 				try {
 					MainFrame window = new MainFrame();
-					AccountManager.init(window);
+					AccountManager.init(window::refresh, true);
 					window.refresh();
 					window.frame.setVisible(true);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-			}
 		});
 	}
 
@@ -74,11 +72,11 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 		menubar = new MainMenuBar(this);
 		search = new JTextField("Search...");
 		accounts = new JList<Account>();
-		
+
 		frame = new JFrame();
 		frame.setLayout(manager);
 		frame.setJMenuBar(menubar);
-		
+
 		listPanel = new JPanel();
 		listPanel.setLayout(new BorderLayout());
 		search.getDocument().addDocumentListener(this);
@@ -88,24 +86,23 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 		accountScrollPane.setPreferredSize(new Dimension(100, 100));
 		listPanel.add(accountScrollPane, BorderLayout.CENTER);
 		frame.add(listPanel, BorderLayout.WEST);
-		
-		
+
 		accountPanel = new AccountPanel();
 		frame.add(accountPanel, BorderLayout.EAST);
-		
+
 		frame.setTitle("Account Management System");
 		frame.pack();
 		frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		// Ask the user to save changes before quitting
 		frame.addWindowListener(new WindowAdapter() {
-            public void windowClosing(WindowEvent ev) {
-            	if (AccountManager.closeFile()) {
-            		frame.dispose();
-            	}
-            }
-        });
+			public void windowClosing(WindowEvent ev) {
+				if (AccountManager.closeFile()) {
+					frame.dispose();
+				}
+			}
+		});
 	}
-	
+
 	@Override
 	public void valueChanged(ListSelectionEvent e) {
 		if (accounts.getSelectedValue() != null)
@@ -116,14 +113,14 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 		accounts.setModel(GUIUtils.listModelFromList(AccountManager.getAccounts()));
 		accountPanel.updatePanel(null);
 	}
-	
+
 	private void search() {
 		String s = search.getText().trim();
 		accounts.setModel(GUIUtils.listModelFromList(AccountManager.search(s)));
 	}
-	
+
 	// Update list on search field change
-	
+
 	@Override
 	public void insertUpdate(DocumentEvent e) {
 		search();

src/test/java/eu/tankernn/accounts/frame/test/MainFrameTest.java

@@ -0,0 +1,12 @@
+package eu.tankernn.accounts.frame.test;
+
+import org.junit.Test;
+
+import eu.tankernn.accounts.frame.MainFrame;
+
+public class MainFrameTest {
+	@Test
+	public void frameShouldInit() {
+		new MainFrame();
+	}
+}

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

@@ -0,0 +1,32 @@
+package eu.tankernn.accounts.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import eu.tankernn.accounts.Account;
+import eu.tankernn.accounts.AccountManager;
+
+public class AccountManagerTest {
+	static Account a;
+
+	@BeforeClass
+	public static void setUpClass() {
+		AccountManager.init(() -> {
+		}, false);
+		a = new Account("Test", "McExample");
+		AccountManager.addAccount(a);
+	}
+
+	@Test
+	public void testSearch() {
+		List<Account> aList = new ArrayList<>();
+		aList.add(a);
+		Assert.assertEquals(aList, AccountManager.search(a.getAccountNumber()));
+		Assert.assertEquals(aList, AccountManager.search(a.getFirstName()));
+		Assert.assertEquals(aList, AccountManager.search(a.getLastName()));
+	}
+}