diff --git a/src/main/java/org/qortal/utils/Amounts.java b/src/main/java/org/qortal/utils/Amounts.java index b53f1977..a975e322 100644 --- a/src/main/java/org/qortal/utils/Amounts.java +++ b/src/main/java/org/qortal/utils/Amounts.java @@ -12,21 +12,7 @@ public abstract class Amounts { public static final BigInteger ROUNDING = MULTIPLIER_BI.subtract(BigInteger.ONE); public static String prettyAmount(long amount) { - StringBuilder stringBuilder = new StringBuilder(20); - - stringBuilder.append(amount / MULTIPLIER); - - stringBuilder.append('.'); - - int dpLength = stringBuilder.length(); - - stringBuilder.append(Math.abs(amount % MULTIPLIER)); - - int paddingRequired = 8 - (stringBuilder.length() - dpLength); - if (paddingRequired > 0) - stringBuilder.append("00000000", 0, paddingRequired); - - return stringBuilder.toString(); + return String.format("%d.%08d", amount / MULTIPLIER, amount % MULTIPLIER); } public static BigDecimal toBigDecimal(long amount) { diff --git a/src/test/java/org/qortal/test/AmountsTests.java b/src/test/java/org/qortal/test/AmountsTests.java new file mode 100644 index 00000000..90159466 --- /dev/null +++ b/src/test/java/org/qortal/test/AmountsTests.java @@ -0,0 +1,22 @@ +package org.qortal.test; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.qortal.utils.Amounts; + +public class AmountsTests { + + @Test + public void testPrettyAmount() { + testPrettyAmount(1L, "0.00000001"); + testPrettyAmount(100000L, "0.00100000"); + testPrettyAmount(100000000L, "1.00000000"); + testPrettyAmount(1000000000L, "10.00000000"); + } + + private void testPrettyAmount(long amount, String prettyAmount) { + assertEquals(prettyAmount, Amounts.prettyAmount(amount)); + } + +}