From 13f6234dd1657185cae733af6851e69d49e44476 Mon Sep 17 00:00:00 2001 From: Fatima Zehra Ulu <3026753@stud.hs-mannheim.de> Date: Mon, 15 Dec 2025 09:32:21 +0100 Subject: [PATCH] Commit 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implementeirung test für Warenkorb kleinere veränderungen --- Cart.java | 11 +++++++++-- CartTest.java | 29 +++++++++++++++++++++++++++++ Shop.java | 7 ++----- 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 CartTest.java diff --git a/Cart.java b/Cart.java index 033d1b8..0ba3403 100644 --- a/Cart.java +++ b/Cart.java @@ -135,7 +135,6 @@ public class Cart { double amount = GrossAmountProd () + deliveryCost () + taxDelivery(); - return amount; } @@ -146,7 +145,15 @@ public class Cart { } } - public void printCart() { + public String [] printCart() { + StringBuilder sb = new StringBuilder("--- Detaillierter Warenkorb ---\n"); + for (Products prod : cartContents){ + sb.append(prod.toString()); + sb.append(prod.toString()).append("\n"); // Nutzt die toString() von Products + } + sb.append("========================\n"); + sb.append(String.format("Gesamtwert (Brutto): %.2f€%n", wholeAmount())); + return new String[]{sb.toString()}; } } \ No newline at end of file diff --git a/CartTest.java b/CartTest.java new file mode 100644 index 0000000..0e13cff --- /dev/null +++ b/CartTest.java @@ -0,0 +1,29 @@ +package Shop; + +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.Test; + +class CartTest { + + @Test + void testEquals() { + Products p1 = new Products("Wein", 0.7, 1.2, 4.20, 19, 87); + Products p2 = new Products("Wein", 0.7, 1.2, 4.20, 19, 87); + + assertTrue(p1.equals(p2)); + } + + @Test + void testConstructor() { + Products p1 = new Products("Wein", 0.7, 1.2, 4.20, 19, 87); + Products p2 = new Products("Kokosmilch", 250, 0.275, 1.67, 7, 12); + + assertEquals("Wein", p1.getName()); + assertEquals("Kokosmilch", p2.getName()); + + assertEquals(4.20, p1.getNetWorth()); + assertEquals(1.67, p2.getNetWorth()); + } + +} \ No newline at end of file diff --git a/Shop.java b/Shop.java index a0592d5..7d8991f 100644 --- a/Shop.java +++ b/Shop.java @@ -40,17 +40,14 @@ public class Shop { } else if (eingabe.equals("produktsuche") || eingabe.equals("suche")) { Search(); } else if (eingabe.equals("warenkorb")) { - System.out.println(" ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄"); - System.out.println(" Auf Wiedersehen! "); - System.out.println("____________________________"); - + new Cart(); } else if (eingabe.equals("beenden")) { System.out.println(" ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄ ̄"); System.out.println(" Auf Wiedersehen! "); System.out.println("____________________________"); } else { - System.out.println("\n\n Ungültige Eingabe (˃̣̣̥ᯅ˂̣̣̥) Versuchen Sie es bitte erneut:"); + System.out.println("\n\n Ungültige Eingabe, Versuchen Sie es bitte erneut:"); mainMenu(); } }