From 09b9e707b95094450cd1654af18a3970e78bdffa Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 27 Oct 2019 08:13:24 +0800 Subject: [PATCH] add test --- .../java/cn/hutool/core/util/ArrayUtil.java | 30 ++++-------------- .../cn/hutool/core/util/ArrayUtilTest.java | 31 ++++++++----------- 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java index 1e8810ea8..e8123ebd6 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java @@ -865,12 +865,9 @@ public class ArrayUtil { * @since 3.2.2 */ public static T[] removeNull(T[] array) { - return filter(array, new Editor() { - @Override - public T edit(T t) { - // 返回null便不加入集合 - return t; - } + return filter(array, (Editor) t -> { + // 返回null便不加入集合 + return t; }); } @@ -883,12 +880,7 @@ public class ArrayUtil { * @since 3.2.2 */ public static T[] removeEmpty(T[] array) { - return filter(array, new Filter() { - @Override - public boolean accept(T t) { - return false == StrUtil.isEmpty(t); - } - }); + return filter(array, (Filter) t -> false == StrUtil.isEmpty(t)); } /** @@ -900,12 +892,7 @@ public class ArrayUtil { * @since 3.2.2 */ public static T[] removeBlank(T[] array) { - return filter(array, new Filter() { - @Override - public boolean accept(T t) { - return false == StrUtil.isBlank(t); - } - }); + return filter(array, (Filter) t -> false == StrUtil.isBlank(t)); } /** @@ -916,12 +903,7 @@ public class ArrayUtil { * @since 3.2.1 */ public static String[] nullToEmpty(String[] array) { - return filter(array, new Editor() { - @Override - public String edit(String t) { - return null == t ? StrUtil.EMPTY : t; - } - }); + return filter(array, (Editor) t -> null == t ? StrUtil.EMPTY : t); } /** diff --git a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java index 6a110d528..e8482a583 100644 --- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java @@ -23,6 +23,16 @@ public class ArrayUtilTest { Assert.assertTrue(ArrayUtil.isEmpty(b)); Object c = null; Assert.assertTrue(ArrayUtil.isEmpty(c)); + + Object d = new Object[]{"1", "2", 3, 4D}; + boolean isEmpty = ArrayUtil.isEmpty(d); + Assert.assertFalse(isEmpty); + d = new Object[0]; + isEmpty = ArrayUtil.isEmpty(d); + Assert.assertTrue(isEmpty); + d = null; + isEmpty = ArrayUtil.isEmpty(d); + Assert.assertTrue(isEmpty); } @Test @@ -51,36 +61,21 @@ public class ArrayUtilTest { @Test public void filterTest() { Integer[] a = {1, 2, 3, 4, 5, 6}; - Integer[] filter = ArrayUtil.filter(a, new Editor() { - @Override - public Integer edit(Integer t) { - return (t % 2 == 0) ? t : null; - } - }); + Integer[] filter = ArrayUtil.filter(a, (Editor) t -> (t % 2 == 0) ? t : null); Assert.assertArrayEquals(filter, new Integer[]{2, 4, 6}); } @Test public void filterTestForFilter() { Integer[] a = {1, 2, 3, 4, 5, 6}; - Integer[] filter = ArrayUtil.filter(a, new Filter() { - @Override - public boolean accept(Integer t) { - return t % 2 == 0; - } - }); + Integer[] filter = ArrayUtil.filter(a, (Filter) t -> t % 2 == 0); Assert.assertArrayEquals(filter, new Integer[]{2, 4, 6}); } @Test public void filterTestForEditor() { Integer[] a = {1, 2, 3, 4, 5, 6}; - Integer[] filter = ArrayUtil.filter(a, new Editor() { - @Override - public Integer edit(Integer t) { - return (t % 2 == 0) ? t * 10 : t; - } - }); + Integer[] filter = ArrayUtil.filter(a, (Editor) t -> (t % 2 == 0) ? t * 10 : t); Assert.assertArrayEquals(filter, new Integer[]{1, 20, 3, 40, 5, 60}); }