From 2b056bba3b0f410aa9f4cc7dcab369c2172ffbe9 Mon Sep 17 00:00:00 2001 From: Shelton Mutambirwa Date: Wed, 25 Sep 2024 19:36:02 +0200 Subject: [PATCH 1/3] Created the RewardValue class --- src/main/java/RewardValue.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/RewardValue.java diff --git a/src/main/java/RewardValue.java b/src/main/java/RewardValue.java new file mode 100644 index 000000000..b0f83e60e --- /dev/null +++ b/src/main/java/RewardValue.java @@ -0,0 +1,22 @@ + +public class RewardValue { + double cash; + int miles; + public RewardValue(double cashValue){ + cash = cashValue; + } + public RewardValue(int mileValue){ + miles = mileValue; + } + public double getCashValue(){ + if(cash != 0){return cash;} + else{cash = (double) ( miles/ 0.0035); + return cash;} + } + public int getMilesValue(){ + if(miles != 0){return miles;} + else{miles = (int) (cash*0.0035); + return miles;} + } + +} From b9f6bb718cf91a6ee6ba54a0a40de6dc77cd9f05 Mon Sep 17 00:00:00 2001 From: Shelton Mutambirwa Date: Wed, 25 Sep 2024 19:41:42 +0200 Subject: [PATCH 2/3] Fixed conversion issues --- src/main/java/RewardValue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/RewardValue.java b/src/main/java/RewardValue.java index b0f83e60e..b9f6142bd 100644 --- a/src/main/java/RewardValue.java +++ b/src/main/java/RewardValue.java @@ -10,12 +10,12 @@ public RewardValue(int mileValue){ } public double getCashValue(){ if(cash != 0){return cash;} - else{cash = (double) ( miles/ 0.0035); + else{cash = (double) ( miles * 0.0035); return cash;} } public int getMilesValue(){ if(miles != 0){return miles;} - else{miles = (int) (cash*0.0035); + else{miles = (int) (cash/0.0035); return miles;} } From b8e7b42a3d420fe98b64f2d5a1ea87c591de4001 Mon Sep 17 00:00:00 2001 From: Shelton Mutambirwa Date: Wed, 25 Sep 2024 19:59:59 +0200 Subject: [PATCH 3/3] Completed the missing unit tests --- src/test/java/RewardValueTests.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/test/java/RewardValueTests.java b/src/test/java/RewardValueTests.java index b3a78de7d..e1a74c206 100644 --- a/src/test/java/RewardValueTests.java +++ b/src/test/java/RewardValueTests.java @@ -20,11 +20,15 @@ void create_with_miles_value() { @Test void convert_from_cash_to_miles() { - assert false; + double cashValue = 100; + var rewardValue = new RewardValue(cashValue); + assertEquals((int) (cashValue/0.0035), rewardValue.getMilesValue()); } @Test void convert_from_miles_to_cash() { - assert false; + int milesValue = 1000; + var rewardValue = new RewardValue(milesValue); + assertEquals(milesValue * 0.0035, rewardValue.getCashValue()); } }