Skip to content

Commit 0d170ba

Browse files
garydgregorygarydgregory
committed
Use JUnit 5 convention for test method visibility
1 parent 4ae0a45 commit 0d170ba

File tree

225 files changed

+2451
-2451
lines changed

Some content is hidden

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

225 files changed

+2451
-2451
lines changed

‎src/test/java/org/apache/commons/io/AbstractFileUtilsDeleteDirectoryTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ public abstract class AbstractFileUtilsDeleteDirectoryTest {
3737
protected abstract boolean setupSymlink(File res, File link) throws Exception;
3838

3939
@Test
40-
public void testDeleteDirectoryNullArgument() {
40+
void testDeleteDirectoryNullArgument() {
4141
assertThrows(NullPointerException.class, () -> FileUtils.deleteDirectory(null));
4242
}
4343

4444
@Test
45-
public void testDeleteDirWithASymbolicLinkDir2() throws Exception {
45+
void testDeleteDirWithASymbolicLinkDir2() throws Exception {
4646

4747
final File realOuter = new File(top, "realouter");
4848
assertTrue(realOuter.mkdirs());
@@ -73,7 +73,7 @@ public void testDeleteDirWithASymbolicLinkDir2() throws Exception {
7373
}
7474

7575
@Test
76-
public void testDeleteDirWithASymlinkDir() throws Exception {
76+
void testDeleteDirWithASymlinkDir() throws Exception {
7777

7878
final File realOuter = new File(top, "realouter");
7979
assertTrue(realOuter.mkdirs());
@@ -104,7 +104,7 @@ public void testDeleteDirWithASymlinkDir() throws Exception {
104104
}
105105

106106
@Test
107-
public void testDeleteDirWithSymlinkFile() throws Exception {
107+
void testDeleteDirWithSymlinkFile() throws Exception {
108108
final File realOuter = new File(top, "realouter");
109109
assertTrue(realOuter.mkdirs());
110110

@@ -135,7 +135,7 @@ public void testDeleteDirWithSymlinkFile() throws Exception {
135135
}
136136

137137
@Test
138-
public void testDeleteInvalidSymbolicLinks() throws Exception {
138+
void testDeleteInvalidSymbolicLinks() throws Exception {
139139
final File aFile = new File(top, "realParentDirA");
140140
assertTrue(aFile.mkdir());
141141
final File bFile = new File(aFile, "realChildDirB");
@@ -158,7 +158,7 @@ public void testDeleteInvalidSymbolicLinks() throws Exception {
158158
}
159159

160160
@Test
161-
public void testDeleteParentSymbolicLink2() throws Exception {
161+
void testDeleteParentSymbolicLink2() throws Exception {
162162
final File realParent = new File(top, "realparent");
163163
assertTrue(realParent.mkdirs());
164164

@@ -191,7 +191,7 @@ public void testDeleteParentSymbolicLink2() throws Exception {
191191
}
192192

193193
@Test
194-
public void testDeleteParentSymlink() throws Exception {
194+
void testDeleteParentSymlink() throws Exception {
195195
final File realParent = new File(top, "realparent");
196196
assertTrue(realParent.mkdirs());
197197

@@ -224,7 +224,7 @@ public void testDeleteParentSymlink() throws Exception {
224224
}
225225

226226
@Test
227-
public void testDeletesNested() throws Exception {
227+
void testDeletesNested() throws Exception {
228228
final File nested = new File(top, "nested");
229229
assertTrue(nested.mkdirs());
230230

@@ -241,7 +241,7 @@ public void testDeletesNested() throws Exception {
241241
}
242242

243243
@Test
244-
public void testDeletesRegular() throws Exception {
244+
void testDeletesRegular() throws Exception {
245245
final File nested = new File(top, "nested");
246246
assertTrue(nested.mkdirs());
247247

‎src/test/java/org/apache/commons/io/ByteOrderMarkTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class ByteOrderMarkTest {
3939

4040
/** Tests that {@link ByteOrderMark#getCharsetName()} can be loaded as a {@link java.nio.charset.Charset} as advertised. */
4141
@Test
42-
public void testConstantCharsetNames() {
42+
void testConstantCharsetNames() {
4343
assertNotNull(Charset.forName(ByteOrderMark.UTF_8.getCharsetName()));
4444
assertNotNull(Charset.forName(ByteOrderMark.UTF_16BE.getCharsetName()));
4545
assertNotNull(Charset.forName(ByteOrderMark.UTF_16LE.getCharsetName()));
@@ -49,7 +49,7 @@ public void testConstantCharsetNames() {
4949

5050
/** Tests Exceptions */
5151
@Test
52-
public void testConstructorExceptions() {
52+
void testConstructorExceptions() {
5353
assertThrows(NullPointerException.class, () -> new ByteOrderMark(null, 1, 2, 3));
5454
assertThrows(IllegalArgumentException.class, () -> new ByteOrderMark("", 1, 2, 3));
5555
assertThrows(NullPointerException.class, () -> new ByteOrderMark("a", (int[]) null));
@@ -59,7 +59,7 @@ public void testConstructorExceptions() {
5959
/** Tests {@link ByteOrderMark#equals(Object)} */
6060
@SuppressWarnings("EqualsWithItself")
6161
@Test
62-
public void testEquals() {
62+
void testEquals() {
6363
assertEquals(ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_16BE);
6464
assertEquals(ByteOrderMark.UTF_16LE, ByteOrderMark.UTF_16LE);
6565
assertEquals(ByteOrderMark.UTF_32BE, ByteOrderMark.UTF_32BE);
@@ -84,7 +84,7 @@ public void testEquals() {
8484

8585
/** Tests {@link ByteOrderMark#getBytes()} */
8686
@Test
87-
public void testGetBytes() {
87+
void testGetBytes() {
8888
assertArrayEquals(TEST_BOM_1.getBytes(), new byte[] { (byte) 1 }, "test1 bytes");
8989
TEST_BOM_1.getBytes()[0] = 2;
9090
assertArrayEquals(TEST_BOM_1.getBytes(), new byte[] { (byte) 1 }, "test1 bytes");
@@ -94,15 +94,15 @@ public void testGetBytes() {
9494

9595
/** Tests {@link ByteOrderMark#getCharsetName()} */
9696
@Test
97-
public void testGetCharsetName() {
97+
void testGetCharsetName() {
9898
assertEquals("test1", TEST_BOM_1.getCharsetName(), "test1 name");
9999
assertEquals("test2", TEST_BOM_2.getCharsetName(), "test2 name");
100100
assertEquals("test3", TEST_BOM_3.getCharsetName(), "test3 name");
101101
}
102102

103103
/** Tests {@link ByteOrderMark#get(int)} */
104104
@Test
105-
public void testGetInt() {
105+
void testGetInt() {
106106
assertEquals(1, TEST_BOM_1.get(0), "test1 get(0)");
107107
assertEquals(1, TEST_BOM_2.get(0), "test2 get(0)");
108108
assertEquals(2, TEST_BOM_2.get(1), "test2 get(1)");
@@ -113,7 +113,7 @@ public void testGetInt() {
113113

114114
/** Tests {@link ByteOrderMark#hashCode()} */
115115
@Test
116-
public void testHashCode() {
116+
void testHashCode() {
117117
final int bomClassHash = ByteOrderMark.class.hashCode();
118118
assertEquals(bomClassHash + 1, TEST_BOM_1.hashCode(), "hash test1 ");
119119
assertEquals(bomClassHash + 3, TEST_BOM_2.hashCode(), "hash test2 ");
@@ -122,14 +122,14 @@ public void testHashCode() {
122122

123123
/** Tests {@link ByteOrderMark#length()} */
124124
@Test
125-
public void testLength() {
125+
void testLength() {
126126
assertEquals(1, TEST_BOM_1.length(), "test1 length");
127127
assertEquals(2, TEST_BOM_2.length(), "test2 length");
128128
assertEquals(3, TEST_BOM_3.length(), "test3 length");
129129
}
130130

131131
@Test
132-
public void testMatches() {
132+
void testMatches() {
133133
assertTrue(ByteOrderMark.UTF_16BE.matches(ByteOrderMark.UTF_16BE.getRawBytes()));
134134
assertTrue(ByteOrderMark.UTF_16LE.matches(ByteOrderMark.UTF_16LE.getRawBytes()));
135135
assertTrue(ByteOrderMark.UTF_32BE.matches(ByteOrderMark.UTF_32BE.getRawBytes()));
@@ -148,7 +148,7 @@ public void testMatches() {
148148

149149
/** Tests {@link ByteOrderMark#toString()} */
150150
@Test
151-
public void testToString() {
151+
void testToString() {
152152
assertEquals("ByteOrderMark[test1: 0x1]", TEST_BOM_1.toString(), "test1 ");
153153
assertEquals("ByteOrderMark[test2: 0x1,0x2]", TEST_BOM_2.toString(), "test2 ");
154154
assertEquals("ByteOrderMark[test3: 0x1,0x2,0x3]", TEST_BOM_3.toString(), "test3 ");

‎src/test/java/org/apache/commons/io/ByteOrderParserTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,17 @@ private ByteOrder parseByteOrder(final String value) {
3333
}
3434

3535
@Test
36-
public void testParseBig() {
36+
void testParseBig() {
3737
assertEquals(ByteOrder.BIG_ENDIAN, parseByteOrder("BIG_ENDIAN"));
3838
}
3939

4040
@Test
41-
public void testParseLittle() {
41+
void testParseLittle() {
4242
assertEquals(ByteOrder.LITTLE_ENDIAN, parseByteOrder("LITTLE_ENDIAN"));
4343
}
4444

4545
@Test
46-
public void testThrowsException() {
46+
void testThrowsException() {
4747
assertThrows(IllegalArgumentException.class, () -> parseByteOrder("some value"));
4848
}
4949
}

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static Set<String> getRequiredCharsetNames() {
8585

8686
@ParameterizedTest
8787
@MethodSource("charsetAliasProvider")
88-
public void testIsAlias(final Charset charset, final String charsetAlias) {
88+
void testIsAlias(final Charset charset, final String charsetAlias) {
8989
assertTrue(Charsets.isAlias(charset, charsetAlias));
9090
assertTrue(Charsets.isAlias(charset, charsetAlias.toLowerCase()));
9191
assertTrue(Charsets.isAlias(charset, charsetAlias.toUpperCase()));
@@ -94,24 +94,24 @@ public void testIsAlias(final Charset charset, final String charsetAlias) {
9494
}
9595

9696
@Test
97-
public void testIso8859_1() {
97+
void testIso8859_1() {
9898
assertEquals("ISO-8859-1", Charsets.ISO_8859_1.name());
9999
}
100100

101101
@ParameterizedTest
102102
@MethodSource("availableCharsetsValues")
103-
public void testIsUTF8Charset(final Charset charset) {
103+
void testIsUTF8Charset(final Charset charset) {
104104
assumeFalse(StandardCharsets.UTF_8.equals(charset));
105105
charset.aliases().forEach(n -> assertFalse(Charsets.isUTF8(Charset.forName(n))));
106106
}
107107

108-
public void testIsUTF8CharsetUTF8() {
108+
void testIsUTF8CharsetUTF8() {
109109
assertTrue(Charsets.isUTF8(StandardCharsets.UTF_8));
110110
StandardCharsets.UTF_8.aliases().forEach(n -> assertTrue(Charsets.isUTF8(Charset.forName(n))));
111111
}
112112

113113
@Test
114-
public void testRequiredCharsets() {
114+
void testRequiredCharsets() {
115115
final SortedMap<String, Charset> requiredCharsets = Charsets.requiredCharsets();
116116
// test for what we expect to be there as of Java 6
117117
// Make sure the object at the given key is the right one
@@ -124,15 +124,15 @@ public void testRequiredCharsets() {
124124
}
125125

126126
@Test
127-
public void testToCharset_String() {
127+
void testToCharset_String() {
128128
assertEquals(Charset.defaultCharset(), Charsets.toCharset((String) null));
129129
assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset) null));
130130
assertEquals(Charset.defaultCharset(), Charsets.toCharset(Charset.defaultCharset()));
131131
assertEquals(StandardCharsets.UTF_8, Charsets.toCharset(StandardCharsets.UTF_8));
132132
}
133133

134134
@Test
135-
public void testToCharsetDefault() {
135+
void testToCharsetDefault() {
136136
assertEquals(Charset.defaultCharset(), Charsets.toCharsetDefault((String) null, null));
137137
assertEquals(Charset.defaultCharset(), Charsets.toCharsetDefault(StringUtils.EMPTY, null));
138138
assertEquals(Charset.defaultCharset(), Charsets.toCharsetDefault(".", null));
@@ -143,7 +143,7 @@ public void testToCharsetDefault() {
143143
}
144144

145145
@Test
146-
public void testToCharsetWithStringCharset() {
146+
void testToCharsetWithStringCharset() {
147147
assertNull(Charsets.toCharset((String) null, null));
148148
assertEquals(Charset.defaultCharset(), Charsets.toCharset((String) null, Charset.defaultCharset()));
149149
assertEquals(Charset.defaultCharset(), Charsets.toCharset((Charset) null, Charset.defaultCharset()));
@@ -154,27 +154,27 @@ public void testToCharsetWithStringCharset() {
154154
}
155155

156156
@Test
157-
public void testUsAscii() {
157+
void testUsAscii() {
158158
assertEquals(StandardCharsets.US_ASCII.name(), Charsets.US_ASCII.name());
159159
}
160160

161161
@Test
162-
public void testUtf16() {
162+
void testUtf16() {
163163
assertEquals(StandardCharsets.UTF_16.name(), Charsets.UTF_16.name());
164164
}
165165

166166
@Test
167-
public void testUtf16Be() {
167+
void testUtf16Be() {
168168
assertEquals(StandardCharsets.UTF_16BE.name(), Charsets.UTF_16BE.name());
169169
}
170170

171171
@Test
172-
public void testUtf16Le() {
172+
void testUtf16Le() {
173173
assertEquals(StandardCharsets.UTF_16LE.name(), Charsets.UTF_16LE.name());
174174
}
175175

176176
@Test
177-
public void testUtf8() {
177+
void testUtf8() {
178178
assertEquals(StandardCharsets.UTF_8.name(), Charsets.UTF_8.name());
179179
}
180180

0 commit comments

Comments
 (0)