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

Merge remote-tracking branch 'origin/v5-dev' into v5-dev

Browse Source
This commit is contained in:
achao
2021-12-06 21:31:41 +08:00
parent 1b28ba13e4 59dbdffb1a
commit c1e6ea8d42
29 changed files with 316 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java
View File

@@ -45,7 +45,7 @@ public class CollUtilTest {
ArrayList<Integer> exceptRemovedList = CollUtil.newArrayList(2, 3);
ArrayList<Integer> exceptResultList = CollUtil.newArrayList(1);
ArrayList<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
List<Integer> resultList = CollUtil.removeWithAddIf(list, ele -> 1 == ele);
Assert.assertEquals(list, exceptRemovedList);
Assert.assertEquals(resultList, exceptResultList);

2
hutool-core/src/test/java/cn/hutool/core/date/CalendarUtilTest.java
View File

@@ -14,7 +14,7 @@ public class CalendarUtilTest {
final String chineseDate = CalendarUtil.formatChineseDate(calendar, false);
Assert.assertEquals("二〇一八年二月二十四日", chineseDate);
final String chineseDateTime = CalendarUtil.formatChineseDate(calendar, true);
Assert.assertEquals("二〇一八年二月二十四日一十二时一十三分一十四秒", chineseDateTime);
Assert.assertEquals("二〇一八年二月二十四日十二时十三分十四秒", chineseDateTime);
}
@Test(expected = IllegalArgumentException.class)

63
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@@ -116,7 +116,7 @@ public class DateUtilTest {
}
@Test
public void truncateTest(){
public void truncateTest() {
String dateStr2 = "2020-02-29 12:59:34";
Date date2 = DateUtil.parse(dateStr2);
final DateTime dateTime = DateUtil.truncate(date2, DateField.MINUTE);
@@ -124,7 +124,7 @@ public class DateUtilTest {
}
@Test
public void ceilingMinuteTest(){
public void ceilingMinuteTest() {
String dateStr2 = "2020-02-29 12:59:34";
Date date2 = DateUtil.parse(dateStr2);
@@ -137,7 +137,7 @@ public class DateUtilTest {
}
@Test
public void ceilingDayTest(){
public void ceilingDayTest() {
String dateStr2 = "2020-02-29 12:59:34";
Date date2 = DateUtil.parse(dateStr2);
@@ -279,13 +279,16 @@ public class DateUtilTest {
public void formatChineseDateTest() {
String formatChineseDate = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24"), true, false);
Assert.assertEquals("二〇一八年二月二十四日", formatChineseDate);
formatChineseDate = DateUtil.formatChineseDate(DateUtil.parse("2018-02-14"), true, false);
Assert.assertEquals("二〇一八年二月十四日", formatChineseDate);
}
@Test
public void formatChineseDateTimeTest() {
String formatChineseDateTime = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24 12:13:14"), true, true);
Assert.assertEquals("二〇一八年二月二十四日一十二时一十三分一十四秒", formatChineseDateTime);
}
@Test
public void formatChineseDateTimeTest() {
String formatChineseDateTime = DateUtil.formatChineseDate(DateUtil.parse("2018-02-24 12:13:14"), true, true);
Assert.assertEquals("二〇一八年二月二十四日十二时十三分十四秒", formatChineseDateTime);
}
@Test
public void formatBetweenTest() {
@@ -666,24 +669,24 @@ public class DateUtilTest {
}
@Test
public void parseUTCTest2(){
public void parseUTCTest2() {
// issue1503@Github
// 检查不同毫秒长度都可以正常匹配
String utcTime="2021-03-30T12:56:51.3Z";
String utcTime = "2021-03-30T12:56:51.3Z";
DateTime parse = DateUtil.parseUTC(utcTime);
Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
utcTime="2021-03-30T12:56:51.34Z";
utcTime = "2021-03-30T12:56:51.34Z";
parse = DateUtil.parseUTC(utcTime);
Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
utcTime="2021-03-30T12:56:51.345Z";
utcTime = "2021-03-30T12:56:51.345Z";
parse = DateUtil.parseUTC(utcTime);
Assert.assertEquals("2021-03-30 12:56:51", parse.toString());
}
@Test
public void parseCSTTest(){
public void parseCSTTest() {
String dateStr = "Wed Sep 16 11:26:23 CST 2009";
SimpleDateFormat sdf = new SimpleDateFormat(DatePattern.JDK_DATETIME_PATTERN, Locale.US);
@@ -697,7 +700,7 @@ public class DateUtilTest {
}
@Test
public void parseCSTTest2(){
public void parseCSTTest2() {
String dateStr = "Wed Sep 16 11:26:23 CST 2009";
SimpleDateFormat sdf = new SimpleDateFormat(DatePattern.JDK_DATETIME_PATTERN, Locale.US);
@@ -737,7 +740,7 @@ public class DateUtilTest {
Date date = DateUtil.endOfQuarter(
DateUtil.parse("2020-05-31 00:00:00"));
Assert.assertEquals("2020-06-30 23:59:59", DateUtil.format(date,"yyyy-MM-dd HH:mm:ss"));
Assert.assertEquals("2020-06-30 23:59:59", DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"));
}
@Test
@@ -803,7 +806,7 @@ public class DateUtilTest {
}
@Test
public void toInstantTest(){
public void toInstantTest() {
LocalDateTime localDateTime = LocalDateTime.parse("2017-05-06T08:30:00", DateTimeFormatter.ISO_DATE_TIME);
Instant instant = DateUtil.toInstant(localDateTime);
Assert.assertEquals("2017-05-06T00:30:00Z", instant.toString());
@@ -818,7 +821,7 @@ public class DateUtilTest {
}
@Test
public void dateTest(){
public void dateTest() {
//LocalDateTime ==> date
LocalDateTime localDateTime = LocalDateTime.parse("2017-05-06T08:30:00", DateTimeFormatter.ISO_DATE_TIME);
DateTime date = DateUtil.date(localDateTime);
@@ -828,11 +831,11 @@ public class DateUtilTest {
LocalDate localDate = localDateTime.toLocalDate();
DateTime date2 = DateUtil.date(localDate);
Assert.assertEquals("2017-05-06",
DateUtil.format(date2, DatePattern.NORM_DATE_PATTERN));
DateUtil.format(date2, DatePattern.NORM_DATE_PATTERN));
}
@Test
public void dateTest2(){
public void dateTest2() {
// 测试负数日期
long dateLong = -1497600000;
final DateTime date = DateUtil.date(dateLong);
@@ -840,7 +843,7 @@ public class DateUtilTest {
}
@Test
public void ageTest(){
public void ageTest() {
String d1 = "2000-02-29";
String d2 = "2018-02-28";
final int age = DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
@@ -848,14 +851,14 @@ public class DateUtilTest {
}
@Test(expected = IllegalArgumentException.class)
public void ageTest2(){
public void ageTest2() {
String d1 = "2019-02-29";
String d2 = "2018-02-28";
DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
}
@Test
public void isExpiredTest(){
public void isExpiredTest() {
DateTime startDate = DateUtil.parse("2019-12-01 17:02:30");
DateTime endDate = DateUtil.parse("2019-12-02 17:02:30");
int length = 3;
@@ -916,7 +919,7 @@ public class DateUtilTest {
@SuppressWarnings("ConstantConditions")
@Test
public void parseSingleNumberTest(){
public void parseSingleNumberTest() {
DateTime dateTime = DateUtil.parse("2020-5-08");
Assert.assertEquals("2020-05-08 00:00:00", dateTime.toString());
dateTime = DateUtil.parse("2020-5-8");
@@ -938,21 +941,21 @@ public class DateUtilTest {
@SuppressWarnings("ConstantConditions")
@Test
public void parseISO8601Test(){
public void parseISO8601Test() {
String dt = "2020-06-03 12:32:12,333";
final DateTime parse = DateUtil.parse(dt);
Assert.assertEquals("2020-06-03 12:32:12", parse.toString());
}
@Test(expected = DateException.class)
public void parseNotFitTest(){
public void parseNotFitTest() {
//https://github.com/looly/hutool/issues/1332
// 在日期格式不匹配的时候，测试是否正常报错
DateUtil.parse("2020-12-23", DatePattern.PURE_DATE_PATTERN);
}
@Test
public void formatTest(){
public void formatTest() {
Calendar calendar = new GregorianCalendar();
calendar.set(2021, Calendar.JULY, 14, 23, 59, 59);
Date date = new DateTime(calendar);
@@ -963,7 +966,7 @@ public class DateUtilTest {
}
@Test
public void formatNormDateTimeFormatterTest(){
public void formatNormDateTimeFormatterTest() {
String format = DateUtil.format(DateUtil.parse("2021-07-14 10:05:38"), DatePattern.NORM_DATETIME_FORMATTER);
Assert.assertEquals("2021-07-14 10:05:38", format);
@@ -973,7 +976,7 @@ public class DateUtilTest {
}
@Test
public void isWeekendTest(){
public void isWeekendTest() {
DateTime parse = DateUtil.parse("2021-07-28");
Assert.assertFalse(DateUtil.isWeekend(parse));
@@ -984,14 +987,14 @@ public class DateUtilTest {
}
@Test
public void parseSingleMonthAndDayTest(){
public void parseSingleMonthAndDayTest() {
final DateTime parse = DateUtil.parse("2021-1-1");
Assert.assertNotNull(parse);
Assert.assertEquals("2021-01-01 00:00:00", parse.toString());
}
@Test
public void parseByDateTimeFormatterTest(){
public void parseByDateTimeFormatterTest() {
final DateTime parse = DateUtil.parse("2021-12-01", DatePattern.NORM_DATE_FORMATTER);
Assert.assertEquals("2021-12-01 00:00:00", parse.toString());
}

8
hutool-core/src/test/java/cn/hutool/core/lang/tree/TreeTest.java
View File

@@ -94,12 +94,12 @@ public class TreeTest {
final Tree<String> tree = TreeUtil.buildSingle(nodeList, "0");
tree.filter((t)->{
final CharSequence name = t.getName();
return null != name && name.toString().contains("管理");
return null != name && name.toString().contains("店铺");
});
List<String> ids = new ArrayList<>();
tree.walk((tr)-> ids.add(tr.getId()));
Assert .assertEquals(6, ids.size());
Assert .assertEquals(4, ids.size());
}
@Test
@@ -109,12 +109,12 @@ public class TreeTest {
// 经过过滤，生成新的树
Tree<String> newTree = tree.filterNew((t)->{
final CharSequence name = t.getName();
return null != name && name.toString().contains("管理");
return null != name && name.toString().contains("店铺");
});
List<String> ids = new ArrayList<>();
newTree.walk((tr)-> ids.add(tr.getId()));
Assert .assertEquals(6, ids.size());
Assert .assertEquals(4, ids.size());
List<String> ids2 = new ArrayList<>();
tree.walk((tr)-> ids2.add(tr.getId()));

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

@@ -1,6 +1,7 @@
package cn.hutool.core.math;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
public class CalculatorTest {
@@ -28,4 +29,12 @@ public class CalculatorTest {
final double conversion = Calculator.conversion("(88*66/23)%26+45%9");
Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
}
@Test
@Ignore
public void conversationTest5(){
// https://github.com/dromara/hutool/issues/1984
final double conversion = Calculator.conversion("((1/1) / (1/1) -1) * 100");
Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
}
}

7
hutool-core/src/test/java/cn/hutool/core/net/UrlBuilderTest.java
View File

@@ -313,4 +313,11 @@ public class UrlBuilderTest {
final UrlBuilder of = UrlBuilder.ofHttpWithoutEncode(url);
Assert.assertEquals(url, of.toString());
}
@Test
public void paramTest(){
String url = "http://ci.xiaohongshu.com/spectrum/c136c98aa2047babe25b994a26ffa7b492bd8058?imageMogr2/thumbnail/x800/format/jpg";
final UrlBuilder builder = UrlBuilder.ofHttp(url);
Assert.assertEquals(url, builder.toString());
}
}

10
hutool-core/src/test/java/cn/hutool/core/net/UrlQueryTest.java
View File

@@ -46,10 +46,18 @@ public class UrlQueryTest {
public void parseTest3(){
// issue#1688@Github
String u = "https://www.baidu.com/proxy";
final UrlQuery query = UrlQuery.of(u, Charset.defaultCharset());
final UrlQuery query = UrlQuery.of(URLUtil.url(u).getQuery(), Charset.defaultCharset());
Assert.assertTrue(MapUtil.isEmpty(query.getQueryMap()));
}
@Test
public void parseTest4(){
// https://github.com/dromara/hutool/issues/1989
String queryStr = "imageMogr2/thumbnail/x800/format/jpg";
final UrlQuery query = UrlQuery.of(queryStr, CharsetUtil.CHARSET_UTF_8);
Assert.assertEquals(queryStr, query.toString());
}
@Test
public void buildWithMapTest() {
Map<String, String> map = new LinkedHashMap<>();

22
hutool-core/src/test/java/cn/hutool/core/util/NumberUtilTest.java
View File

@@ -412,4 +412,26 @@ public class NumberUtilTest {
final Integer[] integers = NumberUtil.generateBySet(10, 100, 5);
Assert.assertEquals(5, integers.length);
}
@Test
public void isOddOrEvenTest(){
int[] a = { 0, 32, -32, 123, -123 };
Assert.assertFalse(NumberUtil.isOdd(a[0]));
Assert.assertTrue(NumberUtil.isEven(a[0]));
Assert.assertFalse(NumberUtil.isOdd(a[1]));
Assert.assertTrue(NumberUtil.isEven(a[1]));
Assert.assertFalse(NumberUtil.isOdd(a[2]));
Assert.assertTrue(NumberUtil.isEven(a[2]));
Assert.assertTrue(NumberUtil.isOdd(a[3]));
Assert.assertFalse(NumberUtil.isEven(a[3]));
Assert.assertTrue(NumberUtil.isOdd(a[4]));
Assert.assertFalse(NumberUtil.isEven(a[4]));
}
}