Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open closed principle #1

Merged
merged 3 commits into from
Mar 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/main/java/com/example/Basket.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
import java.util.List;

public final class Basket {

private final List<Item> items = new LinkedList<>();
private final Tax tax;

Basket(final Tax tax) {
this.tax = tax;
}

public void add(final Item item) {
items.add(item);
Expand All @@ -20,8 +26,6 @@ public BigDecimal subTotal() {
}

public BigDecimal total() {
return subTotal()
.multiply(BigDecimal.valueOf(1.15))
.setScale(2, BigDecimal.ROUND_DOWN);
return tax.applyTo(subTotal());
}
}
7 changes: 7 additions & 0 deletions src/main/java/com/example/Tax.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.example;

import java.math.BigDecimal;

public interface Tax {
BigDecimal applyTo(final BigDecimal subTotal);
}
13 changes: 13 additions & 0 deletions src/main/java/com/example/Tax15PCRoundedDown.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example;

import java.math.BigDecimal;

public final class Tax15PCRoundedDown implements Tax {
@Override
public BigDecimal applyTo(final BigDecimal subTotal) {
return subTotal
.multiply(BigDecimal.valueOf(1.15))
.setScale(2, BigDecimal.ROUND_DOWN);

}
}
21 changes: 9 additions & 12 deletions src/test/java/com.example/BasketTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@

import org.junit.Test;

import java.math.BigDecimal;

import static com.example.BigDecimalHelpers.bd;
import static org.junit.Assert.assertEquals;

public final class BasketTests {

private Basket givenBasket() {
return new Basket(new Tax15PCRoundedDown());
}

@Test
public void canAddToBasketAndGetSubtotal() {
final Basket basket = new Basket();
final Basket basket = givenBasket();
basket.add(new Item(bd(1.23)));
assertEquals(bd(1.23), basket.subTotal());
}

@Test
public void canAddTwoItemsToBasketAndGetSubtotal() {
final Basket basket = new Basket();
final Basket basket = givenBasket();
final double val = 1.23;
basket.add(new Item(bd(val)));
basket.add(new Item(bd(2.34)));
Expand All @@ -26,21 +29,15 @@ public void canAddTwoItemsToBasketAndGetSubtotal() {

@Test
public void canGetTotalWith15PercentTax() {
final Basket basket = new Basket();
final Basket basket = givenBasket();
basket.add(new Item(bd(10)));
assertEquals(bd(11.5), basket.total());
}

@Test
public void canGetTotalWith15PercentTaxRoundedDown() {
final Basket basket = new Basket();
final Basket basket = givenBasket();
basket.add(new Item(bd(1.10)));
assertEquals(bd(1.26), basket.total());
}

private BigDecimal bd(final double val) {
return BigDecimal
.valueOf(val)
.setScale(2, BigDecimal.ROUND_UNNECESSARY);
}
}
12 changes: 12 additions & 0 deletions src/test/java/com.example/BigDecimalHelpers.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example;

import java.math.BigDecimal;

public final class BigDecimalHelpers {

public static BigDecimal bd(final double val) {
return BigDecimal
.valueOf(val)
.setScale(2, BigDecimal.ROUND_UNNECESSARY);
}
}