|
31 | 31 | public class ArrayFillTest extends AbstractLangTest {
|
32 | 32 |
|
33 | 33 | @Test
|
34 |
| - public void testFillByteArray() { |
35 |
| - final byte[] array = new byte[3]; |
36 |
| - final byte val = (byte) 1; |
37 |
| - final byte[] actual = ArrayFill.fill(array, val); |
| 34 | + public void testFillBooleanArray() { |
| 35 | + final boolean[] array = new boolean[3]; |
| 36 | + final boolean val = true; |
| 37 | + final boolean[] actual = ArrayFill.fill(array, val); |
38 | 38 | assertSame(array, actual);
|
39 |
| - for (final byte v : actual) { |
| 39 | + for (final boolean v : actual) { |
40 | 40 | assertEquals(val, v);
|
41 | 41 | }
|
42 | 42 | }
|
43 | 43 |
|
44 | 44 | @Test
|
45 |
| - public void testFillByteArrayNull() { |
46 |
| - final byte[] array = null; |
47 |
| - final byte val = (byte) 1; |
48 |
| - final byte[] actual = ArrayFill.fill(array, val); |
| 45 | + public void testFillBooleanArrayNull() { |
| 46 | + final boolean[] array = null; |
| 47 | + final boolean val = true; |
| 48 | + final boolean[] actual = ArrayFill.fill(array, val); |
49 | 49 | assertSame(array, actual);
|
50 | 50 | }
|
51 | 51 |
|
52 | 52 | @Test
|
53 |
| - public void testFillBooleanArray() { |
54 |
| - final boolean[] array = new boolean[3]; |
55 |
| - final boolean val = true; |
56 |
| - final boolean[] actual = ArrayFill.fill(array, val); |
| 53 | + public void testFillByteArray() { |
| 54 | + final byte[] array = new byte[3]; |
| 55 | + final byte val = (byte) 1; |
| 56 | + final byte[] actual = ArrayFill.fill(array, val); |
57 | 57 | assertSame(array, actual);
|
58 |
| - for (final boolean v : actual) { |
| 58 | + for (final byte v : actual) { |
59 | 59 | assertEquals(val, v);
|
60 | 60 | }
|
61 | 61 | }
|
62 | 62 |
|
63 | 63 | @Test
|
64 |
| - public void testFillBooleanArrayNull() { |
65 |
| - final boolean[] array = null; |
66 |
| - final boolean val = true; |
67 |
| - final boolean[] actual = ArrayFill.fill(array, val); |
| 64 | + public void testFillByteArrayNull() { |
| 65 | + final byte[] array = null; |
| 66 | + final byte val = (byte) 1; |
| 67 | + final byte[] actual = ArrayFill.fill(array, val); |
68 | 68 | assertSame(array, actual);
|
69 | 69 | }
|
70 | 70 |
|
@@ -125,6 +125,21 @@ public void testFillFloatArrayNull() {
|
125 | 125 | assertSame(array, actual);
|
126 | 126 | }
|
127 | 127 |
|
| 128 | + @Test |
| 129 | + public void testFillFunction() throws Exception { |
| 130 | + final FailableIntFunction<?, Exception> nullIntFunction = null; |
| 131 | + assertNull(ArrayFill.fill(null, nullIntFunction)); |
| 132 | + assertArrayEquals(null, ArrayFill.fill(null, nullIntFunction)); |
| 133 | + assertArrayEquals(ArrayUtils.EMPTY_BOOLEAN_OBJECT_ARRAY, ArrayFill.fill(ArrayUtils.EMPTY_BOOLEAN_OBJECT_ARRAY, nullIntFunction)); |
| 134 | + assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, ArrayFill.fill(ArrayUtils.EMPTY_OBJECT_ARRAY, nullIntFunction)); |
| 135 | + final Integer[] array = new Integer[10]; |
| 136 | + final Integer[] array2 = ArrayFill.fill(array, Integer::valueOf); |
| 137 | + assertSame(array, array2); |
| 138 | + for (int i = 0; i < array.length; i++) { |
| 139 | + assertEquals(i, array[i].intValue()); |
| 140 | + } |
| 141 | + } |
| 142 | + |
128 | 143 | @Test
|
129 | 144 | public void testFillIntArray() {
|
130 | 145 | final int[] array = new int[3];
|
@@ -200,19 +215,4 @@ public void testFillShortArrayNull() {
|
200 | 215 | final short[] actual = ArrayFill.fill(array, val);
|
201 | 216 | assertSame(array, actual);
|
202 | 217 | }
|
203 |
| - |
204 |
| - @Test |
205 |
| - public void testFillFunction() throws Exception { |
206 |
| - final FailableIntFunction<?, Exception> nullIntFunction = null; |
207 |
| - assertNull(ArrayFill.fill(null, nullIntFunction)); |
208 |
| - assertArrayEquals(null, ArrayFill.fill(null, nullIntFunction)); |
209 |
| - assertArrayEquals(ArrayUtils.EMPTY_BOOLEAN_OBJECT_ARRAY, ArrayFill.fill(ArrayUtils.EMPTY_BOOLEAN_OBJECT_ARRAY, nullIntFunction)); |
210 |
| - assertArrayEquals(ArrayUtils.EMPTY_OBJECT_ARRAY, ArrayFill.fill(ArrayUtils.EMPTY_OBJECT_ARRAY, nullIntFunction)); |
211 |
| - final Integer[] array = new Integer[10]; |
212 |
| - final Integer[] array2 = ArrayFill.fill(array, Integer::valueOf); |
213 |
| - assertSame(array, array2); |
214 |
| - for (int i = 0; i < array.length; i++) { |
215 |
| - assertEquals(i, array[i].intValue()); |
216 |
| - } |
217 |
| - } |
218 | 218 | }
|
0 commit comments