Skip to content

Commit ce928c2

Browse files
slachiewiczTeamModerne
slachiewicz
and
TeamModerne
committed
JUnit Jupiter best practices
Co-authored-by: Moderne <[email protected]>
1 parent 06b0a4e commit ce928c2

14 files changed

+74
-82
lines changed

‎src/test/java/org/codehaus/plexus/components/io/attributes/AbstractResourceAttributesTCK.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,47 +29,47 @@ protected AbstractResourceAttributesTCK() {}
2929
protected abstract PlexusIoResourceAttributes newAttributes(String mode);
3030

3131
@Test
32-
final void testSetOctalModeString_OwnerModes() {
32+
final void setOctalModeStringOwnerModes() {
3333
verifyStringOctalModeSet("700", new boolean[] {true, true, true, false, false, false, false, false, false});
3434
verifyStringOctalModeSet("600", new boolean[] {true, true, false, false, false, false, false, false, false});
3535
verifyStringOctalModeSet("400", new boolean[] {true, false, false, false, false, false, false, false, false});
3636
verifyStringOctalModeSet("200", new boolean[] {false, true, false, false, false, false, false, false, false});
3737
}
3838

3939
@Test
40-
final void testSetOctalModeString_GroupModes() {
40+
final void setOctalModeStringGroupModes() {
4141
verifyStringOctalModeSet("070", new boolean[] {false, false, false, true, true, true, false, false, false});
4242
verifyStringOctalModeSet("060", new boolean[] {false, false, false, true, true, false, false, false, false});
4343
verifyStringOctalModeSet("040", new boolean[] {false, false, false, true, false, false, false, false, false});
4444
verifyStringOctalModeSet("020", new boolean[] {false, false, false, false, true, false, false, false, false});
4545
}
4646

4747
@Test
48-
final void testSetOctalModeString_WorldModes() {
48+
final void setOctalModeStringWorldModes() {
4949
verifyStringOctalModeSet("007", new boolean[] {false, false, false, false, false, false, true, true, true});
5050
verifyStringOctalModeSet("006", new boolean[] {false, false, false, false, false, false, true, true, false});
5151
verifyStringOctalModeSet("004", new boolean[] {false, false, false, false, false, false, true, false, false});
5252
verifyStringOctalModeSet("002", new boolean[] {false, false, false, false, false, false, false, true, false});
5353
}
5454

5555
@Test
56-
final void testSetOctalMode_OwnerModes() {
56+
final void setOctalModeOwnerModes() {
5757
verifyOctalModeSet("700", new boolean[] {true, true, true, false, false, false, false, false, false});
5858
verifyOctalModeSet("600", new boolean[] {true, true, false, false, false, false, false, false, false});
5959
verifyOctalModeSet("400", new boolean[] {true, false, false, false, false, false, false, false, false});
6060
verifyOctalModeSet("200", new boolean[] {false, true, false, false, false, false, false, false, false});
6161
}
6262

6363
@Test
64-
final void testSetOctalMode_GroupModes() {
64+
final void setOctalModeGroupModes() {
6565
verifyOctalModeSet("070", new boolean[] {false, false, false, true, true, true, false, false, false});
6666
verifyOctalModeSet("060", new boolean[] {false, false, false, true, true, false, false, false, false});
6767
verifyOctalModeSet("040", new boolean[] {false, false, false, true, false, false, false, false, false});
6868
verifyOctalModeSet("020", new boolean[] {false, false, false, false, true, false, false, false, false});
6969
}
7070

7171
@Test
72-
final void testSetOctalMode_WorldModes() {
72+
final void setOctalModeWorldModes() {
7373
verifyOctalModeSet("007", new boolean[] {false, false, false, false, false, false, true, true, true});
7474
verifyOctalModeSet("006", new boolean[] {false, false, false, false, false, false, true, true, false});
7575
verifyOctalModeSet("004", new boolean[] {false, false, false, false, false, false, true, false, false});

‎src/test/java/org/codehaus/plexus/components/io/attributes/AttributeUtilsTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.codehaus.plexus.components.io.attributes;
22

33
import java.io.File;
4-
import java.io.IOException;
54
import java.nio.file.attribute.PosixFilePermission;
65
import java.util.Set;
76

@@ -17,25 +16,25 @@
1716
* @author Kristian Rosenvold
1817
*/
1918
@SuppressWarnings("OctalInteger")
20-
public class AttributeUtilsTest {
19+
class AttributeUtilsTest {
2120
@Test
22-
void testMiscPatterns() {
21+
void miscPatterns() {
2322
final Set<PosixFilePermission> permissions = AttributeUtils.getPermissions(0124);
2423
assertTrue(permissions.contains(PosixFilePermission.OWNER_EXECUTE));
2524
assertTrue(permissions.contains(PosixFilePermission.GROUP_WRITE));
2625
assertTrue(permissions.contains(PosixFilePermission.OTHERS_READ));
2726
}
2827

2928
@Test
30-
void testMorePatterns() {
29+
void morePatterns() {
3130
final Set<PosixFilePermission> permissions = AttributeUtils.getPermissions(0241);
3231
assertTrue(permissions.contains(PosixFilePermission.OWNER_WRITE));
3332
assertTrue(permissions.contains(PosixFilePermission.GROUP_READ));
3433
assertTrue(permissions.contains(PosixFilePermission.OTHERS_EXECUTE));
3534
}
3635

3736
@Test
38-
void testEvenMorePatterns() {
37+
void evenMorePatterns() {
3938
final Set<PosixFilePermission> permissions = AttributeUtils.getPermissions(0412);
4039
assertTrue(permissions.contains(PosixFilePermission.OWNER_READ));
4140
assertTrue(permissions.contains(PosixFilePermission.GROUP_EXECUTE));
@@ -50,7 +49,7 @@ void test777() {
5049

5150
@Test
5251
@DisabledOnOs(OS.WINDOWS)
53-
void testChmodBackAndForth() throws IOException {
52+
void chmodBackAndForth() throws Exception {
5453
final File bxx = File.createTempFile("bxx", "ff");
5554
AttributeUtils.chmod(bxx, 0422);
5655
PlexusIoResourceAttributes firstAttrs = new FileAttributes(bxx);

‎src/test/java/org/codehaus/plexus/components/io/attributes/FileAttributesTest.java‎

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

1919
import java.io.File;
20-
import java.io.IOException;
2120
import java.nio.file.Files;
2221

2322
import org.junit.jupiter.api.Test;
@@ -29,17 +28,17 @@
2928
/**
3029
* @author Kristian Rosenvold
3130
*/
32-
public class FileAttributesTest {
31+
class FileAttributesTest {
3332
@Test
3433
@DisabledOnOs(OS.WINDOWS)
35-
void testGetPosixFileAttributes() throws Exception {
34+
void getPosixFileAttributes() throws Exception {
3635
File file = new File(".");
3736
PlexusIoResourceAttributes fa = new FileAttributes(file);
3837
assertNotNull(fa);
3938
}
4039

4140
@Test
42-
void testFileAttributesHandlesIOException() throws IOException {
41+
void fileAttributesHandlesIOException() throws Exception {
4342
// Test that FileAttributes can be constructed for a regular file
4443
// even if ownership information is not available (e.g., WSL2 mapped network drives)
4544
File tempFile = Files.createTempFile("plexus-io-test", ".tmp").toFile();

‎src/test/java/org/codehaus/plexus/components/io/attributes/PlexusIoResourceAttributeUtilsTest.java‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,11 @@
1717
*/
1818

1919
import java.io.File;
20-
import java.io.IOException;
2120
import java.net.URL;
2221
import java.nio.file.NoSuchFileException;
2322
import java.util.Map;
2423

2524
import org.codehaus.plexus.util.StringUtils;
26-
import org.codehaus.plexus.util.cli.CommandLineException;
2725
import org.codehaus.plexus.util.cli.CommandLineUtils;
2826
import org.codehaus.plexus.util.cli.Commandline;
2927
import org.junit.jupiter.api.Test;
@@ -34,11 +32,11 @@
3432
import static org.junit.jupiter.api.Assertions.*;
3533

3634
@SuppressWarnings("OctalInteger")
37-
public class PlexusIoResourceAttributeUtilsTest {
35+
class PlexusIoResourceAttributeUtilsTest {
3836

3937
@Test
4038
@DisabledOnOs(OS.WINDOWS)
41-
void testGetAttributesForThisTestClass() throws IOException {
39+
void getAttributesForThisTestClass() throws Exception {
4240
URL resource = Thread.currentThread()
4341
.getContextClassLoader()
4442
.getResource(getClass().getName().replace('.', '/') + ".class");
@@ -62,7 +60,7 @@ void testGetAttributesForThisTestClass() throws IOException {
6260

6361
@Test
6462
@DisabledOnOs(OS.WINDOWS)
65-
void testDirectory() throws IOException, CommandLineException {
63+
void directory() throws Exception {
6664
URL resource = Thread.currentThread()
6765
.getContextClassLoader()
6866
.getResource(getClass().getName().replace('.', '/') + ".class");
@@ -100,7 +98,7 @@ void testDirectory() throws IOException, CommandLineException {
10098

10199
@Test
102100
@DisabledOnOs(OS.WINDOWS)
103-
void testSrcResource() throws IOException {
101+
void srcResource() throws Exception {
104102
File dir = new File("src/test/resources/symlinks");
105103
final Map<String, PlexusIoResourceAttributes> fileAttributesByPathScreenScrape =
106104
PlexusIoResourceAttributeUtils.getFileAttributesByPath(dir, true);
@@ -115,15 +113,14 @@ void testSrcResource() throws IOException {
115113
}
116114

117115
@Test
118-
void testNonExistingDirectory() {
119-
assertThrows(NoSuchFileException.class, () -> {
120-
File dir = new File("src/test/noSuchDirectory");
121-
PlexusIoResourceAttributeUtils.getFileAttributesByPath(dir, true);
122-
});
116+
void nonExistingDirectory() {
117+
File dir = new File("src/test/noSuchDirectory");
118+
assertThrows(
119+
NoSuchFileException.class, () -> PlexusIoResourceAttributeUtils.getFileAttributesByPath(dir, true));
123120
}
124121

125122
@Test
126-
void testMergeAttributesWithNullBase() {
123+
void mergeAttributesWithNullBase() {
127124
PlexusIoResourceAttributes override = new SimpleResourceAttributes(1001, "myUser", 1001, "test", 0);
128125
PlexusIoResourceAttributes defaults = new SimpleResourceAttributes(1000, "defaultUser", 1000, "defaultTest", 0);
129126

@@ -135,7 +132,7 @@ void testMergeAttributesWithNullBase() {
135132
}
136133

137134
@Test
138-
void testMergeAttributesWithNullOverrideGroup() {
135+
void mergeAttributesWithNullOverrideGroup() {
139136
final PlexusIoResourceAttributes override = new SimpleResourceAttributes(1001, "myUser", -1, null, 0);
140137
final PlexusIoResourceAttributes defaults =
141138
new SimpleResourceAttributes(1000, "defaultUser", 1000, "defaultGroup", 0);
@@ -148,7 +145,7 @@ void testMergeAttributesWithNullOverrideGroup() {
148145
}
149146

150147
@Test
151-
void testMergeAttributesOverride() {
148+
void mergeAttributesOverride() {
152149
final PlexusIoResourceAttributes blank = new SimpleResourceAttributes();
153150
final PlexusIoResourceAttributes invalid = new SimpleResourceAttributes(-1, null, -1, null, -1);
154151
final PlexusIoResourceAttributes override =
@@ -250,15 +247,15 @@ void testMergeAttributesOverride() {
250247
}
251248

252249
@Test
253-
void testFileAttributesGeneric() throws IOException {
250+
void fileAttributesGeneric() throws Exception {
254251
PlexusIoResourceAttributes attrs = getFileAttributes(new File("src/test/resources/symlinks/src/fileW.txt"));
255252
assertFalse(attrs.isSymbolicLink());
256253
assertTrue(StringUtils.isNotEmpty(attrs.getUserName()));
257254
}
258255

259256
@Test
260257
@DisabledOnOs(OS.WINDOWS)
261-
void testFileAttributes() throws IOException {
258+
void fileAttributes() throws Exception {
262259
PlexusIoResourceAttributes attrs = getFileAttributes(new File("src/test/resources/symlinks/src/fileW.txt"));
263260
assertFalse(attrs.isSymbolicLink());
264261
assertTrue(StringUtils.isNotEmpty(attrs.getUserName()));
@@ -268,7 +265,7 @@ void testFileAttributes() throws IOException {
268265
}
269266

270267
@Test
271-
void testMergeAttributesDefault() {
268+
void mergeAttributesDefault() {
272269
final PlexusIoResourceAttributes blank = new SimpleResourceAttributes(null, null, null, null, 0);
273270
final PlexusIoResourceAttributes invalid = new SimpleResourceAttributes(-1, null, -1, null, -1);
274271
final PlexusIoResourceAttributes defaults =

‎src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
import org.junit.jupiter.api.Test;
2626

2727
import static java.nio.charset.StandardCharsets.UTF_8;
28-
import static org.junit.jupiter.api.Assertions.*;
28+
import static org.junit.jupiter.api.Assertions.assertEquals;
2929

30-
public class SymlinkUtilsTest {
30+
class SymlinkUtilsTest {
3131
final File target = new File("target/symlinkCapabilities");
3232

3333
final String expected = "This is a filed that we'll be symlinking to\n";
3434

3535
@BeforeEach
36-
public void setup() throws IOException {
36+
void setup() throws IOException {
3737
FileUtils.deleteDirectory(target);
3838
Files.createDirectories(target.toPath());
3939
}

‎src/test/java/org/codehaus/plexus/components/io/filemappers/FileMapperTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Test case for the various file mappers.
3232
*/
3333
@PlexusTest
34-
public class FileMapperTest {
34+
class FileMapperTest {
3535
@Inject
3636
PlexusContainer container;
3737

@@ -85,7 +85,7 @@ protected void testFileMapper(FileMapper pMapper, String[] pInput, String[] pOut
8585
};
8686

8787
@Test
88-
void testIdentityMapper() throws Exception {
88+
void identityMapper() throws Exception {
8989
final String[] results = getIdentityResults();
9090
testFileMapper(new IdentityMapper(), SAMPLES, results);
9191
}
@@ -98,15 +98,15 @@ private String[] getIdentityResults() {
9898
}
9999

100100
@Test
101-
void testDefaultMapper() throws Exception {
101+
void defaultMapper() throws Exception {
102102
final String[] results = getIdentityResults();
103103
testFileMapper(container.lookup(FileMapper.class), SAMPLES, results);
104104
testFileMapper(container.lookup(FileMapper.class, IdentityMapper.ROLE_HINT), SAMPLES, results);
105105
testFileMapper(container.lookup(FileMapper.class), SAMPLES, results);
106106
}
107107

108108
@Test
109-
void testFileExtensionMapper() throws Exception {
109+
void fileExtensionMapper() throws Exception {
110110
final String[] results = getIdentityResults();
111111
for (int i = 2; i <= 10; i += 2) {
112112
results[i] += ".png";
@@ -127,7 +127,7 @@ private void testFileExtensionMapper(final String[] results, final FileExtension
127127
}
128128

129129
@Test
130-
void testFlattenMapper() throws Exception {
130+
void flattenMapper() throws Exception {
131131
final String[] results = getIdentityResults();
132132
results[4] = results[6] = results[8] = results[10] = results[2];
133133
results[5] = results[7] = results[9] = results[11] = results[3];
@@ -141,7 +141,7 @@ private void testMergeMapper(String pTargetName, String[] pResults, MergeFileMap
141141
}
142142

143143
@Test
144-
void testMergeMapper() throws Exception {
144+
void mergeMapper() throws Exception {
145145
final String[] results = getIdentityResults();
146146
final String targetName = "zgh";
147147
for (int i = 2; i < results.length; i++) {
@@ -153,7 +153,7 @@ void testMergeMapper() throws Exception {
153153
}
154154

155155
@Test
156-
void testPrefixMapper() throws Exception {
156+
void prefixMapper() throws Exception {
157157
final String prefix = "x7Rtf";
158158
final String[] results = getIdentityResults();
159159
testFileMapper(new PrefixFileMapper(), SAMPLES, results);
@@ -172,7 +172,7 @@ void testPrefixMapper() throws Exception {
172172
}
173173

174174
@Test
175-
void testSuffixMapper() throws Exception {
175+
void suffixMapper() throws Exception {
176176
final String suffix = "suffix";
177177
String[] samples = Arrays.copyOf(SAMPLES, SAMPLES.length + 2);
178178
samples[samples.length - 2] = "archive.tar.gz";
@@ -208,7 +208,7 @@ private RegExpFileMapper configure(RegExpFileMapper pMapper, String pPattern, St
208208
}
209209

210210
@Test
211-
void testRegExpFileMapper() throws Exception {
211+
void regExpFileMapper() throws Exception {
212212
final String[] results = getIdentityResults();
213213
results[3] = "xyz.jpg";
214214
results[5] = "b/xyz.jpg";

‎src/test/java/org/codehaus/plexus/components/io/filemappers/FileSelectorTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* Test case for implementations of {@link FileSelector}.
4040
*/
4141
@PlexusTest
42-
public class FileSelectorTest {
42+
class FileSelectorTest {
4343

4444
@Inject
4545
PlexusContainer container;
@@ -80,7 +80,7 @@ private boolean[] getAllTrues() {
8080
}
8181

8282
@Test
83-
void testAllFilesFileSelector() throws Exception {
83+
void allFilesFileSelector() throws Exception {
8484
testFileSelector(new AllFilesFileSelector());
8585
testFileSelector((AllFilesFileSelector) container.lookup(FileSelector.class));
8686
testFileSelector((AllFilesFileSelector) container.lookup(FileSelector.class, AllFilesFileSelector.ROLE_HINT));
@@ -114,14 +114,14 @@ protected void testFileSelector(IncludeExcludeFileSelector pSelector) throws Exc
114114
}
115115

116116
@Test
117-
void testIncludeExcludeFileSelector() throws Exception {
117+
void includeExcludeFileSelector() throws Exception {
118118
testFileSelector(new IncludeExcludeFileSelector());
119119
testFileSelector((IncludeExcludeFileSelector)
120120
container.lookup(FileSelector.class, IncludeExcludeFileSelector.ROLE_HINT));
121121
}
122122

123123
@Test
124-
void testIncludeExcludeFileSelector_SetExcludes() {
124+
void includeExcludeFileSelectorSetExcludes() {
125125
IncludeExcludeFileSelector selector = new IncludeExcludeFileSelector();
126126

127127
// Test that the setExcludes method does not modify the excludes.

0 commit comments

Comments
 (0)