From 074ead4f1704b69d6d204f3af4dc3e7d84ba168a Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 24 Nov 2022 12:51:13 +0800 Subject: [PATCH] fix code --- .../java/cn/hutool/core/util/ArrayUtil.java | 2 +- .../cn/hutool/core/util/ArrayUtilTest.java | 28 +++++++++++++------ 2 files changed, 20 insertions(+), 10 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 0de0859b2..ca147d729 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java @@ -478,7 +478,7 @@ public class ArrayUtil extends PrimitiveArrayUtil { } // 已有数组的元素类型 - Class originComponentType = array.getClass().getComponentType(); + final Class originComponentType = array.getClass().getComponentType(); Object newEleArr = newElements; // 如果 已有数组的元素类型是 原始类型，则需要转换 新元素数组 为该类型，避免ArrayStoreException if (originComponentType.isPrimitive()) { 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 9bcacf38e..bdba4aca9 100755 --- a/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java +++ b/hutool-core/src/test/java/cn/hutool/core/util/ArrayUtilTest.java @@ -579,7 +579,9 @@ public class ArrayUtilTest { } @Test - public void testInsertPrimitive() { + public void insertPrimitiveTest() { + // https://gitee.com/dromara/hutool/pulls/874 + final boolean[] booleans = new boolean[10]; final byte[] bytes = new byte[10]; final char[] chars = new char[10]; @@ -589,13 +591,21 @@ public class ArrayUtilTest { final float[] floats = new float[10]; final double[] doubles = new double[10]; - boolean[] insert1 = ArrayUtil.insert(booleans, 0, 0, 1, 2); - byte[] insert2 = ArrayUtil.insert(bytes, 0, 1, 2, 3); - char[] insert3 = ArrayUtil.insert(chars, 0, 1, 2, 3); - short[] insert4 = ArrayUtil.insert(shorts, 0, 1, 2, 3); - int[] insert5 = ArrayUtil.insert(ints, 0, 1, 2, 3); - long[] insert6 = ArrayUtil.insert(longs, 0, 1, 2, 3); - float[] insert7 = ArrayUtil.insert(floats, 0, 1, 2, 3); - double[] insert8 = ArrayUtil.insert(doubles, 0, 1, 2, 3); + final boolean[] insert1 = ArrayUtil.insert(booleans, 0, 0, 1, 2); + Assert.assertNotNull(insert1); + final byte[] insert2 = ArrayUtil.insert(bytes, 0, 1, 2, 3); + Assert.assertNotNull(insert2); + final char[] insert3 = ArrayUtil.insert(chars, 0, 1, 2, 3); + Assert.assertNotNull(insert3); + final short[] insert4 = ArrayUtil.insert(shorts, 0, 1, 2, 3); + Assert.assertNotNull(insert4); + final int[] insert5 = ArrayUtil.insert(ints, 0, 1, 2, 3); + Assert.assertNotNull(insert5); + final long[] insert6 = ArrayUtil.insert(longs, 0, 1, 2, 3); + Assert.assertNotNull(insert6); + final float[] insert7 = ArrayUtil.insert(floats, 0, 1, 2, 3); + Assert.assertNotNull(insert7); + final double[] insert8 = ArrayUtil.insert(doubles, 0, 1, 2, 3); + Assert.assertNotNull(insert8); } }