From 91ce5cf8d75f4a3f539b1495c19387bac8e3fbb4 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 18 Jun 2022 10:01:09 +0200 Subject: [PATCH] Add nautical miles (with feet for altitude). Tests were broken. Fixes #1280. --- .../de/dennisguse/opentracks/chart/ChartValueSeriesTest.java | 1 + .../opentracks/data/models/DistanceFormatterTest.java | 2 +- .../dennisguse/opentracks/data/models/SpeedFormatterTest.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java index fbc852cde..4503fe5db 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/chart/ChartValueSeriesTest.java @@ -47,6 +47,7 @@ public class ChartValueSeriesTest { new int[]{1, 100, 1000}, R.string.description_altitude_metric, R.string.description_altitude_imperial, + R.string.description_altitude_imperial, R.color.chart_altitude_fill, R.color.chart_altitude_border, 15, diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java index 7cbbcad47..5eb52f5fe 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/models/DistanceFormatterTest.java @@ -54,6 +54,6 @@ public class DistanceFormatterTest { // A large number in nautical assertEquals("2.70 NM", formatter.formatDistance(Distance.of(5000))); // A small number in nautical - assertEquals("0.05 NM", formatter.formatDistance(Distance.of(100))); + assertEquals("328.08 ft", formatter.formatDistance(Distance.of(100))); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java index 2a5df4026..f7f0fa668 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/models/SpeedFormatterTest.java @@ -89,7 +89,7 @@ public class SpeedFormatterTest { .build(context); assertEquals("6.5", formatter.getSpeedParts(Speed.of(3.34)).first); - assertEquals("knots", formatter.getSpeedParts(Speed.zero()).second); + assertEquals("kn", formatter.getSpeedParts(Speed.zero()).second); } @Test