fix code

hutool-core/src/test/java/cn/hutool/core/collection/CollUtilTest.java

@@ -2,6 +2,7 @@ package cn.hutool.core.collection;
 
 import cn.hutool.core.comparator.ComparableComparator;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Console;
 import cn.hutool.core.map.Dict;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrUtil;
@@ -253,7 +254,8 @@ public class CollUtilTest {
 		final Dict v2 = Dict.create().set("age", 13).set("id", 15).set("name", "李四");
 		final ArrayList<Dict> list = ListUtil.of(v1, v2);
 
-		final List<Object> fieldValues = CollUtil.getFieldValues(list, "name");
+		final List<Object> fieldValues = (List<Object>) CollUtil.getFieldValues(list, "name");
+
 		Assert.assertEquals("张三", fieldValues.get(0));
 		Assert.assertEquals("李四", fieldValues.get(1));
 	}
@@ -284,7 +286,7 @@ public class CollUtilTest {
 	}
 
 	@Test
-	public void filterTest() {
+	public void editTest() {
 		final ArrayList<String> list = ListUtil.of("a", "b", "c");
 
 		final Collection<String> filtered = CollUtil.edit(list, t -> t + 1);
@@ -293,10 +295,10 @@ public class CollUtilTest {
 	}
 
 	@Test
-	public void filterTest2() {
+	public void removeTest() {
 		final ArrayList<String> list = ListUtil.of("a", "b", "c");
 
-		final ArrayList<String> filtered = CollUtil.filter(list, t -> false == "a".equals(t));
+		final ArrayList<String> filtered = CollUtil.remove(list, "a"::equals);
 
 		// 原地过滤
 		Assert.assertSame(list, filtered);
@@ -304,9 +306,9 @@ public class CollUtilTest {
 	}
 
 	@Test
-	public void filterSetTest() {
+	public void removeForSetTest() {
 		final Set<String> set = SetUtil.ofLinked("a", "b", "", "  ", "c");
-		final Set<String> filtered = CollUtil.filter(set, StrUtil::isNotBlank);
+		final Set<String> filtered = CollUtil.remove(set, StrUtil::isBlank);
 
 		Assert.assertEquals(SetUtil.ofLinked("a", "b", "c"), filtered);
 	}
@@ -316,12 +318,12 @@ public class CollUtilTest {
 		final ArrayList<String> list = ListUtil.of("a", "b", "c");
 
 		final List<String> removed = new ArrayList<>();
-		final ArrayList<String> filtered = CollUtil.filter(list, t -> {
+		final ArrayList<String> filtered = CollUtil.remove(list, t -> {
 			if("a".equals(t)){
 				removed.add(t);
-				return false;
+				return true;
 			}
-			return true;
+			return false;
 		});
 
 		Assert.assertEquals(1, removed.size());
@@ -508,22 +510,6 @@ public class CollUtilTest {
 		Assert.assertEquals("D", str);
 	}
 
-	@Test
-	public void addAllIfNotContainsTest() {
-		final ArrayList<String> list1 = new ArrayList<>();
-		list1.add("1");
-		list1.add("2");
-		final ArrayList<String> list2 = new ArrayList<>();
-		list2.add("2");
-		list2.add("3");
-		CollUtil.addAllIfNotContains(list1, list2);
-
-		Assert.assertEquals(3, list1.size());
-		Assert.assertEquals("1", list1.get(0));
-		Assert.assertEquals("2", list1.get(1));
-		Assert.assertEquals("3", list1.get(2));
-	}
-
 	@Test
 	public void subInput1PositiveNegativePositiveOutput1() {
 		// Arrange
@@ -916,4 +902,31 @@ public class CollUtilTest {
 		private String gender;
 		private Integer id;
 	}
+
+	@Test
+	public void mapTest(){
+		final ArrayList<String> list = ListUtil.of("a", "b", "c");
+		final List<Object> extract = CollUtil.map(list, (e) -> e + "_1");
+		Assert.assertEquals(ListUtil.of("a_1",  "b_1", "c_1"), extract);
+	}
+
+	@Test
+	public void mapBeanTest(){
+		final List<Person> people = Arrays.asList(
+				new Person("aa", 12, "man", 1),
+				new Person("bb", 13, "woman", 2),
+				new Person("cc", 14, "man", 3),
+				new Person("dd", 15, "woman", 4)
+		);
+
+		final List<Object> extract = CollUtil.map(people, Person::getName);
+		Assert.assertEquals(ListUtil.of("aa", "bb", "cc", "dd"), extract);
+	}
+
+	@Test
+	public void createTest(){
+		final Collection<Object> collection = CollUtil.create(Collections.emptyList().getClass());
+		Console.log(collection.getClass());
+		Assert.assertNotNull(collection);
+	}
 }

hutool-core/src/test/java/cn/hutool/core/collection/IterUtilTest.java

@@ -108,11 +108,11 @@ public class IterUtilTest {
 	}
 
 	@Test
-	public void filterTest() {
+	public void removeTest() {
 		final List<String> obj2 = ListUtil.of("3");
 		final List<String> obj = ListUtil.of("1", "3");
 
-		IterUtil.filter(obj.iterator(), obj2::contains);
+		IterUtil.remove(obj.iterator(), (e)-> false == obj2.contains(e));
 
 		Assert.assertEquals(1, obj.size());
 		Assert.assertEquals("3", obj.get(0));

hutool-core/src/test/java/cn/hutool/core/collection/ListUtilTest.java

@@ -232,4 +232,20 @@ public class ListUtilTest {
 		map = list.get(0);
 		Assert.assertEquals("李四", map.get("2"));
 	}
+
+	@Test
+	public void addAllIfNotContainsTest() {
+		final ArrayList<String> list1 = new ArrayList<>();
+		list1.add("1");
+		list1.add("2");
+		final ArrayList<String> list2 = new ArrayList<>();
+		list2.add("2");
+		list2.add("3");
+		ListUtil.addAllIfNotContains(list1, list2);
+
+		Assert.assertEquals(3, list1.size());
+		Assert.assertEquals("1", list1.get(0));
+		Assert.assertEquals("2", list1.get(1));
+		Assert.assertEquals("3", list1.get(2));
+	}
 }

hutool-core/src/test/java/cn/hutool/core/collection/MemorySafeLinkedBlockingQueueTest.java

@@ -1,5 +1,6 @@
 package cn.hutool.core.collection;
 
+import cn.hutool.core.util.RandomUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -7,7 +8,12 @@ public class MemorySafeLinkedBlockingQueueTest {
 
 	@Test
 	public void offerTest(){
-		final MemorySafeLinkedBlockingQueue<String> queue = new MemorySafeLinkedBlockingQueue<>(Integer.MAX_VALUE);
-		Assert.assertFalse(queue.offer("123"));
+		// 设置初始值达到最大，这样任何时候元素都无法加入队列
+		final MemorySafeLinkedBlockingQueue<String> queue = new MemorySafeLinkedBlockingQueue<>(Long.MAX_VALUE);
+		Assert.assertFalse(queue.offer(RandomUtil.randomString(RandomUtil.randomInt(100))));
+
+		// 设定一个很小的值，可以成功加入
+		queue.setMaxFreeMemory(10);
+		Assert.assertTrue(queue.offer(RandomUtil.randomString(RandomUtil.randomInt(100))));
 	}
 }