Fix stripTrailingZeros() on early Android versions

Provide a simple workaround
JodaOrg · Oct 29, 2023 · 2989dfd · 2989dfd
1 parent 6354992
commit 2989dfd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/main/java/org/joda/money/BigMoney.java b/src/main/java/org/joda/money/BigMoney.java
@@ -111,6 +111,10 @@ public static BigMoney of(CurrencyUnit currency, BigDecimal amount) {
      */
     public static BigMoney of(CurrencyUnit currency, double amount) {
         MoneyUtils.checkNotNull(currency, "Currency must not be null");
+        // if statement added to support Android before v30 where stripTrailingZeros() is broken, see #129
+        if (amount == 0d) {
+            return zero(currency);
+        }
         return BigMoney.of(currency, BigDecimal.valueOf(amount).stripTrailingZeros());
     }
 

diff --git a/src/test/java/org/joda/money/TestBigMoney.java b/src/test/java/org/joda/money/TestBigMoney.java
@@ -195,6 +195,15 @@ public void test_factory_of_Currency_double_trailingZero2() {
         assertEquals(1, test.getScale());
     }
 
+    @Test
+    public void test_factory_of_Currency_double_zero() {
+        assertEquals(BigMoney.of(GBP, BigDecimal.valueOf(0L, 0)), BigMoney.of(GBP, 0d));
+        assertEquals(BigMoney.of(GBP, BigDecimal.valueOf(0L, 0)), BigMoney.of(GBP, -0d));
+        assertEquals(BigMoney.of(GBP, BigDecimal.valueOf(0L, 0)), BigMoney.of(GBP, 0.0d));
+        assertEquals(BigMoney.of(GBP, BigDecimal.valueOf(0L, 0)), BigMoney.of(GBP, 0.00d));
+        assertEquals(BigMoney.of(GBP, BigDecimal.valueOf(0L, 0)), BigMoney.of(GBP, -0.0d));
+    }
+
     @Test
     public void test_factory_of_Currency_double_medium() {
         BigMoney test = BigMoney.of(GBP, 2000d);