This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 1a0b5351 Port assertions to JUnit 5 APIs
1a0b5351 is described below
commit 1a0b5351eb7b15769710444f0e0fce82eb4fe3b9
Author: Gary Gregory <[email protected]>
AuthorDate: Wed Nov 8 18:59:07 2023 -0500
Port assertions to JUnit 5 APIs
---
.../commons/vfs2/AbstractProviderTestCase.java | 14 ++--
.../org/apache/commons/vfs2/AbstractTestSuite.java | 22 +++---
.../vfs2/cache/DefaultFilesCacheTestCase.java | 4 +-
.../commons/vfs2/cache/LRUFilesCacheTestCase.java | 4 +-
.../commons/vfs2/cache/NullFilesCacheTestCase.java | 4 +-
.../vfs2/cache/SoftRefFilesCacheTestCase.java | 4 +-
.../vfs2/cache/WeakRefFilesCacheTestCase.java | 4 +-
.../commons/vfs2/filter/AgeFileFilterTest.java | 63 +++++++--------
.../apache/commons/vfs2/filter/BaseFilterTest.java | 11 +--
.../commons/vfs2/filter/CanReadFileFilterTest.java | 29 +++----
.../vfs2/filter/CanWriteFileFilterTest.java | 21 ++---
.../vfs2/filter/DirectoryAndFileFilterTest.java | 21 ++---
.../commons/vfs2/filter/EmptyFileFilterTest.java | 29 +++----
.../commons/vfs2/filter/HiddenFileFilterTest.java | 15 ++--
.../commons/vfs2/filter/SizeFileFilterTest.java | 67 ++++++++--------
.../vfs2/provider/ftp/FtpProviderIPv6TestCase.java | 4 +-
.../provider/ftp/FtpProviderMdtmOffTestCase.java | 4 +-
.../vfs2/provider/ftp/FtpProviderTestCase.java | 4 +-
.../provider/ftp/FtpProviderUserDirTestCase.java | 4 +-
.../vfs2/provider/http4/Http4ProviderTestCase.java | 2 -
.../vfs2/provider/jar/JarProviderTestCase.java | 4 +-
.../vfs2/provider/jar/NestedJarTestCase.java | 4 +-
.../vfs2/provider/local/LocalProviderTestCase.java | 4 +-
.../vfs2/provider/ram/CustomRamProviderTest.java | 89 +++++++++++-----------
.../vfs2/provider/ram/RamProviderTestCase.java | 4 +-
.../provider/res/ResourceProviderTestCase.java | 4 +-
.../provider/sftp/SftpFileSystemGroupsTests.java | 9 ++-
.../SftpProviderClosedExecChannelTestCase.java | 4 +-
.../provider/sftp/SftpProviderIPv6TestCase.java | 3 +-
.../sftp/SftpProviderStreamProxyModeTestCase.java | 4 +-
.../vfs2/provider/sftp/SftpProviderTestCase.java | 4 +-
.../commons/vfs2/provider/tar/LargeTarTest.java | 10 +--
.../vfs2/provider/tar/NestedTarTestCase.java | 4 +-
.../vfs2/provider/tar/NestedTbz2TestCase.java | 4 +-
.../vfs2/provider/tar/NestedTgzTestCase.java | 4 +-
.../vfs2/provider/tar/TarProviderTestCase.java | 4 +-
.../vfs2/provider/tar/Tbz2ProviderTestCase.java | 4 +-
.../vfs2/provider/tar/TgzProviderTestCase.java | 4 +-
.../provider/temp/TemporaryProviderTestCase.java | 4 +-
.../provider/test/VirtualProviderTestCase.java | 4 +-
.../vfs2/provider/url/UrlHttpProviderTestCase.java | 4 +-
.../vfs2/provider/url/UrlProviderHttpTestCase.java | 4 +-
.../vfs2/provider/url/UrlProviderTestCase.java | 4 +-
.../vfs2/provider/zip/NestedZipTestCase.java | 4 +-
.../vfs2/provider/zip/ZipFileObjectTest.java | 16 ++--
.../vfs2/provider/zip/ZipProviderTestCase.java | 4 +-
.../zip/ZipProviderWithCharsetNullTestCase.java | 4 +-
.../zip/ZipProviderWithCharsetTestCase.java | 4 +-
.../DelegatingFileSystemOptionsBuilderTest.java | 26 +++----
src/changes/changes.xml | 3 +
50 files changed, 300 insertions(+), 278 deletions(-)
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
index 65d3673a..9b02bf13 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractProviderTestCase.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.vfs2;
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -25,13 +25,11 @@ import java.lang.reflect.Method;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
+import junit.framework.TestCase;
+
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.AbstractFileSystem;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
-import org.junit.Assert;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
/**
* File system test cases, which verifies the structure and naming
functionality.
@@ -92,7 +90,7 @@ public abstract class AbstractProviderTestCase extends
TestCase {
}
// Compare
- assertArrayEquals("same binary content", expectedBin,
outstr.toByteArray());
+ assertArrayEquals(expectedBin, outstr.toByteArray(), "same binary
content");
}
/**
@@ -123,7 +121,7 @@ public abstract class AbstractProviderTestCase extends
TestCase {
}
// Compare
- assertArrayEquals("same binary content", expectedBin,
outstr.toByteArray());
+ assertArrayEquals(expectedBin, outstr.toByteArray(), "same binary
content");
}
/**
@@ -215,7 +213,7 @@ public abstract class AbstractProviderTestCase extends
TestCase {
protected FileSystem getFileSystem() {
final FileObject readFolder = getReadFolder();
- Assert.assertNotNull("This test's read folder should not be null",
readFolder);
+ assertNotNull("This test's read folder should not be null",
readFolder);
return readFolder.getFileSystem();
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
index 49a931ab..51d9513f 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/AbstractTestSuite.java
@@ -17,6 +17,7 @@
package org.apache.commons.vfs2;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.io.File;
import java.lang.reflect.Field;
@@ -27,6 +28,12 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
+import junit.extensions.TestSetup;
+import junit.framework.Protectable;
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@@ -34,13 +41,6 @@ import org.apache.commons.vfs2.impl.DefaultFileReplicator;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.impl.PrivilegedFileReplicator;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
-import org.junit.Assert;
-
-import junit.extensions.TestSetup;
-import junit.framework.Protectable;
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
/**
* The suite of tests for a file system.
@@ -128,7 +128,7 @@ public abstract class AbstractTestSuite extends TestSetup {
*/
private void checkTempDir(final String assertMsg) {
if (tempDir.exists()) {
- Assert.assertTrue(assertMsg + " (" + tempDir.getAbsolutePath() +
")",
+ assertTrue(assertMsg + " (" + tempDir.getAbsolutePath() + ")",
tempDir.isDirectory() && ArrayUtils.isEmpty(tempDir.list()));
}
}
@@ -270,13 +270,13 @@ public abstract class AbstractTestSuite extends TestSetup
{
writeFolder = baseFolder.resolveFile(WRITE_TESTS_FOLDER);
// Make some assumptions about the read folder
- Assert.assertTrue("Folder does not exist: " + readFolder,
readFolder.exists());
- Assert.assertNotEquals(readFolder.getName().getPath(),
FileName.ROOT_PATH);
+ assertTrue("Folder does not exist: " + readFolder,
readFolder.exists());
+ assertNotEquals(readFolder.getName().getPath(), FileName.ROOT_PATH);
// Configure the tests
final Enumeration<Test> tests = testSuite.tests();
if (!tests.hasMoreElements()) {
- Assert.fail("No tests.");
+ fail("No tests.");
}
while (tests.hasMoreElements()) {
final Test test = tests.nextElement();
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
index ebb6eba4..60fdda33 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/DefaultFilesCacheTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FilesCache;
-import junit.framework.Test;
-
/**
* Tests the {@link DefaultFilesCache} using {@link DefaultFilesCacheTests}.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
index 4b3dee5f..53113e42 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/LRUFilesCacheTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FilesCache;
-import junit.framework.Test;
-
/**
* Tests the {@link LRUFilesCache} using {@link LRUFilesCacheTests}.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
index 4cadd4ef..3ddb0cc9 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/NullFilesCacheTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FilesCache;
-import junit.framework.Test;
-
/**
* Tests the {@link NullFilesCache} using {@link NullFilesCacheTests}.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
index 585c3a32..fe767dd4 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/SoftRefFilesCacheTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FilesCache;
-import junit.framework.Test;
-
/**
* Tests the {@link SoftRefFilesCache} using {@link SoftRefFilesCacheTests}.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
index 5a54b5c0..ffe9415d 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/cache/WeakRefFilesCacheTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.cache;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.CacheTestSuite;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FilesCache;
-import junit.framework.Test;
-
/**
* Tests the {@link WeakRefFilesCache} using {@link WeakRefFilesCacheTests}.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
index 15b9b0e7..4ac93552 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.util.Date;
@@ -26,7 +30,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -114,9 +117,9 @@ public class AgeFileFilterTest extends BaseFilterTest {
public void testAgeFileFilterDate() throws FileSystemException {
final AgeFileFilter testee = new AgeFileFilter(new Date());
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
}
@Test
@@ -125,23 +128,23 @@ public class AgeFileFilterTest extends BaseFilterTest {
AgeFileFilter testee;
testee = new AgeFileFilter(new Date(), true);
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
testee = new AgeFileFilter(new Date(), false);
- Assert.assertFalse(testee.accept(oldFileInfo));
- Assert.assertFalse(testee.accept(currentFileInfo));
- Assert.assertTrue(testee.accept(newFileInfo));
+ assertFalse(testee.accept(oldFileInfo));
+ assertFalse(testee.accept(currentFileInfo));
+ assertTrue(testee.accept(newFileInfo));
}
@Test
public void testAgeFileFilterFile() throws FileSystemException {
final AgeFileFilter testee = new
AgeFileFilter(currentFileInfo.getFile());
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
}
@Test
@@ -150,23 +153,23 @@ public class AgeFileFilterTest extends BaseFilterTest {
AgeFileFilter testee;
testee = new AgeFileFilter(currentFileInfo.getFile(), true);
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
testee = new AgeFileFilter(currentFileInfo.getFile(), false);
- Assert.assertFalse(testee.accept(oldFileInfo));
- Assert.assertFalse(testee.accept(currentFileInfo));
- Assert.assertTrue(testee.accept(newFileInfo));
+ assertFalse(testee.accept(oldFileInfo));
+ assertFalse(testee.accept(currentFileInfo));
+ assertTrue(testee.accept(newFileInfo));
}
@Test
public void testAgeFileFilterLong() throws FileSystemException {
final AgeFileFilter testee = new AgeFileFilter(NOW_MILLIS);
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
}
@Test
@@ -175,25 +178,25 @@ public class AgeFileFilterTest extends BaseFilterTest {
AgeFileFilter testee;
testee = new AgeFileFilter(NOW_MILLIS, true);
- Assert.assertTrue(testee.accept(oldFileInfo));
- Assert.assertTrue(testee.accept(currentFileInfo));
- Assert.assertFalse(testee.accept(newFileInfo));
+ assertTrue(testee.accept(oldFileInfo));
+ assertTrue(testee.accept(currentFileInfo));
+ assertFalse(testee.accept(newFileInfo));
testee = new AgeFileFilter(NOW_MILLIS, false);
- Assert.assertFalse(testee.accept(oldFileInfo));
- Assert.assertFalse(testee.accept(currentFileInfo));
- Assert.assertTrue(testee.accept(newFileInfo));
+ assertFalse(testee.accept(oldFileInfo));
+ assertFalse(testee.accept(currentFileInfo));
+ assertTrue(testee.accept(newFileInfo));
// Same test with ZIP file
FileObject[] files;
files = zipFileObj.findFiles(new FileFilterSelector(new
AgeFileFilter(NOW_MILLIS, true)));
assertContains(files, oldFile.getName(), currentFile.getName());
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
AgeFileFilter(NOW_MILLIS, false)));
assertContains(files, newFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
index d5bcbcfd..9053728b 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/BaseFilterTest.java
@@ -16,7 +16,9 @@
*/
package org.apache.commons.vfs2.filter;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -38,7 +40,6 @@ import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
-import org.junit.Assert;
/**
* Base class for test cases.
@@ -53,7 +54,7 @@ public abstract class BaseFilterTest {
*/
protected static void assertContains(final List<?> list, final Object...
objects) {
for (final Object obj : objects) {
- Assert.assertTrue("Couldn't find " + obj + " in " +
Arrays.asList(objects), list.indexOf(obj) > -1);
+ assertTrue(list.indexOf(obj) > -1, () -> "Couldn't find " + obj +
" in " + Arrays.asList(objects));
}
}
@@ -65,9 +66,9 @@ public abstract class BaseFilterTest {
*/
protected static void assertContainsOnly(final List<?> list, final
Object... objects) {
for (final Object obj : objects) {
- Assert.assertTrue("Couldn't find " + obj + " in " +
Arrays.asList(objects), list.indexOf(obj) > -1);
+ assertTrue(list.indexOf(obj) > -1, () -> "Couldn't find " + obj +
" in " + Arrays.asList(objects));
}
- Assert.assertEquals(objects.length, list.size());
+ assertEquals(objects.length, list.size());
}
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
index 45bfbd5d..e776cbce 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanReadFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -25,7 +29,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -106,25 +109,25 @@ public class CanReadFileFilterTest extends BaseFilterTest
{
@Test
public void testAcceptCannotRead() throws FileSystemException {
-
Assert.assertFalse(CanReadFileFilter.CANNOT_READ.accept(writableFileInfo));
-
Assert.assertFalse(CanReadFileFilter.CANNOT_READ.accept(readOnlyFileInfo));
-
Assert.assertTrue(CanReadFileFilter.CANNOT_READ.accept(notExistingFileInfo));
+ assertFalse(CanReadFileFilter.CANNOT_READ.accept(writableFileInfo));
+ assertFalse(CanReadFileFilter.CANNOT_READ.accept(readOnlyFileInfo));
+ assertTrue(CanReadFileFilter.CANNOT_READ.accept(notExistingFileInfo));
}
@Test
public void testAcceptCanRead() throws FileSystemException {
- Assert.assertTrue(CanReadFileFilter.CAN_READ.accept(writableFileInfo));
- Assert.assertTrue(CanReadFileFilter.CAN_READ.accept(readOnlyFileInfo));
-
Assert.assertFalse(CanReadFileFilter.CAN_READ.accept(notExistingFileInfo));
+ assertTrue(CanReadFileFilter.CAN_READ.accept(writableFileInfo));
+ assertTrue(CanReadFileFilter.CAN_READ.accept(readOnlyFileInfo));
+ assertFalse(CanReadFileFilter.CAN_READ.accept(notExistingFileInfo));
}
@Test
public void testAcceptReadOnly() throws FileSystemException {
-
Assert.assertFalse(CanReadFileFilter.READ_ONLY.accept(writableFileInfo));
-
Assert.assertTrue(CanReadFileFilter.READ_ONLY.accept(readOnlyFileInfo));
-
Assert.assertFalse(CanReadFileFilter.READ_ONLY.accept(notExistingFileInfo));
+ assertFalse(CanReadFileFilter.READ_ONLY.accept(writableFileInfo));
+ assertTrue(CanReadFileFilter.READ_ONLY.accept(readOnlyFileInfo));
+ assertFalse(CanReadFileFilter.READ_ONLY.accept(notExistingFileInfo));
}
@Test
@@ -135,16 +138,16 @@ public class CanReadFileFilterTest extends BaseFilterTest
{
// CAN_READ Filter
files = zipFileObj.findFiles(new
FileFilterSelector(CanReadFileFilter.CAN_READ));
assertContains(files, READONLY, WRITABLE);
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
// CANNOT_READ Filter
files = zipFileObj.findFiles(new
FileFilterSelector(CanReadFileFilter.CANNOT_READ));
- Assert.assertTrue(files == null || files.length == 0);
+ assertTrue(files == null || files.length == 0);
// READ_ONLY Filter
files = zipFileObj.findFiles(new
FileFilterSelector(CanReadFileFilter.READ_ONLY));
assertContains(files, READONLY, WRITABLE);
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
index deff89d4..998d9143 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanWriteFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -25,7 +29,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -106,17 +109,17 @@ public class CanWriteFileFilterTest extends
BaseFilterTest {
@Test
public void testAcceptCannotWrite() throws FileSystemException {
-
Assert.assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(writableFileInfo));
-
Assert.assertTrue(CanWriteFileFilter.CANNOT_WRITE.accept(readOnlyFileInfo));
-
Assert.assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(notExistingFileInfo));
+ assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(writableFileInfo));
+ assertTrue(CanWriteFileFilter.CANNOT_WRITE.accept(readOnlyFileInfo));
+
assertFalse(CanWriteFileFilter.CANNOT_WRITE.accept(notExistingFileInfo));
}
@Test
public void testAcceptCanWrite() throws FileSystemException {
-
Assert.assertTrue(CanWriteFileFilter.CAN_WRITE.accept(writableFileInfo));
-
Assert.assertFalse(CanWriteFileFilter.CAN_WRITE.accept(readOnlyFileInfo));
-
Assert.assertTrue(CanWriteFileFilter.CAN_WRITE.accept(notExistingFileInfo));
+ assertTrue(CanWriteFileFilter.CAN_WRITE.accept(writableFileInfo));
+ assertFalse(CanWriteFileFilter.CAN_WRITE.accept(readOnlyFileInfo));
+ assertTrue(CanWriteFileFilter.CAN_WRITE.accept(notExistingFileInfo));
}
@Test
@@ -126,12 +129,12 @@ public class CanWriteFileFilterTest extends
BaseFilterTest {
// CAN_WRITE Filter
files = zipFileObj.findFiles(new
FileFilterSelector(CanWriteFileFilter.CAN_WRITE));
- Assert.assertTrue(files == null || files.length == 0);
+ assertTrue(files == null || files.length == 0);
// CANNOT_WRITE Filter
files = zipFileObj.findFiles(new
FileFilterSelector(CanWriteFileFilter.CANNOT_WRITE));
assertContains(files, READONLY, WRITABLE);
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
index 7ea46257..266a8b93 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/DirectoryAndFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -27,7 +31,6 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSelector;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -121,12 +124,12 @@ public class DirectoryAndFileFilterTest extends
BaseFilterTest {
}
});
assertContains(files, FILE);
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
// DIRECTORY Filter
files = zipFileObj.findFiles(new
FileFilterSelector(DirectoryFileFilter.DIRECTORY));
assertContains(files, DIR);
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
}
@Test
@@ -134,9 +137,9 @@ public class DirectoryAndFileFilterTest extends
BaseFilterTest {
final FileFilter testee = DirectoryFileFilter.DIRECTORY;
- Assert.assertTrue(testee.accept(dirInfo));
- Assert.assertFalse(testee.accept(fileInfo));
- Assert.assertFalse(testee.accept(notExistingFileInfo));
+ assertTrue(testee.accept(dirInfo));
+ assertFalse(testee.accept(fileInfo));
+ assertFalse(testee.accept(notExistingFileInfo));
}
@Test
@@ -144,9 +147,9 @@ public class DirectoryAndFileFilterTest extends
BaseFilterTest {
final FileFilter testee = FileFileFilter.FILE;
- Assert.assertTrue(testee.accept(fileInfo));
- Assert.assertFalse(testee.accept(dirInfo));
- Assert.assertFalse(testee.accept(notExistingFileInfo));
+ assertTrue(testee.accept(fileInfo));
+ assertFalse(testee.accept(dirInfo));
+ assertFalse(testee.accept(notExistingFileInfo));
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
index a203d5a1..42cc5ad1 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/EmptyFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -26,7 +30,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -121,11 +124,11 @@ public class EmptyFileFilterTest extends BaseFilterTest {
final FileFilter testee = EmptyFileFilter.EMPTY;
- Assert.assertFalse(testee.accept(notEmptyFileInfo));
- Assert.assertTrue(testee.accept(emptyFileInfo));
- Assert.assertFalse(testee.accept(notEmptyDirInfo));
- Assert.assertTrue(testee.accept(emptyDirInfo));
- Assert.assertTrue(testee.accept(notExistingFileInfo));
+ assertFalse(testee.accept(notEmptyFileInfo));
+ assertTrue(testee.accept(emptyFileInfo));
+ assertFalse(testee.accept(notEmptyDirInfo));
+ assertTrue(testee.accept(emptyDirInfo));
+ assertTrue(testee.accept(notExistingFileInfo));
}
@Test
@@ -133,11 +136,11 @@ public class EmptyFileFilterTest extends BaseFilterTest {
final FileFilter testee = EmptyFileFilter.NOT_EMPTY;
- Assert.assertTrue(testee.accept(notEmptyFileInfo));
- Assert.assertFalse(testee.accept(emptyFileInfo));
- Assert.assertTrue(testee.accept(notEmptyDirInfo));
- Assert.assertFalse(testee.accept(emptyDirInfo));
- Assert.assertFalse(testee.accept(notExistingFileInfo));
+ assertTrue(testee.accept(notEmptyFileInfo));
+ assertFalse(testee.accept(emptyFileInfo));
+ assertTrue(testee.accept(notEmptyDirInfo));
+ assertFalse(testee.accept(emptyDirInfo));
+ assertFalse(testee.accept(notExistingFileInfo));
}
@Test
@@ -148,11 +151,11 @@ public class EmptyFileFilterTest extends BaseFilterTest {
files = zipFileObj.findFiles(new
FileFilterSelector(EmptyFileFilter.EMPTY));
assertContains(files, emptyFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
files = zipFileObj.findFiles(new
FileFilterSelector(EmptyFileFilter.NOT_EMPTY));
assertContains(files, notEmptyFile.getName(), notEmptyDir.getName());
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
index cb7a04b6..09581a37 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/HiddenFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -26,7 +30,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -101,10 +104,10 @@ public class HiddenFileFilterTest extends BaseFilterTest {
final FileFilter testee = HiddenFileFilter.HIDDEN;
- Assert.assertFalse(testee.accept(visibleFileInfo));
+ assertFalse(testee.accept(visibleFileInfo));
// TODO xxx In Java 6 there is no way to hide a file
// assertThat(testee.accept(hiddenFileInfo));
- Assert.assertFalse(testee.accept(notExistingFileInfo));
+ assertFalse(testee.accept(notExistingFileInfo));
}
@Test
@@ -112,10 +115,10 @@ public class HiddenFileFilterTest extends BaseFilterTest {
final FileFilter testee = HiddenFileFilter.VISIBLE;
- Assert.assertTrue(testee.accept(visibleFileInfo));
+ assertTrue(testee.accept(visibleFileInfo));
// TODO xxx In Java 6 there is no way to hide a file
// assertThat(testee.accept(hiddenFileInfo));
- Assert.assertTrue(testee.accept(notExistingFileInfo));
+ assertTrue(testee.accept(notExistingFileInfo));
}
@Test
@@ -132,7 +135,7 @@ public class HiddenFileFilterTest extends BaseFilterTest {
files = zipFileObj.findFiles(new
FileFilterSelector(HiddenFileFilter.VISIBLE));
assertContains(files, visibleFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
index d8dfb7ef..859dfcc7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SizeFileFilterTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.commons.vfs2.filter;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -25,7 +29,6 @@ import org.apache.commons.vfs2.FileFilterSelector;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -103,9 +106,9 @@ public class SizeFileFilterTest extends BaseFilterTest {
public void testSizeFileFilterLong() throws FileSystemException {
final SizeFileFilter testee = new SizeFileFilter(4);
- Assert.assertFalse(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertTrue(testee.accept(maxFileInfo));
+ assertFalse(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertTrue(testee.accept(maxFileInfo));
}
@Test
@@ -114,14 +117,14 @@ public class SizeFileFilterTest extends BaseFilterTest {
SizeFileFilter testee;
testee = new SizeFileFilter(4, true);
- Assert.assertFalse(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertTrue(testee.accept(maxFileInfo));
+ assertFalse(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertTrue(testee.accept(maxFileInfo));
testee = new SizeFileFilter(4, false);
- Assert.assertTrue(testee.accept(minFileInfo));
- Assert.assertFalse(testee.accept(optFileInfo));
- Assert.assertFalse(testee.accept(maxFileInfo));
+ assertTrue(testee.accept(minFileInfo));
+ assertFalse(testee.accept(optFileInfo));
+ assertFalse(testee.accept(maxFileInfo));
}
@Test
@@ -132,31 +135,31 @@ public class SizeFileFilterTest extends BaseFilterTest {
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeFileFilter(4, true)));
assertContains(files, optFile.getName(), maxFile.getName());
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeFileFilter(4, false)));
assertContains(files, minFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeRangeFileFilter(2, 6)));
assertContains(files, minFile.getName(), optFile.getName(),
maxFile.getName());
- Assert.assertEquals(3, files.length);
+ assertEquals(3, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeRangeFileFilter(3, 6)));
assertContains(files, optFile.getName(), maxFile.getName());
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeRangeFileFilter(2, 5)));
assertContains(files, minFile.getName(), optFile.getName());
- Assert.assertEquals(2, files.length);
+ assertEquals(2, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeRangeFileFilter(3, 5)));
assertContains(files, optFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
files = zipFileObj.findFiles(new FileFilterSelector(new
SizeRangeFileFilter(4, 4)));
assertContains(files, optFile.getName());
- Assert.assertEquals(1, files.length);
+ assertEquals(1, files.length);
}
@Test
@@ -165,29 +168,29 @@ public class SizeFileFilterTest extends BaseFilterTest {
SizeRangeFileFilter testee;
testee = new SizeRangeFileFilter(2, 6);
- Assert.assertTrue(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertTrue(testee.accept(maxFileInfo));
+ assertTrue(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertTrue(testee.accept(maxFileInfo));
testee = new SizeRangeFileFilter(3, 6);
- Assert.assertFalse(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertTrue(testee.accept(maxFileInfo));
+ assertFalse(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertTrue(testee.accept(maxFileInfo));
testee = new SizeRangeFileFilter(2, 5);
- Assert.assertTrue(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertFalse(testee.accept(maxFileInfo));
+ assertTrue(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertFalse(testee.accept(maxFileInfo));
testee = new SizeRangeFileFilter(3, 5);
- Assert.assertFalse(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertFalse(testee.accept(maxFileInfo));
+ assertFalse(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertFalse(testee.accept(maxFileInfo));
testee = new SizeRangeFileFilter(4, 4);
- Assert.assertFalse(testee.accept(minFileInfo));
- Assert.assertTrue(testee.accept(optFileInfo));
- Assert.assertFalse(testee.accept(maxFileInfo));
+ assertFalse(testee.accept(minFileInfo));
+ assertTrue(testee.accept(optFileInfo));
+ assertFalse(testee.accept(maxFileInfo));
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6TestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6TestCase.java
index b5bf8627..c4f08712 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6TestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderIPv6TestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.ftp;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemOptions;
@@ -24,8 +26,6 @@ import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.GenericFileName;
import org.mockito.Mockito;
-import junit.framework.Test;
-
public class FtpProviderIPv6TestCase extends FtpProviderTestCase {
private static class MockedClientFtpFileProvider extends FtpFileProvider {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java
index b3f95ece..3bdfd379 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderMdtmOffTestCase.java
@@ -16,14 +16,14 @@
*/
package org.apache.commons.vfs2.provider.ftp;
+import junit.framework.Test;
+
import org.apache.ftpserver.command.CommandFactory;
import org.apache.ftpserver.command.CommandFactoryFactory;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.impl.FtpReplyTranslator;
import org.apache.ftpserver.impl.LocalizedFtpReply;
-import junit.framework.Test;
-
public class FtpProviderMdtmOffTestCase extends FtpProviderTestCase {
public static Test suite() throws Exception {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
index 60ed3c77..fafedb5e 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderTestCase.java
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.net.URL;
import java.time.Duration;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestCase;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
@@ -40,8 +42,6 @@ import
org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
import org.apache.ftpserver.usermanager.impl.BaseUser;
import org.junit.jupiter.api.Assertions;
-import junit.framework.Test;
-
/**
* Tests for FTP file systems.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
index 0c68c7ad..24550eb6 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpProviderUserDirTestCase.java
@@ -21,6 +21,8 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestDirectory;
import java.io.File;
import java.io.IOException;
+import junit.framework.Test;
+
import org.apache.commons.io.FileUtils;
import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
import org.apache.ftpserver.ftplet.FileSystemFactory;
@@ -28,8 +30,6 @@ import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
-import junit.framework.Test;
-
/**
* Tests for FTP file systems (with homeDirIsRoot=true).
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
index 6ed76e7f..b3269576 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4ProviderTestCase.java
@@ -31,8 +31,6 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import org.apache.commons.vfs2.provider.http5.Http5FileObject;
-import org.apache.commons.vfs2.provider.http5.Http5FileSystemConfigBuilder;
import org.apache.commons.vfs2.util.NHttpFileServer;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
index 64defb92..f9a403e8 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Jar file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
index d91e29da..e09e7915 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/NestedJarTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Zip file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
index 538a16ea..4beaaf6f 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalProviderTestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.local;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
@@ -25,8 +27,6 @@ import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.PermissionsTests;
import org.apache.commons.vfs2.ProviderTestSuite;
-import junit.framework.Test;
-
/**
* Tests for the local file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
index 54c215b0..05aeb4df 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/CustomRamProviderTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.commons.vfs2.provider.ram;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.Closeable;
import java.io.IOException;
@@ -40,7 +40,6 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.FileType;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.UriParser;
-import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -142,7 +141,7 @@ public class CustomRamProviderTest {
FileSystemOptions fsOptions =
fo1.getFileSystem().getFileSystemOptions();
long maxFilesystemSize =
RamFileSystemConfigBuilder.getInstance().getLongMaxSize(fsOptions);
- assertEquals("Filesystem option maxSize must be unlimited",
Long.MAX_VALUE, maxFilesystemSize);
+ assertEquals(Long.MAX_VALUE, maxFilesystemSize, "Filesystem option
maxSize must be unlimited");
// Small FS
final FileObject fo3 = manager.resolveFile("ram:/fo3", smallSizedFso);
@@ -152,7 +151,7 @@ public class CustomRamProviderTest {
fsOptions = fo3.getFileSystem().getFileSystemOptions();
maxFilesystemSize =
RamFileSystemConfigBuilder.getInstance().getLongMaxSize(fsOptions);
- assertEquals("Filesystem option maxSize must be set", 10,
maxFilesystemSize);
+ assertEquals(10, maxFilesystemSize, "Filesystem option maxSize must be
set");
}
/**
@@ -164,14 +163,14 @@ public class CustomRamProviderTest {
final FileObject fileSource =
manager.resolveFile("ram://virtual/source");
fileSource.createFile();
final FileObject fileDest = manager.resolveFile("ram://virtual/dest");
- Assert.assertTrue(fileSource.canRenameTo(fileDest));
+ assertTrue(fileSource.canRenameTo(fileDest));
fileSource.moveTo(fileDest);
}
@Test
public void testReadEmptyFileByteByByte() throws FileSystemException,
IOException {
final InputStream input = this.createEmptyFile();
- assertEquals("Empty file didn't return EOF -1", -1, input.read());
+ assertEquals(-1, input.read(),"Empty file didn't return EOF -1");
}
@Test
@@ -179,26 +178,26 @@ public class CustomRamProviderTest {
final InputStream input = this.createEmptyFile();
final byte[] buffer = new byte[100];
- assertEquals("Empty file didn't return when filling buffer", -1,
input.read(buffer));
- assertArrayEquals("Buffer was written too", new byte[100], buffer);
+ assertEquals(-1, input.read(buffer), "Empty file didn't return when
filling buffer");
+ assertArrayEquals(new byte[100], buffer, "Buffer was written too");
}
@Test
public void testReadEmptyFileIntoBufferWithOffsetAndLength() throws
FileSystemException, IOException {
final InputStream input = this.createEmptyFile();
final byte[] buffer = new byte[100];
- assertEquals("Empty file didn't return when filling buffer", -1,
input.read(buffer, 10, 90));
- assertArrayEquals("Buffer was written too", new byte[100], buffer);
+ assertEquals(-1, input.read(buffer, 10, 90), "Empty file didn't return
when filling buffer");
+ assertArrayEquals(new byte[100], buffer, "Buffer was written too");
}
@Test
public void testReadNonEmptyFileByteByByte() throws FileSystemException,
IOException {
final InputStream input = this.createNonEmptyFile();
- assertEquals("Read 1st byte failed", 1, input.read());
- assertEquals("Read 2st byte failed", 2, input.read());
- assertEquals("Read 3st byte failed", 3, input.read());
- assertEquals("File should be empty", -1, input.read());
+ assertEquals(1, input.read(), "Read 1st byte failed");
+ assertEquals(2, input.read(), "Read 2st byte failed");
+ assertEquals(3, input.read(), "Read 3st byte failed");
+ assertEquals(-1, input.read(), "File should be empty");
}
@Test
@@ -206,16 +205,16 @@ public class CustomRamProviderTest {
final InputStream input = this.createNonEmptyFile();
final byte[] buffer = new byte[100];
- assertEquals("Filling buffer failed when file is not empty",
NON_EMPTY_FILE_CONTENT.length, input.read(buffer));
+ assertEquals(NON_EMPTY_FILE_CONTENT.length, input.read(buffer),
"Filling buffer failed when file is not empty");
final byte[] expectedBuffer = Arrays.copyOf(NON_EMPTY_FILE_CONTENT,
100);
- assertArrayEquals("Buffer not filled", expectedBuffer, buffer);
+ assertArrayEquals(expectedBuffer, buffer, "Buffer not filled");
Arrays.fill(buffer, (byte) 0);
Arrays.fill(expectedBuffer, (byte) 0);
- assertEquals("File should be empty after filling buffer", -1,
input.read(buffer));
- assertArrayEquals("Buffer was written when empty", expectedBuffer,
buffer);
+ assertEquals(-1, input.read(buffer), "File should be empty after
filling buffer");
+ assertArrayEquals(expectedBuffer, buffer, "Buffer was written when
empty");
}
@Test
@@ -224,17 +223,17 @@ public class CustomRamProviderTest {
final byte[] buffer = new byte[100];
final int offset = 10;
- assertEquals("Filling buffer failed when file is not empty",
NON_EMPTY_FILE_CONTENT.length,
- input.read(buffer, offset, 100 - offset));
+ assertEquals(NON_EMPTY_FILE_CONTENT.length,
+ input.read(buffer, offset, 100 - offset), "Filling buffer
failed when file is not empty");
final byte[] expectedBuffer = new byte[100];
System.arraycopy(NON_EMPTY_FILE_CONTENT, 0, expectedBuffer, offset,
NON_EMPTY_FILE_CONTENT.length);
- assertArrayEquals("Buffer not filled", expectedBuffer, buffer);
+ assertArrayEquals(expectedBuffer, buffer, "Buffer not filled");
Arrays.fill(buffer, (byte) 0);
Arrays.fill(expectedBuffer, (byte) 0);
- assertEquals("File should be empty after filling buffer", -1,
input.read(buffer, 10, 90));
- assertArrayEquals("Buffer was written when empty", expectedBuffer,
buffer);
+ assertEquals(-1, input.read(buffer, 10, 90), "File should be empty
after filling buffer");
+ assertArrayEquals(expectedBuffer, buffer, "Buffer was written when
empty");
}
/**
@@ -291,22 +290,22 @@ public class CustomRamProviderTest {
final FileObject getChildResult = dir.getChild(testFileName);
// validate findFiles returns expected result
- assertEquals("Unexpected result findFiles: " +
Arrays.toString(findFilesResult), 2, findFilesResult.length);
+ assertEquals(2, findFilesResult.length, () -> "Unexpected result
findFiles: " + Arrays.toString(findFilesResult));
String resultName = findFilesResult[0].getName().getPathDecoded();
- assertEquals("findFiles Child name does not match", expectedName,
resultName);
- assertEquals("Did findFiles but child was no file", FileType.FILE,
findFilesResult[0].getType());
+ assertEquals(expectedName, resultName, "findFiles Child name does not
match");
+ assertEquals(FileType.FILE, findFilesResult[0].getType(), "Did
findFiles but child was no file");
// validate getChildren returns expected result
- assertEquals("Unexpected result getChildren: " +
Arrays.toString(getChildrenResult), 1, getChildrenResult.length);
+ assertEquals(1, getChildrenResult.length, () -> "Unexpected result
getChildren: " + Arrays.toString(getChildrenResult));
resultName = getChildrenResult[0].getName().getPathDecoded();
- assertEquals("getChildren Child name does not match", expectedName,
resultName);
- assertEquals("Did getChildren but child was no file", FileType.FILE,
getChildrenResult[0].getType());
+ assertEquals(expectedName, resultName, "getChildren Child name does
not match");
+ assertEquals(FileType.FILE, getChildrenResult[0].getType(), "Did
getChildren but child was no file");
// validate getChild returns expected child
- assertNotNull("Did not find direct child", getChildResult);
+ assertNotNull(getChildResult, "Did not find direct child");
resultName = getChildResult.getName().getPathDecoded();
- assertEquals("getChild name does not match", expectedName, resultName);
- assertEquals("getChild was no file", FileType.FILE,
getChildResult.getType());
+ assertEquals(expectedName, resultName, "getChild name does not match");
+ assertEquals(FileType.FILE, getChildResult.getType(), "getChild was no
file");
}
@Test
@@ -355,22 +354,22 @@ public class CustomRamProviderTest {
final FileObject getChildResult =
dir.getChild(UriParser.encode(testFileName, ENC));
// validate findFiles returns expected result
- assertEquals("Unexpected result findFiles: " +
Arrays.toString(findFilesResult), 2, findFilesResult.length);
+ assertEquals(2, findFilesResult.length, () -> "Unexpected result
findFiles: " + Arrays.toString(findFilesResult));
String resultName = findFilesResult[0].getName().getPathDecoded();
- assertEquals("findFiles Child name does not match", expectedName,
resultName);
- assertEquals("Did findFiles but child was no file", FileType.FILE,
findFilesResult[0].getType());
+ assertEquals(expectedName, resultName, "findFiles Child name does not
match");
+ assertEquals(FileType.FILE, findFilesResult[0].getType(), "Did
findFiles but child was no file");
// validate getChildren returns expected result
- assertEquals("Unexpected result getChildren: " +
Arrays.toString(getChildrenResult), 1, getChildrenResult.length);
+ assertEquals(1, getChildrenResult.length, () -> "Unexpected result
getChildren: " + Arrays.toString(getChildrenResult));
resultName = getChildrenResult[0].getName().getPathDecoded();
- assertEquals("getChildren Child name does not match", expectedName,
resultName);
- assertEquals("Did getChildren but child was no file", FileType.FILE,
getChildrenResult[0].getType());
+ assertEquals(expectedName, resultName, "getChildren Child name does
not match");
+ assertEquals(FileType.FILE, getChildrenResult[0].getType(), "Did
getChildren but child was no file");
// validate getChild returns expected child
- assertNotNull("Did not find direct child", getChildResult);
+ assertNotNull(getChildResult, "Did not find direct child");
resultName = getChildResult.getName().getPathDecoded();
- assertEquals("getChild name does not match", expectedName, resultName);
- assertEquals("getChild was no file", FileType.FILE,
getChildResult.getType());
+ assertEquals(expectedName, resultName, "getChild name does not match");
+ assertEquals(FileType.FILE, getChildResult.getType(), "getChild was no
file");
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
index 1e73f664..7a014e50 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamProviderTestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.ram;
import static org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
+import junit.framework.Test;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.vfs2.AbstractProviderTestConfig;
@@ -27,8 +29,6 @@ import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
-import junit.framework.Test;
-
/**
* Tests for the RAM file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
index 8e5a6fbd..946767e2 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResourceProviderTestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.res;
import static org.apache.commons.vfs2.VfsTestUtils.getResourceTestDirectory;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -26,8 +28,6 @@ import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.jar.JarFileProvider;
import org.apache.commons.vfs2.provider.url.UrlFileProvider;
-import junit.framework.Test;
-
/**
* Test cases for the resource provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemGroupsTests.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemGroupsTests.java
index 214469a5..ce4eb0d9 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemGroupsTests.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemGroupsTests.java
@@ -16,10 +16,11 @@
*/
package org.apache.commons.vfs2.provider.sftp;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -47,7 +48,7 @@ public class SftpFileSystemGroupsTests {
final StringBuilder builder = new StringBuilder("\n");
final int[] groups = fileSystem.parseGroupIdOutput(builder);
- Assert.assertEquals("Group ids should be empty", 0, groups.length);
+ assertEquals(0, groups.length, "Group ids should be empty");
}
@Test
@@ -55,8 +56,8 @@ public class SftpFileSystemGroupsTests {
final StringBuilder builder = new StringBuilder("1 22 333 4444\n");
final int[] groups = fileSystem.parseGroupIdOutput(builder);
- Assert.assertEquals("Group ids should not be empty", 4, groups.length);
- Assert.assertArrayEquals(new int[]{1, 22, 333, 4444}, groups);
+ assertEquals(4, groups.length, "Group ids should not be empty");
+ assertArrayEquals(new int[]{1, 22, 333, 4444}, groups);
}
@Test
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java
index 162e520d..a1fd12d5 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderClosedExecChannelTestCase.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.sftp;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.NamingTests;
import org.apache.commons.vfs2.PermissionsTests;
import org.apache.commons.vfs2.ProviderDeleteTests;
@@ -23,8 +25,6 @@ import org.apache.commons.vfs2.ProviderReadTests;
import org.apache.commons.vfs2.ProviderRenameTests;
import org.apache.commons.vfs2.ProviderWriteTests;
-import junit.framework.Test;
-
public class SftpProviderClosedExecChannelTestCase extends
AbstractSftpProviderTestCase {
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6TestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6TestCase.java
index f5ebfb7a..f7924453 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6TestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderIPv6TestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.sftp;
import java.io.IOException;
+import junit.framework.Test;
+
import org.apache.commons.io.input.NullInputStream;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileObject;
@@ -30,7 +32,6 @@ import org.mockito.Mockito;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
-import junit.framework.Test;
public class SftpProviderIPv6TestCase extends AbstractSftpProviderTestCase {
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java
index acbc3e89..fc5db3ba 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderStreamProxyModeTestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.sftp;
import java.net.URI;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
@@ -26,8 +28,6 @@ import org.apache.commons.vfs2.ProviderReadTests;
import com.jcraft.jsch.TestIdentityRepositoryFactory;
-import junit.framework.Test;
-
public class SftpProviderStreamProxyModeTestCase extends
AbstractSftpProviderTestCase {
// --- VFS-440: stream proxy test suite
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java
index e7184659..bdb36a5a 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpProviderTestCase.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.vfs2.provider.sftp;
-import org.apache.commons.vfs2.PermissionsTests;
-
import junit.framework.Test;
+import org.apache.commons.vfs2.PermissionsTests;
+
public class SftpProviderTestCase extends AbstractSftpProviderTestCase {
/**
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
index 98a603a1..a5fa0717 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
@@ -16,9 +16,9 @@
*/
package org.apache.commons.vfs2.provider.tar;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.OutputStream;
@@ -136,7 +136,7 @@ public class LargeTarTest {
assertNotNull(files);
for (final String expectedFile : expectedFiles) {
- assertTrue("Expected file not found: " + expectedFile,
fileExists(expectedFile, files));
+ assertTrue(fileExists(expectedFile, files), () -> "Expected file
not found: " + expectedFile);
}
}
@@ -184,7 +184,7 @@ public class LargeTarTest {
assertEquals(1, files.size());
final FileObject f = files.get(0);
- assertEquals("Expected file not found: " + largeFileName + ".txt",
f.getName().getBaseName(), largeFileName + ".txt");
+ assertEquals(f.getName().getBaseName(), largeFileName + ".txt", () ->
"Expected file not found: " + largeFileName + ".txt");
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
index 932ebd16..246f37a7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTarTestCase.java
@@ -18,6 +18,8 @@ package org.apache.commons.vfs2.provider.tar;
import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -27,8 +29,6 @@ import org.apache.commons.vfs2.auth.StaticUserAuthenticator;
import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system, using a tar file nested inside another tar
file.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
index a73805c2..526b7c3b 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTbz2TestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.tar;
import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system, using a tar file nested inside another tar
file.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
index e212ccf0..c291619c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/NestedTgzTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.tar;
import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system, using a tar file nested inside another tar
file.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
index de229430..06546ec6 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
index c0b7178b..84a5e262 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/Tbz2ProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
index ccdc9585..4dc0301c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TgzProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Tar file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
index d39fcbcd..348c9d04 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/temp/TemporaryProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Test cases for the tmp: file provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
index 246d5b11..8a41c9b0 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/VirtualProviderTestCase.java
@@ -20,13 +20,13 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
-import junit.framework.Test;
-
/**
* Test cases for the virtual file system provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
index 202e8d9a..90731b19 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlHttpProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Test cases for the generic provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
index 43e22174..fefb13ff 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderHttpTestCase.java
@@ -22,6 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
@@ -29,8 +31,6 @@ import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.util.NHttpFileServer;
-import junit.framework.Test;
-
/**
* Test cases for HTTP with the default provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
index 11562c16..185f32a7 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestDirectoryFile;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Test cases for the generic provider.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
index 46f1d89f..f5197e8c 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/NestedZipTestCase.java
@@ -18,14 +18,14 @@ package org.apache.commons.vfs2.provider.zip;
import static org.apache.commons.vfs2.VfsTestUtils.getTestResource;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Zip file system, using a ZIP file nested inside another ZIP
file.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
index 0ec79c43..9b93dbb8 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
@@ -16,6 +16,9 @@
*/
package org.apache.commons.vfs2.provider.zip;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -30,7 +33,6 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
-import org.junit.Assert;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -60,11 +62,9 @@ public class ZipFileObjectTest {
throws IOException {
final String streamData = IOUtils.toString(inputStream,
StandardCharsets.UTF_8);
final String fileObjectString = fileObject.toString();
- Assert.assertNotNull(fileObjectString, streamData);
- Assert.assertEquals(
- fileObjectString, "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\r\n<Root"
- + expectedId + ">foo" + expectedId + "</Root" +
expectedId + ">\r\n",
- streamData);
+ assertNotNull(fileObjectString, streamData);
+ assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<Root" +
expectedId + ">foo" + expectedId + "</Root" + expectedId + ">\r\n", streamData,
+ fileObjectString);
}
private void resolveReadAssert(final FileObject zipFileObject, final
String path)
@@ -180,11 +180,11 @@ public class ZipFileObjectTest {
// test
try (FileObject fileObject = manager.resolveFile(baseUrl)) {
// test getChildren() number equal
- Assert.assertEquals(fileObject.getChildren().length,
fileNames.length);
+ assertEquals(fileObject.getChildren().length, fileNames.length);
// test getChild(String)
for (final String fileName : fileNames) {
- Assert.assertNotNull("can't read file " + fileName,
fileObject.getChild(fileName));
+ assertNotNull(fileObject.getChild(fileName), () -> "can't read
file " + fileName);
}
}
}
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
index 45d7fb04..445f2f37 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderTestCase.java
@@ -20,14 +20,14 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
-import junit.framework.Test;
-
/**
* Tests for the Zip file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
index 6ddf05f1..9f84fdef 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetNullTestCase.java
@@ -20,6 +20,8 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
@@ -29,8 +31,6 @@ import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.junit.jupiter.api.Assertions;
-import junit.framework.Test;
-
/**
* Tests for the Zip file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
index bc5714a2..820c1913 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipProviderWithCharsetTestCase.java
@@ -21,6 +21,8 @@ import static
org.apache.commons.vfs2.VfsTestUtils.getTestResource;
import java.io.File;
import java.nio.charset.StandardCharsets;
+import junit.framework.Test;
+
import org.apache.commons.vfs2.AbstractProviderTestConfig;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystem;
@@ -30,8 +32,6 @@ import org.apache.commons.vfs2.ProviderTestSuite;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.junit.jupiter.api.Assertions;
-import junit.framework.Test;
-
/**
* Tests for the Zip file system.
*/
diff --git
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
index 2ed76e49..f707f73a 100644
---
a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
+++
b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/DelegatingFileSystemOptionsBuilderTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.commons.vfs2.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
@@ -62,7 +62,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
@Test
public void testConfiguration() throws Exception {
for (final String scheme : schemes) {
- assertTrue("Missing " + scheme + " provider",
fsm.hasProvider(scheme));
+ assertTrue(fsm.hasProvider(scheme), () -> "Missing " + scheme + "
provider");
}
}
@@ -99,16 +99,16 @@ public class DelegatingFileSystemOptionsBuilderTest {
delegate.setConfigClass(opts, "sftp", "userinfo",
TrustEveryoneUserInfo.class);
delegate.setConfigStrings(opts, "sftp", "identities", identityPaths);
- assertEquals("http.proxyHost",
HttpFileSystemConfigBuilder.getInstance().getProxyHost(opts), "proxy");
- assertEquals("http.proxyPort",
HttpFileSystemConfigBuilder.getInstance().getProxyPort(opts), 8080);
- assertSame("sftp.userInfo",
SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(),
TrustEveryoneUserInfo.class);
+
assertEquals(HttpFileSystemConfigBuilder.getInstance().getProxyHost(opts),
"proxy", "http.proxyHost");
+
assertEquals(HttpFileSystemConfigBuilder.getInstance().getProxyPort(opts),
8080, "http.proxyPort");
+
assertSame(SftpFileSystemConfigBuilder.getInstance().getUserInfo(opts).getClass(),
TrustEveryoneUserInfo.class, "sftp.userInfo");
final File[] identities =
SftpFileSystemConfigBuilder.getInstance().getIdentities(opts);
- assertNotNull("sftp.identities", identities);
- assertEquals("sftp.identities size", identities.length,
identityPaths.length);
+ assertNotNull(identities, "sftp.identities");
+ assertEquals(identities.length, identityPaths.length, "sftp.identities
size");
for (int iterIdentities = 0; iterIdentities < identities.length;
iterIdentities++) {
- assertEquals("sftp.identities #" + iterIdentities,
identities[iterIdentities].getAbsolutePath(),
- new File(identityPaths[iterIdentities]).getAbsolutePath());
+ assertEquals(identities[iterIdentities].getAbsolutePath(), new
File(identityPaths[iterIdentities]).getAbsolutePath(),
+ "sftp.identities #" + iterIdentities);
}
}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index b46cb4c9..0d1bbe96 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -163,6 +163,9 @@ The <action> type attribute can be add,update,fix,remove.
<action type="fix" issue="VFS-524" dev="ggregory" due-to="Alex, Fedor
Yudanov, Gary Gregory">
A URI with an IPv6 address can't be parsed out correctly #438.
</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Port assertions to JUnit 5 APIs.
+ </action>
<!-- ADD -->
<action type="add" issue="VFS-848" dev="ggregory" due-to="beise, Gary
Gregory">
Config option for trailing slash in webdav URI #425.
