From ae1f3635ce8665b1656d0a8aaec0a5d1206311bf Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 10 Oct 2024 18:52:06 +0800 Subject: [PATCH] fix code --- .../core/math/ChineseNumberFormatter.java | 48 +++- .../core/math/ChineseNumberFormatterTest.java | 268 ++++++++++-------- .../hutool/json/issues/IssueIAW0ITTest.java | 16 ++ 3 files changed, 212 insertions(+), 120 deletions(-) create mode 100644 hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java b/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java index 4d7475c11..f572d8330 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/math/ChineseNumberFormatter.java @@ -18,6 +18,10 @@ package org.dromara.hutool.core.math; import org.dromara.hutool.core.lang.Assert; import org.dromara.hutool.core.text.StrUtil; +import org.dromara.hutool.core.text.split.SplitUtil; + +import java.math.BigDecimal; +import java.util.List; /** * 数字转中文类
@@ -65,7 +69,7 @@ public class ChineseNumberFormatter { if (c < '0' || c > '9') { return c; } - return numberToChinese(c - '0', isUseTraditional); + return singleNumberToChinese(c - '0', isUseTraditional); } /** @@ -115,6 +119,7 @@ public class ChineseNumberFormatter { /** * 是否使用口语模式，此模式下的数字更加简化，如“一十一”会表示为“十一” + * * @param colloquialMode 是否口语模式 * @return this */ @@ -141,11 +146,38 @@ public class ChineseNumberFormatter { * @return this */ public ChineseNumberFormatter setUnitName(final String unitName) { - this.unitName = Assert.notNull(unitName);; + this.unitName = Assert.notNull(unitName); + ; return this; } // endregion + /** + * 阿拉伯数字转换成中文. 使用于整数、小数的转换. + * 支持多位小数 + * + * @param amount 数字 + * @return 中文 + */ + public String format(final BigDecimal amount) { + final long longValue = amount.longValue(); + + String formatAmount; + if (amount.scale() <= 0) { + formatAmount = format(longValue); + } else { + final List numberList = SplitUtil.split(amount.toPlainString(), StrUtil.DOT); + // 小数部分逐个数字转换为汉字 + final StringBuilder decimalPartStr = new StringBuilder(); + for (final char decimalChar : numberList.get(1).toCharArray()) { + decimalPartStr.append(formatChar(decimalChar, this.useTraditional)); + } + formatAmount = format(longValue) + "点" + decimalPartStr; + } + + return formatAmount; + } + /** * 阿拉伯数字转换成中文. * @@ -212,7 +244,7 @@ public class ChineseNumberFormatter { chineseStr.append("零"); } } else { - chineseStr.append(numberToChinese(jiao, this.useTraditional)); + chineseStr.append(singleNumberToChinese(jiao, this.useTraditional)); if (isMoneyMode && 0 != jiao) { chineseStr.append("角"); } @@ -220,7 +252,7 @@ public class ChineseNumberFormatter { // 分 if (0 != fen) { - chineseStr.append(numberToChinese(fen, this.useTraditional)); + chineseStr.append(singleNumberToChinese(fen, this.useTraditional)); if (isMoneyMode) { chineseStr.append("分"); } @@ -232,7 +264,7 @@ public class ChineseNumberFormatter { /** * 阿拉伯数字整数部分转换成中文，只支持正数 * - * @param amount 数字 + * @param amount 数字 * @return 中文 */ private String longToChinese(long amount) { @@ -327,7 +359,7 @@ public class ChineseNumberFormatter { /** * 把一个 0~9999 之间的整数转换为汉字的字符串，如果是 0 则返回 "" * - * @param amountPart 数字部分 + * @param amountPart 数字部分 * @return 转换后的汉字 */ private String thousandToChinese(final int amountPart) { @@ -350,7 +382,7 @@ public class ChineseNumberFormatter { lastIsZero = true; } else { // 取到的数字不是 0 final boolean isUseTraditional = this.useTraditional; - chineseStr.insert(0, numberToChinese(digit, isUseTraditional) + ChineseNumberParser.getUnitName(i, isUseTraditional)); + chineseStr.insert(0, singleNumberToChinese(digit, isUseTraditional) + ChineseNumberParser.getUnitName(i, isUseTraditional)); lastIsZero = false; } temp = temp / 10; @@ -365,7 +397,7 @@ public class ChineseNumberFormatter { * @param isUseTraditional 是否使用繁体 * @return 汉字 */ - private static char numberToChinese(final int number, final boolean isUseTraditional) { + private static char singleNumberToChinese(final int number, final boolean isUseTraditional) { if (0 == number) { return DIGITS[0]; } diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java index a84186428..1e065880f 100644 --- a/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java +++ b/hutool-core/src/test/java/org/dromara/hutool/core/math/ChineseNumberFormatterTest.java @@ -17,305 +17,349 @@ package org.dromara.hutool.core.math; import org.dromara.hutool.core.convert.ConvertUtil; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.math.BigDecimal; + +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ChineseNumberFormatterTest { @Test - public void formatThousandTest(){ + public void formatThousandTest() { String f = ChineseNumberFormatter.of().setColloquialMode(true).format(10); - Assertions.assertEquals("十", f); + assertEquals("十", f); f = ChineseNumberFormatter.of().setColloquialMode(true).format(11); - Assertions.assertEquals("十一", f); + assertEquals("十一", f); f = ChineseNumberFormatter.of().setColloquialMode(true).format(19); - Assertions.assertEquals("十九", f); + assertEquals("十九", f); } // 测试千 @Test - public void formatThousandLongTest(){ + public void formatThousandLongTest() { String f = ChineseNumberFormatter.of().format(0); - Assertions.assertEquals("零", f); + assertEquals("零", f); f = ChineseNumberFormatter.of().format(1); - Assertions.assertEquals("一", f); + assertEquals("一", f); f = ChineseNumberFormatter.of().format(10); - Assertions.assertEquals("一十", f); + assertEquals("一十", f); f = ChineseNumberFormatter.of().format(12); - Assertions.assertEquals("一十二", f); + assertEquals("一十二", f); f = ChineseNumberFormatter.of().format(100); - Assertions.assertEquals("一百", f); + assertEquals("一百", f); f = ChineseNumberFormatter.of().format(101); - Assertions.assertEquals("一百零一", f); + assertEquals("一百零一", f); f = ChineseNumberFormatter.of().format(110); - Assertions.assertEquals("一百一十", f); + assertEquals("一百一十", f); f = ChineseNumberFormatter.of().format(112); - Assertions.assertEquals("一百一十二", f); + assertEquals("一百一十二", f); f = ChineseNumberFormatter.of().format(1000); - Assertions.assertEquals("一千", f); + assertEquals("一千", f); f = ChineseNumberFormatter.of().format(1001); - Assertions.assertEquals("一千零一", f); + assertEquals("一千零一", f); f = ChineseNumberFormatter.of().format(1010); - Assertions.assertEquals("一千零一十", f); + assertEquals("一千零一十", f); f = ChineseNumberFormatter.of().format(1100); - Assertions.assertEquals("一千一百", f); + assertEquals("一千一百", f); f = ChineseNumberFormatter.of().format(1101); - Assertions.assertEquals("一千一百零一", f); + assertEquals("一千一百零一", f); f = ChineseNumberFormatter.of().format(9999); - Assertions.assertEquals("九千九百九十九", f); + assertEquals("九千九百九十九", f); } // 测试万 @Test - public void formatTenThousandLongTest(){ + public void formatTenThousandLongTest() { String f = ChineseNumberFormatter.of().format(1_0000); - Assertions.assertEquals("一万", f); + assertEquals("一万", f); f = ChineseNumberFormatter.of().format(1_0001); - Assertions.assertEquals("一万零一", f); + assertEquals("一万零一", f); f = ChineseNumberFormatter.of().format(1_0010); - Assertions.assertEquals("一万零一十", f); + assertEquals("一万零一十", f); f = ChineseNumberFormatter.of().format(1_0100); - Assertions.assertEquals("一万零一百", f); + assertEquals("一万零一百", f); f = ChineseNumberFormatter.of().format(1_1000); - Assertions.assertEquals("一万一千", f); + assertEquals("一万一千", f); f = ChineseNumberFormatter.of().format(10_1000); - Assertions.assertEquals("一十万零一千", f); + assertEquals("一十万零一千", f); f = ChineseNumberFormatter.of().format(10_0100); - Assertions.assertEquals("一十万零一百", f); + assertEquals("一十万零一百", f); f = ChineseNumberFormatter.of().format(100_1000); - Assertions.assertEquals("一百万零一千", f); + assertEquals("一百万零一千", f); f = ChineseNumberFormatter.of().format(100_0100); - Assertions.assertEquals("一百万零一百", f); + assertEquals("一百万零一百", f); f = ChineseNumberFormatter.of().format(1000_1000); - Assertions.assertEquals("一千万零一千", f); + assertEquals("一千万零一千", f); f = ChineseNumberFormatter.of().format(1000_0100); - Assertions.assertEquals("一千万零一百", f); + assertEquals("一千万零一百", f); f = ChineseNumberFormatter.of().format(9999_0000); - Assertions.assertEquals("九千九百九十九万", f); + assertEquals("九千九百九十九万", f); } // 测试亿 @Test - public void formatHundredMillionLongTest(){ + public void formatHundredMillionLongTest() { String f = ChineseNumberFormatter.of().format(1_0000_0000L); - Assertions.assertEquals("一亿", f); + assertEquals("一亿", f); f = ChineseNumberFormatter.of().format(1_0000_0001L); - Assertions.assertEquals("一亿零一", f); + assertEquals("一亿零一", f); f = ChineseNumberFormatter.of().format(1_0000_1000L); - Assertions.assertEquals("一亿零一千", f); + assertEquals("一亿零一千", f); f = ChineseNumberFormatter.of().format(1_0001_0000L); - Assertions.assertEquals("一亿零一万", f); + assertEquals("一亿零一万", f); f = ChineseNumberFormatter.of().format(1_0010_0000L); - Assertions.assertEquals("一亿零一十万", f); + assertEquals("一亿零一十万", f); f = ChineseNumberFormatter.of().format(1_0010_0000L); - Assertions.assertEquals("一亿零一十万", f); + assertEquals("一亿零一十万", f); f = ChineseNumberFormatter.of().format(1_0100_0000L); - Assertions.assertEquals("一亿零一百万", f); + assertEquals("一亿零一百万", f); f = ChineseNumberFormatter.of().format(1_1000_0000L); - Assertions.assertEquals("一亿一千万", f); + assertEquals("一亿一千万", f); f = ChineseNumberFormatter.of().format(10_1000_0000L); - Assertions.assertEquals("一十亿零一千万", f); + assertEquals("一十亿零一千万", f); f = ChineseNumberFormatter.of().format(100_1000_0000L); - Assertions.assertEquals("一百亿零一千万", f); + assertEquals("一百亿零一千万", f); f = ChineseNumberFormatter.of().format(1000_1000_0000L); - Assertions.assertEquals("一千亿零一千万", f); + assertEquals("一千亿零一千万", f); f = ChineseNumberFormatter.of().format(1100_1000_0000L); - Assertions.assertEquals("一千一百亿零一千万", f); + assertEquals("一千一百亿零一千万", f); f = ChineseNumberFormatter.of().format(9999_0000_0000L); - Assertions.assertEquals("九千九百九十九亿", f); + assertEquals("九千九百九十九亿", f); } // 测试万亿 @Test - public void formatTrillionsLongTest(){ + public void formatTrillionsLongTest() { String f = ChineseNumberFormatter.of().format(1_0000_0000_0000L); - Assertions.assertEquals("一万亿", f); + assertEquals("一万亿", f); f = ChineseNumberFormatter.of().format(1_0000_1000_0000L); - Assertions.assertEquals("一万亿零一千万", f); + assertEquals("一万亿零一千万", f); f = ChineseNumberFormatter.of().format(1_0010_0000_0000L); - Assertions.assertEquals("一万零一十亿", f); + assertEquals("一万零一十亿", f); } @Test public void formatTest() { final String f0 = ChineseNumberFormatter.of().format(5000_8000); - Assertions.assertEquals("五千万零八千", f0); + assertEquals("五千万零八千", f0); String f1 = ChineseNumberFormatter.of().format(1_0889.72356); - Assertions.assertEquals("一万零八百八十九点七二", f1); + assertEquals("一万零八百八十九点七二", f1); f1 = ChineseNumberFormatter.of().format(12653); - Assertions.assertEquals("一万二千六百五十三", f1); + assertEquals("一万二千六百五十三", f1); f1 = ChineseNumberFormatter.of().format(215.6387); - Assertions.assertEquals("二百一十五点六四", f1); + assertEquals("二百一十五点六四", f1); f1 = ChineseNumberFormatter.of().format(1024); - Assertions.assertEquals("一千零二十四", f1); + assertEquals("一千零二十四", f1); f1 = ChineseNumberFormatter.of().format(100350089); - Assertions.assertEquals("一亿零三十五万零八十九", f1); + assertEquals("一亿零三十五万零八十九", f1); f1 = ChineseNumberFormatter.of().format(1200); - Assertions.assertEquals("一千二百", f1); + assertEquals("一千二百", f1); f1 = ChineseNumberFormatter.of().format(12); - Assertions.assertEquals("一十二", f1); + assertEquals("一十二", f1); f1 = ChineseNumberFormatter.of().format(0.05); - Assertions.assertEquals("零点零五", f1); + assertEquals("零点零五", f1); } @Test public void formatTest2() { String f1 = ChineseNumberFormatter.of().format(-0.3); - Assertions.assertEquals("负零点三", f1); + assertEquals("负零点三", f1); f1 = ChineseNumberFormatter.of().format(10); - Assertions.assertEquals("一十", f1); + assertEquals("一十", f1); } @Test public void formatTest3() { final String f1 = ChineseNumberFormatter.of().format(5000_8000); - Assertions.assertEquals("五千万零八千", f1); + assertEquals("五千万零八千", f1); final String f2 = ChineseNumberFormatter.of().format(1_0035_0089); - Assertions.assertEquals("一亿零三十五万零八十九", f2); + assertEquals("一亿零三十五万零八十九", f2); } @Test public void formatMaxTest() { final String f3 = ChineseNumberFormatter.of().format(99_9999_9999_9999L); - Assertions.assertEquals("九十九万九千九百九十九亿九千九百九十九万九千九百九十九", f3); + assertEquals("九十九万九千九百九十九亿九千九百九十九万九千九百九十九", f3); } @Test public void formatTraditionalTest() { String f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(10889.72356); - Assertions.assertEquals("壹万零捌佰捌拾玖点柒贰", f1); + assertEquals("壹万零捌佰捌拾玖点柒贰", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(12653); - Assertions.assertEquals("壹万贰仟陆佰伍拾叁", f1); + assertEquals("壹万贰仟陆佰伍拾叁", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(215.6387); - Assertions.assertEquals("贰佰壹拾伍点陆肆", f1); + assertEquals("贰佰壹拾伍点陆肆", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(1024); - Assertions.assertEquals("壹仟零贰拾肆", f1); + assertEquals("壹仟零贰拾肆", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(100350089); - Assertions.assertEquals("壹亿零叁拾伍万零捌拾玖", f1); + assertEquals("壹亿零叁拾伍万零捌拾玖", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(1200); - Assertions.assertEquals("壹仟贰佰", f1); + assertEquals("壹仟贰佰", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(12); - Assertions.assertEquals("壹拾贰", f1); + assertEquals("壹拾贰", f1); f1 = ChineseNumberFormatter.of().setUseTraditional(true).format(0.05); - Assertions.assertEquals("零点零伍", f1); + assertEquals("零点零伍", f1); } @Test public void formatSimpleTest() { String f1 = ChineseNumberFormatter.formatSimple(1_2345); - Assertions.assertEquals("1.23万", f1); + assertEquals("1.23万", f1); f1 = ChineseNumberFormatter.formatSimple(-5_5555); - Assertions.assertEquals("-5.56万", f1); + assertEquals("-5.56万", f1); f1 = ChineseNumberFormatter.formatSimple(1_2345_6789); - Assertions.assertEquals("1.23亿", f1); + assertEquals("1.23亿", f1); f1 = ChineseNumberFormatter.formatSimple(-5_5555_5555); - Assertions.assertEquals("-5.56亿", f1); + assertEquals("-5.56亿", f1); f1 = ChineseNumberFormatter.formatSimple(1_2345_6789_1011L); - Assertions.assertEquals("1.23万亿", f1); + assertEquals("1.23万亿", f1); f1 = ChineseNumberFormatter.formatSimple(-5_5555_5555_5555L); - Assertions.assertEquals("-5.56万亿", f1); + assertEquals("-5.56万亿", f1); f1 = ChineseNumberFormatter.formatSimple(123); - Assertions.assertEquals("123", f1); + assertEquals("123", f1); f1 = ChineseNumberFormatter.formatSimple(-123); - Assertions.assertEquals("-123", f1); + assertEquals("-123", f1); } @Test public void digitToChineseTest() { String digitToChinese = ConvertUtil.digitToChinese(12_4124_1241_2421.12); - Assertions.assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元壹角贰分", digitToChinese); + assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元壹角贰分", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(12_0000_1241_2421L); - Assertions.assertEquals("壹拾贰万亿零壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese); + assertEquals("壹拾贰万亿零壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(12_0000_0000_2421L); - Assertions.assertEquals("壹拾贰万亿零贰仟肆佰贰拾壹元整", digitToChinese); + assertEquals("壹拾贰万亿零贰仟肆佰贰拾壹元整", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(12_4124_1241_2421D); - Assertions.assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese); + assertEquals("壹拾贰万肆仟壹佰贰拾肆亿壹仟贰佰肆拾壹万贰仟肆佰贰拾壹元整", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(2421.02); - Assertions.assertEquals("贰仟肆佰贰拾壹元零贰分", digitToChinese); + assertEquals("贰仟肆佰贰拾壹元零贰分", digitToChinese); } @Test public void digitToChineseTest2() { double a = 67556.32; String digitUppercase = ConvertUtil.digitToChinese(a); - Assertions.assertEquals("陆万柒仟伍佰伍拾陆元叁角贰分", digitUppercase); + assertEquals("陆万柒仟伍佰伍拾陆元叁角贰分", digitUppercase); a = 1024.00; digitUppercase = ConvertUtil.digitToChinese(a); - Assertions.assertEquals("壹仟零贰拾肆元整", digitUppercase); + assertEquals("壹仟零贰拾肆元整", digitUppercase); final double b = 1024; digitUppercase = ConvertUtil.digitToChinese(b); - Assertions.assertEquals("壹仟零贰拾肆元整", digitUppercase); + assertEquals("壹仟零贰拾肆元整", digitUppercase); } @Test public void digitToChineseTest3() { String digitToChinese = ConvertUtil.digitToChinese(2_0000_0000.00); - Assertions.assertEquals("贰亿元整", digitToChinese); + assertEquals("贰亿元整", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(2_0000.00); - Assertions.assertEquals("贰万元整", digitToChinese); + assertEquals("贰万元整", digitToChinese); digitToChinese = ConvertUtil.digitToChinese(2_0000_0000_0000.00); - Assertions.assertEquals("贰万亿元整", digitToChinese); + assertEquals("贰万亿元整", digitToChinese); } @Test public void digitToChineseTest4() { final String digitToChinese = ConvertUtil.digitToChinese(400_0000.00); - Assertions.assertEquals("肆佰万元整", digitToChinese); + assertEquals("肆佰万元整", digitToChinese); } @Test - public void numberCharToChineseTest(){ + public void numberCharToChineseTest() { char s = ChineseNumberFormatter.formatChar('1', false); - Assertions.assertEquals('一', s); + assertEquals('一', s); s = ChineseNumberFormatter.formatChar('2', false); - Assertions.assertEquals('二', s); + assertEquals('二', s); s = ChineseNumberFormatter.formatChar('0', false); - Assertions.assertEquals('零', s); + assertEquals('零', s); // 非数字字符原样返回 s = ChineseNumberFormatter.formatChar('A', false); - Assertions.assertEquals('A', s); + assertEquals('A', s); } @Test - public void singleMoneyTest(){ + public void singleMoneyTest() { String format = ChineseNumberFormatter.of().setMoneyMode(true).format(0.01); - Assertions.assertEquals("一分", format); + assertEquals("一分", format); format = ChineseNumberFormatter.of().setMoneyMode(true).format(0.10); - Assertions.assertEquals("一角", format); + assertEquals("一角", format); format = ChineseNumberFormatter.of().setMoneyMode(true).format(0.12); - Assertions.assertEquals("一角二分", format); + assertEquals("一角二分", format); format = ChineseNumberFormatter.of().setMoneyMode(true).format(1.00); - Assertions.assertEquals("一元整", format); + assertEquals("一元整", format); format = ChineseNumberFormatter.of().setMoneyMode(true).format(1.10); - Assertions.assertEquals("一元一角", format); + assertEquals("一元一角", format); format = ChineseNumberFormatter.of().setMoneyMode(true).format(1.02); - Assertions.assertEquals("一元零二分", format); + assertEquals("一元零二分", format); } @Test - public void singleNumberTest(){ + public void singleNumberTest() { String format = ChineseNumberFormatter.of().format(0.01); - Assertions.assertEquals("零点零一", format); + assertEquals("零点零一", format); format = ChineseNumberFormatter.of().format(0.10); - Assertions.assertEquals("零点一", format); + assertEquals("零点一", format); format = ChineseNumberFormatter.of().format(0.12); - Assertions.assertEquals("零点一二", format); + assertEquals("零点一二", format); format = ChineseNumberFormatter.of().format(1.00); - Assertions.assertEquals("一", format); + assertEquals("一", format); format = ChineseNumberFormatter.of().format(1.10); - Assertions.assertEquals("一点一", format); + assertEquals("一点一", format); format = ChineseNumberFormatter.of().format(1.02); - Assertions.assertEquals("一点零二", format); + assertEquals("一点零二", format); + } + + @Test + void issueIAW0EMTest() { + final BigDecimal a = new BigDecimal("1.0"); + final String str = ChineseNumberFormatter.of().format(a); + assertEquals("一点零", str); + + // 由于传入的值可能为long类型，因此此处不保留小数 + final String str2 = ChineseNumberFormatter.of().format(1.0); + assertEquals("一", str2); + } + + @Test + void noColloquialModeTest() { + final ChineseNumberFormatter formatter = ChineseNumberFormatter.of().setColloquialMode(false); + assertEquals("一十一", formatter.format(11)); + assertEquals("一十", formatter.format(10)); + assertEquals("负一十一", formatter.format(-11)); + assertEquals("负一十", formatter.format(-10)); + + // BigDecimal + assertEquals("一十一", formatter.format(new BigDecimal("11"))); + assertEquals("一十", formatter.format(new BigDecimal("10"))); + assertEquals("负一十一", formatter.format(new BigDecimal("-11"))); + assertEquals("负一十", formatter.format(new BigDecimal("-10"))); + } + + @Test + void colloquialModeTest() { + final ChineseNumberFormatter formatter = ChineseNumberFormatter.of().setColloquialMode(true); + assertEquals("十一", formatter.format(11)); + assertEquals("十", formatter.format(10)); + assertEquals("负十一", formatter.format(-11)); + assertEquals("负十", formatter.format(-10)); + + // BigDecimal + assertEquals("十一", formatter.format(new BigDecimal("11"))); + assertEquals("十", formatter.format(new BigDecimal("10"))); + assertEquals("负十一", formatter.format(new BigDecimal("-11"))); + assertEquals("负十", formatter.format(new BigDecimal("-10"))); } } diff --git a/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java b/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java new file mode 100644 index 000000000..ba755fdfa --- /dev/null +++ b/hutool-json/src/test/java/org/dromara/hutool/json/issues/IssueIAW0ITTest.java @@ -0,0 +1,16 @@ +package org.dromara.hutool.json.issues; + +import org.dromara.hutool.json.JSONArray; +import org.dromara.hutool.json.JSONUtil; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class IssueIAW0ITTest { + @Test + void jsonArrayToStringTest() { + final JSONArray jsonArray = JSONUtil.ofArray() + .addValue(JSONUtil.ofObj().putValue("value", 0).putValue("empty", false)); + + Assertions.assertEquals("[{\"value\":0,\"empty\":false}]", jsonArray.toString()); + } +}