Skip to content

Commit 2c3fb23

Browse files
garydgregorygarydgregory
committed
Use static imports only for JUnit
1 parent 348a6d9 commit 2c3fb23

8 files changed

Lines changed: 60 additions & 59 deletions

File tree

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
package org.apache.commons.lang3;
1919

20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
2022
import java.nio.charset.Charset;
2123
import java.nio.charset.StandardCharsets;
2224

23-
import org.junit.jupiter.api.Assertions;
2425
import org.junit.jupiter.api.Test;
2526

2627
/**
@@ -30,22 +31,22 @@ class CharsetsTest extends AbstractLangTest {
3031

3132
@Test
3233
void testToCharset_Charset() {
33-
Assertions.assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset) null));
34-
Assertions.assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset()));
35-
Assertions.assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(StandardCharsets.UTF_8));
34+
assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset) null));
35+
assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset()));
36+
assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(StandardCharsets.UTF_8));
3637
}
3738

3839
@Test
3940
void testToCharset_String() {
40-
Assertions.assertEquals(Charset.defaultCharset(), Charsets.toCharset((String) null));
41-
Assertions.assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset().name()));
42-
Assertions.assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(StandardCharsets.UTF_8.name()));
41+
assertEquals(Charset.defaultCharset(), Charsets.toCharset((String) null));
42+
assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset().name()));
43+
assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(StandardCharsets.UTF_8.name()));
4344
}
4445

4546
@Test
4647
void testToCharsetName() {
47-
Assertions.assertEquals(Charset.defaultCharset().name(), Charsets.toCharsetName((String) null));
48-
Assertions.assertEquals("UTF-8", Charsets.toCharsetName(StandardCharsets.UTF_8.name()));
48+
assertEquals(Charset.defaultCharset().name(), Charsets.toCharsetName((String) null));
49+
assertEquals("UTF-8", Charsets.toCharsetName(StandardCharsets.UTF_8.name()));
4950
}
5051

5152
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.net.URL;
2525
import java.net.URLClassLoader;
2626

27-
import org.junit.jupiter.api.Assertions;
2827
import org.junit.jupiter.api.Test;
2928

3029
/**
@@ -50,7 +49,7 @@ void testToString_ClassLoader() throws IOException {
5049
try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { url })) {
5150
@SuppressWarnings("resource")
5251
final ClassLoader classLoader = urlClassLoader;
53-
Assertions.assertEquals(String.format("%s[%s]", classLoader, url), ClassLoaderUtils.toString(classLoader));
52+
assertEquals(String.format("%s[%s]", classLoader, url), ClassLoaderUtils.toString(classLoader));
5453
}
5554
assertEquals("null", ClassLoaderUtils.toString((ClassLoader) null));
5655
}
@@ -59,7 +58,7 @@ void testToString_ClassLoader() throws IOException {
5958
void testToString_URLClassLoader() throws IOException {
6059
final URL url = new URL("http://localhost");
6160
try (URLClassLoader urlClassLoader = new URLClassLoader(new URL[] { url })) {
62-
Assertions.assertEquals(String.format("%s[%s]", urlClassLoader, url), ClassLoaderUtils.toString(urlClassLoader));
61+
assertEquals(String.format("%s[%s]", urlClassLoader, url), ClassLoaderUtils.toString(urlClassLoader));
6362
}
6463
assertEquals("null", ClassLoaderUtils.toString((URLClassLoader) null));
6564
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.apache.commons.lang3.reflect.testbed.GenericConsumer;
4848
import org.apache.commons.lang3.reflect.testbed.GenericParent;
4949
import org.apache.commons.lang3.reflect.testbed.StringParameterizedChild;
50-
import org.junit.jupiter.api.Assertions;
5150
import org.junit.jupiter.api.Test;
5251
import org.junit.jupiter.params.ParameterizedTest;
5352
import org.junitpioneer.jupiter.params.IntRangeSource;
@@ -236,8 +235,8 @@ void test_getAbbreviatedName_String() {
236235
/** When the length hint is longer than the actual length then the same String object is returned */
237236
void test_getAbbreviatedName_TooLongHint() {
238237
final String className = "java.lang.String";
239-
Assertions.assertSame(className, ClassUtils.getAbbreviatedName(className, className.length() + 1));
240-
Assertions.assertSame(className, ClassUtils.getAbbreviatedName(className, className.length()));
238+
assertSame(className, ClassUtils.getAbbreviatedName(className, className.length() + 1));
239+
assertSame(className, ClassUtils.getAbbreviatedName(className, className.length()));
241240
}
242241

243242
@Test

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import static org.apache.commons.lang3.LangAssertions.assertIllegalArgumentException;
2222
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
23+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2324
import static org.junit.jupiter.api.Assertions.assertEquals;
2425
import static org.junit.jupiter.api.Assertions.assertFalse;
2526
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -35,7 +36,6 @@
3536
import java.util.function.Function;
3637
import java.util.function.ToIntFunction;
3738

