From 0e2b558bdf8d171891ff16ec17fb418e1a9d7e75 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 18 Oct 2017 13:31:46 +0200 Subject: [PATCH] fix rounding for NumberAbbreviator --- .../habitrpg/android/habitica/helpers/NumberAbbreviator.java | 2 ++ .../android/habitica/helpers/NumberAbbreviatorTest.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java index c78bbe3a7..6426f5af5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NumberAbbreviator.java @@ -4,6 +4,7 @@ import android.content.Context; import com.habitrpg.android.habitica.R; +import java.math.RoundingMode; import java.text.DecimalFormat; public class NumberAbbreviator { @@ -16,6 +17,7 @@ public class NumberAbbreviator { } DecimalFormat formatter = new DecimalFormat("###.##"+abbreviationForCounter(context, counter)); + formatter.setRoundingMode(RoundingMode.FLOOR); return formatter.format(number); } diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java index 40071cf56..6bd6f48dc 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/NumberAbbreviatorTest.java @@ -52,4 +52,9 @@ public class NumberAbbreviatorTest { assertEquals("1.5k", NumberAbbreviator.abbreviate(context, 1500)); } + @Test + public void voidtestThatitRoundsCorrectly() { + assertEquals("9.99k", NumberAbbreviator.abbreviate(context, 9999)); + } + } \ No newline at end of file