diff --git a/Klausuren/Sd1/2023summer/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java b/Klausuren/Sd1/2023summer/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java index bf910f0585b4c94fcf55e431a3aa42012cb77166..2b802eb3e7eb3019a29a24da77e6d454e7588ebf 100644 --- a/Klausuren/Sd1/2023summer/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java +++ b/Klausuren/Sd1/2023summer/Exam/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java @@ -25,23 +25,20 @@ public class A_Payment { * <p>An order worth of 50.00€ being paid within two days will be reduced by 2% resulting in * 49.00€. The regular costs exceeding 50€ the customer still enjoys a free delivery.</p> * </li> - * * <li> * <p>An order worth of 40.00€ being paid within two days will be reduced by 2% resulting in * 39.20€. The regular costs of 40€ not exceeding the 50€ limit adding 6.50€ shipping results in * a due amount of 45.70€.</p> * </li> * </ul> - * * </li> * </ol> * + * <img src="doc-files/euros.svg" alt="Five euros" style="width: 20em; height: auto;"> + * * @param orderAmount The order's sum of all costs * @param paymentDelayInDays Period until payment occurs. * @return <p>The total due amount a customer is obliged to pay.</p> - * - * <img src="doc-files/euros.svg" alt="Five euros" style="width: 20em; height: auto;"> - * */ static public double getBillingAmount(final double orderAmount, final int paymentDelayInDays) { return 123.456; // TODO: Implement me correctly diff --git a/Klausuren/Sd1/2023summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java b/Klausuren/Sd1/2023summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java index 2b26ec179b0561e983707f389ae65a16381eee2a..d03b412a78423152f0095c65a54de2b12ab30d04 100644 --- a/Klausuren/Sd1/2023summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java +++ b/Klausuren/Sd1/2023summer/Exam/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java @@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults { static private void test(final double expectedCosts, final double amount, int paymentDelay) { final String message = "An order worth of " + amount + "€ and payment at day " + paymentDelay + - " results in total costs of " + expectedCosts + "€"; + " results in total costs of " + expectedCosts + "€"; Assert.assertEquals( message, diff --git a/Klausuren/Sd1/2023summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java b/Klausuren/Sd1/2023summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java index acb47be234f4d9c3ee7ecba9b08fe9302eb1e207..64e5ec2ee213db2bd8c99b4cdd826e7ea9fc8b7e 100644 --- a/Klausuren/Sd1/2023summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java +++ b/Klausuren/Sd1/2023summer/Solve/src/main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java @@ -25,23 +25,20 @@ public class A_Payment { * <p>An order worth of 50.00€ being paid within two days will be reduced by 2% resulting in * 49.00€. The regular costs exceeding 50€ the customer still enjoys a free delivery.</p> * </li> - * * <li> * <p>An order worth of 40.00€ being paid within two days will be reduced by 2% resulting in * 39.20€. The regular costs of 40€ not exceeding the 50€ limit adding 6.50€ shipping results in * a due amount of 45.70€.</p> * </li> * </ul> - * * </li> * </ol> * + * <img src="doc-files/euros.svg" alt="Five euros" style="width: 20em; height: auto;"> + * * @param orderAmount The order's sum of all costs * @param paymentDelayInDays Period until payment occurs. * @return <p>The total due amount a customer is obliged to pay.</p> - * - * <img src="doc-files/euros.svg" alt="Five euros" style="width: 20em; height: auto;"> - * */ static public double getBillingAmount(final double orderAmount, final int paymentDelayInDays) { diff --git a/Klausuren/Sd1/2023summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java b/Klausuren/Sd1/2023summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java index 2b26ec179b0561e983707f389ae65a16381eee2a..d03b412a78423152f0095c65a54de2b12ab30d04 100644 --- a/Klausuren/Sd1/2023summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java +++ b/Klausuren/Sd1/2023summer/Solve/src/test/java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java @@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults { static private void test(final double expectedCosts, final double amount, int paymentDelay) { final String message = "An order worth of " + amount + "€ and payment at day " + paymentDelay + - " results in total costs of " + expectedCosts + "€"; + " results in total costs of " + expectedCosts + "€"; Assert.assertEquals( message,