Skip to content
Snippets Groups Projects
Commit 3caa5e24 authored by Goik Martin's avatar Goik Martin
Browse files

Cosmetics

parent afb265ff
No related branches found
No related tags found
No related merge requests found
...@@ -25,23 +25,20 @@ public class A_Payment { ...@@ -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 * <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> * 49.00€. The regular costs exceeding 50€ the customer still enjoys a free delivery.</p>
* </li> * </li>
*
* <li> * <li>
* <p>An order worth of 40.00€ being paid within two days will be reduced by 2% resulting in * <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 * 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> * a due amount of 45.70€.</p>
* </li> * </li>
* </ul> * </ul>
*
* </li> * </li>
* </ol> * </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 orderAmount The order's sum of all costs
* @param paymentDelayInDays Period until payment occurs. * @param paymentDelayInDays Period until payment occurs.
* @return <p>The total due amount a customer is obliged to pay.</p> * @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) { static public double getBillingAmount(final double orderAmount, final int paymentDelayInDays) {
return 123.456; // TODO: Implement me correctly return 123.456; // TODO: Implement me correctly
......
...@@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults { ...@@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults {
static private void test(final double expectedCosts, final double amount, int paymentDelay) { 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 + 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( Assert.assertEquals(
message, message,
......
...@@ -25,23 +25,20 @@ public class A_Payment { ...@@ -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 * <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> * 49.00€. The regular costs exceeding 50€ the customer still enjoys a free delivery.</p>
* </li> * </li>
*
* <li> * <li>
* <p>An order worth of 40.00€ being paid within two days will be reduced by 2% resulting in * <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 * 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> * a due amount of 45.70€.</p>
* </li> * </li>
* </ul> * </ul>
*
* </li> * </li>
* </ol> * </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 orderAmount The order's sum of all costs
* @param paymentDelayInDays Period until payment occurs. * @param paymentDelayInDays Period until payment occurs.
* @return <p>The total due amount a customer is obliged to pay.</p> * @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) { static public double getBillingAmount(final double orderAmount, final int paymentDelayInDays) {
......
...@@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults { ...@@ -39,7 +39,7 @@ public class A_PaymentTest extends ExaminationTestDefaults {
static private void test(final double expectedCosts, final double amount, int paymentDelay) { 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 + 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( Assert.assertEquals(
message, message,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment