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

# Conflicts:
#	hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java

hutool-core/src/test/java/cn/hutool/core/math/CalculatorTest.java

@@ -22,4 +22,10 @@ public class CalculatorTest {
 		final double conversion = Calculator.conversion("1");
 		Assert.assertEquals(1, conversion, 2);
 	}
+
+	@Test
+	public void conversationTest4(){
+		final double conversion = Calculator.conversion("(88*66/23)%26+45%9");
+		Assert.assertEquals((88D * 66 / 23) % 26, conversion, 2);
+	}
 }

hutool-core/src/test/java/cn/hutool/core/text/StrBuilderTest.java

@@ -14,7 +14,7 @@ import cn.hutool.core.lang.Console;
  *
  */
 public class StrBuilderTest {
-	
+
 	/**
 	 * StrBuilder的性能测试
 	 */
@@ -28,7 +28,7 @@ public class StrBuilderTest {
 			builder.reset();
 		}
 		Console.log(timer.interval());
-		
+
 		timer.restart();
 		StringBuilder b2 = new StringBuilder();
 		for(int i =0; i< 1000000; i++) {
@@ -37,14 +37,14 @@ public class StrBuilderTest {
 		}
 		Console.log(timer.interval());
 	}
-	
+
 	@Test
 	public void appendTest() {
 		StrBuilder builder = StrBuilder.create();
 		builder.append("aaa").append("你好").append('r');
 		Assert.assertEquals("aaa你好r", builder.toString());
 	}
-	
+
 	@Test
 	public void insertTest() {
 		StrBuilder builder = StrBuilder.create(1);
@@ -52,7 +52,7 @@ public class StrBuilderTest {
 		builder.insert(3, "数据插入");
 		Assert.assertEquals("aaa数据插入你好r", builder.toString());
 	}
-	
+
 	@Test
 	public void insertTest2() {
 		StrBuilder builder = StrBuilder.create(1);
@@ -60,7 +60,7 @@ public class StrBuilderTest {
 		builder.insert(8, "数据插入");
 		Assert.assertEquals("aaa你好r  数据插入", builder.toString());
 	}
-	
+
 	@Test
 	public void resetTest() {
 		StrBuilder builder = StrBuilder.create(1);
@@ -69,7 +69,7 @@ public class StrBuilderTest {
 		builder.reset();
 		Assert.assertEquals("", builder.toString());
 	}
-	
+
 	@Test
 	public void resetTest2() {
 		StrBuilder builder = StrBuilder.create(1);
@@ -79,7 +79,7 @@ public class StrBuilderTest {
 		builder.append("bbb".toCharArray());
 		Assert.assertEquals("bbb", builder.toString());
 	}
-	
+
 	@Test
 	public void appendObjectTest() {
 		StrBuilder builder = StrBuilder.create(1);
@@ -100,7 +100,6 @@ public class StrBuilderTest {
 	public void delTest2() {
 		// 删除中间部分测试
 		StrBuilder strBuilder = new StrBuilder("ABCDEFG");
-		int length = strBuilder.length();
 		StrBuilder builder = strBuilder.del(2,6);
 		Assert.assertEquals("ABG", builder.toString());
 	}

hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java

@@ -364,13 +364,20 @@ public class StrUtilTest {
 				.set("Table_Test_Of_day", "table_test_of_day")
 				.set("_Table_Test_Of_day_", "_table_test_of_day_")
 				.set("_Table_Test_Of_DAY_", "_table_test_of_DAY_")
-				.set("_TableTestOfDAYtoday", "_table_test_of_DAY_today")
+				.set("_TableTestOfDAYToday", "_table_test_of_DAY_today")
 				.set("HelloWorld_test", "hello_world_test")
 				.set("H2", "H2")
 				.set("H#case", "H#case")
 				.forEach((key, value) -> Assert.assertEquals(value, StrUtil.toUnderlineCase(key)));
 	}
 
+	@Test
+	public void toUnderLineCaseTest2() {
+		Dict.create()
+				.set("PNLabel", "PN_label")
+				.forEach((key, value) -> Assert.assertEquals(value, StrUtil.toUnderlineCase(key)));
+	}
+
 	@Test
 	public void containsAnyTest() {
 		//字符