zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

🤤release 5.8.33

Browse Source
This commit is contained in:
Looly
2024-11-27 08:28:23 +08:00
parent d57de39963
commit 226d4bd205
70 changed files with 533 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>cn.hutool</groupId>
<artifactId>hutool-parent</artifactId>
<version>5.8.33</version>
<version>5.8.34-SNAPSHOT</version>
</parent>
<artifactId>hutool-core</artifactId>

3
hutool-core/src/main/java/cn/hutool/core/comparator/VersionComparator.java
View File

@@ -1,13 +1,10 @@
package cn.hutool.core.comparator;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Version;
import cn.hutool.core.util.*;
import java.io.Serializable;
import java.util.Comparator;
import java.util.List;
import java.util.regex.Pattern;
/**
* 版本比较器<br>

1
hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java
View File

@@ -1,6 +1,5 @@
package cn.hutool.core.convert;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;

5
hutool-core/src/main/java/cn/hutool/core/convert/impl/MapConverter.java
View File

@@ -74,6 +74,11 @@ public class MapConverter extends AbstractConverter<Map<?, ?>> {
}
convertMapToMap((Map) value, map);
} else if (BeanUtil.isBean(value.getClass())) {
if(value.getClass().getName().equals("cn.hutool.json.JSONArray")){
// issue#3795 增加JSONArray转Map错误检查
throw new UnsupportedOperationException(StrUtil.format("Unsupported {} to Map.", value.getClass().getName()));
}
map = BeanUtil.beanToMap(value);
// 二次转换，转换键值类型
map = convertInternal(map);

4
hutool-core/src/main/java/cn/hutool/core/date/DateRange.java
View File

@@ -48,6 +48,10 @@ public class DateRange extends Range<DateTime> {
*/
public DateRange(Date start, Date end, DateField unit, int step, boolean isIncludeStart, boolean isIncludeEnd) {
super(DateUtil.date(start), DateUtil.date(end), (current, end1, index) -> {
if(step <= 0){
// issue#3783
return null;
}
final DateTime dt = DateUtil.date(start).offsetNew(unit, (index + 1) * step);
if (dt.isAfter(end1)) {
return null;

18
hutool-core/src/main/java/cn/hutool/core/io/unit/DataSizeUtil.java
View File

@@ -1,5 +1,7 @@
package cn.hutool.core.io.unit;
import cn.hutool.core.util.ArrayUtil;
import java.text.DecimalFormat;
/**
@@ -35,4 +37,20 @@ public class DataSizeUtil {
return new DecimalFormat("#,##0.##")
.format(size / Math.pow(1024, digitGroups)) + " " + DataUnit.UNIT_NAMES[digitGroups];
}
/**
* 根据单位，将文件大小转换为对应单位的大小
*
* @param size 文件大小
* @param fileDataUnit 单位
* @return 大小
* @since 5.8.34
*/
public static String format(Long size, DataUnit fileDataUnit){
if (size <= 0) {
return "0";
}
int digitGroups = ArrayUtil.indexOf(DataUnit.UNIT_NAMES,fileDataUnit.getSuffix());
return new DecimalFormat("##0.##").format(size / Math.pow(1024, digitGroups)) + " " + DataUnit.UNIT_NAMES[digitGroups];
}
}

15
hutool-core/src/main/java/cn/hutool/core/io/unit/DataUnit.java
View File

@@ -44,10 +44,12 @@ public enum DataUnit {
*/
TERABYTES("TB", DataSize.ofTerabytes(1));
/**
* 单位后缀
*/
public static final String[] UNIT_NAMES = new String[]{"B", "KB", "MB", "GB", "TB", "PB", "EB"};
private final String suffix;
private final DataSize size;
@@ -56,6 +58,16 @@ public enum DataUnit {
this.size = size;
}
/**
* 单位后缀
*
* @return 单位后缀
* @since 5.8.34
*/
public String getSuffix() {
return this.suffix;
}
DataSize size() {
return this.size;
}
@@ -76,5 +88,4 @@ public enum DataUnit {
}
throw new IllegalArgumentException("Unknown data unit suffix '" + suffix + "'");
}
}

1
hutool-core/src/main/java/cn/hutool/core/lang/Snowflake.java
View File

@@ -2,7 +2,6 @@ package cn.hutool.core.lang;
import cn.hutool.core.date.SystemClock;
import cn.hutool.core.lang.id.IdConstants;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;

4
hutool-core/src/main/java/cn/hutool/core/math/Calculator.java
View File

@@ -1,5 +1,6 @@
package cn.hutool.core.math;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
@@ -192,6 +193,9 @@ public class Calculator {
arr[i] = '~';
}
}
} else if(CharUtil.equals(arr[i], 'x', true)){
// issue#3787 x转换为*
arr[i] = '*';
}
}
if (arr[0] == '~' && (arr.length > 1 && arr[1] == '(')) {

242
hutool-core/src/main/java/cn/hutool/core/text/csv/CsvParser.java
View File

@@ -1,24 +1,33 @@
/*
* Copyright (c) 2013-2024 Hutool Team and hutool.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.hutool.core.text.csv;
import cn.hutool.core.collection.ComputeIter;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import java.io.Closeable;
import java.io.IOException;
import java.io.Reader;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
/**
* CSV行解析器，参考：FastCSV
@@ -30,10 +39,8 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
private static final int DEFAULT_ROW_CAPACITY = 10;
private final Reader reader;
private final CsvReadConfig config;
private final Buffer buf = new Buffer(IoUtil.DEFAULT_LARGE_BUFFER_SIZE);
private final CsvTokener tokener;
/**
* 前一个特殊分界字符
*/
@@ -45,7 +52,7 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
/**
* 当前读取字段
*/
private final StrBuilder currentField = new StrBuilder(512);
private final StringBuilder currentField = new StringBuilder(512);
/**
* 标题行
@@ -78,9 +85,9 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
* @param reader Reader
* @param config 配置，null则为默认配置
*/
public CsvParser(final Reader reader, CsvReadConfig config) {
this.reader = Objects.requireNonNull(reader, "reader must not be null");
this.config = ObjectUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
public CsvParser(final Reader reader, final CsvReadConfig config) {
this.config = ObjUtil.defaultIfNull(config, CsvReadConfig::defaultConfig);
this.tokener = new CsvTokener(reader);
}
/**
@@ -90,13 +97,13 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
* @throws IllegalStateException 如果不解析头部或者没有调用nextRow()方法
*/
public List<String> getHeader() {
if (config.headerLineNo < 0) {
if (config.headerLineNo < 0) {
throw new IllegalStateException("No header available - header parsing is disabled");
}
if (lineNo < config.beginLineNo) {
throw new IllegalStateException("No header available - call nextRow() first");
}
return header.fields;
return header.getRawList();
}
@Override
@@ -107,13 +114,13 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
/**
* 读取下一行数据
*
* @return CsvRow
* @return CsvRow，{@code null}表示
* @throws IORuntimeException IO读取异常
*/
public CsvRow nextRow() throws IORuntimeException {
List<String> currentFields;
int fieldCount;
while (false == finished) {
while (!finished) {
currentFields = readLine();
fieldCount = currentFields.size();
if (fieldCount < 1) {
@@ -122,11 +129,11 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
}
// 读取范围校验
if(lineNo < config.beginLineNo){
if (lineNo < config.beginLineNo) {
// 未达到读取起始行，继续
continue;
}
if(lineNo > config.endLineNo){
if (lineNo > config.endLineNo) {
// 超出结束行，读取结束
break;
}
@@ -175,9 +182,9 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
String field = currentFields.get(i);
if (MapUtil.isNotEmpty(this.config.headerAlias)) {
// 自定义别名
field = ObjectUtil.defaultIfNull(this.config.headerAlias.get(field), field);
field = ObjUtil.defaultIfNull(this.config.headerAlias.get(field), field);
}
if (StrUtil.isNotEmpty(field) && false == localHeaderMap.containsKey(field)) {
if (StrUtil.isNotEmpty(field) && !localHeaderMap.containsKey(field)) {
localHeaderMap.put(field, i);
}
}
@@ -190,7 +197,7 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
* 空行是size为1的List，唯一元素是""
*
* <p>
* 行号要考虑注释行和引号包装的内容中的换行
* 行号要考虑注释行和引号包装的内容中的换行
* </p>
*
* @return 一行数据
@@ -199,70 +206,67 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
private List<String> readLine() throws IORuntimeException {
// 矫正行号
// 当一行内容包含多行数据时，记录首行行号，但是读取下一行时，需要把多行内容的行数加上
if(inQuotesLineCount > 0){
if (inQuotesLineCount > 0) {
this.lineNo += this.inQuotesLineCount;
this.inQuotesLineCount = 0;
}
final List<String> currentFields = new ArrayList<>(maxFieldCount > 0 ? maxFieldCount : DEFAULT_ROW_CAPACITY);
final StrBuilder currentField = this.currentField;
final Buffer buf = this.buf;
final StringBuilder currentField = this.currentField;
int preChar = this.preChar;//前一个特殊分界字符
int copyLen = 0; //拷贝长度
boolean inComment = false;
int c;
while (true) {
if (false == buf.hasRemaining()) {
// 此Buffer读取结束，开始读取下一段
if (copyLen > 0) {
buf.appendTo(currentField, copyLen);
// 此处无需mark，read方法会重置mark
}
if (buf.read(this.reader) < 0) {
// CSV读取结束
finished = true;
if (currentField.hasContent() || preChar == config.fieldSeparator) {
//剩余部分作为一个字段
addField(currentFields, currentField.toStringAndReset());
c = tokener.next();
if(c < 0){
if (currentField.length() > 0 || preChar == config.fieldSeparator) {
if(this.inQuotes){
// 未闭合的文本包装，在末尾补充包装符
currentField.append(config.textDelimiter);
}
break;
}
//重置
copyLen = 0;
//剩余部分作为一个字段
addField(currentFields, currentField.toString());
currentField.setLength(0);
}
// 读取结束
this.finished = true;
break;
}
final char c = buf.get();
// 注释行标记
if(preChar < 0 || preChar == CharUtil.CR || preChar == CharUtil.LF){
if (preChar < 0 || preChar == CharUtil.CR || preChar == CharUtil.LF) {
// 判断行首字符为指定注释字符的注释开始，直到遇到换行符
// 行首分两种，1是preChar < 0表示文本开始，2是换行符后紧跟就是下一行的开始
// issue#IA8WE0 如果注释符出现在包装符内，被认为是普通字符
if((false == inQuotes) && null != this.config.commentCharacter && c == this.config.commentCharacter){
if (!inQuotes && null != this.config.commentCharacter && c == this.config.commentCharacter) {
inComment = true;
}
}
// 注释行处理
if(inComment){
if (inComment) {
if (c == CharUtil.CR || c == CharUtil.LF) {
// 注释行以换行符为结尾
lineNo++;
inComment = false;
}
// 跳过注释行中的任何字符
buf.mark();
preChar = c;
continue;
}
if (inQuotes) {
//引号内，作为内容，直到引号结束
if (c == config.textDelimiter) {
// End of quoted text
inQuotes = false;
// issue#IB5UQ8 文本包装符转义
final int next = tokener.next();
if(next != config.textDelimiter){
// 包装结束
inQuotes = false;
tokener.back();
}
// https://datatracker.ietf.org/doc/html/rfc4180#section-2 跳过转义符，只保留被转义的包装符
} else {
// 字段内容中新行
if (isLineEnd(c, preChar)) {
@@ -270,46 +274,34 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
}
}
// 普通字段字符
copyLen++;
currentField.append((char)c);
} else {
// 非引号内
if (c == config.fieldSeparator) {
//一个字段结束
if (copyLen > 0) {
buf.appendTo(currentField, copyLen);
copyLen = 0;
}
buf.mark();
addField(currentFields, currentField.toStringAndReset());
addField(currentFields, currentField.toString());
currentField.setLength(0);
} else if (c == config.textDelimiter && isFieldBegin(preChar)) {
// 引号开始且出现在字段开头
inQuotes = true;
copyLen++;
currentField.append((char)c);
} else if (c == CharUtil.CR) {
// \r，直接结束
if (copyLen > 0) {
buf.appendTo(currentField, copyLen);
}
buf.mark();
addField(currentFields, currentField.toStringAndReset());
// \r
addField(currentFields, currentField.toString());
currentField.setLength(0);
preChar = c;
break;
} else if (c == CharUtil.LF) {
// \n
if (preChar != CharUtil.CR) {
if (copyLen > 0) {
buf.appendTo(currentField, copyLen);
}
buf.mark();
addField(currentFields, currentField.toStringAndReset());
addField(currentFields, currentField.toString());
currentField.setLength(0);
preChar = c;
break;
}
// 前一个字符是\r，已经处理过这个字段了，此处直接跳过
buf.mark();
} else {
// 普通字符
copyLen++;
currentField.append((char)c);
}
}
@@ -325,7 +317,7 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
@Override
public void close() throws IOException {
reader.close();
tokener.close();
}
/**
@@ -334,7 +326,7 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
* @param currentFields 当前的字段列表（即为行）
* @param field 字段
*/
private void addField(List<String> currentFields, String field) {
private void addField(final List<String> currentFields, String field) {
final char textDelimiter = this.config.textDelimiter;
// 忽略多余引号后的换行符
@@ -342,12 +334,9 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
if(StrUtil.isWrap(field, textDelimiter)){
field = StrUtil.sub(field, 1, field.length() - 1);
// https://datatracker.ietf.org/doc/html/rfc4180#section-2
// 第七条规则，只有包装内的包装符需要转义
field = StrUtil.replace(field, String.valueOf(textDelimiter) + textDelimiter, String.valueOf(textDelimiter));
}
if(this.config.trimField){
if (this.config.trimField) {
// issue#I49M0C@Gitee
field = StrUtil.trim(field);
}
@@ -362,7 +351,7 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
* @return 是否结束
* @since 5.7.4
*/
private boolean isLineEnd(char c, int preChar) {
private boolean isLineEnd(final int c, final int preChar) {
return (c == CharUtil.CR || c == CharUtil.LF) && preChar != CharUtil.CR;
}
@@ -383,89 +372,4 @@ public final class CsvParser extends ComputeIter<CsvRow> implements Closeable, S
|| preChar == CharUtil.LF
|| preChar == CharUtil.CR;
}
/**
* 内部Buffer
*
* @author looly
*/
private static class Buffer implements Serializable{
private static final long serialVersionUID = 1L;
final char[] buf;
/**
* 标记位置，用于读数据
*/
private int mark;
/**
* 当前位置
*/
private int position;
/**
* 读取的数据长度，一般小于buf.length，-1表示无数据
*/
private int limit;
Buffer(int capacity) {
buf = new char[capacity];
}
/**
* 是否还有未读数据
*
* @return 是否还有未读数据
*/
public final boolean hasRemaining() {
return position < limit;
}
/**
* 读取到缓存<br>
* 全量读取，会重置Buffer中所有数据
*
* @param reader {@link Reader}
*/
int read(Reader reader) {
int length;
try {
length = reader.read(this.buf);
} catch (IOException e) {
throw new IORuntimeException(e);
}
this.mark = 0;
this.position = 0;
this.limit = length;
return length;
}
/**
* 先获取当前字符，再将当前位置后移一位<br>
* 此方法不检查是否到了数组末尾，请自行使用{@link #hasRemaining()}判断。
*
* @return 当前位置字符
* @see #hasRemaining()
*/
char get() {
return this.buf[this.position++];
}
/**
* 标记位置记为下次读取位置
*/
void mark() {
this.mark = this.position;
}
/**
* 将数据追加到{@link StrBuilder}，追加结束后需手动调用{@link #mark()} 重置读取位置
*
* @param builder {@link StrBuilder}
* @param length 追加的长度
* @see #mark()
*/
void appendTo(StrBuilder builder, int length) {
builder.append(this.buf, this.mark, length);
}
}
}

102
hutool-core/src/main/java/cn/hutool/core/text/csv/CsvTokener.java Normal file
View File

@@ -0,0 +1,102 @@
/*
* Copyright (c) 2024 Hutool Team and hutool.cn
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.hutool.core.text.csv;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import java.io.Closeable;
import java.io.IOException;
import java.io.Reader;
/**
* CSV解析器，用于解析CSV文件
*
* @author looly
* @since 5.8.0
*/
public class CsvTokener implements Closeable {
private final Reader raw;
/**
* 在Reader的位置（解析到第几个字符）
*/
private long index;
/**
* 前一个字符
*/
private int prev;
/**
* 是否使用前一个字符
*/
private boolean usePrev;
/**
* 构造
*
* @param reader {@link Reader}
*/
public CsvTokener(final Reader reader) {
this.raw = IoUtil.toBuffered(reader);
}
/**
* 读取下一个字符，并记录位置
*
* @return 下一个字符
*/
public int next() {
if(this.usePrev){
this.usePrev = false;
}else{
try {
this.prev = this.raw.read();
} catch (final IOException e) {
throw new IORuntimeException(e);
}
}
this.index++;
return this.prev;
}
/**
* 将标记回退到第一个字符
*
* @throws IllegalStateException 当多次调用back时，抛出此异常
*/
public void back() throws IllegalStateException {
if (this.usePrev || this.index <= 0) {
throw new IllegalStateException("Stepping back two steps is not supported");
}
this.index --;
this.usePrev = true;
}
/**
* 获取当前位置
*
* @return 位置
*/
public long getIndex() {
return this.index;
}
@Override
public void close() throws IOException {
IoUtil.close(this.raw);
}
}

1
hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
View File

@@ -1,6 +1,5 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.ParameterizedTypeImpl;
import cn.hutool.core.lang.reflect.ActualTypeMapperPool;

16
hutool-core/src/main/java/cn/hutool/core/util/ZipUtil.java
View File

@@ -34,10 +34,7 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.function.Consumer;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import java.util.zip.*;
/**
* 压缩工具类
@@ -65,6 +62,17 @@ public class ZipUtil {
try {
return new ZipFile(file, ObjectUtil.defaultIfNull(charset, CharsetUtil.CHARSET_UTF_8));
} catch (IOException e) {
// issue#I3UZ28 可能编码错误提示
if(e instanceof ZipException){
if(e.getMessage().contains("invalid CEN header")){
try {
// 尝试使用不同编码
return new ZipFile(file, CharsetUtil.CHARSET_UTF_8.equals(charset) ? CharsetUtil.CHARSET_GBK : CharsetUtil.CHARSET_UTF_8);
} catch (final IOException ex) {
throw new IORuntimeException(ex);
}
}
}
throw new IORuntimeException(e);
}
}

27
hutool-core/src/test/java/cn/hutool/core/date/DateRangeTest.java Normal file
View File

@@ -0,0 +1,27 @@
package cn.hutool.core.date;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.List;
public class DateRangeTest {
@Test
void issue3783Test() {
final Date start = DateUtil.parse("2024-01-01");
final Date end = DateUtil.parse("2024-02-01");
final List<DateTime> dateTimes = DateUtil.rangeToList(start, end, DateField.DAY_OF_MONTH, 0);
Assertions.assertEquals(1, dateTimes.size());
Assertions.assertEquals("2024-01-01 00:00:00", dateTimes.get(0).toString());
}
@Test
void issue3783Test2() {
final Date start = DateUtil.parse("2024-01-01");
final Date end = DateUtil.parse("2024-02-01");
final List<DateTime> dateTimes = DateUtil.rangeToList(start, end, DateField.DAY_OF_MONTH, -2);
Assertions.assertEquals(1, dateTimes.size());
Assertions.assertEquals("2024-01-01 00:00:00", dateTimes.get(0).toString());
}
}

22
hutool-core/src/test/java/cn/hutool/core/date/Issue3798Test.java Normal file
View File

@@ -0,0 +1,22 @@
package cn.hutool.core.date;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.TimeZone;
public class Issue3798Test {
@Test
void parseTest() {
final String iso_datetime1 = "2000-01-01T12:00:00+08:00";
final DateTime parse1 = DateUtil.parse(iso_datetime1);
Assertions.assertEquals(TimeZone.getTimeZone("GMT+08:00"), parse1.getTimeZone());
Assertions.assertEquals("2000-01-01 12:00:00", parse1.toString());
// 伦敦时间（Greenwich Mean Time, GMT）和北京时间（China Standard Time, CST）之间的时差是8小时。北京时间比伦敦时间快8小时
final String iso_datetime2 = "2000-01-01T12:00:00+00:00";
final DateTime parse2 = DateUtil.parse(iso_datetime2);
Assertions.assertEquals(TimeZone.getTimeZone("GMT+00:00"), parse2.getTimeZone());
Assertions.assertEquals("2000-01-01 20:00:00", parse2.toString(TimeZone.getTimeZone("GMT+08:00")));
}
}

15
hutool-core/src/test/java/cn/hutool/core/io/unit/DataSizeUtilTest.java
View File

@@ -1,8 +1,9 @@
package cn.hutool.core.io.unit;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class DataSizeUtilTest {
@Test
@@ -61,6 +62,18 @@ public class DataSizeUtilTest {
assertEquals("1 TB", format);
}
@Test
public void formatWithUnitTest(){
String format = DataSizeUtil.format(Long.MAX_VALUE, DataUnit.TERABYTES);
assertEquals("8388608 TB", format);
format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024 * 1024, DataUnit.GIGABYTES);
assertEquals("1048576 GB", format);
format = DataSizeUtil.format(1024L * 1024 * 1024 * 1024, DataUnit.GIGABYTES);
assertEquals("1024 GB", format);
}
@Test
public void issueI88Z4ZTest() {
final String size = DataSizeUtil.format(10240000);

13
hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java
View File

@@ -1,8 +1,9 @@
package cn.hutool.core.math;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CalculatorTest {
@Test
@@ -55,4 +56,14 @@ public class CalculatorTest {
final double calcValue = Calculator.conversion("(11+2)12");
assertEquals(156D, calcValue, 0.001);
}
@Test
void issue3787Test() {
final Calculator calculator1 = new Calculator();
double result = calculator1.calculate("0+50/100x(1/0.5)");
assertEquals(1D, result);
result = calculator1.calculate("0+50/100X(1/0.5)");
assertEquals(1D, result);
}
}

15
hutool-core/src/test/java/cn/hutool/core/text/csv/CsvUtilTest.java
View File

@@ -7,7 +7,6 @@ import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharsetUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -17,6 +16,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class CsvUtilTest {
@Test
@@ -32,7 +33,8 @@ public class CsvUtilTest {
assertEquals("关注\"对象\"", row0.get(3));
assertEquals("年龄", row0.get(4));
assertEquals("", row0.get(5));
assertEquals("\"", row0.get(6));
// 由于"""未闭合包装，因此末尾的换行符被当作包装内的内容，相当于："""\n"，转义后就是"\n
assertEquals("\"\n", row0.get(6));
}
@Test
@@ -46,7 +48,8 @@ public class CsvUtilTest {
assertEquals("关注\"对象\"", csvRow.get(3));
assertEquals("年龄", csvRow.get(4));
assertEquals("", csvRow.get(5));
assertEquals("\"", csvRow.get(6));
// 由于"""未闭合包装，因此末尾的换行符被当作包装内的内容，相当于："""\n"，转义后就是"\n
assertEquals("\"\n", csvRow.get(6));
});
}
@@ -70,7 +73,8 @@ public class CsvUtilTest {
assertEquals("关注\"对象\"", row0.get(3));
assertEquals("年龄", row0.get(4));
assertEquals("", row0.get(5));
assertEquals("\"", row0.get(6));
// 由于"""未闭合包装，因此末尾的换行符被当作包装内的内容，相当于："""\n"，转义后就是"\n
assertEquals("\"\n", row0.get(6));
}
@Test
@@ -84,7 +88,8 @@ public class CsvUtilTest {
assertEquals("关注\"对象\"", csvRow.get(3));
assertEquals("年龄", csvRow.get(4));
assertEquals("", csvRow.get(5));
assertEquals("\"", csvRow.get(6));
// 由于"""未闭合包装，因此末尾的换行符被当作包装内的内容，相当于："""\n"，转义后就是"\n
assertEquals("\"\n", csvRow.get(6));
});
}

16
hutool-core/src/test/java/cn/hutool/core/text/csv/IssueIB5UQ8Test.java Normal file
View File

@@ -0,0 +1,16 @@
package cn.hutool.core.text.csv;
import cn.hutool.core.lang.Console;
import org.junit.jupiter.api.Test;
import java.io.StringReader;
public class IssueIB5UQ8Test {
@Test
void parseEscapeTest() {
String csv = "\"Consultancy, 10\"\",, food\"";
final CsvReader reader = CsvUtil.getReader(new StringReader(csv));
final String s = reader.read().getRow(0).get(0);
Console.log(s);
}
}