Skip to content

Commit 6b93cbe

Browse files
garydgregorygarydgregory
committed
Refactor common code pattern in tests for NPE assertions
1 parent b6f72e7 commit 6b93cbe

File tree

59 files changed

+430
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+430
-354
lines changed

‎src/test/java/org/apache/commons/lang3/ArrayUtilsTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.commons.lang3;
1818

19+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
1920
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -83,17 +84,17 @@ private void assertIsEquals(final Object array1, final Object array2, final Obje
8384
@Test
8485
void testArraycopyFunction() {
8586
final String[] arr = { "a", "b" };
86-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(null, 0, 0, 1, i -> new String[3]));
87-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, i -> null));
88-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Function<Integer, String[]>) null));
87+
assertNullPointerException(() -> ArrayUtils.arraycopy(null, 0, 0, 1, i -> new String[3]));
88+
assertNullPointerException(() -> ArrayUtils.arraycopy(arr, 0, 0, 1, i -> null));
89+
assertNullPointerException(() -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Function<Integer, String[]>) null));
8990
}
9091

9192
@Test
9293
void testArraycopySupplier() {
9394
final String[] arr = { "a", "b" };
94-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(null, 0, 0, 1, () -> new String[3]));
95-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, Suppliers.nul()));
96-
assertThrows(NullPointerException.class, () -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Supplier<String[]>) null));
95+
assertNullPointerException(() -> ArrayUtils.arraycopy(null, 0, 0, 1, () -> new String[3]));
96+
assertNullPointerException(() -> ArrayUtils.arraycopy(arr, 0, 0, 1, Suppliers.nul()));
97+
assertNullPointerException(() -> ArrayUtils.arraycopy(arr, 0, 0, 1, (Supplier<String[]>) null));
9798
}
9899
/**
99100
* Tests generic array creation with parameters of same type.
@@ -1669,7 +1670,7 @@ void testIsSortedLong() {
16691670

16701671
@Test
16711672
void testIsSortedNullComparator() {
1672-
assertThrows(NullPointerException.class, () -> ArrayUtils.isSorted(null, null));
1673+
assertNullPointerException(() -> ArrayUtils.isSorted(null, null));
16731674
}
16741675

16751676
@Test

‎src/test/java/org/apache/commons/lang3/BooleanUtilsTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.lang3;
1818

1919
import static org.apache.commons.lang3.ArraySorter.sort;
20+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2021
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2122
import static org.junit.jupiter.api.Assertions.assertEquals;
2223
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -459,7 +460,7 @@ void testAnd_object_nullElementInput() {
459460

460461
@Test
461462
void testAnd_object_nullInput() {
462-
assertThrows(NullPointerException.class, () -> BooleanUtils.and((Boolean[]) null));
463+
assertNullPointerException(() -> BooleanUtils.and((Boolean[]) null));
463464
}
464465

465466
@Test
@@ -571,7 +572,7 @@ void testAnd_primitive_emptyInput() {
571572

572573
@Test
573574
void testAnd_primitive_nullInput() {
574-
assertThrows(NullPointerException.class, () -> BooleanUtils.and((boolean[]) null));
575+
assertNullPointerException(() -> BooleanUtils.and((boolean[]) null));
575576
}
576577

577578
@Test
@@ -658,7 +659,7 @@ void testOneHot_object_nullElementInput() {
658659

659660
@Test
660661
void testOneHot_object_nullInput() {
661-
assertThrows(NullPointerException.class, () -> BooleanUtils.oneHot((Boolean[]) null));
662+
assertNullPointerException(() -> BooleanUtils.oneHot((Boolean[]) null));
662663
}
663664

664665
@Test
@@ -720,7 +721,7 @@ void testOneHot_primitive_emptyInput() {
720721

721722
@Test
722723
void testOneHot_primitive_nullInput() {
723-
assertThrows(NullPointerException.class, () -> BooleanUtils.oneHot((boolean[]) null));
724+
assertNullPointerException(() -> BooleanUtils.oneHot((boolean[]) null));
724725
}
725726

726727
@Test
@@ -776,7 +777,7 @@ void testOr_object_nullElementInput() {
776777

777778
@Test
778779
void testOr_object_nullInput() {
779-
assertThrows(NullPointerException.class, () -> BooleanUtils.or((Boolean[]) null));
780+
assertNullPointerException(() -> BooleanUtils.or((Boolean[]) null));
780781
}
781782

782783
@Test
@@ -888,7 +889,7 @@ void testOr_primitive_emptyInput() {
888889

889890
@Test
890891
void testOr_primitive_nullInput() {
891-
assertThrows(NullPointerException.class, () -> BooleanUtils.or((boolean[]) null));
892+
assertNullPointerException(() -> BooleanUtils.or((boolean[]) null));
892893
}
893894

894895
@Test
@@ -957,7 +958,7 @@ void testXor_object_nullElementInput() {
957958

958959
@Test
959960
void testXor_object_nullInput() {
960-
assertThrows(NullPointerException.class, () -> BooleanUtils.xor((Boolean[]) null));
961+
assertNullPointerException(() -> BooleanUtils.xor((Boolean[]) null));
961962
}
962963

963964
@Test
@@ -1089,7 +1090,7 @@ void testXor_primitive_emptyInput() {
10891090

10901091
@Test
10911092
void testXor_primitive_nullInput() {
1092-
assertThrows(NullPointerException.class, () -> BooleanUtils.xor((boolean[]) null));
1093+
assertNullPointerException(() -> BooleanUtils.xor((boolean[]) null));
10931094
}
10941095

10951096
@Test

‎src/test/java/org/apache/commons/lang3/CharRangeTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.commons.lang3;
2020

21+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2122
import static org.junit.jupiter.api.Assertions.assertEquals;
2223
import static org.junit.jupiter.api.Assertions.assertFalse;
2324
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -262,7 +263,7 @@ void testContains_Charrange() {
262263
@Test
263264
void testContainsNullArg() {
264265
final CharRange range = CharRange.is('a');
265-
final NullPointerException e = assertThrows(NullPointerException.class, () -> range.contains(null));
266+
final NullPointerException e = assertNullPointerException(() -> range.contains(null));
266267
assertEquals("range", e.getMessage());
267268
}
268269

‎src/test/java/org/apache/commons/lang3/CharUtilsTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.commons.lang3;
1818

19+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -200,7 +201,7 @@ void testIsAsciiPrintable_char() {
200201
void testToChar_Character() {
201202
assertEquals('A', CharUtils.toChar(CHARACTER_A));
202203
assertEquals('B', CharUtils.toChar(CHARACTER_B));
203-
assertThrows(NullPointerException.class, () -> CharUtils.toChar((Character) null));
204+
assertNullPointerException(() -> CharUtils.toChar((Character) null));
204205
}
205206

206207
@Test
@@ -214,7 +215,7 @@ void testToChar_Character_char() {
214215
void testToChar_String() {
215216
assertEquals('A', CharUtils.toChar("A"));
216217
assertEquals('B', CharUtils.toChar("BA"));
217-
assertThrows(NullPointerException.class, () -> CharUtils.toChar((String) null));
218+
assertNullPointerException(() -> CharUtils.toChar((String) null));
218219
assertThrows(IllegalArgumentException.class, () -> CharUtils.toChar(""));
219220
}
220221

@@ -284,7 +285,7 @@ void testToIntValue_char_int() {
284285
void testToIntValue_Character() {
285286
assertEquals(0, CharUtils.toIntValue(Character.valueOf('0')));
286287
assertEquals(3, CharUtils.toIntValue(Character.valueOf('3')));
287-
assertThrows(NullPointerException.class, () -> CharUtils.toIntValue(null));
288+
assertNullPointerException(() -> CharUtils.toIntValue(null));
288289
assertThrows(IllegalArgumentException.class, () -> CharUtils.toIntValue(CHARACTER_A));
289290
}
290291

‎src/test/java/org/apache/commons/lang3/ClassPathUtilsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
*/
1717
package org.apache.commons.lang3;
1818