38-
import org.junit.jupiter.api.Assertions;
3939
import org.junit.jupiter.api.Test;
4040

4141
enum Enum64 {
@@ -48,8 +48,8 @@ enum Enum64 {
4848
*/
4949
class EnumUtilsTest extends AbstractLangTest {
5050

51-
private void assertArrayEquals(final long[] actual, final long... expected) {
52-
Assertions.assertArrayEquals(expected, actual);
51+
private void assertLongArrayEquals(final long[] actual, final long... expected) {
52+
assertArrayEquals(expected, (long[]) actual);
5353
}
5454

5555
@Test
@@ -162,25 +162,25 @@ void testGenerateBitVectorFromArray() {
162162

163163
@Test
164164
void testGenerateBitVectors() {
165-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.noneOf(Traffic.class)), 0L);
166-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED)), 1L);
167-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.AMBER)), 2L);
168-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.GREEN)), 4L);
169-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.AMBER)), 3L);
170-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.GREEN)), 5L);
171-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.AMBER, Traffic.GREEN)), 6L);
172-
assertArrayEquals(
165+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.noneOf(Traffic.class)), new long[] { 0L });
166+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED)), 1L);
167+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.AMBER)), 2L);
168+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.GREEN)), 4L);
169+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.AMBER)), 3L);
170+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.GREEN)), 5L);
171+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.AMBER, Traffic.GREEN)), 6L);
172+
assertLongArrayEquals(
173173
EnumUtils.generateBitVectors(Traffic.class, EnumSet.of(Traffic.RED, Traffic.AMBER, Traffic.GREEN)), 7L);
174174

175175
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
176-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A31)), 1L << 31);
177-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A32)), 1L << 32);
178-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), 1L << 63);
179-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), Long.MIN_VALUE);
176+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A31)), 1L << 31);
177+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A32)), 1L << 32);
178+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), 1L << 63);
179+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, EnumSet.of(Enum64.A63)), Long.MIN_VALUE);
180180

181181
// More than 64 values Enum
182-
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.M2)), 1L, 0L);
183-
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.L2, TooMany.M2)), 1L,
182+
assertLongArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.M2)), 1L, 0L);
183+
assertLongArrayEquals(EnumUtils.generateBitVectors(TooMany.class, EnumSet.of(TooMany.L2, TooMany.M2)), 1L,
184184
1L << 63);
185185
}
186186

@@ -236,27 +236,27 @@ void testGenerateBitVectors_nullIterable() {
236236

237237
@Test
238238
void testGenerateBitVectorsFromArray() {
239-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class), 0L);
240-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED), 1L);
241-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.AMBER), 2L);
242-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.GREEN), 4L);
243-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER), 3L);
244-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.GREEN), 5L);
245-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.AMBER, Traffic.GREEN), 6L);
246-
assertArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER, Traffic.GREEN), 7L);
239+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class), new long[] { 0L });
240+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED), 1L);
241+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.AMBER), 2L);
242+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.GREEN), 4L);
243+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER), 3L);
244+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.GREEN), 5L);
245+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.AMBER, Traffic.GREEN), 6L);
246+
assertLongArrayEquals(EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER, Traffic.GREEN), 7L);
247247
// gracefully handles duplicates:
248-
assertArrayEquals(
248+
assertLongArrayEquals(
249249
EnumUtils.generateBitVectors(Traffic.class, Traffic.RED, Traffic.AMBER, Traffic.GREEN, Traffic.GREEN), 7L);
250250

251251
// 64 values Enum (to test whether no int<->long jdk conversion issue exists)
252-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A31), 1L << 31);
253-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A32), 1L << 32);
254-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), 1L << 63);
255-
assertArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), Long.MIN_VALUE);
252+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A31), 1L << 31);
253+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A32), 1L << 32);
254+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), 1L << 63);
255+
assertLongArrayEquals(EnumUtils.generateBitVectors(Enum64.class, Enum64.A63), Long.MIN_VALUE);
256256

257257
// More than 64 values Enum
258-
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.M2), 1L, 0L);
259-
assertArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.L2, TooMany.M2), 1L, 1L << 63);
258+
assertLongArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.M2), 1L, 0L);
259+
assertLongArrayEquals(EnumUtils.generateBitVectors(TooMany.class, TooMany.L2, TooMany.M2), 1L, 1L << 63);
260260

261261
}
262262

