Account operations moved to Account class

Added Account operation tests.

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

@@ -28,6 +28,32 @@ public class Account {
 		this.accountNumber = accountNumber;
 		this.history = history;
 	}
+	
+	public boolean transfer(double amount, Account receiver) {
+		if (amount <= 0 || amount > this.calculateBalance())
+			return false;
+		
+		this.history.add(new AccountEvent(-amount, "Transferred %.2f to " + receiver + "."));
+		receiver.history.add(new AccountEvent(amount, "Received %.2f from " + this + "."));
+		
+		return true;
+	}
+	
+	public boolean deposit(double amount) {
+		if (amount <= 0)
+			return false;
+		
+		history.add(new AccountEvent(amount, "User deposited %.2f."));
+		return true;
+	}
+	
+	public boolean withdraw(double amount) {
+		if (amount <= 0 || amount > this.calculateBalance())
+			return false;
+		
+		history.add(new AccountEvent(-amount, "User withdrew %.2f."));
+		return true;
+	}
 
 	@Override
 	public boolean equals(Object obj) {

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

@@ -119,45 +119,29 @@ public class AccountPanel extends JPanel implements ActionListener {
 		if (src.equals(transferFrom)) {
 			double amount = showAmountDialog("transfer");
 
-			if (amount <= 0) {
-				return;
-			} else if (amount > currentAccount.calculateBalance()) {
-				JOptionPane.showMessageDialog(null, "Invalid amount.");
-				return;
-			}
-
 			int result = JOptionPane.showConfirmDialog(null,
 					new JComponent[] { new JLabel("Please select receiver account."), otherAccounts },
 					"Select account.", JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
-			
+
 			if (result != JOptionPane.OK_OPTION)
 				return;
-			
+
 			Account sender = currentAccount, receiver = (Account) otherAccounts.getSelectedItem();
 
-			sender.history.add(new AccountEvent(-amount, "Transferred %.2f to " + receiver + "."));
-			receiver.history.add(new AccountEvent(amount, "Received %.2f from " + sender + "."));
+			if (!sender.transfer(amount, receiver)) {
+				JOptionPane.showMessageDialog(null, "Invalid amount. (Negative on not enough funds)");
+			}
 		} else if (src.equals(deposit)) {
 			double amount = showAmountDialog("deposit");
 
-			if (amount < 0) {
+			if (!currentAccount.deposit(amount))
 				JOptionPane.showMessageDialog(this, "Please enter a positive value.");
-				return;
-			}
 
-			currentAccount.history.add(new AccountEvent(amount, "User deposited %.2f."));
 		} else if (src.equals(withdraw)) {
 			double amount = showAmountDialog("withdraw");
 
-			if (amount < 0) {
-				JOptionPane.showMessageDialog(this, "Please enter a positive value.");
-				return;
-			} else if (amount > currentAccount.calculateBalance()) {
-				JOptionPane.showMessageDialog(this, "You do not have enough balance to withdraw that amount.");
-				return;
-			}
-
-			currentAccount.history.add(new AccountEvent(-amount, "User withdrew %.2f."));
+			if (!currentAccount.withdraw(amount))
+				JOptionPane.showMessageDialog(null, "Invalid amount. (Negative on not enough funds)");
 		}
 
 		this.updatePanel(currentAccount);

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

@@ -0,0 +1,38 @@
+package eu.tankernn.accounts.test;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import eu.tankernn.accounts.Account;
+
+public class AccountTest {
+	Account a, b;
+	
+	@Before
+	public void setup() {
+		a = new Account("Test", "Tester");
+		b = new Account("Example", "Exampler");
+		b.deposit(500);
+	}
+	
+	@Test
+	public void testDeposit() {
+		Assert.assertTrue(a.deposit(2483));
+		Assert.assertFalse(a.deposit(-23));
+	}
+	
+	@Test
+	public void testWithdraw() {
+		Assert.assertFalse(b.withdraw(2483));
+		Assert.assertFalse(b.withdraw(-23));
+		Assert.assertTrue(b.withdraw(50));
+	}
+	
+	@Test
+	public void testTransfer() {
+		Assert.assertFalse(a.transfer(2, b));
+		Assert.assertFalse(b.transfer(-2, a));
+		Assert.assertTrue(b.transfer(200, a));
+	}
+}