sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +11 -2
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3f0497fba - Show all commits

4
app/src/main/java/com/a1/nextlocation/data/Route.java
View File

@@ -74,9 +74,9 @@ public class Route implements Parcelable {
return this.imageURL; return this.imageURL;
} }
public int calculateTotalTimeMinutes() { public double calculateTotalTimeMinutes() {
// 5 km / h walking speed // 5 km / h walking speed
return (int) ((totalDistance / 1000) / 5) * 60; return ((totalDistance / 1000) / 5) * 60;
} }

9
app/src/test/java/com/a1/nextlocation/RouteTest.java
View File

@@ -99,4 +99,13 @@ public class RouteTest {
assertNotEquals(expected, route.getDescription()); 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);
}
} }