karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Speed and distance each only use one formatting rule.

Browse Source 
Fixes #648.
This commit is contained in:
Dennis Guse
2021-06-06 12:47:42 +02:00
parent e28c385e52
commit 21376cd3da
55 changed files with 34 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/util/StringUtilsTest.java
+9 -9
View File
@@ -153,15 +153,15 @@ public class StringUtilsTest {
assertEquals("10", StringUtils.formatDecimal(10.1, 0));
assertEquals("-0", StringUtils.formatDecimal(-0.1, 0));
assertEquals("0", StringUtils.formatDecimal(0.0, 2));
assertEquals("0.1", StringUtils.formatDecimal(0.1, 2));
assertEquals("1.1", StringUtils.formatDecimal(1.1, 2));
assertEquals("10", StringUtils.formatDecimal(10, 2));
assertEquals("10.1", StringUtils.formatDecimal(10.1, 2));
assertEquals("0.00", StringUtils.formatDecimal(0.0, 2));
assertEquals("0.10", StringUtils.formatDecimal(0.1, 2));
assertEquals("1.10", StringUtils.formatDecimal(1.1, 2));
assertEquals("10.00", StringUtils.formatDecimal(10, 2));
assertEquals("10.10", StringUtils.formatDecimal(10.1, 2));
assertEquals("10.11", StringUtils.formatDecimal(10.111, 2));
assertEquals("-0.1", StringUtils.formatDecimal(-0.1, 2));
assertEquals("-0.10", StringUtils.formatDecimal(-0.1, 2));
assertEquals("1", StringUtils.formatDecimal(0.99, 1));
assertEquals("1.0", StringUtils.formatDecimal(0.99, 1));
}
@Test
@@ -181,7 +181,7 @@ public class StringUtilsTest {
assertEquals("4:59 min/km", StringUtils.formatSpeed(context, Speed.of(3.34), true, false));
assertEquals("8:02 min/mi", StringUtils.formatSpeed(context, Speed.of(3.34), false, false));
assertEquals("12.02 km/h", StringUtils.formatSpeed(context, Speed.of(3.34), true, true));
assertEquals("7.47 mph", StringUtils.formatSpeed(context, Speed.of(3.34), false, true));
assertEquals("12.0 km/h", StringUtils.formatSpeed(context, Speed.of(3.34), true, true));
assertEquals("7.5 mph", StringUtils.formatSpeed(context, Speed.of(3.34), false, true));
}
}