diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..524f096 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* diff --git a/README.md b/README.md index a75f02e..04b6dc5 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,5 @@ Avviando il main() della classe ATMCaseStudy, viene richiesto l’inserimento de - Numero di conto = 98765, PIN = 56789 --------------------------------------------------------------------------- + +Stiamo per fare un conflitto \ No newline at end of file diff --git a/bin/ATM.class b/bin/ATM.class deleted file mode 100644 index 76543bf..0000000 Binary files a/bin/ATM.class and /dev/null differ diff --git a/bin/ATMCaseStudy.class b/bin/ATMCaseStudy.class deleted file mode 100644 index 607c10d..0000000 Binary files a/bin/ATMCaseStudy.class and /dev/null differ diff --git a/bin/Account.class b/bin/Account.class deleted file mode 100644 index 5d2d636..0000000 Binary files a/bin/Account.class and /dev/null differ diff --git a/bin/BalanceInquiry.class b/bin/BalanceInquiry.class deleted file mode 100644 index 48f8e6a..0000000 Binary files a/bin/BalanceInquiry.class and /dev/null differ diff --git a/bin/BankDatabase.class b/bin/BankDatabase.class deleted file mode 100644 index 429aec1..0000000 Binary files a/bin/BankDatabase.class and /dev/null differ diff --git a/bin/CashDispenser.class b/bin/CashDispenser.class deleted file mode 100644 index b8cedba..0000000 Binary files a/bin/CashDispenser.class and /dev/null differ diff --git a/bin/Deposit.class b/bin/Deposit.class deleted file mode 100644 index 57b0c3f..0000000 Binary files a/bin/Deposit.class and /dev/null differ diff --git a/bin/DepositSlot.class b/bin/DepositSlot.class deleted file mode 100644 index a2664ad..0000000 Binary files a/bin/DepositSlot.class and /dev/null differ diff --git a/bin/Keypad.class b/bin/Keypad.class deleted file mode 100644 index 9b066e2..0000000 Binary files a/bin/Keypad.class and /dev/null differ diff --git a/bin/Screen.class b/bin/Screen.class deleted file mode 100644 index a036758..0000000 Binary files a/bin/Screen.class and /dev/null differ diff --git a/bin/Transaction.class b/bin/Transaction.class deleted file mode 100644 index 1330b55..0000000 Binary files a/bin/Transaction.class and /dev/null differ diff --git a/bin/Withdrawal.class b/bin/Withdrawal.class deleted file mode 100644 index 291d645..0000000 Binary files a/bin/Withdrawal.class and /dev/null differ diff --git a/componenti.txt b/componenti.txt new file mode 100644 index 0000000..50bb4c5 --- /dev/null +++ b/componenti.txt @@ -0,0 +1,2 @@ +Lorenzo Mecca - 5317293 +Carlo Arturo Zecca - 5228599 \ No newline at end of file diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar new file mode 100644 index 0000000..9d5fe16 Binary files /dev/null and b/lib/hamcrest-core-1.3.jar differ diff --git a/lib/junit-4.13.2.jar b/lib/junit-4.13.2.jar new file mode 100644 index 0000000..6da55d8 Binary files /dev/null and b/lib/junit-4.13.2.jar differ diff --git a/src/ATM.java b/src/code/Business_logic/ATM.java similarity index 98% rename from src/ATM.java rename to src/code/Business_logic/ATM.java index aa3d187..9fc520e 100644 --- a/src/ATM.java +++ b/src/code/Business_logic/ATM.java @@ -1,6 +1,12 @@ +package code.Business_logic; // ATM.java // Represents an automated teller machine +import code.Database.BankDatabase; + +import code.GUI.Keypad; +import code.GUI.Screen; + public class ATM { private boolean userAuthenticated; // whether user is authenticated diff --git a/src/ATMCaseStudy.java b/src/code/Business_logic/ATMCaseStudy.java similarity index 97% rename from src/ATMCaseStudy.java rename to src/code/Business_logic/ATMCaseStudy.java index b9033bd..7a4dc31 100644 --- a/src/ATMCaseStudy.java +++ b/src/code/Business_logic/ATMCaseStudy.java @@ -1,3 +1,4 @@ +package code.Business_logic; // ATMCaseStudy.java // Driver program for the ATM case study diff --git a/src/Account.java b/src/code/Business_logic/Account.java similarity index 80% rename from src/Account.java rename to src/code/Business_logic/Account.java index c308eca..dcc8e78 100644 --- a/src/Account.java +++ b/src/code/Business_logic/Account.java @@ -1,3 +1,4 @@ +package code.Business_logic; // Account.java // Represents a bank account @@ -5,12 +6,12 @@ public class Account { private int accountNumber; // account number private int pin; // PIN for authentication - private double availableBalance; // funds available for withdrawal - private double totalBalance; // funds available + pending deposits + private Euro availableBalance; // funds available for withdrawal + private Euro totalBalance; // funds available + pending deposits // Account constructor initializes attributes public Account( int theAccountNumber, int thePIN, - double theAvailableBalance, double theTotalBalance ) + Euro theAvailableBalance, Euro theTotalBalance ) { accountNumber = theAccountNumber; pin = thePIN; @@ -28,28 +29,28 @@ public boolean validatePIN( int userPIN ) } // end method validatePIN // returns available balance - public double getAvailableBalance() + public Euro getAvailableBalance() { return availableBalance; } // end getAvailableBalance // returns the total balance - public double getTotalBalance() + public Euro getTotalBalance() { return totalBalance; } // end method getTotalBalance // credits an amount to the account - public void credit( double amount ) + public void credit( Euro amount ) { - totalBalance += amount; // add to total balance + totalBalance.somma(amount); // add to total balance } // end method credit // debits an amount from the account - public void debit( double amount ) + public void debit( Euro amount ) { - availableBalance -= amount; // subtract from available balance - totalBalance -= amount; // subtract from total balance + availableBalance.sottrai(amount); // subtract from available balance + totalBalance.sottrai(amount); // subtract from total balance } // end method debit // returns account number diff --git a/src/BalanceInquiry.java b/src/code/Business_logic/BalanceInquiry.java similarity index 93% rename from src/BalanceInquiry.java rename to src/code/Business_logic/BalanceInquiry.java index d45fa6a..ef8d1c4 100644 --- a/src/BalanceInquiry.java +++ b/src/code/Business_logic/BalanceInquiry.java @@ -1,6 +1,11 @@ +package code.Business_logic; // BalanceInquiry.java // Represents a balance inquiry ATM transaction +import code.Database.BankDatabase; + +import code.GUI.Screen; + public class BalanceInquiry extends Transaction { // BalanceInquiry constructor @@ -18,11 +23,11 @@ public void execute() Screen screen = getScreen(); // get the available balance for the account involved - double availableBalance = + Euro availableBalance = bankDatabase.getAvailableBalance( getAccountNumber() ); // get the total balance for the account involved - double totalBalance = + Euro totalBalance = bankDatabase.getTotalBalance( getAccountNumber() ); // display the balance information on the screen diff --git a/src/CashDispenser.java b/src/code/Business_logic/CashDispenser.java similarity index 84% rename from src/CashDispenser.java rename to src/code/Business_logic/CashDispenser.java index b249faf..5e9bc0c 100644 --- a/src/CashDispenser.java +++ b/src/code/Business_logic/CashDispenser.java @@ -1,3 +1,4 @@ +package code.Business_logic; // CashDispenser.java // Represents the cash dispenser of the ATM @@ -14,18 +15,18 @@ public CashDispenser() } // end CashDispenser constructor // simulates dispensing of specified amount of cash - public void dispenseCash( int amount ) + public void dispenseCash( Euro amount ) { - int billsRequired = amount / 20; // number of $20 bills required + int billsRequired = (int)(amount.getValore() / 20) / 100; // number of $20 bills required count -= billsRequired; // update the count of bills } // end method dispenseCash // indicates whether cash dispenser can dispense desired amount - public boolean isSufficientCashAvailable( int amount ) + public boolean isSufficientCashAvailable( Euro amount ) { - int billsRequired = amount / 20; // number of $20 bills required + int billsRequired = (int)(amount.getValore() / 20) / 100; // number of $20 bills required - if ( count >= billsRequired ) + if ( count >= billsRequired) return true; // enough bills available else return false; // not enough bills available diff --git a/src/Deposit.java b/src/code/Business_logic/Deposit.java similarity index 91% rename from src/Deposit.java rename to src/code/Business_logic/Deposit.java index 916ef70..0ce0d81 100644 --- a/src/Deposit.java +++ b/src/code/Business_logic/Deposit.java @@ -1,9 +1,15 @@ +package code.Business_logic; // Deposit.java // Represents a deposit ATM transaction +import code.Database.BankDatabase; + +import code.GUI.Keypad; +import code.GUI.Screen; + public class Deposit extends Transaction { - private double amount; // amount to deposit + private Euro amount; // amount to deposit private Keypad keypad; // reference to keypad private DepositSlot depositSlot; // reference to deposit slot private final static int CANCELED = 0; // constant for cancel option @@ -30,7 +36,7 @@ public void execute() amount = promptForDepositAmount(); // get deposit amount from user // check whether user entered a deposit amount or canceled - if ( amount != CANCELED ) + if ( amount.getValore() != CANCELED ) { // request deposit envelope containing specified amount screen.displayMessage( @@ -65,7 +71,7 @@ public void execute() } // end method execute // prompt user to enter a deposit amount in cents - private double promptForDepositAmount() + private Euro promptForDepositAmount() { Screen screen = getScreen(); // get reference to screen @@ -76,10 +82,10 @@ private double promptForDepositAmount() // check whether the user canceled or entered a valid amount if ( input == CANCELED ) - return CANCELED; + return new Euro(0, CANCELED); else { - return ( double ) input / 100; // return dollar amount + return new Euro(input / 100, input % 100); // return dollar amount } // end else } // end method promptForDepositAmount } // end class Deposit diff --git a/src/DepositSlot.java b/src/code/Business_logic/DepositSlot.java similarity index 98% rename from src/DepositSlot.java rename to src/code/Business_logic/DepositSlot.java index 64e02c2..e310a6b 100644 --- a/src/DepositSlot.java +++ b/src/code/Business_logic/DepositSlot.java @@ -1,3 +1,4 @@ +package code.Business_logic; // DepositSlot.java // Represents the deposit slot of the ATM diff --git a/src/code/Business_logic/Euro.java b/src/code/Business_logic/Euro.java new file mode 100644 index 0000000..0049dd5 --- /dev/null +++ b/src/code/Business_logic/Euro.java @@ -0,0 +1,47 @@ +package code.Business_logic; + +public class Euro { + private long valore; + + public Euro(long euro, long cent) { + if (euro >= 0) { + valore = euro*100 + cent; + } else { + valore = euro*100 - cent; + } + } + + public Euro(double d) { + valore = (long)(d*100); + } + + public long getValore() { + return valore; + } + + public Euro somma(Euro e) { + this.valore = this.valore + e.getValore(); + return this; + } + + public Euro sottrai(Euro e) { + this.valore = this.valore - e.getValore(); + return this; + } + + public boolean ugualeA(Euro e){ + if (valore == e.getValore()) + return true; + else return false; + } + + public boolean minoreDi(Euro e){ + if (valore <= e.getValore()) + return true; + else return false; + } + + public String stampa(){ + return (double)valore/100 +" euro"; + } +} \ No newline at end of file diff --git a/src/Transaction.java b/src/code/Business_logic/Transaction.java similarity index 96% rename from src/Transaction.java rename to src/code/Business_logic/Transaction.java index 508fea8..8aabdfc 100644 --- a/src/Transaction.java +++ b/src/code/Business_logic/Transaction.java @@ -1,6 +1,11 @@ +package code.Business_logic; // Transaction.java // Abstract superclass Transaction represents an ATM transaction +import code.Database.BankDatabase; + +import code.GUI.Screen; + public abstract class Transaction { private int accountNumber; // indicates account involved diff --git a/src/Withdrawal.java b/src/code/Business_logic/Withdrawal.java similarity index 85% rename from src/Withdrawal.java rename to src/code/Business_logic/Withdrawal.java index 6e0af62..41cb876 100644 --- a/src/Withdrawal.java +++ b/src/code/Business_logic/Withdrawal.java @@ -1,9 +1,16 @@ +package code.Business_logic; // Withdrawal.java // Represents a withdrawal ATM transaction + +import code.Database.BankDatabase; + +import code.GUI.Keypad; +import code.GUI.Screen; + public class Withdrawal extends Transaction { - private int amount; // amount to withdraw + private Euro amount; // amount to withdraw private Keypad keypad; // reference to keypad private CashDispenser cashDispenser; // reference to cash dispenser @@ -27,7 +34,7 @@ public Withdrawal( int userAccountNumber, Screen atmScreen, public void execute() { boolean cashDispensed = false; // cash was not dispensed yet - double availableBalance; // amount available for withdrawal + Euro availableBalance; // amount available for withdrawal // get references to bank database and screen BankDatabase bankDatabase = getBankDatabase(); @@ -40,22 +47,22 @@ public void execute() amount = displayMenuOfAmounts(); // check whether user chose a withdrawal amount or canceled - if ( amount != CANCELED ) + if (!amount.ugualeA(new Euro(CANCELED))) { // get available balance of account involved availableBalance = - bankDatabase.getAvailableBalance( getAccountNumber() ); + bankDatabase.getAvailableBalance(getAccountNumber()); // check whether the user has enough money in the account - if ( amount <= availableBalance ) + if ( amount.minoreDi(availableBalance)) { // check whether the cash dispenser has enough money - if ( cashDispenser.isSufficientCashAvailable( amount ) ) + if ( cashDispenser.isSufficientCashAvailable(amount)) { // update the account involved to reflect withdrawal - bankDatabase.debit( getAccountNumber(), amount ); + bankDatabase.debit(getAccountNumber(), amount); - cashDispenser.dispenseCash( amount ); // dispense cash + cashDispenser.dispenseCash(amount); // dispense cash cashDispensed = true; // cash was dispensed // instruct user to take cash @@ -85,9 +92,9 @@ public void execute() // display a menu of withdrawal amounts and the option to cancel; // return the chosen amount or 0 if the user chooses to cancel - private int displayMenuOfAmounts() + private Euro displayMenuOfAmounts() { - int userChoice = 0; // local variable to store return value + Euro userChoice = new Euro(0); // local variable to store return value Screen screen = getScreen(); // get screen reference @@ -95,7 +102,7 @@ private int displayMenuOfAmounts() int amounts[] = { 0, 20, 40, 60, 100, 200 }; // loop while no valid choice has been made - while ( userChoice == 0 ) + while ( userChoice.ugualeA(new Euro(0))) { // display the menu screen.displayMessageLine( "\nWithdrawal Menu:" ); @@ -117,10 +124,10 @@ private int displayMenuOfAmounts() case 3: // corresponding amount from amounts array case 4: case 5: - userChoice = amounts[ input ]; // save user's choice + userChoice = new Euro(amounts[input]); // save user's choice break; case CANCELED: // the user chose to cancel - userChoice = CANCELED; // save user's choice + userChoice = new Euro(CANCELED); // save user's choice break; default: // the user did not enter a value from 1-6 screen.displayMessageLine( diff --git a/src/BankDatabase.java b/src/code/Database/BankDatabase.java similarity index 86% rename from src/BankDatabase.java rename to src/code/Database/BankDatabase.java index 3978497..35e3fa7 100644 --- a/src/BankDatabase.java +++ b/src/code/Database/BankDatabase.java @@ -1,6 +1,10 @@ +package code.Database; // BankDatabase.java // Represents the bank account information database +import code.Business_logic.Account; +import code.Business_logic.Euro; + public class BankDatabase { private Account accounts[]; // array of Accounts @@ -9,8 +13,8 @@ public class BankDatabase public BankDatabase() { accounts = new Account[ 2 ]; // just 2 accounts for testing - accounts[ 0 ] = new Account( 12345, 54321, 1000.0, 1200.0 ); - accounts[ 1 ] = new Account( 98765, 56789, 200.0, 200.0 ); + accounts[ 0 ] = new Account( 12345, 54321, new Euro(1000, 0), new Euro(1200, 0)); + accounts[ 1 ] = new Account( 98765, 56789, new Euro(200, 0), new Euro(200, 0)); } // end no-argument BankDatabase constructor // retrieve Account object containing specified account number @@ -42,25 +46,25 @@ public boolean authenticateUser( int userAccountNumber, int userPIN ) } // end method authenticateUser // return available balance of Account with specified account number - public double getAvailableBalance( int userAccountNumber ) + public Euro getAvailableBalance( int userAccountNumber ) { return getAccount( userAccountNumber ).getAvailableBalance(); } // end method getAvailableBalance // return total balance of Account with specified account number - public double getTotalBalance( int userAccountNumber ) + public Euro getTotalBalance( int userAccountNumber ) { return getAccount( userAccountNumber ).getTotalBalance(); } // end method getTotalBalance // credit an amount to Account with specified account number - public void credit( int userAccountNumber, double amount ) + public void credit( int userAccountNumber, Euro amount ) { getAccount( userAccountNumber ).credit( amount ); } // end method credit // debit an amount from of Account with specified account number - public void debit( int userAccountNumber, double amount ) + public void debit( int userAccountNumber, Euro amount ) { getAccount( userAccountNumber ).debit( amount ); } // end method debit diff --git a/src/Keypad.java b/src/code/GUI/Keypad.java similarity index 98% rename from src/Keypad.java rename to src/code/GUI/Keypad.java index cd035c7..f0f716c 100644 --- a/src/Keypad.java +++ b/src/code/GUI/Keypad.java @@ -1,3 +1,4 @@ +package code.GUI; // Keypad.java // Represents the keypad of the ATM import java.util.Scanner; // program uses Scanner to obtain user input diff --git a/src/Screen.java b/src/code/GUI/Screen.java similarity index 91% rename from src/Screen.java rename to src/code/GUI/Screen.java index 44d3f30..38fba6a 100644 --- a/src/Screen.java +++ b/src/code/GUI/Screen.java @@ -1,6 +1,9 @@ +package code.GUI; // Screen.java // Represents the screen of the ATM +import code.Business_logic.Euro; + public class Screen { // displays a message without a carriage return @@ -16,9 +19,9 @@ public void displayMessageLine( String message ) } // end method displayMessageLine // display a dollar amount - public void displayDollarAmount( double amount ) + public void displayDollarAmount( Euro amount ) { - System.out.printf( "$%,.2f", amount ); + System.out.printf(amount.stampa()); } // end method displayDollarAmount } // end class Screen diff --git a/src/test/TestAccount.java b/src/test/TestAccount.java new file mode 100644 index 0000000..bb7602e --- /dev/null +++ b/src/test/TestAccount.java @@ -0,0 +1,50 @@ +package test; + +import org.junit.Assert; +import org.junit.Test; + +import code.Business_logic.Euro; +import code.Business_logic.Account; + +public class TestAccount { + + @Test + public void testValidatePIN() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + Assert.assertTrue(account.validatePIN(54321)); + Assert.assertFalse(account.validatePIN(12345)); + } + + @Test + public void testGetAvailableBalance() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + Assert.assertEquals(100000, account.getAvailableBalance().getValore()); + } + + @Test + public void testGetTotalBalance() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + Assert.assertEquals(200000, account.getTotalBalance().getValore()); + } + + @Test + public void testCredit() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + account.credit(new Euro(500)); + Assert.assertEquals(250000, account.getTotalBalance().getValore()); + } + + @Test + public void testDebit() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + account.debit(new Euro(500)); + Assert.assertEquals(50000, account.getAvailableBalance().getValore()); + Assert.assertEquals(150000, account.getTotalBalance().getValore()); + } + + @Test + public void testGetAccountNumber() { + Account account = new Account(12345, 54321, new Euro(1000), new Euro(2000)); + Assert.assertEquals(12345, account.getAccountNumber()); + } +} \ No newline at end of file diff --git a/src/test/TestBankDatabase.java b/src/test/TestBankDatabase.java new file mode 100644 index 0000000..5afc1dc --- /dev/null +++ b/src/test/TestBankDatabase.java @@ -0,0 +1,46 @@ +package test; + +import code.Business_logic.Euro; +import code.Database.BankDatabase; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +public class TestBankDatabase { + + private BankDatabase bankDatabase; + + @Before + public void setUp() { + bankDatabase = new BankDatabase(); + } + + @Test + public void testAuthenticateUser() { + Assert.assertTrue(bankDatabase.authenticateUser(12345, 54321)); + Assert.assertFalse(bankDatabase.authenticateUser(12345, 12345)); + } + + @Test + public void testGetAvailableBalance() { + Assert.assertEquals(100000, bankDatabase.getAvailableBalance(12345).getValore()); + } + + @Test + public void testGetTotalBalance() { + Assert.assertEquals(120000, bankDatabase.getTotalBalance(12345).getValore()); + } + + @Test + public void testCredit() { + bankDatabase.credit(12345, new Euro(500, 0)); + Assert.assertEquals(170000, bankDatabase.getTotalBalance(12345).getValore()); + } + + @Test + public void testDebit() { + bankDatabase.debit(12345, new Euro(500, 0)); + Assert.assertEquals(50000, bankDatabase.getAvailableBalance(12345).getValore()); + } +} \ No newline at end of file diff --git a/src/test/TestEuro.java b/src/test/TestEuro.java new file mode 100644 index 0000000..17f592f --- /dev/null +++ b/src/test/TestEuro.java @@ -0,0 +1,38 @@ +package test; + +import org.junit.Assert; +import org.junit.Test; +import code.Business_logic.Euro; + +public class TestEuro { + + @Test + public void testSomma() { + Euro euro1 = new Euro(5, 50); + Euro euro2 = new Euro(4, 50); + euro1.somma(euro2); + Assert.assertEquals(1000, euro1.getValore()); + } + + @Test + public void testSottrai() { + Euro euro1 = new Euro(5, 50); + Euro euro2 = new Euro(4, 50); + euro1.sottrai(euro2); + Assert.assertEquals(100, euro1.getValore()); + } + + @Test + public void testUgualeA() { + Euro euro1 = new Euro(5, 50); + Euro euro2 = new Euro(5, 50); + Assert.assertTrue(euro1.ugualeA(euro2)); + } + + @Test + public void testMinoreDi() { + Euro euro1 = new Euro(4, 50); + Euro euro2 = new Euro(5, 50); + Assert.assertTrue(euro1.minoreDi(euro2)); + } +} \ No newline at end of file