diff --git a/src/Client/src/main/java/greenify/client/Hints.java b/src/Client/src/main/java/greenify/client/Hints.java index 34aa3fb..95f010d 100644 --- a/src/Client/src/main/java/greenify/client/Hints.java +++ b/src/Client/src/main/java/greenify/client/Hints.java @@ -56,7 +56,7 @@ public class Hints { } /** - * This method returns a random hint from the list of hints. + * This method gets a random hint from the list of hints. * @return the random hint. */ public String randomHint() { diff --git a/src/Server/src/main/java/greenify/server/service/CalculatorService.java b/src/Server/src/main/java/greenify/server/service/CalculatorService.java index 4258c3b..26ee5ca 100644 --- a/src/Server/src/main/java/greenify/server/service/CalculatorService.java +++ b/src/Server/src/main/java/greenify/server/service/CalculatorService.java @@ -77,6 +77,10 @@ public class CalculatorService { return footprint; } + /** + * This method adds extra input to the user. + * @param user name of the user + */ public void addExtras(User user) { if (user.getExtraInputs().get("local_produce")) { user.setFootPrint(user.getFootPrint() - 2); diff --git a/src/Server/src/test/java/greenify/server/service/CalculatorServiceTest.java b/src/Server/src/test/java/greenify/server/service/CalculatorServiceTest.java index d252949..caace32 100644 --- a/src/Server/src/test/java/greenify/server/service/CalculatorServiceTest.java +++ b/src/Server/src/test/java/greenify/server/service/CalculatorServiceTest.java @@ -96,19 +96,21 @@ public class CalculatorServiceTest { public void addExtrasTest() throws URISyntaxException { User user = new User(1L,"greenify", "password"); Map map = new HashMap() {{ - put("local_produce", false); - put("bike", false); - put("temperature", false); - put("solar_panels", false); - }}; + put("local_produce", false); + put("bike", false); + put("temperature", false); + put("solar_panels", false); + } + }; user.setExtraInputs(map); user.setFootPrint(50f); Map secondMap = new HashMap() {{ - put("local_produce", true); - put("bike", true); - put("temperature", true); - put("solar_panels", true); - }}; + put("local_produce", true); + put("bike", true); + put("temperature", true); + put("solar_panels", true); + } + }; user.setExtraInputs(secondMap); calculatorService.addExtras(user); mockServer.verify();