Merge branch 'v5-dev' of https://gitee.com/deligense/hutool into v5-dev

hutool-core/src/test/java/cn/hutool/core/lang/OptTest.java

@@ -63,6 +63,34 @@ public class OptTest {
 		Assert.assertEquals("hutool", name);
 	}
 
+	@Test
+	public void peeksTest() {
+		User user = new User();
+		// 相当于上面peek的动态参数调用，更加灵活，你可以像操作数组一样去动态设置中间的步骤，也可以使用这种方式去编写你的代码
+		// 可以一行搞定
+		Opt.ofNullable("hutool").peeks(user::setUsername, user::setNickname);
+		// 也可以在适当的地方换行使得代码的可读性提高
+		Opt.of(user).peeks(
+				u -> Assert.assertEquals("hutool", u.getNickname()),
+				u -> Assert.assertEquals("hutool", u.getUsername())
+		);
+		Assert.assertEquals("hutool", user.getNickname());
+		Assert.assertEquals("hutool", user.getUsername());
+
+		// 注意，传入的lambda中，对包裹内的元素执行赋值操作并不会影响到原来的元素,这是java语言的特性。。。
+		// 这也是为什么我们需要getter和setter而不直接给bean中的属性赋值中的其中一个原因
+		String name = Opt.ofNullable("hutool").peeks(
+				username -> username = "123", username -> username = "456",
+				n -> Assert.assertEquals("hutool", n)).get();
+		Assert.assertEquals("hutool", name);
+
+		// 当然，以下情况不会抛出NPE，但也没什么意义
+		Opt.ofNullable("hutool").peeks().peeks().peeks();
+		Opt.ofNullable(null).peeks(i -> {
+		});
+
+	}
+
 	@Test
 	public void orTest() {
 		// 这是jdk9 Optional中的新函数，直接照搬了过来

hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java

@@ -21,7 +21,7 @@ public class ValidatorTest {
 	}
 
 	@Test
-	public void hasNumberTest() throws Exception {
+	public void hasNumberTest() {
 		String var1 = "";
 		String var2 = "str";
 		String var3 = "180";
@@ -218,4 +218,13 @@ public class ValidatorTest {
 	public void isCarDrivingLicenceTest(){
 		Assert.assertTrue(Validator.isCarDrivingLicence("430101758218"));
 	}
+
+	@Test
+	public void validateIpv4Test(){
+		Validator.validateIpv4("192.168.1.1", "Error ip");
+		Validator.validateIpv4("8.8.8.8", "Error ip");
+		Validator.validateIpv4("0.0.0.0", "Error ip");
+		Validator.validateIpv4("255.255.255.255", "Error ip");
+		Validator.validateIpv4("127.0.0.0", "Error ip");
+	}
 }

hutool-core/src/test/java/cn/hutool/core/net/Ipv4UtilTest.java

@@ -1,11 +1,10 @@
 package cn.hutool.core.net;
 
-import cn.hutool.core.lang.Console;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 
 import java.util.List;
-import org.junit.function.ThrowingRunnable;
 
 public class Ipv4UtilTest {
 
@@ -40,7 +39,7 @@ public class Ipv4UtilTest {
 		String ip = "192.168.1.1";
 		final int maskBitByMask = Ipv4Util.getMaskBitByMask("255.255.255.0");
 		final String endIpStr = Ipv4Util.getEndIpStr(ip, maskBitByMask);
-		Console.log(endIpStr);
+		Assert.assertEquals("192.168.1.255", endIpStr);
 	}
 
 	@Test
@@ -75,4 +74,16 @@ public class Ipv4UtilTest {
 		boolean maskBitValid = Ipv4Util.isMaskBitValid(33);
 		Assert.assertFalse("掩码位非法检验", maskBitValid);
 	}
+
+	@Test
+	public void ipv4ToLongTest(){
+		long l = Ipv4Util.ipv4ToLong("127.0.0.1");
+		Assert.assertEquals(2130706433L, l);
+		l = Ipv4Util.ipv4ToLong("114.114.114.114");
+		Assert.assertEquals(1920103026L, l);
+		l = Ipv4Util.ipv4ToLong("0.0.0.0");
+		Assert.assertEquals(0L, l);
+		l = Ipv4Util.ipv4ToLong("255.255.255.255");
+		Assert.assertEquals(4294967295L, l);
+	}
 }

hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java

@@ -101,4 +101,15 @@ public class NetUtilTest {
 		Console.log(txt);
 	}
 
+	@Test
+	public void isInRangeTest(){
+		Assert.assertTrue(NetUtil.isInRange("114.114.114.114","0.0.0.0/0"));
+		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.0.0.0/8"));
+		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.0.0/16"));
+		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.0/24"));
+		Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.4/32"));
+		Assert.assertFalse(NetUtil.isInRange("8.8.8.8","192.0.0.0/8"));
+		Assert.assertFalse(NetUtil.isInRange("114.114.114.114","192.168.3.4/32"));
+	}
+
 }