From 3c46accd08922474f91d40499ff5ecefcd7539fb Mon Sep 17 00:00:00 2001 From: mokha Date: Sun, 5 May 2019 19:16:42 -0600 Subject: add additional tax for married couples with income over $350,000.00 --- .../src/main/java/ca/mokhan/assignment1/TaxReturn.java | 2 ++ .../src/test/java/ca/mokhan/assignment1/TaxReturnTest.java | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/TaxReturn.java b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/TaxReturn.java index fe0f664..91a226a 100644 --- a/assignments/assignment1/src/main/java/ca/mokhan/assignment1/TaxReturn.java +++ b/assignments/assignment1/src/main/java/ca/mokhan/assignment1/TaxReturn.java @@ -47,6 +47,8 @@ public class TaxReturn { RATE1 * MARRIED_BRACKET1 + RATE2 * (MARRIED_BRACKET2 - MARRIED_BRACKET1) + RATE3 * (income - MARRIED_BRACKET2); + + if (income > 349999.0) tax += (income - 200000) * 0.35; } return tax; } diff --git a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/TaxReturnTest.java b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/TaxReturnTest.java index 421fc44..474f899 100644 --- a/assignments/assignment1/src/test/java/ca/mokhan/assignment1/TaxReturnTest.java +++ b/assignments/assignment1/src/test/java/ca/mokhan/assignment1/TaxReturnTest.java @@ -70,4 +70,16 @@ public class TaxReturnTest extends TestCase { TaxReturn subject = new TaxReturn(TaxReturn.MARRIED_BRACKET2 + 0.01, TaxReturn.MARRIED); assertEquals(19566.003099999998, subject.getTax()); } + + // if the income is greater than $349,999 for MARRIED, then add a tax of 35% on income amount + // above $200,000. + public void test_MARRIED_Income_Greater_Than_350K() { + // $0 - $35,800: 0.15% = $5,370.0 + // $35,800 - $86,500: 0.28% = $14196.000000000002 + // $86,500 - $350,000: 0.31% = $81685.0 + // $200,000 - $350,000: 0.35% = $52500.0 + // total: $153,751.0 + TaxReturn subject = new TaxReturn(350000, TaxReturn.MARRIED); + assertEquals(153751.0, subject.getTax()); + } } -- cgit v1.2.3