Skip to content

Commit b79f149

Browse files
garydgregorygarydgregory
committed
Use static imports only for JUnit
1 parent c1e214d commit b79f149

24 files changed

Lines changed: 118 additions & 86 deletions

‎commons-vfs2-hdfs/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTestCase.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.vfs2.provider.hdfs;
1818

1919
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
20+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2021
import static org.junit.jupiter.api.Assertions.assertTrue;
2122
import static org.junit.jupiter.api.Assertions.fail;
2223

@@ -74,7 +75,7 @@ public HdfsProviderTestSuite(final ProviderTestConfig providerConfig, final Stri
7475
private void copyTestResources(final File directory, final Path parent) throws Exception {
7576
final File[] listFiles = Objects.requireNonNull(Objects.requireNonNull(directory, "directory").listFiles(),
7677
() -> directory.toString() + " no data, directory exists: " + directory.exists() + ", current: " + PathUtils.current().toAbsolutePath().normalize());
77-
Assertions.assertNotNull(directory, directory::toString);
78+
assertNotNull(directory, directory::toString);
7879
for (final File file : listFiles) {
7980
if (file.isFile()) {
8081
final Path src = new Path(file.getAbsolutePath());
@@ -117,7 +118,7 @@ protected void setUp() throws Exception {
117118
cluster = new MiniDFSCluster(PORT, conf, 1, true, true, true, null, null, null, null);
118119
cluster.waitActive();
119120
} catch (final IOException e) {
120-
Assertions.fail("Error setting up mini cluster", e);
121+
fail("Error setting up mini cluster", e);
121122
}
122123
hdfs = cluster.getFileSystem();
123124

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/LastModifiedTests.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
21+
import static org.junit.jupiter.api.Assertions.fail;
2122

2223
import java.time.Duration;
2324
import java.time.Instant;
2425
import java.util.Date;
2526

26-
import org.junit.jupiter.api.Assertions;
2727
import org.junit.jupiter.api.Test;
2828

2929
/**
@@ -40,7 +40,7 @@ protected void assertDeltaMillis(final String message, final long expectedMillis
4040
// getLastModTimeAccuracy() is not accurate
4141
final long actualDelta = Math.abs(expectedMillis - actualMillis);
4242
if (actualDelta > Math.max(deltaMillis, 1000)) {
43-
Assertions.fail(String.format("%s expected=%,d (%s), actual=%,d (%s), expected delta=%,d millis, actual delta=%,d millis", message,
43+
fail(String.format("%s expected=%,d (%s), actual=%,d (%s), expected delta=%,d millis, actual delta=%,d millis", message,
4444
Long.valueOf(expectedMillis), new Date(expectedMillis).toString(), Long.valueOf(actualMillis), new Date(actualMillis).toString(),
4545
Long.valueOf(deltaMillis), Long.valueOf(actualDelta)));
4646
}
@@ -49,7 +49,7 @@ protected void assertDeltaMillis(final String message, final long expectedMillis
4949
protected void assertEqualMillis(final String message, final long expectedMillis, final long actualMillis) {
5050
if (expectedMillis != actualMillis) {
5151
final long delta = Math.abs(expectedMillis - actualMillis);
52-
Assertions.fail(String.format("%s expected=%,d (%s), actual=%,d (%s), delta=%,d millis", message, Long.valueOf(expectedMillis),
52+
fail(String.format("%s expected=%,d (%s), actual=%,d (%s), delta=%,d millis", message, Long.valueOf(expectedMillis),
5353
new Date(expectedMillis).toString(), Long.valueOf(actualMillis), new Date(actualMillis).toString(), delta));
5454
}
5555
}

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderRandomSetLengthTests.java‎

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

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.fail;
21+
1922
import java.io.IOException;
2023

2124
import org.apache.commons.vfs2.util.RandomAccessMode;
22-
import org.junit.jupiter.api.Assertions;
2325
import org.junit.jupiter.api.Test;
2426

2527
/**
@@ -63,25 +65,25 @@ public void testRandomSetLength() throws Exception {
6365

6466
// Write long string
6567
ra.writeBytes(TEST_DATA);
66-
Assertions.assertEquals( TEST_DATA.length(), ra.length(),fileString);
68+
assertEquals( TEST_DATA.length(), ra.length(),fileString);
6769

6870
// Shrink to length 1
6971
ra.setLength(1);
70-
Assertions.assertEquals(1, ra.length(), fileString);
72+
assertEquals(1, ra.length(), fileString);
7173
// now read 1
7274
ra.seek(0);
73-
Assertions.assertEquals(TEST_DATA.charAt(0), ra.readByte(), fileString);
75+
assertEquals(TEST_DATA.charAt(0), ra.readByte(), fileString);
7476

7577
try {
7678
ra.readByte();
77-
Assertions.fail("Expected " + Exception.class.getName());
79+
fail("Expected " + Exception.class.getName());
7880
} catch (final IOException e) {
7981
// Expected
8082
}
8183

8284
// Grow to length 2
8385
ra.setLength(2);
84-
Assertions.assertEquals(2, ra.length(), fileString);
86+
assertEquals(2, ra.length(), fileString);
8587
// We have an undefined extra byte
8688
ra.seek(1);
8789
ra.readByte();

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderReadTests.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static org.apache.commons.vfs2.VfsTestUtils.assertSameMessage;
2020
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
2122
import static org.junit.jupiter.api.Assertions.assertNotNull;
2223
import static org.junit.jupiter.api.Assertions.assertSame;
2324
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -29,7 +30,6 @@
2930
import java.util.Collections;
3031
import java.util.List;
3132

32-
import org.junit.jupiter.api.Assertions;
3333
import org.junit.jupiter.api.Test;
3434

3535
/**
@@ -144,9 +144,9 @@ public void testConcurrentReadFolder() throws Exception {
144144
@Test
145145
public void testDotJarFolderName() throws Exception {
146146
final FileObject folder = getReadFolderDir1().resolveFile("subdir4.jar");
147-
Assertions.assertTrue(folder.exists());
147+
assertTrue(folder.exists());
148148
final FileObject file = folder.resolveFile("file1.txt");
149-
Assertions.assertTrue(file.exists());
149+
assertTrue(file.exists());
150150
}
151151

152152
/**
@@ -155,8 +155,8 @@ public void testDotJarFolderName() throws Exception {
155155
@Test
156156
public void testDotJarFolderNameLayer() throws Exception {
157157
final FileObject folder = getReadFolderDir1().resolveFile("subdir4.jar");
158-
Assertions.assertTrue(folder.isFolder(), "subdir4.jar/ must exist as folder, check test setup.");
159-
Assertions.assertFalse(getManager().canCreateFileSystem(folder), "subdir4.jar/ must not be layerable");
158+
assertTrue(folder.isFolder(), "subdir4.jar/ must exist as folder, check test setup.");
159+
assertFalse(getManager().canCreateFileSystem(folder), "subdir4.jar/ must not be layerable");
160160
try {
161161
final FileObject ignored = getManager().createFileSystem(folder);
162162
fail("Should not be able to create a layered filesystem on a directory. " + ignored);
@@ -214,7 +214,7 @@ public void testFolderContent() throws Exception {
214214
@Test
215215
public void testFolderIsHidden() throws Exception {
216216
final FileObject folder = getReadFolderDir1();
217-
Assertions.assertFalse(folder.isHidden());
217+
assertFalse(folder.isHidden());
218218
}
219219

220220
/**
@@ -223,7 +223,7 @@ public void testFolderIsHidden() throws Exception {
223223
@Test
224224
public void testFolderIsReadable() throws Exception {
225225
final FileObject folder = getReadFolderDir1();
226-
Assertions.assertTrue(folder.isReadable());
226+
assertTrue(folder.isReadable());
227227
}
228228

229229
/**
@@ -232,7 +232,7 @@ public void testFolderIsReadable() throws Exception {
232232
@Test
233233
public void testFolderIsSymbolicLink() throws Exception {
234234
final FileObject folder = getReadFolderDir1();
235-
Assertions.assertFalse(folder.isSymbolicLink());
235+
assertFalse(folder.isSymbolicLink());
236236
}
237237

238238
@Test

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderWriteTests.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.Objects;
3131
import java.util.Set;
3232

33-
import org.junit.jupiter.api.Assertions;
3433
import org.junit.jupiter.api.Test;
3534

3635
/**
@@ -499,7 +498,7 @@ public void testFolderCreate() throws Exception {
499498
@Test
500499
public void testFolderIsHidden() throws Exception {
501500
final FileObject folder = getReadFolderDir1();
502-
Assertions.assertFalse(folder.isHidden());
501+
assertFalse(folder.isHidden());
503502
}
504503

505504
/**
@@ -508,7 +507,7 @@ public void testFolderIsHidden() throws Exception {
508507
@Test
509508
public void testFolderIsReadable() throws Exception {
510509
final FileObject folder = getReadFolderDir1();
511-
Assertions.assertTrue(folder.isReadable());
510+
assertTrue(folder.isReadable());
512511
}
513512

514513
/**
@@ -517,7 +516,7 @@ public void testFolderIsReadable() throws Exception {
517516
@Test
518517
public void testFolderIsWritable() throws Exception {
519518
final FileObject folder = getWriteFolder().resolveFile("dir1");
520-
Assertions.assertTrue(folder.isWriteable());
519+
assertTrue(folder.isWriteable());
521520
}
522521

523522
/**

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNull;
21-
import static org.junit.jupiter.api.Assertions.assertSame;
2221

2322
import org.junit.jupiter.api.Test;
2423

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/bzip2/Bzip2Test.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
package org.apache.commons.vfs2.provider.bzip2;
1818

1919
import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
20+
import static org.junit.jupiter.api.Assertions.assertEquals;
21+
import static org.junit.jupiter.api.Assertions.assertFalse;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2023

2124
import java.io.File;
2225
import java.io.IOException;
@@ -26,7 +29,6 @@
2629
import org.apache.commons.vfs2.FileObject;
2730
import org.apache.commons.vfs2.VFS;
2831
import org.apache.commons.vfs2.provider.compressed.CompressedFileFileObject;
29-
import org.junit.jupiter.api.Assertions;
3032
import org.junit.jupiter.api.Test;
3133

3234
public class Bzip2Test {
@@ -35,21 +37,21 @@ public class Bzip2Test {
3537
public void testBZip2() throws IOException {
3638
final File testResource = getTestResource("bla.txt.bz2");
3739
try (FileObject bz2FileObject = VFS.getManager().resolveFile("bz2://" + testResource)) {
38-
Assertions.assertTrue(bz2FileObject.exists());
39-
Assertions.assertTrue(bz2FileObject.isFolder());
40+
assertTrue(bz2FileObject.exists());
41+
assertTrue(bz2FileObject.isFolder());
4042
try (FileObject fileObjectDir = bz2FileObject.resolveFile("bla.txt")) {
41-
Assertions.assertTrue(fileObjectDir.exists());
42-
Assertions.assertTrue(bz2FileObject.isFolder());
43+
assertTrue(fileObjectDir.exists());
44+
assertTrue(bz2FileObject.isFolder());
4345
try (FileObject fileObject = fileObjectDir.resolveFile("bla.txt")) {
44-
Assertions.assertTrue(fileObject.exists());
45-
Assertions.assertFalse(fileObject.isFolder());
46-
Assertions.assertTrue(fileObject.isFile());
46+
assertTrue(fileObject.exists());
47+
assertFalse(fileObject.isFolder());
48+
assertTrue(fileObject.isFile());
4749
try (FileContent content = fileObject.getContent()) {
48-
Assertions.assertEquals(CompressedFileFileObject.SIZE_UNDEFINED, content.getSize());
50+
assertEquals(CompressedFileFileObject.SIZE_UNDEFINED, content.getSize());
4951
// blows up, Commons Compress?
5052
final String string = content.getString(StandardCharsets.UTF_8);
51-
Assertions.assertEquals(26, string.length());
52-
Assertions.assertEquals("Hallo, dies ist ein Test.\n", string);
53+
assertEquals(26, string.length());
54+
assertEquals("Hallo, dies ist ein Test.\n", string);
5355
}
5456
}
5557
}

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpMdtmOnRefreshLastModifiedTests.java‎

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

19+
import static org.junit.jupiter.api.Assertions.fail;
1920
import static org.mockito.Mockito.spy;
2021
import static org.mockito.Mockito.when;
2122

@@ -27,7 +28,6 @@
2728
import org.apache.commons.vfs2.FileObject;
2829
import org.apache.commons.vfs2.FileSystemException;
2930
import org.apache.commons.vfs2.LastModifiedTests;
30-
import org.junit.jupiter.api.Assertions;
3131
import org.junit.jupiter.api.Test;
3232

3333
public class FtpMdtmOnRefreshLastModifiedTests extends LastModifiedTests {
@@ -42,7 +42,7 @@ private void returnsCorrectMdtmValue(final FtpFileObject fileObject) throws IOEx
4242
final long lastModTIme = fileObject.getContent().getLastModifiedTime();
4343

4444
if (expected != lastModTIme) {
45-
Assertions.fail(String.format("%s returned epoch %s not expected: %s.",
45+
fail(String.format("%s returned epoch %s not expected: %s.",
4646
FtpFileObject.class.getSimpleName(), lastModTIme, expected));
4747
}
4848
}

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.vfs2.provider.ftp;
1818

1919
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
20+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2021

2122
import java.net.URL;
2223
import java.nio.charset.Charset;
@@ -45,7 +46,6 @@
4546
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
4647
import org.apache.ftpserver.usermanager.impl.BaseUser;
4748
import org.junit.jupiter.api.AfterAll;
48-
import org.junit.jupiter.api.Assertions;
4949

5050
/**
5151
* JUnit 5 tests for FTP file systems with MDTM disabled.
@@ -111,7 +111,7 @@ public static void setUpClass(final String rootDirectory, final FileSystemFactor
111111
final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
112112
propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
113113
final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(USER_PROPS_RES);
114-
Assertions.assertNotNull(userPropsResource, USER_PROPS_RES);
114+
assertNotNull(userPropsResource, USER_PROPS_RES);
115115
propertiesUserManagerFactory.setUrl(userPropsResource);
116116
final UserManager userManager = propertiesUserManagerFactory.createUserManager();
117117
final BaseUser user = (BaseUser) userManager.getUserByName("test");

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOnRefreshTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.commons.vfs2.provider.ftp;
1818

1919
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
20+
import static org.junit.jupiter.api.Assertions.assertNotNull;
2021

2122
import java.net.URL;
2223
import java.nio.charset.Charset;
@@ -41,7 +42,6 @@
4142
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
4243
import org.apache.ftpserver.usermanager.impl.BaseUser;
4344
import org.junit.jupiter.api.AfterAll;
44-
import org.junit.jupiter.api.Assertions;
4545

4646
/**
4747
* JUnit 5 tests for FTP file systems with MDTM enabled and refresh behavior.
@@ -106,7 +106,7 @@ public static void setUpClass(final String rootDirectory, final FileSystemFactor
106106
final PropertiesUserManagerFactory propertiesUserManagerFactory = new PropertiesUserManagerFactory();
107107
propertiesUserManagerFactory.setPasswordEncryptor(new Md5PasswordEncryptor());
108108
final URL userPropsResource = ClassLoader.getSystemClassLoader().getResource(USER_PROPS_RES);
109-
Assertions.assertNotNull(userPropsResource, USER_PROPS_RES);
109+
assertNotNull(userPropsResource, USER_PROPS_RES);
110110
propertiesUserManagerFactory.setUrl(userPropsResource);
111111
final UserManager userManager = propertiesUserManagerFactory.createUserManager();
112112
final BaseUser user = (BaseUser) userManager.getUserByName("test");

0 commit comments

Comments
 (0)
⚡