From a8dbdba9caafd75e626df3fe2f15d5a2d1417810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Fr=C4=85cz?= Date: Wed, 8 Jan 2020 15:31:13 +0100 Subject: [PATCH 1/8] Specs! --- .../pl/edu/agh/mwo/invoice/InvoiceTest.java | 107 ++++++++++++++++++ .../agh/mwo/invoice/product/ProductTest.java | 57 ++++++++++ 2 files changed, 164 insertions(+) create mode 100644 src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java create mode 100644 src/test/java/pl/edu/agh/mwo/invoice/product/ProductTest.java diff --git a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java new file mode 100644 index 000000000..8dce08e28 --- /dev/null +++ b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java @@ -0,0 +1,107 @@ +package pl.edu.agh.mwo.invoice; + +import java.math.BigDecimal; + +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import pl.edu.agh.mwo.invoice.Invoice; +import pl.edu.agh.mwo.invoice.product.DairyProduct; +import pl.edu.agh.mwo.invoice.product.OtherProduct; +import pl.edu.agh.mwo.invoice.product.Product; +import pl.edu.agh.mwo.invoice.product.TaxFreeProduct; + +public class InvoiceTest { + private Invoice invoice; + + @Before + public void createEmptyInvoiceForTheTest() { + invoice = new Invoice(); + } + + @Test + public void testEmptyInvoiceHasEmptySubtotal() { + Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getSubtotal())); + } + + @Test + public void testEmptyInvoiceHasEmptyTaxAmount() { + Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getTax())); + } + + @Test + public void testEmptyInvoiceHasEmptyTotal() { + Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getTotal())); + } + + @Test + public void testInvoiceHasTheSameSubtotalAndTotalIfTaxIsZero() { + Product taxFreeProduct = new TaxFreeProduct("Warzywa", new BigDecimal("199.99")); + invoice.addProduct(taxFreeProduct); + Assert.assertThat(invoice.getTotal(), Matchers.comparesEqualTo(invoice.getSubtotal())); + } + + @Test + public void testInvoiceHasProperSubtotalForManyProducts() { + invoice.addProduct(new TaxFreeProduct("Owoce", new BigDecimal("200"))); + invoice.addProduct(new DairyProduct("Maslanka", new BigDecimal("100"))); + invoice.addProduct(new OtherProduct("Wino", new BigDecimal("10"))); + Assert.assertThat(new BigDecimal("310"), Matchers.comparesEqualTo(invoice.getSubtotal())); + } + + @Test + public void testInvoiceHasProperTaxValueForManyProduct() { + // tax: 0 + invoice.addProduct(new TaxFreeProduct("Pampersy", new BigDecimal("200"))); + // tax: 8 + invoice.addProduct(new DairyProduct("Kefir", new BigDecimal("100"))); + // tax: 2.30 + invoice.addProduct(new OtherProduct("Piwko", new BigDecimal("10"))); + Assert.assertThat(new BigDecimal("10.30"), Matchers.comparesEqualTo(invoice.getTax())); + } + + @Test + public void testInvoiceHasProperTotalValueForManyProduct() { + // price with tax: 200 + invoice.addProduct(new TaxFreeProduct("Maskotki", new BigDecimal("200"))); + // price with tax: 108 + invoice.addProduct(new DairyProduct("Maslo", new BigDecimal("100"))); + // price with tax: 12.30 + invoice.addProduct(new OtherProduct("Chipsy", new BigDecimal("10"))); + Assert.assertThat(new BigDecimal("320.30"), Matchers.comparesEqualTo(invoice.getTotal())); + } + + @Test + public void testInvoiceHasPropoerSubtotalWithQuantityMoreThanOne() { + // 2x kubek - price: 10 + invoice.addProduct(new TaxFreeProduct("Kubek", new BigDecimal("5")), 2); + // 3x kozi serek - price: 30 + invoice.addProduct(new DairyProduct("Kozi Serek", new BigDecimal("10")), 3); + // 1000x pinezka - price: 10 + invoice.addProduct(new OtherProduct("Pinezka", new BigDecimal("0.01")), 1000); + Assert.assertThat(new BigDecimal("50"), Matchers.comparesEqualTo(invoice.getSubtotal())); + } + + @Test + public void testInvoiceHasPropoerTotalWithQuantityMoreThanOne() { + // 2x chleb - price with tax: 10 + invoice.addProduct(new TaxFreeProduct("Chleb", new BigDecimal("5")), 2); + // 3x chedar - price with tax: 32.40 + invoice.addProduct(new DairyProduct("Chedar", new BigDecimal("10")), 3); + // 1000x pinezka - price with tax: 12.30 + invoice.addProduct(new OtherProduct("Pinezka", new BigDecimal("0.01")), 1000); + Assert.assertThat(new BigDecimal("54.70"), Matchers.comparesEqualTo(invoice.getTotal())); + } + + @Test(expected = IllegalArgumentException.class) + public void testInvoiceWithZeroQuantity() { + invoice.addProduct(new TaxFreeProduct("Tablet", new BigDecimal("1678")), 0); + } + + @Test(expected = IllegalArgumentException.class) + public void testInvoiceWithNegativeQuantity() { + invoice.addProduct(new DairyProduct("Zsiadle mleko", new BigDecimal("5.55")), -1); + } +} diff --git a/src/test/java/pl/edu/agh/mwo/invoice/product/ProductTest.java b/src/test/java/pl/edu/agh/mwo/invoice/product/ProductTest.java new file mode 100644 index 000000000..9b3c5bd6e --- /dev/null +++ b/src/test/java/pl/edu/agh/mwo/invoice/product/ProductTest.java @@ -0,0 +1,57 @@ +package pl.edu.agh.mwo.invoice.product; + +import java.math.BigDecimal; + +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + +import pl.edu.agh.mwo.invoice.product.Product; + +public class ProductTest { + @Test + public void testProductNameIsCorrect() { + Product product = new OtherProduct("buty", new BigDecimal("100.0")); + Assert.assertEquals("buty", product.getName()); + } + + @Test + public void testProductPriceAndTaxWithDefaultTax() { + Product product = new OtherProduct("Ogorki", new BigDecimal("100.0")); + Assert.assertThat(new BigDecimal("100"), Matchers.comparesEqualTo(product.getPrice())); + Assert.assertThat(new BigDecimal("0.23"), Matchers.comparesEqualTo(product.getTaxPercent())); + } + + @Test + public void testProductPriceAndTaxWithDairyProduct() { + Product product = new DairyProduct("Szarlotka", new BigDecimal("100.0")); + Assert.assertThat(new BigDecimal("100"), Matchers.comparesEqualTo(product.getPrice())); + Assert.assertThat(new BigDecimal("0.08"), Matchers.comparesEqualTo(product.getTaxPercent())); + } + + @Test + public void testPriceWithTax() { + Product product = new DairyProduct("Oscypek", new BigDecimal("100.0")); + Assert.assertThat(new BigDecimal("108"), Matchers.comparesEqualTo(product.getPriceWithTax())); + } + + @Test(expected = IllegalArgumentException.class) + public void testProductWithNullName() { + new OtherProduct(null, new BigDecimal("100.0")); + } + + @Test(expected = IllegalArgumentException.class) + public void testProductWithEmptyName() { + new TaxFreeProduct("", new BigDecimal("100.0")); + } + + @Test(expected = IllegalArgumentException.class) + public void testProductWithNullPrice() { + new DairyProduct("Banany", null); + } + + @Test(expected = IllegalArgumentException.class) + public void testProductWithNegativePrice() { + new TaxFreeProduct("Mandarynki", new BigDecimal("-1.00")); + } +} From 005f93bf3c60f18d725e58063bea02709c4a6b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Fr=C4=85cz?= Date: Sat, 5 Feb 2022 12:23:34 +0100 Subject: [PATCH 2/8] New invoice tests --- .../java/pl/edu/agh/mwo/invoice/InvoiceTest.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java index 8dce08e28..93666ea8c 100644 --- a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java +++ b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java @@ -36,6 +36,22 @@ public void testEmptyInvoiceHasEmptyTotal() { Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getTotal())); } + @Test + public void testInvoiceSubtotalWithTwoDifferentProducts() { + Product onions = new TaxFreeProduct("Warzywa", new BigDecimal("10")); + Product apples = new TaxFreeProduct("Owoce", new BigDecimal("10")); + invoice.addProduct(onions); + invoice.addProduct(apples); + Assert.assertThat(new BigDecimal("20"), Matchers.comparesEqualTo(invoice.getSubtotal())); + } + + @Test + public void testInvoiceSubtotalWithManySameProducts() { + Product onions = new TaxFreeProduct("Warzywa", new BigDecimal("10")); + invoice.addProduct(onions, 100); + Assert.assertThat(new BigDecimal("1000"), Matchers.comparesEqualTo(invoice.getSubtotal())); + } + @Test public void testInvoiceHasTheSameSubtotalAndTotalIfTaxIsZero() { Product taxFreeProduct = new TaxFreeProduct("Warzywa", new BigDecimal("199.99")); From d0b574259095f3391a1875e5a8e6414cfe4d0a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wojciech=20Fr=C4=85cz?= Date: Sat, 26 Feb 2022 16:22:29 +0100 Subject: [PATCH 3/8] Add test for null product check --- src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java index 93666ea8c..7f4b6f795 100644 --- a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java +++ b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java @@ -47,7 +47,7 @@ public void testInvoiceSubtotalWithTwoDifferentProducts() { @Test public void testInvoiceSubtotalWithManySameProducts() { - Product onions = new TaxFreeProduct("Warzywa", new BigDecimal("10")); + Product onions = new TaxFreeProduct("Warzywa", BigDecimal.valueOf(10)); invoice.addProduct(onions, 100); Assert.assertThat(new BigDecimal("1000"), Matchers.comparesEqualTo(invoice.getSubtotal())); } @@ -120,4 +120,9 @@ public void testInvoiceWithZeroQuantity() { public void testInvoiceWithNegativeQuantity() { invoice.addProduct(new DairyProduct("Zsiadle mleko", new BigDecimal("5.55")), -1); } + + @Test(expected = IllegalArgumentException.class) + public void testAddingNullProduct() { + invoice.addProduct(null); + } } From 3f5ba87ff847795f393bd7e4d7ce534ddf31db1a Mon Sep 17 00:00:00 2001 From: gomolka Date: Sun, 11 Jan 2026 13:24:37 +0100 Subject: [PATCH 4/8] First fix for test product --- src/main/java/pl/edu/agh/mwo/invoice/product/Product.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java index 318de9ac9..ea0003732 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java @@ -16,18 +16,18 @@ protected Product(String name, BigDecimal price, BigDecimal tax) { } public String getName() { - return null; + return this.name; } public BigDecimal getPrice() { - return null; + return price; } public BigDecimal getTaxPercent() { - return null; + return taxPercent; } public BigDecimal getPriceWithTax() { - return null; + return price; //* taxPercent; } } From 9e01b9fc41eda636e40702d7f05712ff179554ca Mon Sep 17 00:00:00 2001 From: gomolka Date: Sun, 11 Jan 2026 13:30:45 +0100 Subject: [PATCH 5/8] Next fix --- src/main/java/pl/edu/agh/mwo/invoice/product/Product.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java index ea0003732..ffc09dec2 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java @@ -28,6 +28,6 @@ public BigDecimal getTaxPercent() { } public BigDecimal getPriceWithTax() { - return price; //* taxPercent; + return price.add(price.multiply(taxPercent)); //* taxPercent; } } From 566256168d45855a25c385f4c98527a712f1b91b Mon Sep 17 00:00:00 2001 From: gomolkap Date: Sun, 11 Jan 2026 13:53:26 +0100 Subject: [PATCH 6/8] Implement some more product text 3 --- .../java/pl/edu/agh/mwo/invoice/product/Product.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java index ffc09dec2..05a09e511 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/product/Product.java @@ -9,7 +9,15 @@ public abstract class Product { private final BigDecimal taxPercent; - protected Product(String name, BigDecimal price, BigDecimal tax) { + protected Product(String name, BigDecimal price, BigDecimal tax) throws IllegalArgumentException { + if (name == null || name.isEmpty()) { + throw new IllegalArgumentException("null product"); + } + + if (price == null || price.compareTo(BigDecimal.ZERO) < 0) { + throw new IllegalArgumentException("null Price"); + } + this.name = name; this.price = price; this.taxPercent = tax; @@ -28,6 +36,6 @@ public BigDecimal getTaxPercent() { } public BigDecimal getPriceWithTax() { - return price.add(price.multiply(taxPercent)); //* taxPercent; + return price.add(price.multiply(taxPercent)); } } From 6c058c58c0dd30b972e82349f94d124433cb06d2 Mon Sep 17 00:00:00 2001 From: gomolkap Date: Sun, 11 Jan 2026 14:15:07 +0100 Subject: [PATCH 7/8] Implement invoice tests 4 --- .../java/pl/edu/agh/mwo/invoice/Invoice.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java b/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java index 56fe02359..485da2409 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java @@ -1,30 +1,53 @@ package pl.edu.agh.mwo.invoice; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Collection; import pl.edu.agh.mwo.invoice.product.Product; public class Invoice { - private Collection products; + private Collection products = new ArrayList<>(); public void addProduct(Product product) { - // TODO: implement + if (product == null) { + throw new IllegalArgumentException("Product is null, incorect"); + } + this.products.add(product); } public void addProduct(Product product, Integer quantity) { - // TODO: implement + if (product == null || quantity == null || quantity <= 0) { + throw new IllegalArgumentException("Quantity equols 0, incorect"); + } + for (int i = 0; i < quantity; i++) { + this.addProduct(product); + } } public BigDecimal getSubtotal() { - return null; + BigDecimal sum = BigDecimal.ZERO; + for (Product product : products) { + sum = sum.add(product.getPrice()); + } + return sum; } public BigDecimal getTax() { - return null; + BigDecimal taxSum = BigDecimal.ZERO; + for (Product product : products) { + // Podatek = cena netto * procent podatku + BigDecimal productTax = product.getPrice().multiply(product.getTaxPercent()); + taxSum = taxSum.add(productTax); + } + return taxSum; } public BigDecimal getTotal() { - return null; + BigDecimal totalSum = BigDecimal.ZERO; + for (Product product : products) { + totalSum = totalSum.add(product.getPriceWithTax()); + } + return totalSum; } } From 291a2780f11092df8368dde7ccd85377522fd9ba Mon Sep 17 00:00:00 2001 From: gomolkap Date: Sun, 11 Jan 2026 14:17:56 +0100 Subject: [PATCH 8/8] Implement invoice tests 4 --- src/main/java/pl/edu/agh/mwo/invoice/Invoice.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java b/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java index 485da2409..7d7f53569 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java @@ -11,14 +11,14 @@ public class Invoice { public void addProduct(Product product) { if (product == null) { - throw new IllegalArgumentException("Product is null, incorect"); + throw new IllegalArgumentException("Product is null, incorect."); } this.products.add(product); } public void addProduct(Product product, Integer quantity) { if (product == null || quantity == null || quantity <= 0) { - throw new IllegalArgumentException("Quantity equols 0, incorect"); + throw new IllegalArgumentException("Quantity equols 0, incorect."); } for (int i = 0; i < quantity; i++) { this.addProduct(product);