You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/02/20 19:51:46 UTC
[commons-vfs] branch master updated: JUnit v5 upgrades easy tests (#240)
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 235b2cd JUnit v5 upgrades easy tests (#240)
235b2cd is described below
commit 235b2cd2b2e4d70aad912aae9bdc9f48ebeab68f
Author: John Patrick <14...@users.noreply.github.com>
AuthorDate: Sun Feb 20 19:51:42 2022 +0000
JUnit v5 upgrades easy tests (#240)
* JUnit v5 switch to junit-bom
(cherry picked from commit fb03aee6b11922a4d6c70478c4942570d5c28e68)
* JUnit v5 add support for junit-jupiter-engine
(cherry picked from commit d4b814c44c7647ef1c39a77653e3f04fb9d55c04)
* JUnit v5 StaticUserAuthenticatorTest upgrade
* JUnit v5 VfsConsumerTest upgrade
* JUnit v5 BasicOperationsTest upgrade
* JUnit v5 DelegatingFileSystemOptionsBuilderTest upgrade
* JUnit v5 EncryptDecryptTest upgrade
* JUnit v5 FileObjectUtilsTest upgrade
* JUnit v5 RandomAccessModeTest upgrade
* JUnit v5 HttpFilesCacheTest upgrade
* JUnit v5 Http4FilesCacheTest upgrade
* JUnit v5 Http4GetContentInfoTest upgrade
* JUnit v5 Http4sGetContentInfoTest upgrade
* JUnit v5 Http5FilesCacheTest upgrade
* JUnit v5 Http5GetContentInfoTest upgrade
* JUnit v5 Http5sGetContentInfoTest upgrade
* JUnit v5 WebDav4FilesTest upgrade
* JUnit v5 AgeFileFilterTest upgrade
* JUnit v5 AndFileFilterTest upgrade
* JUnit v5 CanExecuteFileFilterTest upgrade
* JUnit v5 CanReadFileFilterTest upgrade
* JUnit v5 CanWriteFileFilterTest upgrade
* JUnit v5 DirectoryAndFileFilterTest upgrade
* JUnit v5 EmptyFileFilterTest upgrade
* JUnit v5 HiddenFileFilterTest upgrade
* JUnit v5 NameFileFilterTest upgrade
* JUnit v5 NotFileFilterTest upgrade
* JUnit v5 OrFileFilterTest upgrade
* JUnit v5 PrefixFileFilterTest upgrade
* JUnit v5 RegexFileFilterTest upgrade
* JUnit v5 SizeFileFilterTest upgrade
* JUnit v5 SuffixFileFilterTest upgrade
* JUnit v5 SymbolicLinkFileFilterTest upgrade
* JUnit v5 rename FileFilters to not include Test in the name
* JUnit v5 WildcardFileFilterTest upgrade
* JUnit v5 FtpFileNameParserTest upgrade
* JUnit v5 FtpFileSystemConfigBuilderTest upgrade
* JUnit v5 UriParserTest upgrade
* JUnit v5 MultipleConnectionTest upgrade
* JUnit v5 MultipleConnectionTest upgrade
* JUnit v5 JarAttributesTest upgrade
* JUnit v5 ConversionTest upgrade
* JUnit v5 LocalFileRandomAccessContentTest upgrade
* JUnit v5 RamFileRandomAccessContentTest upgrade
* JUnit v5 ResSchemeTest upgrade
* JUnit v5 SftpFileSystemConfigBuilderTest upgrade
* JUnit v5 CreateFileSystemTest upgrade
* JUnit v5 LargeTarTest upgrade
* JUnit v5 TarFileObjectTest upgrade
* JUnit v5 TarFileSystemTest upgrade
* JUnit v5 FileLockTest upgrade
* JUnit v5 Jira733Test upgrade
* JUnit v5 ParseXmlInZipTest upgrade
* JUnit v5 ZipFileObjectTest upgrade
* JUnit v5 ZipFileSystemTest upgrade
* JUnit v5 FileObjectSortTest upgrade
* JUnit v5 UserAuthenticationDataTest upgrade
* JUnit v5 DefaultFileMonitorTest upgrade
* JUnit v5 HdfsFileProviderTest upgrade
* JUnit v5 PatternFileSelectorTest upgrade
* JUnit v5 ResSchemeTest upgrade
* JUnit v5 DefaultFileSystemManagerTest upgrade
* JUnit v5 DefaultFileContentTest upgrade
* JUnit v5 StandardFileSystemManagerTest upgrade
* JUnit v5 GetContentInfoFunctionalTest upgrade
* JUnit v5 GetContentInfoFunctionalTest upgrade
* JUnit v5 CustomRamProviderTest upgrade
* JUnit v5 UrlFileNameParserTest upgrade
* JUnit v5 AbstractFileNameTest upgrade
* JUnit v5 FileChangeEventTest upgrade
* JUnit v5 FileExtensionSelectorTest upgrade
* JUnit v5 FileIteratorTest upgrade
* JUnit v5 FileObjectContentOutputStreamCloseTest upgrade
* JUnit v5 FileObjectEscapeCharacterInPathTest upgrade
* JUnit v5 FileSystemExceptionTest upgrade
* JUnit v5 FileSystemOptionsTest upgrade
* JUnit v5 FileTypeSelectorTest upgrade
* JUnit v5 FileTypeTest upgrade
* JUnit v5 InvertIncludeFileSelectorTest upgrade
* JUnit v5 VFSTest upgrade
* JUnit v5 Webdav4FileObjectTest upgrade
---
commons-vfs2-jackrabbit2/pom.xml | 5 ++++
.../provider/webdav4/Webdav4FileObjectTest.java | 2 +-
...av4FilesTestCase.java => WebDav4FilesTest.java} | 6 ++--
commons-vfs2-sandbox/pom.xml | 5 ++++
commons-vfs2/pom.xml | 5 ++++
.../apache/commons/vfs2/FileChangeEventTest.java | 2 +-
.../commons/vfs2/FileExtensionSelectorTest.java | 11 ++++----
.../org/apache/commons/vfs2/FileIteratorTest.java | 10 +++----
.../FileObjectContentOutputStreamCloseTest.java | 2 +-
.../vfs2/FileObjectEscapeCharacterInPathTest.java | 2 +-
.../commons/vfs2/FileSystemExceptionTest.java | 3 +-
.../apache/commons/vfs2/FileSystemOptionsTest.java | 2 +-
.../apache/commons/vfs2/FileTypeSelectorTest.java | 11 ++++----
.../java/org/apache/commons/vfs2/FileTypeTest.java | 2 +-
.../vfs2/InvertIncludeFileSelectorTest.java | 10 +++----
.../commons/vfs2/PatternFileSelectorTest.java | 16 ++++++-----
...stCase.java => UserAuthenticationDataTest.java} | 5 ++--
.../test/java/org/apache/commons/vfs2/VFSTest.java | 2 +-
...tCase.java => StaticUserAuthenticatorTest.java} | 13 +++++----
.../commons/vfs2/filter/AgeFileFilterTest.java | 10 +++----
...eFileFilter.java => AlwaysFalseFileFilter.java} | 2 +-
...ueFileFilter.java => AlwaysTrueFileFilter.java} | 2 +-
.../commons/vfs2/filter/AndFileFilterTest.java | 26 +++++++++---------
.../vfs2/filter/CanExecuteFileFilterTest.java | 14 +++++-----
.../commons/vfs2/filter/CanReadFileFilterTest.java | 10 +++----
.../vfs2/filter/CanWriteFileFilterTest.java | 10 +++----
.../vfs2/filter/DirectoryAndFileFilterTest.java | 10 +++----
.../commons/vfs2/filter/EmptyFileFilterTest.java | 10 +++----
.../commons/vfs2/filter/HiddenFileFilterTest.java | 10 +++----
.../commons/vfs2/filter/NameFileFilterTest.java | 2 +-
.../commons/vfs2/filter/NotFileFilterTest.java | 2 +-
.../commons/vfs2/filter/OrFileFilterTest.java | 14 +++++-----
.../commons/vfs2/filter/PrefixFileFilterTest.java | 2 +-
...ilterTestCase.java => RegexFileFilterTest.java} | 4 +--
.../commons/vfs2/filter/SizeFileFilterTest.java | 10 +++----
.../commons/vfs2/filter/SuffixFileFilterTest.java | 2 +-
.../vfs2/filter/SymbolicLinkFileFilterTest.java | 10 +++----
.../vfs2/filter/WildcardFileFilterTest.java | 2 +-
.../commons/vfs2/function/VfsConsumerTest.java | 2 +-
.../commons/vfs2/impl/DefaultFileMonitorTest.java | 16 +++++------
.../vfs2/impl/DefaultFileSystemManagerTest.java | 32 ++++++++++++----------
.../vfs2/impl/StandardFileSystemManagerTest.java | 2 +-
...tionsTestCase.java => BasicOperationsTest.java} | 13 +++++----
.../vfs2/provider/AbstractFileNameTest.java | 3 +-
.../vfs2/provider/DefaultFileContentTest.java | 21 ++++++++------
.../{UriParserTestCase.java => UriParserTest.java} | 4 +--
...serTestCase.java => FtpFileNameParserTest.java} | 4 +--
...se.java => FtpFileSystemConfigBuilderTest.java} | 4 +--
...onTestCase.java => MultipleConnectionTest.java} | 12 ++++----
...onTestCase.java => MultipleConnectionTest.java} | 12 ++++----
.../vfs2/provider/hdfs/HdfsFileProviderTest.java | 20 ++++++++------
.../http/GetContentInfoFunctionalTest.java | 2 +-
...sCacheTestCase.java => HttpFilesCacheTest.java} | 6 ++--
...CacheTestCase.java => Http4FilesCacheTest.java} | 6 ++--
.../provider/http4/Http4GetContentInfoTest.java | 6 ++--
.../provider/http4s/Http4sGetContentInfoTest.java | 6 ++--
...CacheTestCase.java => Http5FilesCacheTest.java} | 6 ++--
...oTestCase.java => Http5GetContentInfoTest.java} | 6 ++--
.../provider/http5s/Http5sGetContentInfoTest.java | 8 +++---
.../https/GetContentInfoFunctionalTest.java | 2 +-
...ributesTestCase.java => JarAttributesTest.java} | 4 +--
...ConversionTestCase.java => ConversionTest.java} | 10 +++----
....java => LocalFileRandomAccessContentTest.java} | 4 +--
.../vfs2/provider/ram/CustomRamProviderTest.java | 11 ++++----
...se.java => RamFileRandomAccessContentTest.java} | 4 +--
.../{ResSchemeTestCase.java => ResSchemeTest.java} | 18 ++++++------
...e.java => SftpFileSystemConfigBuilderTest.java} | 4 +--
...stemTestCase.java => CreateFileSystemTest.java} | 4 +--
.../{LargeTarTestCase.java => LargeTarTest.java} | 9 +++---
...eObjectTestCase.java => TarFileObjectTest.java} | 5 ++--
...eSystemTestCase.java => TarFileSystemTest.java} | 4 +--
...ctSortTestCase.java => FileObjectSortTest.java} | 12 ++++----
.../vfs2/provider/url/UrlFileNameParserTest.java | 2 +-
.../{FileLockTestCase.java => FileLockTest.java} | 8 +++---
.../zip/{Jira733TestCase.java => Jira733Test.java} | 12 ++++----
...mlInZipTestCase.java => ParseXmlInZipTest.java} | 12 ++++----
...eObjectTestCase.java => ZipFileObjectTest.java} | 8 +++---
...eSystemTestCase.java => ZipFileSystemTest.java} | 4 +--
.../DelegatingFileSystemOptionsBuilderTest.java | 10 +++----
.../commons/vfs2/util/EncryptDecryptTest.java | 7 +++--
.../commons/vfs2/util/FileObjectUtilsTest.java | 2 +-
.../commons/vfs2/util/RandomAccessModeTest.java | 2 +-
pom.xml | 6 ++--
83 files changed, 322 insertions(+), 299 deletions(-)
diff --git a/commons-vfs2-jackrabbit2/pom.xml b/commons-vfs2-jackrabbit2/pom.xml
index 3c79083..88a059a 100644
--- a/commons-vfs2-jackrabbit2/pom.xml
+++ b/commons-vfs2-jackrabbit2/pom.xml
@@ -69,6 +69,11 @@
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
diff --git a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObjectTest.java b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObjectTest.java
index 890155c..94fdbf2 100644
--- a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObjectTest.java
+++ b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/Webdav4FileObjectTest.java
@@ -24,7 +24,7 @@ import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.GenericURLFileName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class Webdav4FileObjectTest {
diff --git a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTestCase.java b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTest.java
similarity index 94%
rename from commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTestCase.java
rename to commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTest.java
index c18fa0c..ac43f6d 100644
--- a/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTestCase.java
+++ b/commons-vfs2-jackrabbit2/src/test/java/org/apache/commons/vfs2/provider/webdav4/test/WebDav4FilesTest.java
@@ -21,14 +21,12 @@ 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.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-810.
*/
-public class WebDav4FilesTestCase extends TestCase {
+public class WebDav4FilesTest {
@Test
public void testUrlWithAuthority() throws FileSystemException {
diff --git a/commons-vfs2-sandbox/pom.xml b/commons-vfs2-sandbox/pom.xml
index 70aa38e..9af4153 100644
--- a/commons-vfs2-sandbox/pom.xml
+++ b/commons-vfs2-sandbox/pom.xml
@@ -70,6 +70,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
diff --git a/commons-vfs2/pom.xml b/commons-vfs2/pom.xml
index 0434f0e..a1a2d61 100644
--- a/commons-vfs2/pom.xml
+++ b/commons-vfs2/pom.xml
@@ -94,6 +94,11 @@
</dependency>
<dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
index 7e7850a..7c4eea6 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileChangeEventTest.java
@@ -20,7 +20,7 @@ package org.apache.commons.vfs2;
import java.io.File;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FileChangeEventTest {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
index ec3e8a0..7b5f9cb 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileExtensionSelectorTest.java
@@ -21,10 +21,10 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests FileExtensionSelector.
@@ -32,6 +32,7 @@ import org.junit.Test;
* @since 2.1
*/
public class FileExtensionSelectorTest {
+
private static FileObject BaseFolder;
private static final int FileCount = 9;
@@ -45,7 +46,7 @@ public class FileExtensionSelectorTest {
*
* @throws Exception
*/
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
BaseFolder = VFS.getManager().resolveFile("ram://" + FileExtensionSelectorTest.class.getName());
BaseFolder.deleteAll();
@@ -66,7 +67,7 @@ public class FileExtensionSelectorTest {
*
* @throws Exception
*/
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
if (BaseFolder != null) {
BaseFolder.deleteAll();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java
index f518e9d..76ac4a8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileIteratorTest.java
@@ -18,10 +18,10 @@ package org.apache.commons.vfs2;
import java.util.Iterator;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link FileObject}s with iterators its implementation the {@link Iterable} interface to allow a FileObject to
@@ -38,7 +38,7 @@ public class FileIteratorTest {
*
* @throws Exception
*/
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
BaseFolder = VFS.getManager().resolveFile("ram://" + FileIteratorTest.class.getName());
BaseFolder.deleteAll();
@@ -62,7 +62,7 @@ public class FileIteratorTest {
*
* @throws Exception
*/
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
if (BaseFolder != null) {
BaseFolder.deleteAll();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
index 47392c3..8f8ece1 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectContentOutputStreamCloseTest.java
@@ -24,7 +24,7 @@ import java.io.OutputStreamWriter;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FileObjectContentOutputStreamCloseTest {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
index 0802a32..fe179f8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileObjectEscapeCharacterInPathTest.java
@@ -34,7 +34,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.lang3.function.FailableFunction;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class FileObjectEscapeCharacterInPathTest {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
index 3bbf8ad..6ed02e3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemExceptionTest.java
@@ -18,12 +18,13 @@ package org.apache.commons.vfs2;
import static org.junit.Assert.assertEquals;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests the {@link FileSystemException}.
*/
public class FileSystemExceptionTest {
+
/**
* Tests a {@link FileSystemException} containing info with a URL containing only the user information.
*/
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemOptionsTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemOptionsTest.java
index 6338a1c..748b809 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemOptionsTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileSystemOptionsTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Check FileSystemOptions.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
index 83403ae..fd5bc07 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeSelectorTest.java
@@ -16,10 +16,10 @@
*/
package org.apache.commons.vfs2;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests FileTypeSelector.
@@ -27,6 +27,7 @@ import org.junit.Test;
* @since 2.1
*/
public class FileTypeSelectorTest {
+
private static FileObject BaseFolder;
/**
@@ -34,7 +35,7 @@ public class FileTypeSelectorTest {
*
* @throws Exception
*/
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
BaseFolder = VFS.getManager().resolveFile("ram://" + FileTypeSelectorTest.class.getName());
BaseFolder.resolveFile("root1.html").createFile();
@@ -52,7 +53,7 @@ public class FileTypeSelectorTest {
*
* @throws Exception
*/
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
if (BaseFolder != null) {
BaseFolder.deleteAll();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeTest.java
index f3b6ce3..c3d6528 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/FileTypeTest.java
@@ -20,7 +20,7 @@ import java.io.Serializable;
import org.apache.commons.lang3.SerializationUtils;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Sanity check that a custom enum can be properly serialized and deserialized on a give JRE.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/InvertIncludeFileSelectorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/InvertIncludeFileSelectorTest.java
index f8029e9..daf5808 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/InvertIncludeFileSelectorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/InvertIncludeFileSelectorTest.java
@@ -16,19 +16,19 @@
*/
package org.apache.commons.vfs2;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class InvertIncludeFileSelectorTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
PatternFileSelectorTest.setUpClass();
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
PatternFileSelectorTest.tearDownClass();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
index 52781a2..545d12f 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/PatternFileSelectorTest.java
@@ -17,15 +17,16 @@
package org.apache.commons.vfs2;
import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests FileExtensionSelector.
@@ -33,6 +34,7 @@ import org.junit.Test;
* @since 2.1
*/
public class PatternFileSelectorTest {
+
private static FileObject BaseFolder;
/**
@@ -53,7 +55,7 @@ public class PatternFileSelectorTest {
*
* @throws Exception
*/
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws Exception {
BaseFolder = VFS.getManager().resolveFile("ram://" + PatternFileSelectorTest.class.getName());
BaseFolder.deleteAll();
@@ -74,7 +76,7 @@ public class PatternFileSelectorTest {
*
* @throws Exception
*/
- @AfterClass
+ @AfterAll
public static void tearDownClass() throws Exception {
if (BaseFolder != null) {
BaseFolder.deleteAll();
@@ -153,10 +155,10 @@ public class PatternFileSelectorTest {
*
* @throws Exception
*/
- @Test(expected = NullPointerException.class)
+ @Test
public void testNullString() throws Exception {
// Yep, this will blow up.
- new PatternFileSelector((String) null);
+ assertThrows(NullPointerException.class, () -> new PatternFileSelector((String) null));
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTest.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTest.java
index 845cde7..83e2a39 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/UserAuthenticationDataTest.java
@@ -20,9 +20,10 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+public class UserAuthenticationDataTest {
-public class UserAuthenticationDataTestCase {
@Test
public void testCharacterBasedData() {
final UserAuthenticationData data = new UserAuthenticationData();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
index ecc57e4..9691f99 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/VFSTest.java
@@ -23,7 +23,7 @@ import java.nio.file.Paths;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class VFSTest {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTest.java
similarity index 89%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTest.java
index b5660f3..695ae68 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/auth/StaticUserAuthenticatorTest.java
@@ -16,17 +16,18 @@
*/
package org.apache.commons.vfs2.auth;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.vfs2.UserAuthenticationData;
import org.apache.commons.vfs2.UserAuthenticator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+public class StaticUserAuthenticatorTest {
-public class StaticUserAuthenticatorTestCase {
@Test
public void testAuthenticationRequest() {
final UserAuthenticator userAuthenticator = new StaticUserAuthenticator("DOMAIN", "USER", "PWD");
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 333e30b..3b9dd62 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
@@ -25,10 +25,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link AgeFileFilter}.
@@ -62,7 +62,7 @@ public class AgeFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
newFileInfo = null;
newFile = null;
@@ -81,7 +81,7 @@ public class AgeFileFilterTest extends BaseFilterTest {
testDir = null;
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(AgeFileFilterTest.class.getName());
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestFalseFileFilter.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysFalseFileFilter.java
similarity index 94%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestFalseFileFilter.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysFalseFileFilter.java
index 345dca4..7f1d607 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestFalseFileFilter.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysFalseFileFilter.java
@@ -22,7 +22,7 @@ import org.apache.commons.vfs2.FileSelectInfo;
/**
* Always FALSE.
*/
-final class TestFalseFileFilter implements FileFilter {
+final class AlwaysFalseFileFilter implements FileFilter {
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestTrueFileFilter.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysTrueFileFilter.java
similarity index 94%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestTrueFileFilter.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysTrueFileFilter.java
index eb0a030..53c547e 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/TestTrueFileFilter.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AlwaysTrueFileFilter.java
@@ -22,7 +22,7 @@ import org.apache.commons.vfs2.FileSelectInfo;
/**
* Always TRUE.
*/
-final class TestTrueFileFilter implements FileFilter {
+final class AlwaysTrueFileFilter implements FileFilter {
@Override
public boolean accept(final FileSelectInfo fileSelectInfo) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
index 2fa68d4..cd059d9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AndFileFilterTest.java
@@ -24,7 +24,7 @@ import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
// CHECKSTYLE:OFF Test code
public class AndFileFilterTest extends BaseFilterTest {
@@ -51,14 +51,14 @@ public class AndFileFilterTest extends BaseFilterTest {
Assert.assertFalse(new AndFileFilter().accept(any));
// True
- Assert.assertTrue(new AndFileFilter(new TestTrueFileFilter()).accept(any));
- Assert.assertTrue(new AndFileFilter(new TestTrueFileFilter(), new TestTrueFileFilter()).accept(any));
+ Assert.assertTrue(new AndFileFilter(new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertTrue(new AndFileFilter(new AlwaysTrueFileFilter(), new AlwaysTrueFileFilter()).accept(any));
// False
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter(), new TestFalseFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter(), new TestTrueFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestTrueFileFilter(), new TestFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter(), new AlwaysFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter(), new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysTrueFileFilter(), new AlwaysFalseFileFilter()).accept(any));
}
@@ -71,14 +71,14 @@ public class AndFileFilterTest extends BaseFilterTest {
Assert.assertFalse(new AndFileFilter().accept(any));
// True
- Assert.assertTrue(new AndFileFilter(new TestTrueFileFilter()).accept(any));
- Assert.assertTrue(new AndFileFilter(new TestTrueFileFilter(), new TestTrueFileFilter()).accept(any));
+ Assert.assertTrue(new AndFileFilter(new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertTrue(new AndFileFilter(new AlwaysTrueFileFilter(), new AlwaysTrueFileFilter()).accept(any));
// False
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter(), new TestFalseFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestFalseFileFilter(), new TestTrueFileFilter()).accept(any));
- Assert.assertFalse(new AndFileFilter(new TestTrueFileFilter(), new TestFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter(), new AlwaysFalseFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysFalseFileFilter(), new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertFalse(new AndFileFilter(new AlwaysTrueFileFilter(), new AlwaysFalseFileFilter()).accept(any));
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
index 24bdc43..391330b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/CanExecuteFileFilterTest.java
@@ -23,17 +23,17 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link CanExecuteFileFilter}.
*/
// CHECKSTYLE:OFF Test code
-@Ignore
+@Disabled("Disabled pre junit v5")
public class CanExecuteFileFilterTest extends BaseFilterTest {
private static final String EXECUTABLE = "executable.txt";
@@ -58,7 +58,7 @@ public class CanExecuteFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
executableFileInfo = null;
@@ -81,7 +81,7 @@ public class CanExecuteFileFilterTest extends BaseFilterTest {
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(CanExecuteFileFilterTest.class.getName());
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 f20203c..4757341 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
@@ -24,10 +24,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link CanReadFileFilter}.
@@ -57,7 +57,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
writableFileInfo = null;
@@ -80,7 +80,7 @@ public class CanReadFileFilterTest extends BaseFilterTest {
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(CanReadFileFilterTest.class.getName());
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 453d819..d2b1603 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
@@ -24,10 +24,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link CanWriteFileFilter}.
@@ -57,7 +57,7 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
writableFileInfo = null;
@@ -80,7 +80,7 @@ public class CanWriteFileFilterTest extends BaseFilterTest {
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(CanWriteFileFilterTest.class.getName());
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 6525082..473ff49 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
@@ -26,10 +26,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link DirectoryFileFilter} and {@link FileFileFilter}.
@@ -59,7 +59,7 @@ public class DirectoryAndFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
file = null;
@@ -81,7 +81,7 @@ public class DirectoryAndFileFilterTest extends BaseFilterTest {
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(DirectoryAndFileFilterTest.class.getName());
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 9d94ebf..c1646f0 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
@@ -25,10 +25,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link EmptyFileFilter}.
@@ -62,7 +62,7 @@ public class EmptyFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
notEmptyFile = null;
@@ -84,7 +84,7 @@ public class EmptyFileFilterTest extends BaseFilterTest {
testDir = null;
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(EmptyFileFilterTest.class.getName());
testDir.mkdir();
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 30d59c9..f3662c3 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
@@ -25,10 +25,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link HiddenFileFilter}.
@@ -54,7 +54,7 @@ public class HiddenFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
visibleFile = null;
@@ -72,7 +72,7 @@ public class HiddenFileFilterTest extends BaseFilterTest {
testDir = null;
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(HiddenFileFilterTest.class.getName());
testDir.mkdir();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NameFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NameFileFilterTest.java
index eaf123e..48ff73c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NameFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NameFileFilterTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NameFileFilter}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NotFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NotFileFilterTest.java
index e2d913e..825a724 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NotFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/NotFileFilterTest.java
@@ -21,7 +21,7 @@ import java.io.File;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link NotFileFilter}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/OrFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/OrFileFilterTest.java
index 0f65381..eba90f9 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/OrFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/OrFileFilterTest.java
@@ -24,7 +24,7 @@ import org.apache.commons.vfs2.FileFilter;
import org.apache.commons.vfs2.FileSelectInfo;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
// CHECKSTYLE:OFF Test code
public class OrFileFilterTest extends BaseFilterTest {
@@ -50,14 +50,14 @@ public class OrFileFilterTest extends BaseFilterTest {
Assert.assertFalse(new OrFileFilter().accept(any));
// True
- Assert.assertTrue(new OrFileFilter(new TestTrueFileFilter()).accept(any));
- Assert.assertTrue(new OrFileFilter(new TestTrueFileFilter(), new TestTrueFileFilter()).accept(any));
- Assert.assertTrue(new OrFileFilter(new TestFalseFileFilter(), new TestTrueFileFilter()).accept(any));
- Assert.assertTrue(new OrFileFilter(new TestTrueFileFilter(), new TestFalseFileFilter()).accept(any));
+ Assert.assertTrue(new OrFileFilter(new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertTrue(new OrFileFilter(new AlwaysTrueFileFilter(), new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertTrue(new OrFileFilter(new AlwaysFalseFileFilter(), new AlwaysTrueFileFilter()).accept(any));
+ Assert.assertTrue(new OrFileFilter(new AlwaysTrueFileFilter(), new AlwaysFalseFileFilter()).accept(any));
// False
- Assert.assertFalse(new OrFileFilter(new TestFalseFileFilter()).accept(any));
- Assert.assertFalse(new OrFileFilter(new TestFalseFileFilter(), new TestFalseFileFilter()).accept(any));
+ Assert.assertFalse(new OrFileFilter(new AlwaysFalseFileFilter()).accept(any));
+ Assert.assertFalse(new OrFileFilter(new AlwaysFalseFileFilter(), new AlwaysFalseFileFilter()).accept(any));
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/PrefixFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/PrefixFileFilterTest.java
index bd00a91..c170314 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/PrefixFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/PrefixFileFilterTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link PrefixFileFilter}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTest.java
index f8feda3..f20a375 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/RegexFileFilterTest.java
@@ -23,13 +23,13 @@ import java.util.regex.Pattern;
import org.apache.commons.vfs2.FileFilter;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link RegexFileFilter}.
*/
// CHECKSTYLE:OFF Test code
-public class RegexFileFilterTestCase extends BaseFilterTest {
+public class RegexFileFilterTest extends BaseFilterTest {
@Test
public void testPatternNullArgConstruction() {
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 d538f3a..5b05a51 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
@@ -24,10 +24,10 @@ 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.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link SizeFileFilter}.
@@ -53,7 +53,7 @@ public class SizeFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObj;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
minFileInfo = null;
@@ -73,7 +73,7 @@ public class SizeFileFilterTest extends BaseFilterTest {
testDir = null;
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
testDir = getTestDir(SizeFileFilterTest.class.getName());
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SuffixFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SuffixFileFilterTest.java
index 82da456..2cf2d80 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SuffixFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SuffixFileFilterTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link SuffixFileFilter}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
index c8b2b87..80dfdfc 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/SymbolicLinkFileFilterTest.java
@@ -26,11 +26,11 @@ 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.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link SymbolicLinkFileFilter}.
@@ -69,7 +69,7 @@ public class SymbolicLinkFileFilterTest extends BaseFilterTest {
private static FileObject zipFileObject;
- @AfterClass
+ @AfterAll
public static void afterClass() throws IOException {
targetFile = null;
targetFileInfo = null;
@@ -90,7 +90,7 @@ public class SymbolicLinkFileFilterTest extends BaseFilterTest {
}
}
- @BeforeClass
+ @BeforeAll
public static void beforeClass() throws IOException {
Assume.assumeTrue(Boolean.getBoolean(SymbolicLinkFileFilterTest.class.getSimpleName() + ".Enable"));
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/WildcardFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/WildcardFileFilterTest.java
index 418c819..fdad241 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/WildcardFileFilterTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/WildcardFileFilterTest.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.commons.vfs2.FileSystemException;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for {@link WildcardFileFilter}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
index 61dc56d..323f932 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/function/VfsConsumerTest.java
@@ -22,7 +22,7 @@ import java.nio.file.Paths;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link VfsConsumer}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
index 7f7369d..7d46391 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileMonitorTest.java
@@ -36,10 +36,10 @@ import org.apache.commons.vfs2.FileListener;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link DefaultFileMonitor}.
@@ -125,7 +125,7 @@ public class DefaultFileMonitorTest {
*
* As a result, the file monitor will fire two created events.
*/
- @Ignore("VFS-299")
+ @Disabled("VFS-299")
@Test
public void ignore_testAddRemove() throws Exception {
try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
@@ -148,7 +148,7 @@ public class DefaultFileMonitorTest {
*
* As a result, listeners of stopped monitors still receive events.
*/
- @Ignore("VFS-299")
+ @Disabled("VFS-299")
@Test
public void ignore_testStartStop() throws Exception {
try (FileObject fileObject = fileSystemManager.resolveFile(testFile.toURI().toString())) {
@@ -190,7 +190,7 @@ public class DefaultFileMonitorTest {
status.clear();
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
fileSystemManager = VFS.getManager();
testDir = AbstractVfsTestCase.getTestDirectoryFile();
@@ -199,7 +199,7 @@ public class DefaultFileMonitorTest {
deleteTestFileIfPresent();
}
- @After
+ @AfterEach
public void tearDown() {
deleteTestFileIfPresent();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
index 51d63d3..476caa3 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/DefaultFileSystemManagerTest.java
@@ -34,10 +34,12 @@ import org.apache.commons.vfs2.provider.jar.JarFileObject;
import org.apache.commons.vfs2.provider.ram.RamFileProvider;
import org.apache.commons.vfs2.provider.zip.ZipFileObject;
import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* Tests {@link DefaultFileSystemManager}.
*
@@ -97,7 +99,7 @@ public class DefaultFileSystemManagerTest {
}
@Test
- @Ignore
+ @Disabled
public void testCreateGzipFileSystem() throws FileSystemException {
testCreateFileSystem("src/test/resources/test-data/好.txt.gz", GzipFileObject.class);
}
@@ -155,10 +157,10 @@ public class DefaultFileSystemManagerTest {
*
* @see "VFS-519"
*/
- @Test(expected = NullPointerException.class)
- public void testResolveFileAbsoluteThrows() throws FileSystemException {
+ @Test
+ public void testResolveFileAbsoluteThrows() {
final String absolute = new File("/").getAbsoluteFile().toURI().toString();
- VFS.getManager().resolveFile((File) null, absolute);
+ assertThrows(NullPointerException.class, () -> VFS.getManager().resolveFile((File) null, absolute));
}
/**
@@ -166,9 +168,9 @@ public class DefaultFileSystemManagerTest {
*
* @see VFS-189
*/
- @Test(expected = FileSystemException.class)
- public void testResolveFileNameNull() throws FileSystemException {
- VFS.getManager().resolveName((FileName) null, "../");
+ @Test
+ public void testResolveFileNameNull() {
+ assertThrows(FileSystemException.class, () -> VFS.getManager().resolveName((FileName) null, "../"));
}
@Test
@@ -177,13 +179,13 @@ public class DefaultFileSystemManagerTest {
VFS.getManager().resolveFile((FileObject) null, absolute);
}
- @Test(expected = FileSystemException.class)
- public void testResolveFileObjectRelativeThrows() throws FileSystemException {
- VFS.getManager().resolveFile((FileObject) null, "relativePath");
+ @Test
+ public void testResolveFileObjectRelativeThrows() {
+ assertThrows(FileSystemException.class, () -> VFS.getManager().resolveFile((FileObject) null, "relativePath"));
}
- @Test(expected = NullPointerException.class)
- public void testResolveFileRelativeThrows() throws FileSystemException {
- VFS.getManager().resolveFile((File) null, "relativePath");
+ @Test
+ public void testResolveFileRelativeThrows() {
+ assertThrows(NullPointerException.class, () -> VFS.getManager().resolveFile((File) null, "relativePath"));
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
index 1f1ca8a..15593b7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/StandardFileSystemManagerTest.java
@@ -23,7 +23,7 @@ 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.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link StandardFileSystemManager}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTest.java
index 9a273ea..182a2e2 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/operations/BasicOperationsTest.java
@@ -33,14 +33,15 @@ import org.apache.commons.vfs2.provider.FileProvider;
import org.apache.commons.vfs2.provider.VfsComponent;
import org.apache.commons.vfs2.provider.VfsComponentContext;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Basic Tests for the FileOperations and FileOperationsProvider API.
*/
-public class BasicOperationsTestCase {
+public class BasicOperationsTest {
+
/** This FileOperationsProvider is a VfsComponent and records invocations. */
static class MyFileOperationProviderComp extends MyFileOprationProviderBase implements VfsComponent {
@Override
@@ -102,7 +103,7 @@ public class BasicOperationsTestCase {
*
* @throws FileSystemException for runtime problems
*/
- @Before
+ @BeforeEach
public void setUp() throws FileSystemException {
manager = new DefaultFileSystemManager();
final FileProvider fp = new DefaultLocalFileProvider();
@@ -115,7 +116,7 @@ public class BasicOperationsTestCase {
*
* @throws FileSystemException for runtime problems
*/
- @After
+ @AfterEach
public void tearDown() throws FileSystemException {
if (manager != null) {
manager.close();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/AbstractFileNameTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/AbstractFileNameTest.java
index 9e4a4bc..3d91fd0 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/AbstractFileNameTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/AbstractFileNameTest.java
@@ -19,9 +19,10 @@ package org.apache.commons.vfs2.provider;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.FileType;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class AbstractFileNameTest {
+
@Test
public void testHashSignEncoded() {
final AbstractFileName fileName = new AbstractFileName("file", "/foo/bar/file#name.txt", FileType.FILE) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
index f2d889a..7922123 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/DefaultFileContentTest.java
@@ -32,13 +32,16 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* {@code DefaultFileContentTest} tests for bug-VFS-614. This bug involves the stream implementation closing the stream
* after reading to the end of the buffer, which broke marking.
*/
public class DefaultFileContentTest {
+
private static final String expected = "testing";
/**
@@ -77,9 +80,9 @@ public class DefaultFileContentTest {
testInputStreamBufferSize(1);
}
- @Test(expected = IllegalArgumentException.class)
- public void testInputStreamBufferSizeNegative() throws Exception {
- testInputStreamBufferSize(-2);
+ @Test
+ public void testInputStreamBufferSizeNegative() {
+ assertThrows(IllegalArgumentException.class, () -> testInputStreamBufferSize(-2));
}
@Test
@@ -160,18 +163,18 @@ public class DefaultFileContentTest {
testOutputStreamBufferSize(1);
}
- @Test(expected = IllegalArgumentException.class)
- public void testOutputStreamBufferSizeNegative() throws Exception {
- testOutputStreamBufferSize(-1);
+ @Test
+ public void testOutputStreamBufferSizeNegative() {
+ assertThrows(IllegalArgumentException.class, () -> testOutputStreamBufferSize(-1));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void testOutputStreamBufferSizeNegativeWithAppendFlag() throws Exception {
final File temp = File.createTempFile("temp-file-name", ".tmp");
final FileSystemManager fileSystemManager = VFS.getManager();
try (FileObject file = fileSystemManager.resolveFile(temp.getAbsolutePath())) {
- file.getContent().getOutputStream(true, -1);
+ assertThrows(IllegalArgumentException.class, () -> file.getContent().getOutputStream(true, -1));
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java
index 0b82377..0d9b417 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/UriParserTest.java
@@ -17,12 +17,12 @@
package org.apache.commons.vfs2.provider;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class UriParserTestCase {
+public class UriParserTest {
private static final String[] schemes = {"ftp", "file"};
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
index df085cd..9d46462 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileNameParserTest.java
@@ -22,14 +22,14 @@ import static org.junit.Assert.assertTrue;
import org.apache.commons.vfs2.FileName;
import org.apache.commons.vfs2.provider.GenericFileName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-793.
*
* See also https://issues.apache.org/jira/browse/VFS-810.
*/
-public class FtpFileNameParserTestCase {
+public class FtpFileNameParserTest {
@Test
public void testGenericFileName1() throws Exception {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
index 7d2791e..440dee7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/FtpFileSystemConfigBuilderTest.java
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertEquals;
import java.time.Duration;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link FtpFileSystemConfigBuilder}.
*/
-public class FtpFileSystemConfigBuilderTestCase {
+public class FtpFileSystemConfigBuilderTest {
@Test
public void testControlKeepAliveReplyTimeout() {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
similarity index 92%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
index f2e4ace..5e6f8ec 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftp/MultipleConnectionTest.java
@@ -25,18 +25,18 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.apache.ftpserver.ftplet.FtpException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-public class MultipleConnectionTestCase {
+public class MultipleConnectionTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws FtpException {
FtpProviderTestCase.setUpClass(AbstractVfsTestCase.getTestDirectory(), null, null);
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() {
FtpProviderTestCase.tearDownClass();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTest.java
similarity index 93%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTest.java
index ba826ab..2a01f56 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ftps/MultipleConnectionTest.java
@@ -24,18 +24,18 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.apache.ftpserver.ftplet.FtpException;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-public class MultipleConnectionTestCase {
+public class MultipleConnectionTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws FtpException, IOException {
AbstractFtpsProviderTestCase.setUpClass(true);
}
- @AfterClass
+ @AfterAll
public static void tearDownClass() {
AbstractFtpsProviderTestCase.tearDownClass();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTest.java
index 6097459..1b6b42f 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/hdfs/HdfsFileProviderTest.java
@@ -36,11 +36,13 @@ import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* This test class uses the Hadoop MiniDFSCluster class to create an embedded Hadoop cluster.
@@ -97,7 +99,7 @@ public class HdfsFileProviderTest {
}
}
- @BeforeClass
+ @BeforeAll
public static void setUp() throws Exception {
Logger.getRootLogger().setLevel(Level.ERROR);
@@ -125,7 +127,7 @@ public class HdfsFileProviderTest {
hdfs = cluster.getFileSystem();
}
- @AfterClass
+ @AfterAll
public static void tearDown() throws Exception {
if (null != hdfs) {
hdfs.close();
@@ -133,7 +135,7 @@ public class HdfsFileProviderTest {
manager.close();
}
- @After
+ @AfterEach
public void after() throws Exception {
if (null != hdfs) {
hdfs.delete(DIR1_PATH, true);
@@ -299,7 +301,7 @@ public class HdfsFileProviderTest {
Assert.assertNotEquals(-1, file.getContent().getLastModifiedTime());
}
- @Test(expected = FileSystemException.class)
+ @Test
public void testRandomAccessContent() throws Exception {
final FileObject fo = manager.resolveFile(TEST_DIR1);
Assert.assertNotNull(fo);
@@ -308,7 +310,7 @@ public class HdfsFileProviderTest {
// Create the test file
final FileObject file = createTestFile(hdfs);
Assert.assertTrue(fo.exists());
- file.getContent().getRandomAccessContent(RandomAccessMode.READWRITE).close();
+ assertThrows(FileSystemException.class, () -> file.getContent().getRandomAccessContent(RandomAccessMode.READWRITE).close());
}
@Test
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
index 1362733..e0f88ab 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/GetContentInfoFunctionalTest.java
@@ -26,7 +26,7 @@ import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on HttpFileObject.getContent().getContentInfo()
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTest.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTest.java
index 6fd37dd..47f0241 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http/HttpFilesCacheTest.java
@@ -21,9 +21,7 @@ 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.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-426
@@ -31,7 +29,7 @@ import junit.framework.TestCase;
* ggregory $
* @since 2.1
*/
-public class HttpFilesCacheTestCase extends TestCase {
+public class HttpFilesCacheTest {
/**
* Tests https://issues.apache.org/jira/browse/VFS-426
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTest.java
index 007a4cb..5faf293 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4FilesCacheTest.java
@@ -23,14 +23,12 @@ 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.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-426 and https://issues.apache.org/jira/browse/VFS-810.
*/
-public class Http4FilesCacheTestCase extends TestCase {
+public class Http4FilesCacheTest {
@Test
public void testQueryStringUrl0() throws FileSystemException {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
index c53ba46..d63d53b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4/Http4GetContentInfoTest.java
@@ -27,14 +27,12 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.auth.StaticUserAuthenticator;
import org.junit.Assert;
-import org.junit.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on Http4FileObject.getContent().getContentInfo().
*/
-public class Http4GetContentInfoTest extends TestCase {
+public class Http4GetContentInfoTest {
FileSystemOptions getOptionsWithProxy() throws MalformedURLException {
// get proxy host and port from env var "https_proxy"
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
index 17cb3c3..9afe704 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http4s/Http4sGetContentInfoTest.java
@@ -27,14 +27,12 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.http4.Http4FileSystemConfigBuilder;
import org.junit.Assert;
-import org.junit.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on Http4FileObject.getContent().getContentInfo()
*/
-public class Http4sGetContentInfoTest extends TestCase {
+public class Http4sGetContentInfoTest {
FileSystemOptions getOptionsWithProxy() throws MalformedURLException {
// get proxy host and port from env var "https_proxy"
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTest.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTest.java
index ce50fb2..37b9b15 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5FilesCacheTest.java
@@ -21,14 +21,12 @@ 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.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-426.
*/
-public class Http5FilesCacheTestCase extends TestCase {
+public class Http5FilesCacheTest {
/**
* Tests https://issues.apache.org/jira/browse/VFS-426
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTest.java
index 1eb297d..6596da7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5/Http5GetContentInfoTest.java
@@ -27,14 +27,12 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.auth.StaticUserAuthenticator;
import org.junit.Assert;
-import org.junit.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on Http5FileObject.getContent().getContentInfo().
*/
-public class Http5GetContentInfoTestCase extends TestCase {
+public class Http5GetContentInfoTest {
FileSystemOptions getOptionsWithProxy() throws MalformedURLException {
// get proxy host and port from env var "https_proxy"
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
index e90f498..3aff61b 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/http5s/Http5sGetContentInfoTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.vfs2.provider.http5s;
+import static org.junit.Assert.assertNotNull;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -33,14 +35,12 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.http5.Http5FileSystemConfigBuilder;
import org.junit.Assert;
-import org.junit.Test;
-
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on Http5FileObject.getContent().getContentInfo()
*/
-public class Http5sGetContentInfoTest extends TestCase {
+public class Http5sGetContentInfoTest {
private static final String SERVER_JCEKS_RES = "org.apache.httpserver/star_apache_cert.ts";
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
index e53647b..59f20c2 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/https/GetContentInfoFunctionalTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.vfs2.FileSystemOptions;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests VFS-427 NPE on HttpFileObject.getContent().getContentInfo()
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTest.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTest.java
index 88a629a..ca7cdb7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/jar/JarAttributesTest.java
@@ -21,13 +21,13 @@ import java.util.Map;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests JAR attributes.
*
*/
-public class JarAttributesTestCase {
+public class JarAttributesTest {
private void printAttributes(final Map<String, Object> attributes) {
for (final Map.Entry<String, Object> e : attributes.entrySet()) {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTest.java
similarity index 94%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTest.java
index 8e974b8..cd55086 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/ConversionTest.java
@@ -28,18 +28,18 @@ import java.nio.file.Files;
import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
/**
* Tests conversion from VFS to File.
* <p>
* VFS-443 Need an easy way to convert from a FileObject to a File.
*/
-public class ConversionTestCase {
+public class ConversionTest {
@Test
- @Ignore
+ @Disabled("Ignored pre JUnit v5")
public void testFileNameWithCharacters() throws URISyntaxException, IOException {
final File file = new File("target", "+# %&.txt");
final String fileURL = file.toURI().toURL().toExternalForm();
@@ -59,7 +59,7 @@ public class ConversionTestCase {
}
@Test
- @Ignore
+ @Disabled("Ignored pre JUnit v5")
public void testFileNameWithSpaces() throws URISyntaxException, IOException {
final File file = new File("target", "a name.txt");
final String fileURL = file.toURI().toURL().toExternalForm();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTest.java
similarity index 95%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTest.java
index 4190bf2..33f9370 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/local/LocalFileRandomAccessContentTest.java
@@ -22,12 +22,12 @@ import java.io.InputStream;
import org.apache.commons.vfs2.util.RandomAccessMode;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 2.7.0
*/
-public class LocalFileRandomAccessContentTestCase {
+public class LocalFileRandomAccessContentTest {
private final int EOF = -1;
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 48ce1f8..b0fa3e9 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
@@ -40,15 +40,16 @@ 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.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Custom tests for RamProvider.
*/
public class CustomRamProviderTest {
+
private static final byte[] NON_EMPTY_FILE_CONTENT = { 1, 2, 3 };
/** List of URL special characters encoded for AbstractFileObject#getChild */
@@ -110,7 +111,7 @@ public class CustomRamProviderTest {
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
manager = new DefaultFileSystemManager();
manager.addProvider("ram", new RamFileProvider());
@@ -121,7 +122,7 @@ public class CustomRamProviderTest {
RamFileSystemConfigBuilder.getInstance().setMaxSize(smallSizedFso, 10L);
}
- @After
+ @AfterEach
public void tearDown() {
for (final Closeable closeable : this.closeables) {
try {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTest.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTest.java
index d17f881..4bdb773 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/ram/RamFileRandomAccessContentTest.java
@@ -24,12 +24,12 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.util.RandomAccessMode;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 2.7.0
*/
-public class RamFileRandomAccessContentTestCase {
+public class RamFileRandomAccessContentTest {
private final int EOF = -1;
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
similarity index 87%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
index ba63469..9b34400 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/res/ResSchemeTest.java
@@ -23,9 +23,11 @@ import java.net.URISyntaxException;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ResSchemeTestCase {
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class ResSchemeTest {
@Test
public void test_resolveFile_String() throws FileSystemException {
@@ -47,10 +49,10 @@ public class ResSchemeTestCase {
Assert.assertTrue(VFS.getManager().resolveFile("res://test.properties").exists());
}
- @Test(expected = FileSystemException.class)
- public void test_resolveFile_String_SSSnull() throws FileSystemException {
+ @Test
+ public void test_resolveFile_String_SSSnull() {
// Resulting path is empty
- Assert.assertTrue(VFS.getManager().resolveFile("res:///").exists());
+ assertThrows(FileSystemException.class, () -> VFS.getManager().resolveFile("res:///").exists());
}
@Test
@@ -93,9 +95,9 @@ public class ResSchemeTestCase {
Assert.assertTrue(VFS.getManager().resolveURI("res:///test.properties").isFile());
}
- @Test(expected = FileSystemException.class)
- public void test_resolveURI_String_SSSnull() throws FileSystemException {
+ @Test
+ public void test_resolveURI_String_SSSnull() {
// Resulting path is empty
- Assert.assertTrue(VFS.getManager().resolveURI("res:///").isFile());
+ assertThrows(FileSystemException.class, () -> VFS.getManager().resolveURI("res:///").isFile());
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
index 97c95cb..1d174d8 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/sftp/SftpFileSystemConfigBuilderTest.java
@@ -22,12 +22,12 @@ import static org.junit.Assert.assertEquals;
import java.time.Duration;
import org.apache.commons.vfs2.FileSystemOptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link SftpFileSystemConfigBuilder}.
*/
-public class SftpFileSystemConfigBuilderTestCase {
+public class SftpFileSystemConfigBuilderTest {
private static final Duration ONE_MINUTE = Duration.ofMinutes(1);
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTest.java
index ba76b9e..53a3c2e 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/CreateFileSystemTest.java
@@ -23,14 +23,14 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* test use DefaultFileSystemManager.createFileSystem method to create tar,tgz,tbz2 file system
*
* @since 2.7.0
**/
-public class CreateFileSystemTestCase {
+public class CreateFileSystemTest {
private FileObject createFileSystem(final String testFilePath) throws IOException {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
similarity index 98%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
index 538a03f..3c12dd1 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/LargeTarTest.java
@@ -39,11 +39,12 @@ import org.apache.commons.vfs2.FileObject;
import org.apache.commons.vfs2.cache.SoftRefFilesCache;
import org.apache.commons.vfs2.impl.DefaultFileSystemManager;
import org.apache.commons.vfs2.provider.local.DefaultLocalFileProvider;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
//@SuppressWarnings("nls")
-public class LargeTarTestCase {
+public class LargeTarTest {
+
private final static String baseDir = "target/test-classes/test-data/";
private final static String largeFilePath = baseDir;
@@ -160,7 +161,7 @@ public class LargeTarTestCase {
return false;
}
- @Before
+ @BeforeEach
public void setUp() throws Exception {
manager = new DefaultFileSystemManager();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTest.java
index 7f81bb4..8992e51 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileObjectTest.java
@@ -23,10 +23,9 @@ 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.Test;
+import org.junit.jupiter.api.Test;
-
-public class TarFileObjectTestCase {
+public class TarFileObjectTest {
private void testReadSpecialNameFileInFile(final String testFilePath, final String scheme) throws FileSystemException {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTest.java
similarity index 98%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTest.java
index c190f59..018c3de 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/tar/TarFileSystemTest.java
@@ -24,9 +24,9 @@ import org.apache.commons.vfs2.FilesCache;
import org.apache.commons.vfs2.cache.WeakRefFilesCache;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class TarFileSystemTestCase {
+public class TarFileSystemTest {
@Test
public void testTarFileUseDefaultFilesCache() throws FileSystemException {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTest.java
similarity index 93%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTest.java
index 5b5ad3b..ba888eb 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/test/FileObjectSortTest.java
@@ -24,15 +24,15 @@ import org.apache.commons.vfs2.FileSystem;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
/**
* Tests FileObject sorting.
*
* $Id$
*/
-public class FileObjectSortTestCase {
+public class FileObjectSortTest {
/**
* The size of arrays to sort.
@@ -52,16 +52,16 @@ public class FileObjectSortTestCase {
return fs.resolveFile(String.format("%010d", i));
}
- @BeforeClass
+ @BeforeAll
public static void setUpClass() throws FileSystemException {
VfsFileSystem = VFS.getManager().createVirtualFileSystem("vfs://").getFileSystem();
SortedArray = new FileObject[SIZE];
for (int i = 0; i < SIZE; i++) {
- SortedArray[i] = FileObjectSortTestCase.resolveFile(VfsFileSystem, i);
+ SortedArray[i] = FileObjectSortTest.resolveFile(VfsFileSystem, i);
}
UnSortedArray = new FileObject[SIZE];
for (int i = 0; i < SIZE; i++) {
- UnSortedArray[i] = FileObjectSortTestCase.resolveFile(VfsFileSystem, SIZE - i - 1);
+ UnSortedArray[i] = FileObjectSortTest.resolveFile(VfsFileSystem, SIZE - i - 1);
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
index d99faf6..6b6e2cd 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/url/UrlFileNameParserTest.java
@@ -21,7 +21,7 @@ import java.net.URI;
import org.apache.commons.vfs2.FileName;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
public class UrlFileNameParserTest {
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
similarity index 98%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
index a3ae1a4..ce8ec5c 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/FileLockTest.java
@@ -31,13 +31,13 @@ import org.apache.commons.vfs2.FileSystemManager;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests https://issues.apache.org/jira/browse/VFS-291
*/
-public class FileLockTestCase {
+public class FileLockTest {
private FileSystemManager manager;
private File newZipFile;
@@ -75,7 +75,7 @@ public class FileLockTestCase {
}
}
- @Before
+ @BeforeEach
public void setup() throws IOException {
final File zipFile = new File("src/test/resources/test-data/test.zip");
newZipFile = File.createTempFile(getClass().getSimpleName(), ".zip");
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
similarity index 96%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
index 77dd213..8c72447 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733TestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/Jira733Test.java
@@ -24,15 +24,15 @@ import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.apache.commons.vfs2.cache.OnCallRefreshFileObject;
import org.apache.commons.vfs2.function.VfsConsumer;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-public class Jira733TestCase {
+public class Jira733Test {
- @After
- @Before
+ @AfterEach
+ @BeforeEach
public void reset() throws FileSystemException {
VFS.reset();
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
index a80d866..1389467 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ParseXmlInZipTest.java
@@ -33,21 +33,21 @@ 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.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
/**
* Tests that we can use JAXP to parse an input stream living inside a Zip file.
*/
-public class ParseXmlInZipTestCase {
+public class ParseXmlInZipTest {
private Locale defaultLocale;
- @Before
+ @BeforeEach
public void changeDefaultLocale() {
// save origin default Locale
defaultLocale = Locale.getDefault();
@@ -93,7 +93,7 @@ public class ParseXmlInZipTestCase {
return documentBuilder;
}
- @After
+ @AfterEach
public void resetDefaultLocale() {
Locale.setDefault(defaultLocale);
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
index b7fefe4..de39ff7 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileObjectTest.java
@@ -29,10 +29,10 @@ 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.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
-public class ZipFileObjectTestCase {
+public class ZipFileObjectTest {
private static final String NESTED_FILE_1 = "/read-xml-tests/file1.xml";
private static final String NESTED_FILE_2 = "/read-xml-tests/file2.xml";
@@ -81,7 +81,7 @@ public class ZipFileObjectTestCase {
* @throws IOException
*/
@Test
- @Ignore("Shows that leaving a stream open and not closing any resource leaves the container file locked")
+ @Disabled("Shows that leaving a stream open and not closing any resource leaves the container file locked")
public void testLeaveNestedFileOpen() throws IOException {
final File newZipFile = createTempFile();
final FileSystemManager manager = VFS.getManager();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTestCase.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTest.java
similarity index 97%
rename from commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTestCase.java
rename to commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTest.java
index ea7f3aa..02da16d 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTestCase.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/provider/zip/ZipFileSystemTest.java
@@ -23,9 +23,9 @@ import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.cache.WeakRefFilesCache;
import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ZipFileSystemTestCase {
+public class ZipFileSystemTest {
/**
* Sets a file system's file cache to use WeakReference, and test resolve file after GC.
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 4a7271e..1ee0613 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
@@ -31,9 +31,9 @@ import org.apache.commons.vfs2.impl.StandardFileSystemManager;
import org.apache.commons.vfs2.provider.http.HttpFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder;
import org.apache.commons.vfs2.provider.sftp.TrustEveryoneUserInfo;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Some tests for the DelegatingFileSystemOptionsBuilder
@@ -44,7 +44,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
private StandardFileSystemManager fsm;
- @Before
+ @BeforeEach
public void setUp() throws Exception {
// get a full blown, fully functional manager
@@ -52,7 +52,7 @@ public class DelegatingFileSystemOptionsBuilderTest {
fsm.init();
}
- @After
+ @AfterEach
public void tearDown() throws Exception {
if (fsm != null) {
fsm.close();
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
index a753552..c642b56 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/EncryptDecryptTest.java
@@ -17,8 +17,9 @@
package org.apache.commons.vfs2.util;
import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*/
@@ -37,11 +38,11 @@ public class EncryptDecryptTest {
assertEquals(source, decrypted);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test
public void testInvalidDecrypt() throws Exception {
// provider.HostFileNameParser.extractToPath(String, StringBuilder) catches `Exception`
final String broken = "91458";
final Cryptor cryptor = CryptorFactory.getCryptor();
- /* ignored */ cryptor.decrypt(broken);
+ assertThrows(IllegalArgumentException.class, () -> cryptor.decrypt(broken));
}
}
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
index 8094b89..819b38a 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/FileObjectUtilsTest.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang3.SystemUtils;
import org.apache.commons.vfs2.FileSystemException;
import org.apache.commons.vfs2.VFS;
import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link FileObjectUtils}.
diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/RandomAccessModeTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/RandomAccessModeTest.java
index d9ca070..3599628 100644
--- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/RandomAccessModeTest.java
+++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/util/RandomAccessModeTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.nio.file.AccessMode;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link RandomAccessMode}.
diff --git a/pom.xml b/pom.xml
index 1cc1f0e..ff21437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -617,9 +617,11 @@
</dependency>
<!-- Testing -->
<dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
<version>5.8.2</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>