19+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
1920
import static org.junit.jupiter.api.Assertions.assertEquals;
2021
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -57,7 +58,7 @@ void testPathToPackage() {
5758

5859
@Test
5960
void testToFullyQualifiedNameClassNull() {
60-
assertThrows(NullPointerException.class, () -> ClassPathUtils.toFullyQualifiedName(ClassPathUtils.class, null));
61+
assertNullPointerException(() -> ClassPathUtils.toFullyQualifiedName(ClassPathUtils.class, null));
6162
}
6263

6364
@Test
@@ -104,7 +105,7 @@ void testToFullyQualifiedPathClass() {
104105

105106
@Test
106107
void testToFullyQualifiedPathClassNull() {
107-
assertThrows(NullPointerException.class, () -> ClassPathUtils.toFullyQualifiedPath(ClassPathUtils.class, null));
108+
assertNullPointerException(() -> ClassPathUtils.toFullyQualifiedPath(ClassPathUtils.class, null));
108109
}
109110

110111
@Test

‎src/test/java/org/apache/commons/lang3/DoubleRangeTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.commons.lang3;
1919

20+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122
import static org.junit.jupiter.api.Assertions.assertFalse;
2223
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -119,7 +120,7 @@ void testContainsRange() {
119120

120121
@Test
121122
void testElementCompareTo() {
122-
assertThrows(NullPointerException.class, () -> range1.elementCompareTo(null));
123+
assertNullPointerException(() -> range1.elementCompareTo(null));
123124

124125
assertEquals(-1, range1.elementCompareTo(5d));
125126
assertEquals(0, range1.elementCompareTo(10d));
@@ -152,7 +153,7 @@ void testFit() {
152153

153154
@Test
154155
void testFitNull() {
155-
assertThrows(NullPointerException.class, () -> {
156+
assertNullPointerException(() -> {
156157
range1.fit(null);
157158
});
158159
}
@@ -379,7 +380,7 @@ void testOfWithContains() {
379380
assertFalse(rb.contains(21d), "should not contain 21");
380381
assertFalse(rb.contains(-11d), "should not contain -11");
381382

382-
assertThrows(NullPointerException.class, () -> of(null, null));
383+
assertNullPointerException(() -> of(null, null));
383384
}
384385

385386
@Test

‎src/test/java/org/apache/commons/lang3/EnumUtilsTest.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.commons.lang3;
2020

21+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2122
import static org.junit.jupiter.api.Assertions.assertEquals;
2223
import static org.junit.jupiter.api.Assertions.assertFalse;
2324
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -106,7 +107,7 @@ void testGenerateBitVector_nonEnumClassWithArray() {
106107

107108
@Test
108109
void testGenerateBitVector_nullArray() {
109-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVector(Traffic.class, (Traffic[]) null));
110+
assertNullPointerException(() -> EnumUtils.generateBitVector(Traffic.class, (Traffic[]) null));
110111
}
111112

112113
@Test
@@ -117,12 +118,12 @@ void testGenerateBitVector_nullArrayElement() {
117118

118119
@Test
119120
void testGenerateBitVector_nullClass() {
120-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVector(null, EnumSet.of(Traffic.RED)));
121+
assertNullPointerException(() -> EnumUtils.generateBitVector(null, EnumSet.of(Traffic.RED)));
121122
}
122123

123124
@Test
124125
void testGenerateBitVector_nullClassWithArray() {
125-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVector(null, Traffic.RED));
126+
assertNullPointerException(() -> EnumUtils.generateBitVector(null, Traffic.RED));
126127
}
127128

128129
@Test
@@ -202,7 +203,7 @@ void testGenerateBitVectors_nonEnumClassWithArray() {
202203

203204
@Test
204205
void testGenerateBitVectors_nullArray() {
205-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVectors(Traffic.class, (Traffic[]) null));
206+
assertNullPointerException(() -> EnumUtils.generateBitVectors(Traffic.class, (Traffic[]) null));
206207
}
207208

208209
@Test
@@ -213,12 +214,12 @@ void testGenerateBitVectors_nullArrayElement() {
213214

214215
@Test
215216
void testGenerateBitVectors_nullClass() {
216-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVectors(null, EnumSet.of(Traffic.RED)));
217+
assertNullPointerException(() -> EnumUtils.generateBitVectors(null, EnumSet.of(Traffic.RED)));
217218
}
218219

219220
@Test
220221
void testGenerateBitVectors_nullClassWithArray() {
221-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVectors(null, Traffic.RED));
222+
assertNullPointerException(() -> EnumUtils.generateBitVectors(null, Traffic.RED));
222223
}
223224

224225
@Test
@@ -229,7 +230,7 @@ void testGenerateBitVectors_nullElement() {
229230

230231
@Test
231232
void testGenerateBitVectors_nullIterable() {
232-
assertThrows(NullPointerException.class, () -> EnumUtils.generateBitVectors(null, (Iterable<Traffic>) null));
233+
assertNullPointerException(() -> EnumUtils.generateBitVectors(null, (Iterable<Traffic>) null));
233234
}
234235

235236
@Test
@@ -294,7 +295,7 @@ void testGetEnum_nonEnumClass() {
294295

295296
@Test
296297
void testGetEnum_nullClass() {
297-
assertThrows(NullPointerException.class, () -> EnumUtils.getEnum((Class<Traffic>) null, "PURPLE"));
298+
assertNullPointerException(() -> EnumUtils.getEnum((Class<Traffic>) null, "PURPLE"));
298299
}
299300

300301
@Test
@@ -333,7 +334,7 @@ void testGetEnumIgnoreCase_nonEnumClass() {
333334

334335
@Test
335336
void testGetEnumIgnoreCase_nullClass() {
336-
assertThrows(NullPointerException.class, () -> EnumUtils.getEnumIgnoreCase((Class<Traffic>) null, "PURPLE"));
337+
assertNullPointerException(() -> EnumUtils.getEnumIgnoreCase((Class<Traffic>) null, "PURPLE"));
337338
}
338339

339340
@Test
@@ -465,7 +466,7 @@ void testIsValidEnum() {
465466

466467
@Test
467468
void testIsValidEnum_nullClass() {
468-
assertThrows(NullPointerException.class, () -> EnumUtils.isValidEnum(null, "PURPLE"));
469+
assertNullPointerException(() -> EnumUtils.isValidEnum(null, "PURPLE"));
469470
}
470471

471472
@Test
@@ -479,7 +480,7 @@ void testIsValidEnumIgnoreCase() {
479480

480481
@Test
481482
void testIsValidEnumIgnoreCase_nullClass() {
482-
assertThrows(NullPointerException.class, () -> EnumUtils.isValidEnumIgnoreCase(null, "PURPLE"));
483+
assertNullPointerException(() -> EnumUtils.isValidEnumIgnoreCase(null, "PURPLE"));
483484
}
484485

485486
@Test
@@ -509,7 +510,7 @@ void testProcessBitVector_longClass() {
509510
@Test
510511
void testProcessBitVector_nullClass() {
511512
final Class<Traffic> empty = null;
512-
assertThrows(NullPointerException.class, () -> EnumUtils.processBitVector(empty, 0L));
513+
assertNullPointerException(() -> EnumUtils.processBitVector(empty, 0L));
513514
}
514515

515516
@Test
@@ -602,7 +603,7 @@ void testProcessBitVectors_longClass() {
602603
@Test
603604
void testProcessBitVectors_nullClass() {
604605
final Class<Traffic> empty = null;
605-
assertThrows(NullPointerException.class, () -> EnumUtils.processBitVectors(empty, 0L));
606+
assertNullPointerException(() -> EnumUtils.processBitVectors(empty, 0L));
606607
}
607608

608609
}

‎src/test/java/org/apache/commons/lang3/IntegerRangeTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
package org.apache.commons.lang3;
1919

20+
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2021
import static org.junit.jupiter.api.Assertions.assertEquals;
2122
import static org.junit.jupiter.api.Assertions.assertFalse;
2223
import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -120,7 +121,7 @@ void testContainsRange() {
120121

121122
@Test
122123
void testElementCompareTo() {
123-
assertThrows(NullPointerException.class, () -> range1.elementCompareTo(null));
124+
assertNullPointerException(() -> range1.elementCompareTo(null));
124125

125126
assertEquals(-1, range1.elementCompareTo(5));
126127
assertEquals(0, range1.elementCompareTo(10));
@@ -153,7 +154,7 @@ void testFit() {
153154

154155
@Test
155156
void testFitNull() {
156-
assertThrows(NullPointerException.class, () -> {
157+
assertNullPointerException(() -> {
157158
range1.fit(null);
158159
});
159160
}
@@ -380,7 +381,7 @@ void testOfWithContains() {
380381
assertFalse(rb.contains(21), "should not contain 21");
381382
assertFalse(rb.contains(-11), "should not contain -11");
382383

383-
assertThrows(NullPointerException.class, () -> of(null, null));
384+
assertNullPointerException(() -> of(null, null));
384385
}
385386

386387
@Test

0 commit comments

Comments
 (0)