From f062b1915c1ecacd8da6c27f9532fa0c3c1c85ff Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 6 Jan 2021 20:59:48 +0100 Subject: [PATCH 1/2] fix? --- app/src/main/java/com/a1/nextlocation/data/Route.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/a1/nextlocation/data/Route.java b/app/src/main/java/com/a1/nextlocation/data/Route.java index c837de1..75f0863 100644 --- a/app/src/main/java/com/a1/nextlocation/data/Route.java +++ b/app/src/main/java/com/a1/nextlocation/data/Route.java @@ -74,9 +74,9 @@ public class Route implements Parcelable { return this.imageURL; } - public int calculateTotalTimeMinutes() { + public double calculateTotalTimeMinutes() { // 5 km / h walking speed - return (int) ((totalDistance / 1000) / 5) * 60; + return ((totalDistance / 1000) / 5) * 60; } From f552afb49e51789bdc6895763dc75e630e6c0c58 Mon Sep 17 00:00:00 2001 From: Robin Koedood Date: Wed, 6 Jan 2021 21:01:20 +0100 Subject: [PATCH 2/2] [ADD] ROUTE TEST NIEUWE METHODE --- app/src/test/java/com/a1/nextlocation/RouteTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/test/java/com/a1/nextlocation/RouteTest.java b/app/src/test/java/com/a1/nextlocation/RouteTest.java index 82003ee..80494c9 100644 --- a/app/src/test/java/com/a1/nextlocation/RouteTest.java +++ b/app/src/test/java/com/a1/nextlocation/RouteTest.java @@ -99,4 +99,13 @@ public class RouteTest { assertNotEquals(expected, route.getDescription()); } + @Test + public void testCalculate(){ + route.setTotalDistance(18000); + int expected = 216; + System.out.println(route.getTotalDistance()); + System.out.println(route.calculateTotalTimeMinutes()); + assertEquals(expected, route.calculateTotalTimeMinutes(), 0.01); + } + }