From 3caa5e249ea75b800bb44c143b8b3aab07a6df6a Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 19 Nov 2023 14:19:58 +0100
Subject: [PATCH] Cosmetics
---
.../main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java | 7 ++-----
.../java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java | 2 +-
.../main/java/de/hdm_stuttgart/mi/sd1/task1/A_Payment.java | 7 ++-----
.../java/de/hdm_stuttgart/mi/sd1/task1/A_PaymentTest.java | 2 +-
4 files changed, 6 insertions(+), 12 deletions(-)
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 bf910f058..2b802eb3e 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 2b26ec179..d03b412a7 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 acb47be23..64e5ec2ee 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 2b26ec179..d03b412a7 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,
--
GitLab