From f80c5bd9235e9c0dc2ba5ac2f39ef789a734e0fb Mon Sep 17 00:00:00 2001 From: MajowyLas Date: Sun, 11 Jan 2026 15:42:03 +0100 Subject: [PATCH 1/3] pierwsze testy invoicowe --- pom.xml | 5 ++- .../java/pl/edu/agh/mwo/invoice/Invoice.java | 41 +++++++++++++++---- .../edu/agh/mwo/invoice/product/Product.java | 26 +++++++++--- .../pl/edu/agh/mwo/invoice/InvoiceTest.java | 23 +++++------ 4 files changed, 67 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 2d40c3e8a..8d7fb0cef 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,9 @@ org.apache.maven.plugins maven-compiler-plugin - 17 - 17 + 25 + 25 + --enable-preview 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..ef78e25d7 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 java.util.HashMap; +import java.util.Map; import pl.edu.agh.mwo.invoice.product.Product; public class Invoice { private Collection products; + public Invoice() { + this.products = new ArrayList<>(); + } + + public void addProduct(Product product) { - // TODO: implement + this.products.add(product); } + public void addProduct(Product product, Integer quantity) { - // TODO: implement - } + this.productsMap.put(product,quantity); + } + + + private Map productsMap = new HashMap<>(); + + public BigDecimal getNetValue() { + BigDecimal netValue = BigDecimal.ZERO; + + for (Product product : this.productsMap.keySet()) { + Integer quantity = this.productsMap.get(product); + BigDecimal price = product.getPrice(); + price = price.multiply(BigDecimal.valueOf(quantity)); + netValue = netValue.add(price); + + } + return netValue; + } - public BigDecimal getSubtotal() { - return null; - } public BigDecimal getTax() { - return null; + + return BigDecimal.ZERO; } - public BigDecimal getTotal() { - return null; + public BigDecimal getGrossValue() { + return BigDecimal.ZERO; } } 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..ba3811236 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,25 +9,41 @@ public abstract class Product { private final BigDecimal taxPercent; + protected Product(String name, BigDecimal price, BigDecimal tax) { + + if(name == null || name.isBlank()) { + throw new IllegalArgumentException("Product name cannot be null"); + } this.name = name; + + if(price == null) { + throw new IllegalArgumentException("Price cannot be null"); + } this.price = price; + + if(tax == null|| price.compareTo(BigDecimal.ZERO) < 0) { + throw new IllegalArgumentException("Tax percent cannot be null"); + } this.taxPercent = tax; } + public String getName() { - return null; + return this.name; } public BigDecimal getPrice() { - return null; + return this.price; } public BigDecimal getTaxPercent() { - return null; + return this.taxPercent; } public BigDecimal getPriceWithTax() { - return null; + BigDecimal result = this.price.multiply(this.taxPercent); + return (BigDecimal)price.add(result); + } -} +} \ No newline at end of file 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 7f4b6f795..140dc461b 100644 --- a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java +++ b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java @@ -7,7 +7,6 @@ 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; @@ -23,7 +22,7 @@ public void createEmptyInvoiceForTheTest() { @Test public void testEmptyInvoiceHasEmptySubtotal() { - Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getSubtotal())); + Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getNetValue())); } @Test @@ -33,30 +32,30 @@ public void testEmptyInvoiceHasEmptyTaxAmount() { @Test public void testEmptyInvoiceHasEmptyTotal() { - Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getTotal())); + Assert.assertThat(BigDecimal.ZERO, Matchers.comparesEqualTo(invoice.getGrossValue())); } @Test - public void testInvoiceSubtotalWithTwoDifferentProducts() { + public void testInvoiceNetValueWithTwoDifferentProducts() { 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())); + Assert.assertThat(new BigDecimal("20"), Matchers.comparesEqualTo(invoice.getNetValue())); } @Test - public void testInvoiceSubtotalWithManySameProducts() { + public void testInvoiceSNetValueWithManySameProducts() { Product onions = new TaxFreeProduct("Warzywa", BigDecimal.valueOf(10)); invoice.addProduct(onions, 100); - Assert.assertThat(new BigDecimal("1000"), Matchers.comparesEqualTo(invoice.getSubtotal())); + Assert.assertThat(new BigDecimal("1000"), Matchers.comparesEqualTo(invoice.getNetValue())); } @Test public void testInvoiceHasTheSameSubtotalAndTotalIfTaxIsZero() { Product taxFreeProduct = new TaxFreeProduct("Warzywa", new BigDecimal("199.99")); invoice.addProduct(taxFreeProduct); - Assert.assertThat(invoice.getTotal(), Matchers.comparesEqualTo(invoice.getSubtotal())); + Assert.assertThat(invoice.getGrossValue(), Matchers.comparesEqualTo(invoice.getNetValue())); } @Test @@ -64,7 +63,7 @@ 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())); + Assert.assertThat(new BigDecimal("310"), Matchers.comparesEqualTo(invoice.getNetValue())); } @Test @@ -86,7 +85,7 @@ public void testInvoiceHasProperTotalValueForManyProduct() { 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())); + Assert.assertThat(new BigDecimal("320.30"), Matchers.comparesEqualTo(invoice.getGrossValue())); } @Test @@ -97,7 +96,7 @@ public void testInvoiceHasPropoerSubtotalWithQuantityMoreThanOne() { 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())); + Assert.assertThat(new BigDecimal("50"), Matchers.comparesEqualTo(invoice.getNetValue())); } @Test @@ -108,7 +107,7 @@ public void testInvoiceHasPropoerTotalWithQuantityMoreThanOne() { 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())); + Assert.assertThat(new BigDecimal("54.70"), Matchers.comparesEqualTo(invoice.getGrossValue())); } @Test(expected = IllegalArgumentException.class) From 55ab6faeefd9ca4a5ff38a1e6b0ac931c661a1a9 Mon Sep 17 00:00:00 2001 From: MajowyLas Date: Sun, 11 Jan 2026 15:55:55 +0100 Subject: [PATCH 2/3] 3 failed tests left --- .../java/pl/edu/agh/mwo/invoice/Invoice.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 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 ef78e25d7..b059e482e 100644 --- a/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java +++ b/src/main/java/pl/edu/agh/mwo/invoice/Invoice.java @@ -17,7 +17,7 @@ public Invoice() { public void addProduct(Product product) { - this.products.add(product); + this.addProduct(product,1); } @@ -43,11 +43,21 @@ public BigDecimal getNetValue() { public BigDecimal getTax() { - - return BigDecimal.ZERO; + return getGrossValue().subtract(getNetValue()); } + public BigDecimal getGrossValue() { - return BigDecimal.ZERO; + BigDecimal netValue = BigDecimal.ZERO; + + for (Product product : this.productsMap.keySet()) { + Integer quantity = this.productsMap.get(product); + BigDecimal price = product.getPriceWithTax(); + price = price.multiply(BigDecimal.valueOf(quantity)); + netValue = netValue.add(price); + + } + return netValue; + } } -} + From b246722084d3c1f96c0e6c24c023cd8a7225fd2e Mon Sep 17 00:00:00 2001 From: Anna Maywald Date: Fri, 16 Jan 2026 17:53:21 +0100 Subject: [PATCH 3/3] testInvoiceWithZeroQuantity testInvoiceWithNegativeQuantity testAddingNullProduct --- src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java | 1 + 1 file changed, 1 insertion(+) 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 140dc461b..129190513 100644 --- a/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java +++ b/src/test/java/pl/edu/agh/mwo/invoice/InvoiceTest.java @@ -124,4 +124,5 @@ public void testInvoiceWithNegativeQuantity() { public void testAddingNullProduct() { invoice.addProduct(null); } + }