diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 973fcd2..9b7ab75 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,6 +6,7 @@ + diff --git a/main.iml b/main.iml index 648fd83..a0383c0 100644 --- a/main.iml +++ b/main.iml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..0787fb7 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..63b728b Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/java/AccountInfo.java b/src/main/java/Bank/AccountInfo.java similarity index 98% rename from src/main/java/java/AccountInfo.java rename to src/main/java/Bank/AccountInfo.java index e2b1ea9..2932471 100644 --- a/src/main/java/java/AccountInfo.java +++ b/src/main/java/Bank/AccountInfo.java @@ -1,9 +1,6 @@ -package java; +package Bank; public final class AccountInfo { - - - private final int id; private final String name; private final String email; diff --git a/src/main/java/java/Charity.java b/src/main/java/Bank/Charity.java similarity index 93% rename from src/main/java/java/Charity.java rename to src/main/java/Bank/Charity.java index 8ef60ce..9c1f1a4 100644 --- a/src/main/java/java/Charity.java +++ b/src/main/java/Bank/Charity.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class Charity implements Deposit { diff --git a/src/main/java/java/Deposit.java b/src/main/java/Bank/Deposit.java similarity index 92% rename from src/main/java/java/Deposit.java rename to src/main/java/Bank/Deposit.java index 802802d..4c2d036 100644 --- a/src/main/java/java/Deposit.java +++ b/src/main/java/Bank/Deposit.java @@ -1,4 +1,4 @@ -package java; +package Bank; public interface Deposit { diff --git a/src/main/java/java/Family.java b/src/main/java/Bank/Family.java similarity index 64% rename from src/main/java/java/Family.java rename to src/main/java/Bank/Family.java index 3c26c32..618ccba 100644 --- a/src/main/java/java/Family.java +++ b/src/main/java/Bank/Family.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class Family { } diff --git a/src/main/java/java/GlobalCharities.java b/src/main/java/Bank/GlobalCharities.java similarity index 91% rename from src/main/java/java/GlobalCharities.java rename to src/main/java/Bank/GlobalCharities.java index b443d98..e216a06 100644 --- a/src/main/java/java/GlobalCharities.java +++ b/src/main/java/Bank/GlobalCharities.java @@ -1,4 +1,4 @@ -package java; +package Bank; public enum GlobalCharities { UNICEF, diff --git a/src/main/java/java/MainApplication.java b/src/main/java/Bank/MainApplication.java similarity index 94% rename from src/main/java/java/MainApplication.java rename to src/main/java/Bank/MainApplication.java index 6723f84..5d682ba 100644 --- a/src/main/java/java/MainApplication.java +++ b/src/main/java/Bank/MainApplication.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class MainApplication { diff --git a/src/main/java/java/MutualFund.java b/src/main/java/Bank/MutualFund.java similarity index 67% rename from src/main/java/java/MutualFund.java rename to src/main/java/Bank/MutualFund.java index dc1cf95..94ee9bd 100644 --- a/src/main/java/java/MutualFund.java +++ b/src/main/java/Bank/MutualFund.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class MutualFund { } diff --git a/src/main/java/java/ReceiptPrinter.java b/src/main/java/Bank/ReceiptPrinter.java similarity index 93% rename from src/main/java/java/ReceiptPrinter.java rename to src/main/java/Bank/ReceiptPrinter.java index 543194c..30a83a8 100644 --- a/src/main/java/java/ReceiptPrinter.java +++ b/src/main/java/Bank/ReceiptPrinter.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class ReceiptPrinter { diff --git a/src/main/java/java/SavingsChecking.java b/src/main/java/Bank/SavingsChecking.java similarity index 70% rename from src/main/java/java/SavingsChecking.java rename to src/main/java/Bank/SavingsChecking.java index 51c0273..9cec4d0 100644 --- a/src/main/java/java/SavingsChecking.java +++ b/src/main/java/Bank/SavingsChecking.java @@ -1,4 +1,4 @@ -package java; +package Bank; public class SavingsChecking { } diff --git a/src/main/java/java/Withdraw.java b/src/main/java/Bank/Withdraw.java similarity index 92% rename from src/main/java/java/Withdraw.java rename to src/main/java/Bank/Withdraw.java index 359ec43..5a7d805 100644 --- a/src/main/java/java/Withdraw.java +++ b/src/main/java/Bank/Withdraw.java @@ -1,4 +1,4 @@ -package java; +package Bank; public interface Withdraw { diff --git a/src/main/java/java/localCharities.java b/src/main/java/Bank/localCharities.java similarity index 94% rename from src/main/java/java/localCharities.java rename to src/main/java/Bank/localCharities.java index 6dfa679..c62b389 100644 --- a/src/main/java/java/localCharities.java +++ b/src/main/java/Bank/localCharities.java @@ -1,4 +1,4 @@ -package java; +package Bank; public enum localCharities { diff --git a/src/test/Bank/AccountInfoTest.java b/src/test/Bank/AccountInfoTest.java new file mode 100644 index 0000000..b2cf8c5 --- /dev/null +++ b/src/test/Bank/AccountInfoTest.java @@ -0,0 +1,40 @@ +package Bank; + +import Bank.AccountInfo; +import org.junit.Assert; +import org.junit.Test; + +public class AccountInfoTest { + @Test + public void getId() { + AccountInfo accData = new AccountInfo(1000, "Basic", "basic@gmail.com", 500, "basic"); + int expected = 1000; + int actual = accData.getId(); + Assert.assertEquals(expected,actual); + } + @Test + public void getName() { + AccountInfo accInfo = new AccountInfo(1000, "Basic", "basic@gmail.com", 500, "basic"); + String expected = "Basic"; + String actual = accInfo.getName(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getEmail() { + AccountInfo accData = new AccountInfo(1000, "Basic", "basic@gmail.com", 500, "basic"); + String expected = "basic@gmail.com"; + String actual = accData.getEmail(); + Assert.assertEquals(expected,actual); + } + + @Test + public void getBalance() { + AccountInfo accData = new AccountInfo(1000, "Basic", "basic@gmail.com", 500, "basic"); + float expected = 500.00f; + float actual = accData.getBalance(); + Assert.assertEquals(expected,actual, 0.0); + } + +} + diff --git a/src/test/Bank/CharityTest.java b/src/test/Bank/CharityTest.java new file mode 100644 index 0000000..43625a6 --- /dev/null +++ b/src/test/Bank/CharityTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class CharityTest { +} diff --git a/src/test/Bank/FamilyTest.java b/src/test/Bank/FamilyTest.java new file mode 100644 index 0000000..96fa3d4 --- /dev/null +++ b/src/test/Bank/FamilyTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class FamilyTest { +} diff --git a/src/test/Bank/GlobalCharitiesTest.java b/src/test/Bank/GlobalCharitiesTest.java new file mode 100644 index 0000000..beec4fe --- /dev/null +++ b/src/test/Bank/GlobalCharitiesTest.java @@ -0,0 +1,4 @@ +package Bank; + +public enum GlobalCharitiesTest { +} diff --git a/src/test/Bank/MainApplicationTest.java b/src/test/Bank/MainApplicationTest.java new file mode 100644 index 0000000..27e652f --- /dev/null +++ b/src/test/Bank/MainApplicationTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class MainApplicationTest { +} diff --git a/src/test/Bank/MutualFundTest.java b/src/test/Bank/MutualFundTest.java new file mode 100644 index 0000000..b5499ab --- /dev/null +++ b/src/test/Bank/MutualFundTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class MutualFundTest { +} diff --git a/src/test/Bank/ReceiptPrinterTest.java b/src/test/Bank/ReceiptPrinterTest.java new file mode 100644 index 0000000..29fce5d --- /dev/null +++ b/src/test/Bank/ReceiptPrinterTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class ReceiptPrinterTest { +} diff --git a/src/test/Bank/SavingsCheckingTest.java b/src/test/Bank/SavingsCheckingTest.java new file mode 100644 index 0000000..fb14b25 --- /dev/null +++ b/src/test/Bank/SavingsCheckingTest.java @@ -0,0 +1,4 @@ +package Bank; + +public class SavingsCheckingTest { +} diff --git a/src/test/Bank/localCharitiesTest.java b/src/test/Bank/localCharitiesTest.java new file mode 100644 index 0000000..77573c6 --- /dev/null +++ b/src/test/Bank/localCharitiesTest.java @@ -0,0 +1,4 @@ +package Bank; + +public enum localCharitiesTest { +} diff --git a/target/test-classes/META-INF/main.kotlin_module b/target/test-classes/META-INF/main.kotlin_module new file mode 100644 index 0000000..a49347a Binary files /dev/null and b/target/test-classes/META-INF/main.kotlin_module differ