@@ -616,7 +616,7 @@ void testProcessBitVectors_nullClass() {
616616
@Test
617617
void testStream() {
618618
assertEquals(7, EnumUtils.stream(TimeUnit.class).count());
619-
Assertions.assertArrayEquals(TimeUnit.values(), EnumUtils.stream(TimeUnit.class).toArray(TimeUnit[]::new));
619+
assertArrayEquals(TimeUnit.values(), EnumUtils.stream(TimeUnit.class).toArray(TimeUnit[]::new));
620620
assertEquals(0, EnumUtils.stream(Object.class).count());
621621
assertEquals(0, EnumUtils.stream(null).count());
622622
}

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

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

19-
import org.junit.jupiter.api.Assertions;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertNull;
21+
2022
import org.junit.jupiter.api.Test;
2123

2224
/**
@@ -26,16 +28,16 @@ class StringUtilsValueOfTest extends AbstractLangTest {
2628

2729
@Test
2830
void testValueOfChar() {
29-
Assertions.assertEquals("ABC", StringUtils.valueOf(new char[] {'A', 'B', 'C' }));
31+
assertEquals("ABC", StringUtils.valueOf(new char[] {'A', 'B', 'C' }));
3032
}
3133

3234
@Test
3335
void testValueOfCharEmpty() {
34-
Assertions.assertEquals(StringUtils.EMPTY, StringUtils.valueOf(ArrayUtils.EMPTY_CHAR_ARRAY));
36+
assertEquals(StringUtils.EMPTY, StringUtils.valueOf(ArrayUtils.EMPTY_CHAR_ARRAY));
3537
}
3638

3739
@Test
3840
void testValueOfCharNull() {
39-
Assertions.assertNull(StringUtils.valueOf(null));
41+
assertNull(StringUtils.valueOf(null));
4042
}
4143
}

‎src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderIncludeTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.commons.lang3.builder;
1919

2020
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertThrows;
2122
import static org.junit.jupiter.api.Assertions.assertTrue;
2223

2324
import java.util.ArrayList;
@@ -26,7 +27,6 @@
2627

2728
import org.apache.commons.lang3.AbstractLangTest;
2829
import org.apache.commons.lang3.ArrayUtils;
29-
import org.junit.jupiter.api.Assertions;
3030
import org.junit.jupiter.api.Test;
3131

3232
class ReflectionToStringBuilderIncludeTest extends AbstractLangTest {
@@ -157,7 +157,7 @@ void test_toStringSetIncludeAndExcludeWithIntersection() {
157157
final ReflectionToStringBuilder builder = new ReflectionToStringBuilder(new TestFeature());
158158
builder.setExcludeFieldNames(FIELDS[1], FIELDS[4]);
159159
builder.setIncludeFieldNames(FIELDS[0], FIELDS[1]);
160-
Assertions.assertThrows(IllegalStateException.class, () -> builder.toString());
160+
assertThrows(IllegalStateException.class, () -> builder.toString());
161161
}
162162

163163
@Test
@@ -174,7 +174,7 @@ void test_toStringSetIncludeAndExcludeWithRandomFieldsWithIntersection() {
174174
final ReflectionToStringBuilder builder = new ReflectionToStringBuilder(new TestFeature());
175175
builder.setExcludeFieldNames(FIELDS[1], "random1");
176176
builder.setIncludeFieldNames("random1");
177-
Assertions.assertThrows(IllegalStateException.class, () -> builder.toString());
177+
assertThrows(IllegalStateException.class, () -> builder.toString());
178178
}
179179

180180
@Test

‎src/test/java/org/apache/commons/lang3/function/BooleanConsumerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2121
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertThrows;
2223
import static org.junit.jupiter.api.Assertions.assertTrue;
2324

2425
import java.util.concurrent.atomic.AtomicBoolean;
2526

2627
import org.apache.commons.lang3.AbstractLangTest;
27-
import org.junit.jupiter.api.Assertions;
2828
import org.junit.jupiter.api.Test;
2929

3030
/**
@@ -73,7 +73,7 @@ void testAndThen() throws Throwable {
7373
};
7474
final BooleanConsumer badComposite = bad.andThen(aBool2::lazySet);
7575

76-
Assertions.assertThrows(IllegalStateException.class, () -> badComposite.accept(true));
76+
assertThrows(IllegalStateException.class, () -> badComposite.accept(true));
7777
assertFalse(aBool2.get(), "Second consumer should not be invoked");
7878
}
7979

‎src/test/java/org/apache/commons/lang3/function/ByteConsumerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
import static org.apache.commons.lang3.LangAssertions.assertNullPointerException;
2121
import static org.junit.jupiter.api.Assertions.assertEquals;
22+
import static org.junit.jupiter.api.Assertions.assertThrows;
2223

2324
import java.util.concurrent.atomic.AtomicInteger;
2425

2526
import org.apache.commons.lang3.AbstractLangTest;
26-
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.Test;
2828

2929
/**
@@ -75,7 +75,7 @@ void testAndThen() throws Throwable {
7575
};
7676
final ByteConsumer badComposite = bad.andThen(ref2::lazySet);
7777

78-
Assertions.assertThrows(IllegalStateException.class, () -> badComposite.accept(B1));
78+
assertThrows(IllegalStateException.class, () -> badComposite.accept(B1));
7979
assertEquals(0, ref2.get(), "Second consumer should not be invoked");
8080
}
8181

0 commit comments

Comments
 (0)