From a61f7d7a1654ad4540b699126c236dd2b5a10124 Mon Sep 17 00:00:00 2001 From: smdonaldson2 Date: Fri, 19 Jan 2024 00:17:51 -0500 Subject: [PATCH 1/5] Step #1 Create Running Tests. --- .idea/misc.xml | 2 +- src/InsuranceCalculator.java | 1 + test/EMPTY | 0 test/InsuranceCalculatorTest.java | 29 +++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) delete mode 100644 test/EMPTY create mode 100644 test/InsuranceCalculatorTest.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 0792e77..e361bb9 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java index 558e0a0..6127e99 100644 --- a/src/InsuranceCalculator.java +++ b/src/InsuranceCalculator.java @@ -11,5 +11,6 @@ public double calculateInsurance(double income) { return (income-60000)*0.02+105600; } } + // edit } diff --git a/test/EMPTY b/test/EMPTY deleted file mode 100644 index e69de29..0000000 diff --git a/test/InsuranceCalculatorTest.java b/test/InsuranceCalculatorTest.java new file mode 100644 index 0000000..9b2dc00 --- /dev/null +++ b/test/InsuranceCalculatorTest.java @@ -0,0 +1,29 @@ +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class InsuranceCalculatorTest { + @Test + public void lowIncomeInsuranceIsCorrect() { + assertEquals(1825, insuranceFor(5000), 0.01); + } + + @Test + public void mediumIncomeInsuranceIsCorrect() { + assertEquals(38600, insuranceFor(25000), 0.01); + } + + @Test + public void highIncomeInsuranceIsCorrect() { + assertEquals(78500, insuranceFor(50000), 0.01); + } + + @Test + public void veryHighIncomeInsuranceIsCorrect() { + assertEquals(106400, insuranceFor(100_000), 0.01); + } + + private double insuranceFor(double income) { + return new InsuranceCalculator().calculateInsurance(income); + } +} \ No newline at end of file From 75d0e783e6827b001af9addba06806361b7d276d Mon Sep 17 00:00:00 2001 From: smdonaldson2 Date: Fri, 19 Jan 2024 00:27:07 -0500 Subject: [PATCH 2/5] Step #2 Extract Methods. --- src/InsuranceCalculator.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java index 6127e99..76d56ff 100644 --- a/src/InsuranceCalculator.java +++ b/src/InsuranceCalculator.java @@ -8,9 +8,22 @@ public double calculateInsurance(double income) { } else if (income <= 60000) { return (income-30000)*0.1+76500; } else { - return (income-60000)*0.02+105600; + return calculateInsuranceVeryHigh(income); } } - // edit + + public double calculateInsuranceVeryHigh(double income) { + return (income- getAdjustment())* getWeight() + getConstant(); + } + public int getConstant() { + return 105600; + } + + public double getWeight() { + return 0.02; + } + public int getAdjustment() { + return 60000; + } } From 4027e2ec3da20a27075b0e0db27e256a57f0c581 Mon Sep 17 00:00:00 2001 From: smdonaldson2 Date: Fri, 19 Jan 2024 00:51:27 -0500 Subject: [PATCH 3/5] Step #3 Extract Delegate Refactoring. --- src/InsuranceCalculator.java | 12 +++++++----- src/InsuranceStrategyVeryHigh.java | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 src/InsuranceStrategyVeryHigh.java diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java index 76d56ff..0de297f 100644 --- a/src/InsuranceCalculator.java +++ b/src/InsuranceCalculator.java @@ -1,5 +1,7 @@ public class InsuranceCalculator { + private final InsuranceStrategyVeryHigh insuranceStrategyVeryHigh = new InsuranceStrategyVeryHigh(); + public double calculateInsurance(double income) { if (income <= 10000) { return income*0.365; @@ -8,22 +10,22 @@ public double calculateInsurance(double income) { } else if (income <= 60000) { return (income-30000)*0.1+76500; } else { - return calculateInsuranceVeryHigh(income); + return insuranceStrategyVeryHigh.calculateInsuranceVeryHigh(income); } } public double calculateInsuranceVeryHigh(double income) { - return (income- getAdjustment())* getWeight() + getConstant(); + return insuranceStrategyVeryHigh.calculateInsuranceVeryHigh(income); } public int getConstant() { - return 105600; + return insuranceStrategyVeryHigh.getConstant(); } public double getWeight() { - return 0.02; + return insuranceStrategyVeryHigh.getWeight(); } public int getAdjustment() { - return 60000; + return insuranceStrategyVeryHigh.getAdjustment(); } } diff --git a/src/InsuranceStrategyVeryHigh.java b/src/InsuranceStrategyVeryHigh.java new file mode 100644 index 0000000..63a9516 --- /dev/null +++ b/src/InsuranceStrategyVeryHigh.java @@ -0,0 +1,20 @@ +public class InsuranceStrategyVeryHigh { + public InsuranceStrategyVeryHigh() { + } + + public double calculateInsuranceVeryHigh(double income) { + return (income - getAdjustment()) * getWeight() + getConstant(); + } + + public int getConstant() { + return 105600; + } + + public double getWeight() { + return 0.02; + } + + public int getAdjustment() { + return 60000; + } +} \ No newline at end of file From 4131b41303d9829068ccf7bfc8105064c21bfaa2 Mon Sep 17 00:00:00 2001 From: smdonaldson2 Date: Fri, 19 Jan 2024 01:14:19 -0500 Subject: [PATCH 4/5] Step #4 Fine Tuning. --- src/InsuranceCalculator.java | 19 +++---------------- src/InsuranceStrategy.java | 11 +++++++++++ src/InsuranceStrategyVeryHigh.java | 9 ++++----- 3 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 src/InsuranceStrategy.java diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java index 0de297f..e915654 100644 --- a/src/InsuranceCalculator.java +++ b/src/InsuranceCalculator.java @@ -1,6 +1,6 @@ public class InsuranceCalculator { - private final InsuranceStrategyVeryHigh insuranceStrategyVeryHigh = new InsuranceStrategyVeryHigh(); + private InsuranceStrategyVeryHigh strategy; public double calculateInsurance(double income) { if (income <= 10000) { @@ -10,22 +10,9 @@ public double calculateInsurance(double income) { } else if (income <= 60000) { return (income-30000)*0.1+76500; } else { - return insuranceStrategyVeryHigh.calculateInsuranceVeryHigh(income); + strategy = new InsuranceStrategyVeryHigh(); + return strategy.calculateInsuranceVeryHigh(income); } } - public double calculateInsuranceVeryHigh(double income) { - return insuranceStrategyVeryHigh.calculateInsuranceVeryHigh(income); - } - public int getConstant() { - return insuranceStrategyVeryHigh.getConstant(); - } - - public double getWeight() { - return insuranceStrategyVeryHigh.getWeight(); - } - public int getAdjustment() { - return insuranceStrategyVeryHigh.getAdjustment(); - } - } diff --git a/src/InsuranceStrategy.java b/src/InsuranceStrategy.java new file mode 100644 index 0000000..41d9d0c --- /dev/null +++ b/src/InsuranceStrategy.java @@ -0,0 +1,11 @@ +public abstract class InsuranceStrategy { + public double calculateInsuranceVeryHigh(double income) { + return (income - getAdjustment()) * getWeight() + getConstant(); + } + + public abstract int getConstant(); + + public abstract double getWeight(); + + public abstract int getAdjustment(); +} diff --git a/src/InsuranceStrategyVeryHigh.java b/src/InsuranceStrategyVeryHigh.java index 63a9516..81cf8a4 100644 --- a/src/InsuranceStrategyVeryHigh.java +++ b/src/InsuranceStrategyVeryHigh.java @@ -1,19 +1,18 @@ -public class InsuranceStrategyVeryHigh { +public class InsuranceStrategyVeryHigh extends InsuranceStrategy { public InsuranceStrategyVeryHigh() { } - public double calculateInsuranceVeryHigh(double income) { - return (income - getAdjustment()) * getWeight() + getConstant(); - } - + @Override public int getConstant() { return 105600; } + @Override public double getWeight() { return 0.02; } + @Override public int getAdjustment() { return 60000; } From 6418fce482b5ccb56e2d50327e5e9951b4d44261 Mon Sep 17 00:00:00 2001 From: smdonaldson2 Date: Fri, 19 Jan 2024 01:47:43 -0500 Subject: [PATCH 5/5] Step #5 Implementing Abstract Class. --- src/InsuranceCalculator.java | 13 ++++++++----- src/InsuranceStrategy.java | 2 +- src/InsuranceStrategyHigh.java | 16 ++++++++++++++++ src/InsuranceStrategyLow.java | 16 ++++++++++++++++ src/InsuranceStrategyMedium.java | 16 ++++++++++++++++ 5 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 src/InsuranceStrategyHigh.java create mode 100644 src/InsuranceStrategyLow.java create mode 100644 src/InsuranceStrategyMedium.java diff --git a/src/InsuranceCalculator.java b/src/InsuranceCalculator.java index e915654..82cb5d5 100644 --- a/src/InsuranceCalculator.java +++ b/src/InsuranceCalculator.java @@ -1,17 +1,20 @@ public class InsuranceCalculator { - private InsuranceStrategyVeryHigh strategy; + private InsuranceStrategy strategy; public double calculateInsurance(double income) { if (income <= 10000) { - return income*0.365; + strategy = new InsuranceStrategyLow(); + return strategy.calculate(income); } else if (income <= 30000) { - return (income-10000)*0.2+35600; + strategy = new InsuranceStrategyMedium(); + return strategy.calculate(income); } else if (income <= 60000) { - return (income-30000)*0.1+76500; + strategy = new InsuranceStrategyHigh(); + return strategy.calculate(income); } else { strategy = new InsuranceStrategyVeryHigh(); - return strategy.calculateInsuranceVeryHigh(income); + return strategy.calculate(income); } } diff --git a/src/InsuranceStrategy.java b/src/InsuranceStrategy.java index 41d9d0c..1ebf362 100644 --- a/src/InsuranceStrategy.java +++ b/src/InsuranceStrategy.java @@ -1,5 +1,5 @@ public abstract class InsuranceStrategy { - public double calculateInsuranceVeryHigh(double income) { + public double calculate(double income) { return (income - getAdjustment()) * getWeight() + getConstant(); } diff --git a/src/InsuranceStrategyHigh.java b/src/InsuranceStrategyHigh.java new file mode 100644 index 0000000..e316b15 --- /dev/null +++ b/src/InsuranceStrategyHigh.java @@ -0,0 +1,16 @@ +public class InsuranceStrategyHigh extends InsuranceStrategy { + @Override + public int getConstant() { + return 76500; + } + + @Override + public double getWeight() { + return 0.1; + } + + @Override + public int getAdjustment() { + return 30000; + } +} diff --git a/src/InsuranceStrategyLow.java b/src/InsuranceStrategyLow.java new file mode 100644 index 0000000..58278e8 --- /dev/null +++ b/src/InsuranceStrategyLow.java @@ -0,0 +1,16 @@ +public class InsuranceStrategyLow extends InsuranceStrategy { + @Override + public int getConstant() { + return 0; + } + + @Override + public double getWeight() { + return 0.365; + } + + @Override + public int getAdjustment() { + return 0; + } +} diff --git a/src/InsuranceStrategyMedium.java b/src/InsuranceStrategyMedium.java new file mode 100644 index 0000000..6994a01 --- /dev/null +++ b/src/InsuranceStrategyMedium.java @@ -0,0 +1,16 @@ +public class InsuranceStrategyMedium extends InsuranceStrategy { + @Override + public int getConstant() { + return 35600; + } + + @Override + public double getWeight() { + return 0.2; + } + + @Override + public int getAdjustment() { + return 10000; + } +}