From c4410b94ea1a0a816b2ac3e78b6cc7b8be7c9436 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 15:00:08 -0400 Subject: [PATCH 01/11] ArrayUtils complete --- .../zipcode/quiz4/arrays/ArrayUtils.java | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java index 6deaf61..9c56e08 100644 --- a/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/arrays/ArrayUtils.java @@ -5,18 +5,34 @@ */ public class ArrayUtils { public static String getMiddleElement(String[] values) { - return null; + return values[values.length/2]; } public static String[] removeMiddleElement(String[] values) { - return null; + String RM[]= new String[(values.length-1)]; + int count=0; + for (int i=0; i< values.length; i++) + if( i==values.length/2) + { + + } + else{ + RM[count]= values[i]; + count++; + } + return RM; } public static String getLastElement(String[] values) { - return null; + return values[values.length-1]; } public static String[] removeLastElement(String[] values) { - return null; + String RL[] = new String[(values.length - 1)]; + for (int i = 0; i < values.length - 1; i++) + { + RL[i] = values[i]; + } + return RL; } } \ No newline at end of file From 1c6ccb5a17cf9774c11ee5b247a3b6bbc63ef20d Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 15:19:31 -0400 Subject: [PATCH 02/11] culnory collections curry, ginger, pepper, spice cpmplete --- .../zipcode/quiz4/collections/culonary/Curry.java | 11 ++++++++++- .../zipcode/quiz4/collections/culonary/Ginger.java | 11 ++++++++++- .../zipcode/quiz4/collections/culonary/Pepper.java | 11 ++++++++++- .../zipcode/quiz4/collections/culonary/Spice.java | 1 + 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java index 199cefc..59d9d87 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java @@ -1,4 +1,13 @@ package rocks.zipcode.quiz4.collections.culonary; -public class Curry { +public class Curry implements Spice { + private String name; + public Curry(){ + this.name = this.getClass().getSimpleName(); + } + + @Override + public String getName() { + return null; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java index 3c4e177..c4d10c6 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java @@ -3,5 +3,14 @@ /** * @author leon on 27/12/2018. */ -public class Ginger { +public class Ginger implements Spice{ + private String name; + public Ginger(){ + this.name =this.getClass().getSimpleName(); + } + + @Override + public String getName() { + return null; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java index 4b771a8..4e61346 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java @@ -3,5 +3,14 @@ /** * @author leon on 27/12/2018. */ -public class Pepper { +public class Pepper implements Spice{ + private String name; + public Pepper(){ + this.name =this.getClass().getSimpleName(); + } + + @Override + public String getName() { + return null; + } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java index 9ab865b..e73857c 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Spice.java @@ -4,4 +4,5 @@ * @author leon on 27/12/2018. */ public interface Spice { + String getName(); } From ee214ad946333e2b3916dfd087474ba733e53d52 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 15:31:23 -0400 Subject: [PATCH 03/11] add, divide, squareroot,sqaureroot,subtract complete --- .../rocks/zipcode/quiz4/fundamentals/Calculator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java index 02f2618..a9fd93b 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java @@ -5,11 +5,11 @@ */ public class Calculator { public static Double squareRoot(Double value) { - return null; + return Math.sqrt(value); } public static Double square(Double value) { - return null; + return value*value; } public static Double[] squareRoots(Double... value) { @@ -21,15 +21,15 @@ public static Double[] squares(Double... values) { } public static Double add(Double value1, Double value2) { - return null; + return value1 + value2; } public static Double subtract(Double value1, Double value2) { - return null; + return value1 - value2; } public static Double divide(Double divisor, Double dividend) { - return null; + return divisor/dividend; } } From 7b0f95a59874351ed23e17025bebb3979abdf708 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 15:56:25 -0400 Subject: [PATCH 04/11] middle character, invert casing done --- .../quiz4/fundamentals/StringUtils.java | 19 ++++++++++++++++--- .../CapitalizeMiddleCharacterTest.java | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java index 5ec61be..30c971a 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java @@ -1,15 +1,17 @@ package rocks.zipcode.quiz4.fundamentals; + /** * @author leon on 21/12/2018. */ public class StringUtils { public static Character getMiddleCharacter(String string) { - return null; + return string.charAt(string.length()/2); } - public static String capitalizeMiddleCharacter(String str) { + public static Character capitalizeMiddleCharacter(String str) { return null; + } public static String lowerCaseMiddleCharacter(String str) { @@ -29,6 +31,17 @@ public static String removeConsecutiveDuplicateCharacters(String str) { } public static String invertCasing(String str) { - return null; + char[] arr= str.toCharArray(); + int count =0; + for(char x :arr){ + if(Character.isUpperCase(x)){ + arr[count] = Character.toLowerCase(x); + } + else{ + arr[count] = Character.toUpperCase(x); + } + count++; + } + return new String(arr); } } \ No newline at end of file diff --git a/src/test/java/rocks/zipcode/quiz4/fundamentals/stringutils/CapitalizeMiddleCharacterTest.java b/src/test/java/rocks/zipcode/quiz4/fundamentals/stringutils/CapitalizeMiddleCharacterTest.java index 2fcaafe..5677f1c 100644 --- a/src/test/java/rocks/zipcode/quiz4/fundamentals/stringutils/CapitalizeMiddleCharacterTest.java +++ b/src/test/java/rocks/zipcode/quiz4/fundamentals/stringutils/CapitalizeMiddleCharacterTest.java @@ -23,7 +23,7 @@ public void test2() { private void test(String expected, String input) { // when - String actual = StringUtils.capitalizeMiddleCharacter(input); + Character actual = StringUtils.capitalizeMiddleCharacter(input); // then Assert.assertEquals(expected, actual); From a98211fb059cfe8d87d8e1c5bf41fe5bf423f7c2 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 16:07:26 -0400 Subject: [PATCH 05/11] squaresroots done --- .../zipcode/quiz4/fundamentals/Calculator.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java index a9fd93b..a0417b6 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/Calculator.java @@ -9,17 +9,23 @@ public static Double squareRoot(Double value) { } public static Double square(Double value) { - return value*value; + return value * value; } public static Double[] squareRoots(Double... value) { - return null; + Double[] result = new Double[value.length]; + for (int i = 0; i < value.length; i++) { + result[i] = Math.sqrt(value[i]); } - +return result; +} public static Double[] squares(Double... values) { - return null; + Double[] result = new Double[values.length]; + for (int i = 0; i < values.length; i++) { + result[i] = values[i] * values[i]; + } + return result; } - public static Double add(Double value1, Double value2) { return value1 + value2; } From b5b7dd9f601a76f3ac56c2a64820dd0f8414a76b Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 17:07:09 -0400 Subject: [PATCH 06/11] string utils complete --- .../quiz4/fundamentals/StringUtils.java | 40 +++++++++++++++---- .../CapitalizeMiddleCharacterTest.java | 2 +- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java index 30c971a..d9b683e 100644 --- a/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java +++ b/src/main/java/rocks/zipcode/quiz4/fundamentals/StringUtils.java @@ -6,28 +6,54 @@ */ public class StringUtils { public static Character getMiddleCharacter(String string) { - return string.charAt(string.length()/2); + return string.charAt(string.length() / 2); } - public static Character capitalizeMiddleCharacter(String str) { - return null; + public static String capitalizeMiddleCharacter(String str) { + return str.substring(0, str.length() / 2) + + getMiddleCharacter(str.toUpperCase()) + str.substring(str.length() / 2 + 1); } public static String lowerCaseMiddleCharacter(String str) { - return null; + return str.substring(0, (str.length() / 2))+ + getMiddleCharacter(str.toLowerCase()) + str.substring(str.length() / 2+1); } public static Boolean isIsogram(String str) { - return null; + + for( int i =1; i Date: Fri, 20 Mar 2020 17:17:51 -0400 Subject: [PATCH 07/11] tests passed for account --- .../quiz4/objectorientation/account/Account.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java index 40eb4a8..28093e4 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Account.java @@ -3,11 +3,18 @@ /** * @author leon on 30/12/2018. */ -public class Account extends BankAccount { - public Long getId() { - return null; +public class Account { + private Long id; + public Account(){} + + public Account (Long id) { + this.id=id; } - public void setId(Long id) { + public Long getId() { + return this.id; + } + public void setId(Long id){ + this.id= id; } } From ed4f6cb62f4fffb38d62b366e160219a685a546e Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 20:40:43 -0400 Subject: [PATCH 08/11] tests passed for culonary --- .../java/rocks/zipcode/quiz4/collections/culonary/Curry.java | 4 ++-- .../java/rocks/zipcode/quiz4/collections/culonary/Food.java | 5 ++++- .../rocks/zipcode/quiz4/collections/culonary/Ginger.java | 2 +- .../rocks/zipcode/quiz4/collections/culonary/Pepper.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java index 59d9d87..c4aeb81 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Curry.java @@ -3,11 +3,11 @@ public class Curry implements Spice { private String name; public Curry(){ - this.name = this.getClass().getSimpleName(); + this.name= this.getClass().getSimpleName(); } @Override public String getName() { - return null; + return name; } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java index e06abbc..da5e5ab 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java @@ -1,5 +1,6 @@ package rocks.zipcode.quiz4.collections.culonary; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -7,8 +8,9 @@ * @author leon on 27/12/2018. */ public class Food { + List spices=new ArrayList<>(); public List getAllSpices() { - return null; + return this.spices; } public > Map getSpiceCount() { @@ -16,5 +18,6 @@ public > Map getSpi } public void applySpice(Spice spice) { + spices.add(spice); } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java index c4d10c6..e1d6507 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Ginger.java @@ -11,6 +11,6 @@ public Ginger(){ @Override public String getName() { - return null; + return name; } } diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java index 4e61346..6edc329 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Pepper.java @@ -11,6 +11,6 @@ public Pepper(){ @Override public String getName() { - return null; + return name; } } From bd6a1e7fb5e2f89080dd6b780ec8e84a8ad5c5b6 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Fri, 20 Mar 2020 20:51:50 -0400 Subject: [PATCH 09/11] word counter done and Bank class complete --- .../zipcode/quiz4/collections/WordCounter.java | 14 +++++++++++++- .../quiz4/objectorientation/account/Bank.java | 11 +++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java index 2bf5ec2..869fa90 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/WordCounter.java @@ -1,12 +1,24 @@ package rocks.zipcode.quiz4.collections; +import java.util.HashMap; import java.util.Map; public class WordCounter { + String[] arr; public WordCounter(String... strings) { + arr= strings; } + public Map getWordCountMap() { - return null; + Map map =new HashMap<>(); + for(String x : arr){ + if(map.containsKey(x)){ + map.replace(x, map.get(x)+1); + }else{ + map.put(x,1); + } + } + return map; } } diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java index 0dd4183..cd80576 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Bank.java @@ -1,17 +1,24 @@ package rocks.zipcode.quiz4.objectorientation.account; +import java.util.ArrayList; +import java.util.List; + /** * @author leon on 27/12/2018. */ public class Bank { + private List accountList= new ArrayList<>(); public BankAccount removeBankAccountByIndex(Integer indexNumber) { - return null; + BankAccount removed = accountList.get(indexNumber); + accountList.remove(removed); + return removed; } public void addBankAccount(BankAccount bankAccount) { + accountList.add(bankAccount); } public Boolean containsBankAccount(BankAccount bankAccount) { - throw new UnsupportedOperationException("Method not yet implemented"); + return accountList.contains(bankAccount); } } From a89eae049a89b705cc53821cebe42ec6d6876588 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Sat, 21 Mar 2020 12:36:13 -0400 Subject: [PATCH 10/11] section three done --- .../quiz4/collections/culonary/Food.java | 5 +- .../account/BankAccount.java | 29 +++++++++- .../objectorientation/account/Employee.java | 54 ++++++++++++++++++- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java index da5e5ab..db1b9be 100644 --- a/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java +++ b/src/main/java/rocks/zipcode/quiz4/collections/culonary/Food.java @@ -1,6 +1,7 @@ package rocks.zipcode.quiz4.collections.culonary; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,7 +15,9 @@ public List getAllSpices() { } public > Map getSpiceCount() { - return null; + Map spiceCount = new HashMap<>(); + spiceCount.put((SpiceType)spices.get(0).getClass(), spices.size()); + return spiceCount; } public void applySpice(Spice spice) { diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java index 70ccb74..a5ae5af 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java @@ -3,7 +3,34 @@ /** * @author leon on 27/12/2018. */ -public class BankAccount { +public class BankAccount extends Account implements Transactable{ + public Double getBalance; + private Double balance; + public BankAccount(){ + this.balance=0.0; + } + + + + @Override + public void deposit(Double amountToIncreaseBy){ + if(amountToIncreaseBy<0) throw new IllegalArgumentException(); + balance += amountToIncreaseBy; + } + @Override + public void withdrawal(Double amountToDecreaseBy){ + if(amountToDecreaseBy<0) throw new IllegalArgumentException(); + balance -= amountToDecreaseBy; + } + + @Override + public Double getBalance() { + return balance; + } + + public void setBalance(Double val) { + this.balance= val; } + } diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java index 8407f1a..5177dc9 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java @@ -3,18 +3,68 @@ /** * @author leon on 30/12/2018. */ -public class Employee { +public class Employee implements Worker, Transactable{ + + private BankAccount personalAccount; + private Double numberOfHours; + private Double hourlyWage; + private Double moneyEarned; + + public Employee() { + this(new BankAccount()); } public Employee(BankAccount bankAccount) { + this.personalAccount = bankAccount; + this.hourlyWage = 35.0; + this.numberOfHours =0.0; + this.moneyEarned= 0.0; + } public BankAccount getBankAccount() { - return null; + + return personalAccount; } public void setBankAccount(BankAccount bankAccount) { + this.personalAccount= bankAccount; + + } + + @Override + public void deposit(Double amountToIncreaseBy) { + personalAccount.deposit(amountToIncreaseBy); + } + + @Override + public void withdrawal(Double amountToDecreaseBy) { + personalAccount.withdrawal(amountToDecreaseBy); + } + + @Override + public Double getBalance() { + return personalAccount.getBalance; + } + + @Override + public void increaseHoursWorked(Double numberOfHours) { + this.numberOfHours += numberOfHours; + } + + @Override + public Double getHoursWorked() { + return numberOfHours; + } + + @Override + public Double getHourlyWage() { + return hourlyWage; + } + @Override + public Double getMoneyEarned() { + return moneyEarned; } } From f18ae73d42146760e6ebd8a58522308502546b38 Mon Sep 17 00:00:00 2001 From: aartikansal Date: Sat, 21 Mar 2020 16:16:29 -0400 Subject: [PATCH 11/11] all tests passes --- .../account/BankAccount.java | 49 ++++++++++--------- .../objectorientation/account/Employee.java | 14 ++++-- .../bankaccount/WithdrawalPositiveTest.java | 2 +- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java index a5ae5af..67bea91 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/BankAccount.java @@ -3,34 +3,39 @@ /** * @author leon on 27/12/2018. */ -public class BankAccount extends Account implements Transactable{ - public Double getBalance; - private Double balance; - public BankAccount(){ - this.balance=0.0; +public class BankAccount extends Account implements Transactable { + private Double balance; + + public BankAccount() { + this.balance= 0.0; } @Override - public void deposit(Double amountToIncreaseBy){ - if(amountToIncreaseBy<0) throw new IllegalArgumentException(); - balance += amountToIncreaseBy; - } - @Override - public void withdrawal(Double amountToDecreaseBy){ - if(amountToDecreaseBy<0) throw new IllegalArgumentException(); - balance -= amountToDecreaseBy; - } + public void deposit(Double amountToIncreaseBy) { + if (amountToIncreaseBy < 0) + throw new IllegalArgumentException(); + balance += amountToIncreaseBy; + } - @Override - public Double getBalance() { - return balance; - } + @Override + public void withdrawal (Double amountToDecreaseBy){ + if (amountToDecreaseBy < 0 || balance - amountToDecreaseBy<0) throw new IllegalArgumentException(); + balance -= amountToDecreaseBy; + } - public void setBalance(Double val) { - this.balance= val; - } -} + @Override + public Double getBalance () { + return balance; + } + public void setBalance (Double val){ + this.balance = val; + + } + + + } + diff --git a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java index 5177dc9..30aa007 100644 --- a/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java +++ b/src/main/java/rocks/zipcode/quiz4/objectorientation/account/Employee.java @@ -3,18 +3,20 @@ /** * @author leon on 30/12/2018. */ -public class Employee implements Worker, Transactable{ +public class Employee extends BankAccount implements Worker, Transactable{ private BankAccount personalAccount; private Double numberOfHours; private Double hourlyWage; private Double moneyEarned; - public Employee() { this(new BankAccount()); + + } + public Employee(BankAccount bankAccount) { this.personalAccount = bankAccount; this.hourlyWage = 35.0; @@ -23,6 +25,8 @@ public Employee(BankAccount bankAccount) { } + + public BankAccount getBankAccount() { return personalAccount; @@ -45,7 +49,7 @@ public void withdrawal(Double amountToDecreaseBy) { @Override public Double getBalance() { - return personalAccount.getBalance; + return personalAccount.getBalance(); } @Override @@ -55,7 +59,7 @@ public void increaseHoursWorked(Double numberOfHours) { @Override public Double getHoursWorked() { - return numberOfHours; + return numberOfHours; } @Override @@ -68,3 +72,5 @@ public Double getMoneyEarned() { return moneyEarned; } } + + diff --git a/src/test/java/rocks/zipcode/quiz4/objectorientation/bankaccount/WithdrawalPositiveTest.java b/src/test/java/rocks/zipcode/quiz4/objectorientation/bankaccount/WithdrawalPositiveTest.java index b72a6b2..83854f3 100644 --- a/src/test/java/rocks/zipcode/quiz4/objectorientation/bankaccount/WithdrawalPositiveTest.java +++ b/src/test/java/rocks/zipcode/quiz4/objectorientation/bankaccount/WithdrawalPositiveTest.java @@ -50,4 +50,4 @@ public void test(Double initialBalance, Double withdrawalAmount) { // then Assert.assertEquals(expected, actual); } -} +} \ No newline at end of file