Repository: commons-lang Updated Branches: refs/heads/master b155e6461 -> a49ea7a65
rename local variable name to more applicable (closes #215) separate test cases by a new line Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/a49ea7a6 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/a49ea7a6 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/a49ea7a6 Branch: refs/heads/master Commit: a49ea7a65b7990b3e6e625bc8bfff7396ee49300 Parents: b155e64 Author: Andrii <aabra...@gmail.com> Authored: Wed Nov 23 00:00:46 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Tue Nov 22 23:18:51 2016 +0100 ---------------------------------------------------------------------- .../commons/lang3/AnnotationUtilsTest.java | 14 +- .../lang3/ArrayUtilsRemoveMultipleTest.java | 216 +++++++++++++++++++ 2 files changed, 223 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/a49ea7a6/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java index e87abae..5b0760e 100644 --- a/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/AnnotationUtilsTest.java @@ -494,14 +494,14 @@ public class AnnotationUtilsTest { @Test(timeout = 666000) public void testToString() throws Exception { - final Test testAnno = getClass().getDeclaredMethod("testToString") + final Test testAnnotation = getClass().getDeclaredMethod("testToString") .getAnnotation(Test.class); - final String toString = AnnotationUtils.toString(testAnno); - assertTrue(toString.startsWith("@org.junit.Test(")); - assertTrue(toString.endsWith(")")); - assertTrue(toString.contains("expected=class org.junit.Test$None")); - assertTrue(toString.contains("timeout=666000")); - assertTrue(toString.contains(", ")); + final String annotationString = AnnotationUtils.toString(testAnnotation); + assertTrue(annotationString.startsWith("@org.junit.Test(")); + assertTrue(annotationString.endsWith(")")); + assertTrue(annotationString.contains("expected=class org.junit.Test$None")); + assertTrue(annotationString.contains("timeout=666000")); + assertTrue(annotationString.contains(", ")); } } http://git-wip-us.apache.org/repos/asf/commons-lang/blob/a49ea7a6/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java index 6b548b7..b6f22d5 100644 --- a/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java +++ b/src/test/java/org/apache/commons/lang3/ArrayUtilsRemoveMultipleTest.java @@ -35,36 +35,47 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllObjectArray() { Object[] array; + array = ArrayUtils.removeAll(new Object[] { "a" }, 0); assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b" }, 0, 1); assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c" }, 1, 2); assertArrayEquals(new Object[] { "a" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 1, 2); assertArrayEquals(new Object[] { "a", "d" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 0, 3); assertArrayEquals(new Object[] { "b", "c" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 0, 1, 3); assertArrayEquals(new Object[] { "c" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d", "e" }, 0, 1, 3); assertArrayEquals(new Object[] { "c", "e" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d", "e" }, 0, 2, 4); assertArrayEquals(new Object[] { "b", "d" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 0, 1, 3, 0, 1, 3); assertArrayEquals(new Object[] { "c" }, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 2, 1, 0, 3); assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, array); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new Object[] { "a", "b", "c", "d" }, 2, 0, 1, 3, 0, 2, 1, 3); assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, array); assertEquals(Object.class, array.getClass().getComponentType()); @@ -99,12 +110,15 @@ public class ArrayUtilsRemoveMultipleTest { final Number[] inarray = { Integer.valueOf(1), Long.valueOf(2L), Byte.valueOf((byte) 3) }; assertEquals(3, inarray.length); Number[] outarray; + outarray = ArrayUtils.removeAll(inarray, 1); assertArrayEquals(new Number[] { Integer.valueOf(1), Byte.valueOf((byte) 3) }, outarray); assertEquals(Number.class, outarray.getClass().getComponentType()); + outarray = ArrayUtils.removeAll(outarray, 1); assertArrayEquals(new Number[] { Integer.valueOf(1) }, outarray); assertEquals(Number.class, outarray.getClass().getComponentType()); + outarray = ArrayUtils.removeAll(outarray, 0); assertEquals(0, outarray.length); assertEquals(Number.class, outarray.getClass().getComponentType()); @@ -112,9 +126,11 @@ public class ArrayUtilsRemoveMultipleTest { outarray = ArrayUtils.removeAll(inarray, 0, 1); assertArrayEquals(new Number[] { Byte.valueOf((byte) 3) }, outarray); assertEquals(Number.class, outarray.getClass().getComponentType()); + outarray = ArrayUtils.removeAll(inarray, 0, 2); assertArrayEquals(new Number[] { Long.valueOf(2L) }, outarray); assertEquals(Number.class, outarray.getClass().getComponentType()); + outarray = ArrayUtils.removeAll(inarray, 1, 2); assertArrayEquals(new Number[] { Integer.valueOf(1) }, outarray); assertEquals(Number.class, outarray.getClass().getComponentType()); @@ -123,15 +139,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllBooleanArray() { boolean[] array; + array = ArrayUtils.removeAll(new boolean[] { true }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false }, 0); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false }, 1); assertTrue(Arrays.equals(new boolean[] { true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true }, 1); assertTrue(Arrays.equals(new boolean[] { true, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); @@ -139,30 +159,39 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new boolean[] { true, false }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, false }, 0, 1); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, false }, 0, 2); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, false }, 1, 2); assertTrue(Arrays.equals(new boolean[] { true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true }, 0, 2, 4); assertTrue(Arrays.equals(new boolean[] { false, false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true }, 1, 3); assertTrue(Arrays.equals(new boolean[] { true, true, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true }, 1, 3, 4); assertTrue(Arrays.equals(new boolean[] { true, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true, false, true }, 0, 2, 4, 6); assertTrue(Arrays.equals(new boolean[] { false, false, false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true, false, true }, 1, 3, 5); assertTrue(Arrays.equals(new boolean[] { true, true, true, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new boolean[] { true, false, true, false, true, false, true }, 0, 1, 2); assertTrue(Arrays.equals(new boolean[] { false, true, false, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); @@ -195,15 +224,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllByteArray() { byte[] array; + array = ArrayUtils.removeAll(new byte[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2 }, 0); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2 }, 1); assertTrue(Arrays.equals(new byte[] { 1 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new byte[] { 1, 1 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); @@ -211,24 +244,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new byte[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new byte[] { 3 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new byte[] { 1 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new byte[] { 1, 3, 5 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new byte[] { 2, 4 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new byte[] { 1, 3, 5, 7 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new byte[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new byte[] { 2, 4, 6 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); @@ -261,15 +301,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllCharArray() { char[] array; + array = ArrayUtils.removeAll(new char[] { 'a' }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b' }, 0); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b' }, 1); assertTrue(Arrays.equals(new char[] { 'a' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c' }, 1); assertTrue(Arrays.equals(new char[] { 'a', 'c' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); @@ -277,24 +321,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new char[] { 'a', 'b' }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c' }, 0, 1); assertTrue(Arrays.equals(new char[] { 'c' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c' }, 1, 2); assertTrue(Arrays.equals(new char[] { 'a' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c' }, 0, 2); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c', 'd', 'e' }, 1, 3); assertTrue(Arrays.equals(new char[] { 'a', 'c', 'e' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c', 'd', 'e' }, 0, 2, 4); assertTrue(Arrays.equals(new char[] { 'b', 'd' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g' }, 1, 3, 5); assertTrue(Arrays.equals(new char[] { 'a', 'c', 'e', 'g' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new char[] { 'a', 'b', 'c', 'd', 'e', 'f', 'g' }, 0, 2, 4, 6); assertTrue(Arrays.equals(new char[] { 'b', 'd', 'f' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); @@ -327,15 +378,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllDoubleArray() { double[] array; + array = ArrayUtils.removeAll(new double[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2 }, 0); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2 }, 1); assertTrue(Arrays.equals(new double[] { 1 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new double[] { 1, 1 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); @@ -343,24 +398,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new double[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new double[] { 3 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new double[] { 1 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new double[] { 1, 3, 5 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new double[] { 2, 4 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new double[] { 1, 3, 5, 7 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new double[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new double[] { 2, 4, 6 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); @@ -393,15 +455,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllFloatArray() { float[] array; + array = ArrayUtils.removeAll(new float[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2 }, 0); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2 }, 1); assertTrue(Arrays.equals(new float[] { 1 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new float[] { 1, 1 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); @@ -409,24 +475,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new float[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new float[] { 3 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new float[] { 1 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new float[] { 1, 3, 5 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new float[] { 2, 4 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new float[] { 1, 3, 5, 7 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new float[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new float[] { 2, 4, 6 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); @@ -459,19 +532,25 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllIntArray() { int[] array; + array = ArrayUtils.removeAll(ArrayUtils.EMPTY_INT_ARRAY, ArrayUtils.EMPTY_INT_ARRAY); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); + array = ArrayUtils.removeAll(new int[] { 1 }, ArrayUtils.EMPTY_INT_ARRAY); assertTrue(Arrays.equals(new int[] { 1 }, array)); + array = ArrayUtils.removeAll(new int[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2 }, 0); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2 }, 1); assertTrue(Arrays.equals(new int[] { 1 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new int[] { 1, 1 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); @@ -479,24 +558,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new int[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new int[] { 3 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new int[] { 1 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new int[] { 1, 3, 5 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new int[] { 2, 4 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new int[] { 1, 3, 5, 7 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new int[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new int[] { 2, 4, 6 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); @@ -529,15 +615,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllLongArray() { long[] array; + array = ArrayUtils.removeAll(new long[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2 }, 0); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2 }, 1); assertTrue(Arrays.equals(new long[] { 1 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new long[] { 1, 1 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); @@ -545,24 +635,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new long[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new long[] { 3 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new long[] { 1 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new long[] { 1, 3, 5 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new long[] { 2, 4 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new long[] { 1, 3, 5, 7 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new long[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new long[] { 2, 4, 6 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); @@ -595,15 +692,19 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveAllShortArray() { short[] array; + array = ArrayUtils.removeAll(new short[] { 1 }, 0); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2 }, 0); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2 }, 1); assertTrue(Arrays.equals(new short[] { 1 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new short[] { 1, 1 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); @@ -611,24 +712,31 @@ public class ArrayUtilsRemoveMultipleTest { array = ArrayUtils.removeAll(new short[] { 1, 2 }, 0, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3 }, 0, 1); assertTrue(Arrays.equals(new short[] { 3 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3 }, 1, 2); assertTrue(Arrays.equals(new short[] { 1 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3 }, 0, 2); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3, 4, 5 }, 1, 3); assertTrue(Arrays.equals(new short[] { 1, 3, 5 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3, 4, 5 }, 0, 2, 4); assertTrue(Arrays.equals(new short[] { 2, 4 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3, 4, 5, 6, 7 }, 1, 3, 5); assertTrue(Arrays.equals(new short[] { 1, 3, 5, 7 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeAll(new short[] { 1, 2, 3, 4, 5, 6, 7 }, 0, 2, 4, 6); assertTrue(Arrays.equals(new short[] { 2, 4, 6 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); @@ -661,41 +769,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementsObjectArray() { Object[] array; + array = ArrayUtils.removeElements((Object[]) null, "a"); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_OBJECT_ARRAY, "a"); assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a" }, "a"); assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b" }, "a"); assertTrue(Arrays.equals(new Object[] { "b" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b", "a" }, "a"); assertTrue(Arrays.equals(new Object[] { "b", "a" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); array = ArrayUtils.removeElements((Object[]) null, "a", "b"); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_OBJECT_ARRAY, "a", "b"); assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a" }, "a", "b"); assertTrue(Arrays.equals(ArrayUtils.EMPTY_OBJECT_ARRAY, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b" }, "a", "c"); assertTrue(Arrays.equals(new Object[] { "b" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b", "a" }, "a"); assertTrue(Arrays.equals(new Object[] { "b", "a" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b", "a" }, "a", "b"); assertTrue(Arrays.equals(new Object[] { "a" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b", "a" }, "a", "a"); assertTrue(Arrays.equals(new Object[] { "b" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new Object[] { "a", "b", "a" }, "a", "a", "a", "a"); assertTrue(Arrays.equals(new Object[] { "b" }, array)); assertEquals(Object.class, array.getClass().getComponentType()); @@ -704,41 +824,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementBooleanArray() { boolean[] array; + array = ArrayUtils.removeElements((boolean[]) null, true); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_BOOLEAN_ARRAY, true); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true }, true); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false }, true); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false, true }, true); assertTrue(Arrays.equals(new boolean[] { false, true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((boolean[]) null, true, false); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_BOOLEAN_ARRAY, true, false); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true }, true, false); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false }, true, false); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BOOLEAN_ARRAY, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false }, true, true); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false, true }, true, false); assertTrue(Arrays.equals(new boolean[] { true }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false, true }, true, true); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new boolean[] { true, false, true }, true, true, true, true); assertTrue(Arrays.equals(new boolean[] { false }, array)); assertEquals(Boolean.TYPE, array.getClass().getComponentType()); @@ -747,41 +879,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementByteArray() { byte[] array; + array = ArrayUtils.removeElements((byte[]) null, (byte) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_BYTE_ARRAY, (byte) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1 }, (byte) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2 }, (byte) 1); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2, 1 }, (byte) 1); assertTrue(Arrays.equals(new byte[] { 2, 1 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((byte[]) null, (byte) 1, (byte) 2); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_BYTE_ARRAY, (byte) 1, (byte) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1 }, (byte) 1, (byte) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2 }, (byte) 1, (byte) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_BYTE_ARRAY, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2 }, (byte) 1, (byte) 1); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2, 1 }, (byte) 1, (byte) 2); assertTrue(Arrays.equals(new byte[] { 1 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2, 1 }, (byte) 1, (byte) 1); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new byte[] { 1, 2, 1 }, (byte) 1, (byte) 1, (byte) 1, (byte) 1); assertTrue(Arrays.equals(new byte[] { 2 }, array)); assertEquals(Byte.TYPE, array.getClass().getComponentType()); @@ -790,41 +934,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementCharArray() { char[] array; + array = ArrayUtils.removeElements((char[]) null, 'a'); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_CHAR_ARRAY, 'a'); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a' }, 'a'); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b' }, 'a'); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b', 'a' }, 'a'); assertTrue(Arrays.equals(new char[] { 'b', 'a' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((char[]) null, 'a', 'b'); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_CHAR_ARRAY, 'a', 'b'); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a' }, 'a', 'b'); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b' }, 'a', 'b'); assertTrue(Arrays.equals(ArrayUtils.EMPTY_CHAR_ARRAY, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b' }, 'a', 'a'); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b', 'a' }, 'a', 'b'); assertTrue(Arrays.equals(new char[] { 'a' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b', 'a' }, 'a', 'a'); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new char[] { 'a', 'b', 'a' }, 'a', 'a', 'a', 'a'); assertTrue(Arrays.equals(new char[] { 'b' }, array)); assertEquals(Character.TYPE, array.getClass().getComponentType()); @@ -834,41 +990,53 @@ public class ArrayUtilsRemoveMultipleTest { @SuppressWarnings("cast") public void testRemoveElementDoubleArray() { double[] array; + array = ArrayUtils.removeElements((double[]) null, (double) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_DOUBLE_ARRAY, (double) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1 }, (double) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2 }, (double) 1); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2, 1 }, (double) 1); assertTrue(Arrays.equals(new double[] { 2, 1 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((double[]) null, (double) 1, (double) 2); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_DOUBLE_ARRAY, (double) 1, (double) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1 }, (double) 1, (double) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2 }, (double) 1, (double) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_DOUBLE_ARRAY, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2 }, (double) 1, (double) 1); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2, 1 }, (double) 1, (double) 2); assertTrue(Arrays.equals(new double[] { 1 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2, 1 }, (double) 1, (double) 1); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new double[] { 1, 2, 1 }, (double) 1, (double) 1, (double) 1, (double) 1); assertTrue(Arrays.equals(new double[] { 2 }, array)); assertEquals(Double.TYPE, array.getClass().getComponentType()); @@ -878,41 +1046,53 @@ public class ArrayUtilsRemoveMultipleTest { @SuppressWarnings("cast") public void testRemoveElementFloatArray() { float[] array; + array = ArrayUtils.removeElements((float[]) null, (float) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_FLOAT_ARRAY, (float) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1 }, (float) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2 }, (float) 1); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2, 1 }, (float) 1); assertTrue(Arrays.equals(new float[] { 2, 1 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((float[]) null, (float) 1, (float) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_FLOAT_ARRAY, (float) 1, (float) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1 }, (float) 1, (float) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2 }, (float) 1, (float) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_FLOAT_ARRAY, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2 }, (float) 1, (float) 1); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2, 1 }, (float) 1, (float) 1); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2, 1 }, (float) 1, (float) 2); assertTrue(Arrays.equals(new float[] { 1 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new float[] { 1, 2, 1 }, (float) 1, (float) 1, (float) 1, (float) 1); assertTrue(Arrays.equals(new float[] { 2 }, array)); assertEquals(Float.TYPE, array.getClass().getComponentType()); @@ -921,41 +1101,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementIntArray() { int[] array; + array = ArrayUtils.removeElements((int[]) null, 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_INT_ARRAY, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1 }, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2 }, 1); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2, 1 }, 1); assertTrue(Arrays.equals(new int[] { 2, 1 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((int[]) null, 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_INT_ARRAY, 1, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1 }, 1, 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2 }, 1, 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_INT_ARRAY, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2 }, 1, 1); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2, 1 }, 1, 2); assertTrue(Arrays.equals(new int[] { 1 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2, 1 }, 1, 1); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new int[] { 1, 2, 1 }, 1, 1, 1, 1); assertTrue(Arrays.equals(new int[] { 2 }, array)); assertEquals(Integer.TYPE, array.getClass().getComponentType()); @@ -965,41 +1157,53 @@ public class ArrayUtilsRemoveMultipleTest { @SuppressWarnings("cast") public void testRemoveElementLongArray() { long[] array; + array = ArrayUtils.removeElements((long[]) null, (long) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, (long) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1 }, (long) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1); assertTrue(Arrays.equals(new long[] { 2, 1 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((long[]) null, (long) 1, (long) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_LONG_ARRAY, (long) 1, (long) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1 }, (long) 1, (long) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1, (long) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_LONG_ARRAY, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2 }, (long) 1, (long) 1); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 1); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 2); assertTrue(Arrays.equals(new long[] { 1 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new long[] { 1, 2, 1 }, (long) 1, (long) 1, (long) 1, (long) 1); assertTrue(Arrays.equals(new long[] { 2 }, array)); assertEquals(Long.TYPE, array.getClass().getComponentType()); @@ -1008,41 +1212,53 @@ public class ArrayUtilsRemoveMultipleTest { @Test public void testRemoveElementShortArray() { short[] array; + array = ArrayUtils.removeElements((short[]) null, (short) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_SHORT_ARRAY, (short) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1 }, (short) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2 }, (short) 1); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2, 1 }, (short) 1); assertTrue(Arrays.equals(new short[] { 2, 1 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); array = ArrayUtils.removeElements((short[]) null, (short) 1, (short) 1); assertNull(array); + array = ArrayUtils.removeElements(ArrayUtils.EMPTY_SHORT_ARRAY, (short) 1, (short) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1 }, (short) 1, (short) 1); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2 }, (short) 1, (short) 2); assertTrue(Arrays.equals(ArrayUtils.EMPTY_SHORT_ARRAY, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2 }, (short) 1, (short) 1); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2, 1 }, (short) 1, (short) 1); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2, 1 }, (short) 1, (short) 2); assertTrue(Arrays.equals(new short[] { 1 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType()); + array = ArrayUtils.removeElements(new short[] { 1, 2, 1 }, (short) 1, (short) 1, (short) 1, (short) 1); assertTrue(Arrays.equals(new short[] { 2 }, array)); assertEquals(Short.TYPE, array.getClass().getComponentType());
