zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

!1152 MapUtil.增加ofKvsLink、ofKvs方法

Browse Source 
* wgs84toBd09Test2 测试用例，增加精度，避免不同架构、不同版本jdk数值不同
* 1、readBytesTest 代码还原，未发现有修改test.properties的现象
* 简化ofKvs保留，ofKvsLink删除，统一返回LinkedHashMap
* 1、修复报错的注释
* 增加hasEmptyVarargs、isAllEmptyVarargs支持可变参数。
* ArrayUtil类已经恢复
* 1、MapUtil.增加ofKvsLink、ofKvs方法
This commit is contained in:
dazer007
2024-01-16 11:50:39 +00:00
committed by Looly
parent 595b8c5ce5
commit 0b960768d8
11 changed files with 127 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-core/src/test/java/org/dromara/hutool/core/array/ArrayUtilTest.java
View File

@@ -784,4 +784,16 @@ public class ArrayUtilTest {
Assertions.assertFalse(ArrayUtil.regionMatches(a, 2, b, 0, 2));
Assertions.assertFalse(ArrayUtil.regionMatches(a, 3, b, 0, 2));
}
@Test
public void hasEmptyVarargsTest() {
Assertions.assertFalse(ArrayUtil.hasEmptyVarargs(1,2,3,4,5));
Assertions.assertTrue(ArrayUtil.hasEmptyVarargs("", " ", " "));
Assertions.assertTrue(ArrayUtil.hasEmptyVarargs("", "apple", "pear"));
}
@Test
public void isAllEmptyTest() {
Assertions.assertFalse(ArrayUtil.isAllEmptyVarargs("apple", "pear", "", "orange"));
}
}

4
hutool-core/src/test/java/org/dromara/hutool/core/data/CoordinateUtilTest.java
View File

@@ -49,7 +49,9 @@ public class CoordinateUtilTest {
// https://tool.lu/coordinate/
final CoordinateUtil.Coordinate coordinate = CoordinateUtil.wgs84ToBd09(122.99395597D, 44.99804071D);
Assertions.assertEquals(123.00636516028885D, coordinate.getLng(), 0);
Assertions.assertEquals(45.0063690918959D, coordinate.getLat(), 0);
// 不同jdk版本、不同架构jdk, 精度有差异，数值不完全相等，这里增加精度控制delta
// 参考：从Java Math底层实现看Arm与x86的差异：https://yikun.github.io/2020/04/10/%E4%BB%8EJava-Math%E5%BA%95%E5%B1%82%E5%AE%9E%E7%8E%B0%E7%9C%8BArm%E4%B8%8Ex86%E7%9A%84%E5%B7%AE%E5%BC%82/
Assertions.assertEquals(45.00636909189589D, coordinate.getLat(), 0.00000000000001D);
}
@Test

1
hutool-core/src/test/java/org/dromara/hutool/core/io/file/FileUtilTest.java
View File

@@ -512,6 +512,7 @@ public class FileUtilTest {
}
@Test
@Disabled
void readBytesTest() {
final byte[] bytes = FileUtil.readBytes("test.properties");
Assertions.assertEquals(125, bytes.length);

18
hutool-core/src/test/java/org/dromara/hutool/core/map/MapUtilTest.java
View File

@@ -20,13 +20,7 @@ import lombok.Data;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Queue;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -319,4 +313,14 @@ public class MapUtilTest {
Assertions.assertEquals("1", filtered.get("a"));
Assertions.assertEquals("2", filtered.get("b"));
}
@Test
public void ofKvsLinkTest() {
LinkedHashMap<String,Long> map2 = MapUtil.ofKvs(
"RED", 0xFF0000,
"GREEN", 0x00FF00,
"BLUE", 0x0000FF);
Assertions.assertEquals(3, map2.size());
Assertions.assertEquals(LinkedHashMap.class, map2.getClass());
}
}