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-compress.git
commit 8631b605efb61d6f12237bd1607ab6ac7c5e0c7e Author: Gary Gregory <[email protected]> AuthorDate: Sat Nov 4 08:04:11 2023 -0400 Normalize test class names *TestCase -> *Test --- .../compress/{AbstractTestCase.java => AbstractTest.java} | 4 ++-- .../java/org/apache/commons/compress/ArchiveReadTest.java | 2 +- .../java/org/apache/commons/compress/ArchiveUtilsTest.java | 2 +- .../compress/{ChainingTestCase.java => ChainingTest.java} | 2 +- .../{DetectArchiverTestCase.java => DetectArchiverTest.java} | 2 +- src/test/java/org/apache/commons/compress/IOMethodsTest.java | 2 +- .../compress/archivers/{ArTestCase.java => ArTest.java} | 4 ++-- .../commons/compress/archivers/ArchiveOutputStreamTest.java | 4 ++-- .../commons/compress/archivers/ArchiveStreamFactoryTest.java | 4 ++-- .../compress/archivers/{CpioTestCase.java => CpioTest.java} | 4 ++-- .../compress/archivers/{DumpTestCase.java => DumpTest.java} | 4 ++-- .../compress/archivers/{JarTestCase.java => JarTest.java} | 4 ++-- .../org/apache/commons/compress/archivers/LongPathTest.java | 4 ++-- .../apache/commons/compress/archivers/LongSymLinkTest.java | 4 ++-- .../archivers/{SevenZTestCase.java => SevenZTest.java} | 6 +++--- .../compress/archivers/{TarTestCase.java => TarTest.java} | 4 ++-- .../compress/archivers/{ZipTestCase.java => ZipTest.java} | 4 ++-- .../compress/archivers/ar/ArArchiveInputStreamTest.java | 4 ++-- .../compress/archivers/ar/ArArchiveOutputStreamTest.java | 4 ++-- .../compress/archivers/arj/ArjArchiveInputStreamTest.java | 4 ++-- .../compress/archivers/cpio/CpioArchiveInputStreamTest.java | 4 ++-- .../compress/archivers/cpio/CpioArchiveOutputStreamTest.java | 4 ++-- .../compress/archivers/dump/DumpArchiveInputStreamTest.java | 4 ++-- .../commons/compress/archivers/examples/ExpanderTest.java | 4 ++-- .../archivers/examples/ParameterizedArchiverTest.java | 4 ++-- .../archivers/examples/ParameterizedExpanderTest.java | 4 ++-- .../compress/archivers/examples/SevenZArchiverTest.java | 4 ++-- .../compress/archivers/jar/JarArchiveOutputStreamTest.java | 4 ++-- .../{MemoryArchiveTestCase.java => MemoryArchiveTest.java} | 2 +- .../commons/compress/archivers/sevenz/SevenZFileTest.java | 4 ++-- .../compress/archivers/sevenz/SevenZNativeHeapTest.java | 4 ++-- .../compress/archivers/sevenz/SevenZOutputFileTest.java | 4 ++-- .../apache/commons/compress/archivers/tar/BigFilesIT.java | 4 ++-- .../apache/commons/compress/archivers/tar/FileTimesIT.java | 4 ++-- .../commons/compress/archivers/tar/SparseFilesTest.java | 4 ++-- .../commons/compress/archivers/tar/TarArchiveEntryTest.java | 8 ++++---- .../compress/archivers/tar/TarArchiveInputStreamTest.java | 4 ++-- .../compress/archivers/tar/TarArchiveOutputStreamTest.java | 4 ++-- .../apache/commons/compress/archivers/tar/TarFileTest.java | 4 ++-- .../apache/commons/compress/archivers/tar/TarUtilsTest.java | 4 ++-- .../commons/compress/archivers/zip/EncryptedArchiveTest.java | 2 +- .../compress/archivers/zip/Maven221MultiVolumeTest.java | 4 ++-- .../archivers/zip/ParallelScatterZipCreatorTest.java | 8 ++++---- .../compress/archivers/zip/ScatterZipOutputStreamTest.java | 2 +- .../commons/compress/archivers/zip/UTF8ZipFilesTest.java | 4 ++-- .../compress/archivers/zip/X5455_ExtendedTimestampTest.java | 6 +++--- .../commons/compress/archivers/zip/X7875_NewUnixTest.java | 2 +- .../commons/compress/archivers/zip/Zip64SupportIT.java | 10 +++++----- .../commons/compress/archivers/zip/ZipArchiveEntryTest.java | 2 +- .../compress/archivers/zip/ZipArchiveInputStreamTest.java | 4 ++-- .../archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java | 4 ++-- .../apache/commons/compress/archivers/zip/ZipFileTest.java | 4 ++-- .../compress/archivers/zip/ZipMemoryFileSystemTest.java | 2 +- .../compress/archivers/zip/ZipSplitOutputStreamTest.java | 4 ++-- .../commons/compress/changes/ChangeSetRawTypesTest.java | 4 ++-- .../commons/compress/changes/ChangeSetSafeTypesTest.java | 4 ++-- .../compressors/{BZip2TestCase.java => BZip2Test.java} | 4 ++-- .../{BZip2UtilsTestCase.java => BZip2UtilsTest.java} | 2 +- .../compressors/{DeflateTestCase.java => DeflateTest.java} | 4 ++-- ...tectCompressorTestCase.java => DetectCompressorTest.java} | 4 ++-- .../{FramedSnappyTestCase.java => FramedSnappyTest.java} | 6 +++--- .../compressors/{GZipTestCase.java => GZipTest.java} | 4 ++-- .../{GzipUtilsTestCase.java => GzipUtilsTest.java} | 2 +- .../compressors/{LZMATestCase.java => LZMATest.java} | 4 ++-- .../compressors/{Pack200TestCase.java => Pack200Test.java} | 4 ++-- .../compress/compressors/{XZTestCase.java => XZTest.java} | 4 ++-- .../compress/compressors/{ZTestCase.java => ZTest.java} | 4 ++-- .../compressors/brotli/BrotliCompressorInputStreamTest.java | 4 ++-- .../compressors/bzip2/BZip2CompressorInputStreamTest.java | 4 ++-- .../compressors/bzip2/BZip2NSelectorsOverflowTest.java | 4 ++-- .../deflate/DeflateCompressorInputStreamTest.java | 12 ++++++------ .../compress/compressors/deflate64/Deflate64BugsTest.java | 2 +- .../compressors/lz4/BlockLZ4CompressorInputStreamTest.java | 4 ++-- .../compressors/lz4/BlockLZ4CompressorRoundtripTest.java | 4 ++-- .../apache/commons/compress/compressors/lz4/FactoryTest.java | 4 ++-- .../compressors/lz4/FramedLZ4CompressorInputStreamTest.java | 4 ++-- .../compressors/lz4/FramedLZ4CompressorRoundtripTest.java | 4 ++-- .../commons/compress/compressors/lz4/XXHash32Test.java | 4 ++-- .../lzma/{LZMAUtilsTestCase.java => LZMAUtilsTest.java} | 2 +- .../compress/compressors/pack200/Pack200UtilsTest.java | 4 ++-- .../snappy/FramedSnappyCompressorInputStreamTest.java | 4 ++-- .../compress/compressors/snappy/SnappyRoundtripTest.java | 4 ++-- .../compress/compressors/xz/XZCompressorInputStreamTest.java | 2 +- .../xz/{XZUtilsTestCase.java => XZUtilsTest.java} | 2 +- .../compress/compressors/z/ZCompressorInputStreamTest.java | 2 +- .../compressors/zstandard/ZstdCompressorInputStreamTest.java | 4 ++-- .../compress/compressors/zstandard/ZstdRoundtripTest.java | 4 ++-- .../{AbstractBandsTestCase.java => AbstractBandsTest.java} | 2 +- .../compress/harmony/unpack200/tests/BcBandsTest.java | 4 ++-- .../compress/harmony/unpack200/tests/ClassBandsTest.java | 4 ++-- .../harmony/unpack200/tests/NewAttributeBandsTest.java | 2 +- .../utils/ZipSplitReadOnlySeekableByteChannelTest.java | 4 ++-- 92 files changed, 178 insertions(+), 178 deletions(-) diff --git a/src/test/java/org/apache/commons/compress/AbstractTestCase.java b/src/test/java/org/apache/commons/compress/AbstractTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/AbstractTestCase.java rename to src/test/java/org/apache/commons/compress/AbstractTest.java index 4ec6d703..ad0e4b22 100644 --- a/src/test/java/org/apache/commons/compress/AbstractTestCase.java +++ b/src/test/java/org/apache/commons/compress/AbstractTest.java @@ -47,7 +47,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.io.TempDir; -public abstract class AbstractTestCase { +public abstract class AbstractTest { protected interface StreamWrapper<I extends InputStream> { I wrap(InputStream inputStream) throws Exception; @@ -83,7 +83,7 @@ public abstract class AbstractTestCase { } public static File getFile(final String path) throws IOException { - final URL url = AbstractTestCase.class.getClassLoader().getResource(path); + final URL url = AbstractTest.class.getClassLoader().getResource(path); if (url == null) { throw new FileNotFoundException("couldn't find " + path); } diff --git a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java index e3b62dff..46318993 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveReadTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveReadTest.java @@ -42,7 +42,7 @@ import org.junit.jupiter.params.provider.MethodSource; * Files must be in resources/archives, and there must be a file.txt containing * the list of files in the archives. */ -public class ArchiveReadTest extends AbstractTestCase { +public class ArchiveReadTest extends AbstractTest { private static final ClassLoader CLASSLOADER = ArchiveReadTest.class.getClassLoader(); private static final File ARCDIR; diff --git a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java index 87154918..bf485857 100644 --- a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java @@ -28,7 +28,7 @@ import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; import org.apache.commons.compress.utils.ArchiveUtils; import org.junit.jupiter.api.Test; -public class ArchiveUtilsTest extends AbstractTestCase { +public class ArchiveUtilsTest extends AbstractTest { private static final int bytesToTest = 50; private static final byte[] byteTest = new byte[bytesToTest]; diff --git a/src/test/java/org/apache/commons/compress/ChainingTestCase.java b/src/test/java/org/apache/commons/compress/ChainingTest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/ChainingTestCase.java rename to src/test/java/org/apache/commons/compress/ChainingTest.java index de0e1f55..1af16711 100644 --- a/src/test/java/org/apache/commons/compress/ChainingTestCase.java +++ b/src/test/java/org/apache/commons/compress/ChainingTest.java @@ -27,7 +27,7 @@ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.junit.jupiter.api.Test; -public class ChainingTestCase extends AbstractTestCase { +public class ChainingTest extends AbstractTest { @Test public void testTarBzip2() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java similarity index 98% rename from src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java rename to src/test/java/org/apache/commons/compress/DetectArchiverTest.java index c06cf54e..ff3216ae 100644 --- a/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java +++ b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java @@ -38,7 +38,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; import org.junit.jupiter.api.Test; -public final class DetectArchiverTestCase extends AbstractTestCase { +public final class DetectArchiverTest extends AbstractTest { final ClassLoader classLoader = getClass().getClassLoader(); diff --git a/src/test/java/org/apache/commons/compress/IOMethodsTest.java b/src/test/java/org/apache/commons/compress/IOMethodsTest.java index cda9acc2..412d2ae7 100644 --- a/src/test/java/org/apache/commons/compress/IOMethodsTest.java +++ b/src/test/java/org/apache/commons/compress/IOMethodsTest.java @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; * Check that the different write methods create the same output. * TODO perform the same checks for reads. */ -public class IOMethodsTest extends AbstractTestCase { +public class IOMethodsTest extends AbstractTest { private static final int bytesToTest = 50; private static final byte[] byteTest = new byte[bytesToTest]; diff --git a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ArTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/archivers/ArTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/ArTest.java index a6812f6a..337095f8 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArTest.java @@ -30,7 +30,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ar.ArArchiveEntry; import org.apache.commons.compress.archivers.ar.ArArchiveInputStream; import org.apache.commons.compress.archivers.ar.ArArchiveOutputStream; @@ -38,7 +38,7 @@ import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -public final class ArTestCase extends AbstractTestCase { +public final class ArTest extends AbstractTest { @Test public void testArArchiveCreation() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java index 150fe988..f10008e5 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArchiveOutputStreamTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ar.ArArchiveEntry; import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry; import org.apache.commons.compress.archivers.jar.JarArchiveEntry; @@ -34,7 +34,7 @@ import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.junit.jupiter.api.Test; -public class ArchiveOutputStreamTest<O extends ArchiveOutputStream<E>, E extends ArchiveEntry> extends AbstractTestCase { +public class ArchiveOutputStreamTest<O extends ArchiveOutputStream<E>, E extends ArchiveEntry> extends AbstractTest { private O createArchiveWithDummyEntry(final String archiveType, final OutputStream out1, final File dummy) throws Exception { final O aos1 = factory.createArchiveOutputStream(archiveType, out1); diff --git a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java index 3b106b2b..aee3c083 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Field; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.arj.ArjArchiveInputStream; import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream; import org.apache.commons.compress.archivers.dump.DumpArchiveInputStream; @@ -42,7 +42,7 @@ import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.io.input.BrokenInputStream; import org.junit.jupiter.api.Test; -public class ArchiveStreamFactoryTest extends AbstractTestCase { +public class ArchiveStreamFactoryTest extends AbstractTest { static class TestData { final String testFile; diff --git a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java b/src/test/java/org/apache/commons/compress/archivers/CpioTest.java similarity index 98% rename from src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/CpioTest.java index f0f30a2f..b28c6a2f 100644 --- a/src/test/java/org/apache/commons/compress/archivers/CpioTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/CpioTest.java @@ -30,14 +30,14 @@ import java.nio.file.Files; import java.util.HashMap; import java.util.Map; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry; import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream; import org.apache.commons.compress.archivers.cpio.CpioArchiveOutputStream; import org.apache.commons.compress.archivers.cpio.CpioConstants; import org.junit.jupiter.api.Test; -public final class CpioTestCase extends AbstractTestCase { +public final class CpioTest extends AbstractTest { @Test public void testCpioArchiveCreation() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java b/src/test/java/org/apache/commons/compress/archivers/DumpTest.java similarity index 96% rename from src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/DumpTest.java index 1500ce04..b1180b3c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/DumpTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/DumpTest.java @@ -26,11 +26,11 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.ArrayList; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.dump.DumpArchiveInputStream; import org.junit.jupiter.api.Test; -public final class DumpTestCase extends AbstractTestCase { +public final class DumpTest extends AbstractTest { private void archiveDetection(final File f) throws Exception { try (InputStream is = Files.newInputStream(f.toPath()); diff --git a/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java b/src/test/java/org/apache/commons/compress/archivers/JarTest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/archivers/JarTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/JarTest.java index be255bcd..270a9f99 100644 --- a/src/test/java/org/apache/commons/compress/archivers/JarTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/JarTest.java @@ -23,12 +23,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; import org.junit.jupiter.api.Test; -public final class JarTestCase extends AbstractTestCase { +public final class JarTest extends AbstractTest { @Test public void testJarArchiveCreation() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java index b1c79249..cd7c7310 100644 --- a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java @@ -30,7 +30,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ar.ArArchiveInputStream; import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -47,7 +47,7 @@ import org.junit.jupiter.params.provider.MethodSource; * Files must be in resources/longpath, and there must be a file.txt containing * the list of files in the archives. */ -public class LongPathTest extends AbstractTestCase { +public class LongPathTest extends AbstractTest { private static final ClassLoader CLASSLOADER = LongPathTest.class.getClassLoader(); private static final File ARCDIR; diff --git a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java index 992e448d..75b49f98 100644 --- a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java @@ -29,7 +29,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ar.ArArchiveInputStream; import org.apache.commons.compress.archivers.cpio.CpioArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; @@ -45,7 +45,7 @@ import org.junit.jupiter.params.provider.MethodSource; * * Files must be in resources/longsymlink, and there must be a file.txt containing the list of files in the archives. */ -public class LongSymLinkTest extends AbstractTestCase { +public class LongSymLinkTest extends AbstractTest { private static final ClassLoader CLASSLOADER = LongSymLinkTest.class.getClassLoader(); private static final File ARCDIR; diff --git a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java similarity index 98% rename from src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/SevenZTest.java index 9d80ebfb..972e162e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/SevenZTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java @@ -30,7 +30,7 @@ import java.security.NoSuchAlgorithmException; import javax.crypto.Cipher; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry; import org.apache.commons.compress.archivers.sevenz.SevenZFile; import org.apache.commons.compress.archivers.sevenz.SevenZMethod; @@ -39,7 +39,7 @@ import org.apache.commons.compress.utils.TimeUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class SevenZTestCase extends AbstractTestCase { +public class SevenZTest extends AbstractTest { private static void assumeStrongCryptoIsAvailable() throws NoSuchAlgorithmException { assumeTrue(Cipher.getMaxAllowedKeyLength("AES/ECB/PKCS5Padding") >= 256, "test requires strong crypto"); @@ -48,7 +48,7 @@ public class SevenZTestCase extends AbstractTestCase { private final File file1, file2; - public SevenZTestCase() throws IOException { + public SevenZTest() throws IOException { file1 = getFile("test1.xml"); file2 = getFile("test2.xml"); } diff --git a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java b/src/test/java/org/apache/commons/compress/archivers/TarTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/archivers/TarTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/TarTest.java index 4691f06b..65038a96 100644 --- a/src/test/java/org/apache/commons/compress/archivers/TarTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/TarTest.java @@ -37,7 +37,7 @@ import java.nio.file.Files; import java.util.Arrays; import java.util.List; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream; @@ -48,7 +48,7 @@ import org.apache.commons.compress.utils.CharsetNames; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class TarTestCase extends AbstractTestCase { +public final class TarTest extends AbstractTest { private String createLongName(final int nameLength) { final StringBuilder buffer = new StringBuilder(); diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/ZipTest.java index c15416c3..f499dc70 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java @@ -46,7 +46,7 @@ import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipException; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.Zip64Mode; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveEntryPredicate; @@ -60,7 +60,7 @@ import org.apache.commons.compress.utils.InputStreamStatistics; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; import org.junit.jupiter.api.Test; -public final class ZipTestCase extends AbstractTestCase { +public final class ZipTest extends AbstractTest { final String first_payload = "ABBA"; diff --git a/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java index e5d5b5b5..ae86a45c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStreamTest.java @@ -29,13 +29,13 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.utils.ArchiveUtils; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class ArArchiveInputStreamTest extends AbstractTestCase { +public class ArArchiveInputStreamTest extends AbstractTest { private void checkLongNameEntry(final String archive) throws Exception { try (final InputStream fis = newInputStream(archive); diff --git a/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStreamTest.java index 64d4f070..20f05503 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStreamTest.java @@ -28,10 +28,10 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.List; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; -public class ArArchiveOutputStreamTest extends AbstractTestCase { +public class ArArchiveOutputStreamTest extends AbstractTest { @Test public void testLongFileNamesCauseExceptionByDefault() throws IOException { diff --git a/src/test/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStreamTest.java index 334e8260..487c830d 100644 --- a/src/test/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/arj/ArjArchiveInputStreamTest.java @@ -26,12 +26,12 @@ import java.io.InputStream; import java.util.Calendar; import java.util.TimeZone; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class ArjArchiveInputStreamTest extends AbstractTestCase { +public class ArjArchiveInputStreamTest extends AbstractTest { @Test public void testArjUnarchive() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java index c88f2c02..6e432475 100644 --- a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java @@ -23,12 +23,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.InputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class CpioArchiveInputStreamTest extends AbstractTestCase { +public class CpioArchiveInputStreamTest extends AbstractTest { @Test public void testCpioUnarchive() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStreamTest.java index 28546a24..f734f5ed 100644 --- a/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStreamTest.java @@ -25,10 +25,10 @@ import java.io.File; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; -public class CpioArchiveOutputStreamTest extends AbstractTestCase { +public class CpioArchiveOutputStreamTest extends AbstractTest { @Test public void testWriteOldBinary() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStreamTest.java index 070de92f..29402fd7 100644 --- a/src/test/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/dump/DumpArchiveInputStreamTest.java @@ -26,13 +26,13 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.InputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class DumpArchiveInputStreamTest extends AbstractTestCase { +public class DumpArchiveInputStreamTest extends AbstractTest { @Test public void testConsumesArchiveCompletely() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java index faa533be..1c48b745 100644 --- a/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/examples/ExpanderTest.java @@ -36,7 +36,7 @@ import java.nio.channels.SeekableByteChannel; import java.nio.file.Files; import java.nio.file.StandardOpenOption; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveOutputStream; @@ -49,7 +49,7 @@ import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class ExpanderTest extends AbstractTestCase { +public class ExpanderTest extends AbstractTest { private File archive; diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java index 788cb376..16386c72 100644 --- a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedArchiverTest.java @@ -36,7 +36,7 @@ import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveInputStream; @@ -47,7 +47,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -public class ParameterizedArchiverTest extends AbstractTestCase { +public class ParameterizedArchiverTest extends AbstractTest { // can't test 7z here as 7z cannot write to non-seekable streams // and reading logic would be different as well - see diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java index b6dad792..61604876 100644 --- a/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/examples/ParameterizedExpanderTest.java @@ -33,7 +33,7 @@ import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveOutputStream; @@ -44,7 +44,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.junit.runners.Parameterized.Parameters; -public class ParameterizedExpanderTest extends AbstractTestCase { +public class ParameterizedExpanderTest extends AbstractTest { // 7z and ZIP using ZipFile is in ExpanderTest @Parameters(name = "format={0}") diff --git a/src/test/java/org/apache/commons/compress/archivers/examples/SevenZArchiverTest.java b/src/test/java/org/apache/commons/compress/archivers/examples/SevenZArchiverTest.java index ee3f03df..b08233f3 100644 --- a/src/test/java/org/apache/commons/compress/archivers/examples/SevenZArchiverTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/examples/SevenZArchiverTest.java @@ -34,7 +34,7 @@ import java.nio.channels.SeekableByteChannel; import java.nio.file.Files; import java.nio.file.StandardOpenOption; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.StreamingNotSupportedException; @@ -42,7 +42,7 @@ import org.apache.commons.compress.archivers.sevenz.SevenZFile; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class SevenZArchiverTest extends AbstractTestCase { +public class SevenZArchiverTest extends AbstractTest { private File target; private void assertDir(final String expectedName, final ArchiveEntry entry) { diff --git a/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java index 5168b1b8..0e6d0f43 100644 --- a/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStreamTest.java @@ -27,7 +27,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.JarMarker; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipExtraField; @@ -65,7 +65,7 @@ public class JarArchiveOutputStreamTest { fes = ze.getExtraFields(); assertEquals(0, fes.length); } finally { - AbstractTestCase.forceDelete(testArchive); + AbstractTest.forceDelete(testArchive); } } diff --git a/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java b/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java rename to src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTest.java index 2817298c..8f6aba9b 100644 --- a/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTestCase.java +++ b/src/test/java/org/apache/commons/compress/archivers/memory/MemoryArchiveTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.apache.commons.compress.archivers.ArchiveEntry; import org.junit.jupiter.api.Test; -public final class MemoryArchiveTestCase { +public final class MemoryArchiveTest { @Test public void testReading() throws IOException { diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java index d59e2f2f..089ac4be 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZFileTest.java @@ -49,7 +49,7 @@ import java.util.function.Function; import javax.crypto.Cipher; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.MemoryLimitException; import org.apache.commons.compress.PasswordRequiredException; import org.apache.commons.compress.utils.IOUtils; @@ -57,7 +57,7 @@ import org.apache.commons.compress.utils.MultiReadOnlySeekableByteChannel; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; import org.junit.jupiter.api.Test; -public class SevenZFileTest extends AbstractTestCase { +public class SevenZFileTest extends AbstractTest { private static final String TEST2_CONTENT = "<?xml version = '1.0'?>\r\n<!DOCTYPE" + " connections>\r\n<meinxml>\r\n\t<leer />\r\n</meinxml>\n"; private static boolean isStrongCryptoAvailable() throws NoSuchAlgorithmException { diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java index 94e8701a..edba49b9 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZNativeHeapTest.java @@ -25,14 +25,14 @@ import java.util.zip.DataFormatException; import java.util.zip.Deflater; import java.util.zip.Inflater; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.sevenz.Coders.DeflateDecoder; import org.apache.commons.compress.archivers.sevenz.Coders.DeflateDecoder.DeflateDecoderInputStream; import org.apache.commons.compress.archivers.sevenz.Coders.DeflateDecoder.DeflateDecoderOutputStream; import org.apache.commons.compress.utils.ByteUtils; import org.junit.jupiter.api.Test; -public class SevenZNativeHeapTest extends AbstractTestCase { +public class SevenZNativeHeapTest extends AbstractTest { private static final class DelegatingDeflater extends Deflater { diff --git a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java index 9e9a0ee8..9ee8701f 100644 --- a/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java @@ -38,7 +38,7 @@ import java.util.Collections; import java.util.Date; import java.util.Iterator; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.PasswordRequiredException; import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; @@ -46,7 +46,7 @@ import org.apache.commons.compress.utils.TimeUtils; import org.junit.jupiter.api.Test; import org.tukaani.xz.LZMA2Options; -public class SevenZOutputFileTest extends AbstractTestCase { +public class SevenZOutputFileTest extends AbstractTest { private static final boolean XZ_BCJ_IS_BUGGY; diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java index d863a35e..a334f1b0 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/BigFilesIT.java @@ -29,11 +29,11 @@ import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Random; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.junit.jupiter.api.Test; -public class BigFilesIT extends AbstractTestCase { +public class BigFilesIT extends AbstractTest { private void readFileBiggerThan8GByte(final String name) throws Exception { try (InputStream in = new BufferedInputStream(Files.newInputStream(getPath(name))); diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java b/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java index 7cbdbe3a..97c28056 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/FileTimesIT.java @@ -28,10 +28,10 @@ import java.nio.file.Files; import java.nio.file.attribute.FileTime; import java.time.Instant; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; -public class FileTimesIT extends AbstractTestCase { +public class FileTimesIT extends AbstractTest { private void assertGlobalHeaders(final TarArchiveEntry e) { assertEquals(5, e.getExtraPaxHeaders().size()); diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java index 27270e55..a080e36b 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/SparseFilesTest.java @@ -32,14 +32,14 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; -public class SparseFilesTest extends AbstractTestCase { +public class SparseFilesTest extends AbstractTest { private void assertPaxGNUEntry(final TarArchiveEntry entry, final String suffix) { assertEquals("sparsefile-" + suffix, entry.getName()); diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java index bdcddbc7..cad0c374 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveEntryTest.java @@ -18,8 +18,8 @@ package org.apache.commons.compress.archivers.tar; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.commons.compress.AbstractTestCase.getFile; -import static org.apache.commons.compress.AbstractTestCase.getPath; +import static org.apache.commons.compress.AbstractTest.getFile; +import static org.apache.commons.compress.AbstractTest.getPath; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Locale; import java.util.Random; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.ZipEncodingHelper; import org.apache.commons.compress.utils.CharsetNames; import org.junit.jupiter.api.Test; @@ -477,7 +477,7 @@ public class TarArchiveEntryTest implements TarConstants { assertTrue(t.isCheckSumOK()); } } finally { - AbstractTestCase.forceDelete(f); + AbstractTest.forceDelete(f); } } diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java index 25d3748b..9c3b1a1a 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java @@ -39,7 +39,7 @@ import java.util.Date; import java.util.TimeZone; import java.util.zip.GZIPInputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveStreamFactory; @@ -47,7 +47,7 @@ import org.apache.commons.compress.utils.CharsetNames; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class TarArchiveInputStreamTest extends AbstractTestCase { +public class TarArchiveInputStreamTest extends AbstractTest { private void datePriorToEpoch(final String archive) throws Exception { try (TarArchiveInputStream in = new TarArchiveInputStream(Files.newInputStream(getFile(archive).toPath()))) { diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java index 17bbec09..0863436e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java @@ -42,7 +42,7 @@ import java.util.HashMap; import java.util.Map; import java.util.TimeZone; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveOutputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; @@ -51,7 +51,7 @@ import org.apache.commons.io.output.NullOutputStream; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -public class TarArchiveOutputStreamTest extends AbstractTestCase { +public class TarArchiveOutputStreamTest extends AbstractTest { private static byte[] createTarArchiveContainingOneDirectory(final String fileName, final Date modificationDate) throws IOException { final ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarFileTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarFileTest.java index 52d9e044..2aecc0c6 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarFileTest.java @@ -37,12 +37,12 @@ import java.util.List; import java.util.TimeZone; import java.util.zip.GZIPInputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.CharsetNames; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class TarFileTest extends AbstractTestCase { +public class TarFileTest extends AbstractTest { private void datePriorToEpoch(final String archive) throws Exception { try (final TarFile tarFile = new TarFile(getPath(archive))) { diff --git a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java index 76c0c6dc..02656702 100644 --- a/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/tar/TarUtilsTest.java @@ -33,14 +33,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.ZipEncoding; import org.apache.commons.compress.archivers.zip.ZipEncodingHelper; import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.compress.utils.CharsetNames; import org.junit.jupiter.api.Test; -public class TarUtilsTest extends AbstractTestCase { +public class TarUtilsTest extends AbstractTest { private void checkName(final String string) { final byte[] buff = new byte[100]; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java index 2727cb5e..b3dbfe9d 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/EncryptedArchiveTest.java @@ -17,7 +17,7 @@ package org.apache.commons.compress.archivers.zip; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java index 85af8b11..3d2adbb0 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Maven221MultiVolumeTest.java @@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.junit.jupiter.api.Test; @@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test; * anymore. All entries but the last one are returned correctly, the last entry * yields an exception. */ -public class Maven221MultiVolumeTest extends AbstractTestCase { +public class Maven221MultiVolumeTest extends AbstractTest { private static final String[] ENTRIES = { // @formatter:off diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java index 9177d6b3..83b6a9be 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ParallelScatterZipCreatorTest.java @@ -44,7 +44,7 @@ import java.util.function.Function; import java.util.zip.Deflater; import java.util.zip.ZipEntry; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.parallel.FileBasedScatterGatherBackingStore; import org.apache.commons.compress.parallel.InputStreamSupplier; import org.apache.commons.compress.parallel.ScatterGatherBackingStoreSupplier; @@ -126,8 +126,8 @@ public class ParallelScatterZipCreatorTest { @AfterEach public void cleanup() { - AbstractTestCase.forceDelete(result); - AbstractTestCase.forceDelete(tmp); + AbstractTest.forceDelete(result); + AbstractTest.forceDelete(tmp); } @@ -314,7 +314,7 @@ public class ParallelScatterZipCreatorTest { private Map<String, byte[]> writeTestFilesAsCallable(final ParallelScatterZipCreator zipCreator, final CallableConsumer consumer) throws IOException { final Map<String, byte[]> entries = new HashMap<>(); - final File baseDir = AbstractTestCase.getFile(""); + final File baseDir = AbstractTest.getFile(""); int filesCount = 0; for (final File file : baseDir.listFiles()) { // do not compress too many files diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java index 077f6a0e..ace594fa 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ScatterZipOutputStreamTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.compress.archivers.zip; -import static org.apache.commons.compress.AbstractTestCase.forceDelete; +import static org.apache.commons.compress.AbstractTest.forceDelete; import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java index 0ac8b8f2..bf358743 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/UTF8ZipFilesTest.java @@ -33,11 +33,11 @@ import java.nio.file.Files; import java.util.Enumeration; import java.util.zip.CRC32; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.CharsetNames; import org.junit.jupiter.api.Test; -public class UTF8ZipFilesTest extends AbstractTestCase { +public class UTF8ZipFilesTest extends AbstractTest { private static final String CP437 = "cp437"; private static final String ASCII_TXT = "ascii.txt"; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java index aa0087c9..cb91ce2f 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java @@ -40,7 +40,7 @@ import java.util.Enumeration; import java.util.TimeZone; import java.util.zip.ZipException; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -157,7 +157,7 @@ public class X5455_ExtendedTimestampTest { @AfterEach public void removeTempFiles() { if (tmpDir != null) { - AbstractTestCase.forceDelete(tmpDir); + AbstractTest.forceDelete(tmpDir); } } @@ -505,7 +505,7 @@ public class X5455_ExtendedTimestampTest { well. */ - final File archive = AbstractTestCase.getFile("COMPRESS-210_unix_time_zip_test.zip"); + final File archive = AbstractTest.getFile("COMPRESS-210_unix_time_zip_test.zip"); try (ZipFile zf = new ZipFile(archive)) { final Enumeration<ZipArchiveEntry> en = zf.getEntries(); diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java index f58d03ef..7b1271f9 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java @@ -18,7 +18,7 @@ */ package org.apache.commons.compress.archivers.zip; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java index 6f05b58b..541e4995 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/Zip64SupportIT.java @@ -17,7 +17,7 @@ package org.apache.commons.compress.archivers.zip; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -38,7 +38,7 @@ import java.util.Enumeration; import java.util.Random; import java.util.zip.ZipEntry; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.io.RandomAccessFileMode; import org.junit.jupiter.api.Test; @@ -289,11 +289,11 @@ public class Zip64SupportIT { if (os != null) { os.close(); } - AbstractTestCase.forceDelete(f); + AbstractTest.forceDelete(f); } finally { if (dir != null) { final File directory = dir; - AbstractTestCase.forceDelete(directory); + AbstractTest.forceDelete(directory); } } } @@ -2294,7 +2294,7 @@ public class Zip64SupportIT { read5GBOfZerosUsingZipFileImpl(f, "5GB_of_Zeros"); } finally { if (f != null) { - AbstractTestCase.forceDelete(f); + AbstractTest.forceDelete(f); } } } diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java index ddc3d29e..f61dcd95 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java @@ -17,7 +17,7 @@ package org.apache.commons.compress.archivers.zip; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java index 1aaf1df2..11009554 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStreamTest.java @@ -40,7 +40,7 @@ import java.util.Arrays; import java.util.zip.ZipEntry; import java.util.zip.ZipException; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; @@ -48,7 +48,7 @@ import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class ZipArchiveInputStreamTest extends AbstractTestCase { +public class ZipArchiveInputStreamTest extends AbstractTest { private static void nameSource(final String archive, final String entry, int entryNo, final ZipArchiveEntry.NameSource expected) throws Exception { try (ZipArchiveInputStream zis = new ZipArchiveInputStream(Files.newInputStream(getFile(archive).toPath()))) { diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java index ad603417..f8ff381e 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileIgnoringLocalFileHeaderTest.java @@ -26,14 +26,14 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.Enumeration; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; public class ZipFileIgnoringLocalFileHeaderTest { private static ZipFile openZipWithoutLFH(final String fileName) throws IOException { - return new ZipFile(AbstractTestCase.getFile(fileName), ZipEncodingHelper.UTF8, true, true); + return new ZipFile(AbstractTest.getFile(fileName), ZipEncodingHelper.UTF8, true, true); } @TempDir diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java index 00320609..93ea599c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipFileTest.java @@ -51,7 +51,7 @@ import java.util.zip.CRC32; import java.util.zip.Deflater; import java.util.zip.ZipEntry; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.ByteUtils; import org.apache.commons.compress.utils.IOUtils; import org.apache.commons.compress.utils.SeekableInMemoryByteChannel; @@ -62,7 +62,7 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; -public class ZipFileTest extends AbstractTestCase { +public class ZipFileTest extends AbstractTest { private static final int OUT_OF_MEMORY = 137; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java index c69f7727..f41a7e87 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipMemoryFileSystemTest.java @@ -18,7 +18,7 @@ package org.apache.commons.compress.archivers.zip; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.apache.commons.compress.AbstractTestCase.getPath; +import static org.apache.commons.compress.AbstractTest.getPath; import static org.apache.commons.compress.archivers.zip.ZipArchiveEntryRequest.createZipArchiveEntryRequest; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStreamTest.java b/src/test/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStreamTest.java index 20eaf954..4cd57c05 100644 --- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipSplitOutputStreamTest.java @@ -25,10 +25,10 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; -public class ZipSplitOutputStreamTest extends AbstractTestCase { +public class ZipSplitOutputStreamTest extends AbstractTest { @Test public void testCreateSplittedFiles() throws IOException { diff --git a/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java b/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java index fc04850b..6227350b 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java @@ -32,7 +32,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveOutputStream; @@ -51,7 +51,7 @@ import org.junit.jupiter.params.provider.MethodSource; * * @see ChangeSetSafeTypesTest */ -public final class ChangeSetRawTypesTest extends AbstractTestCase { +public final class ChangeSetRawTypesTest extends AbstractTest { // Delete a single file private void archiveListDelete(final String prefix) { diff --git a/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java b/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java index 64ff99fd..074920ea 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java @@ -31,7 +31,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveInputStream; @@ -61,7 +61,7 @@ import org.junit.jupiter.params.provider.MethodSource; * @param <E> ArchiveEntry type must match between input and output. * @see ChangeSetRawTypesTest */ -public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O extends ArchiveOutputStream<E>, E extends ArchiveEntry> extends AbstractTestCase { +public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O extends ArchiveOutputStream<E>, E extends ArchiveEntry> extends AbstractTest { /** Deletes a single file. */ private void archiveListDelete(final String prefix) { diff --git a/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java similarity index 97% rename from src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java rename to src/test/java/org/apache/commons/compress/compressors/BZip2Test.java index 489fb1f5..773b1c75 100644 --- a/src/test/java/org/apache/commons/compress/compressors/BZip2TestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java @@ -25,11 +25,11 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.junit.jupiter.api.Test; -public final class BZip2TestCase extends AbstractTestCase { +public final class BZip2Test extends AbstractTest { @Test public void testBzip2Unarchive() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTestCase.java b/src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTest.java index 1e41c4ab..04997e39 100644 --- a/src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/BZip2UtilsTest.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.commons.compress.compressors.bzip2.BZip2Utils; import org.junit.jupiter.api.Test; -public class BZip2UtilsTestCase { +public class BZip2UtilsTest { @SuppressWarnings("deprecation") @Test diff --git a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/DeflateTest.java index 39b59c3c..b2fa598a 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DeflateTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java @@ -23,13 +23,13 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream; import org.apache.commons.compress.compressors.deflate.DeflateCompressorOutputStream; import org.apache.commons.compress.compressors.deflate.DeflateParameters; import org.junit.jupiter.api.Test; -public final class DeflateTestCase extends AbstractTestCase { +public final class DeflateTest extends AbstractTest { /** * Tests the creation of a DEFLATE archive with zlib header diff --git a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java index 83c26131..1c7e2ab8 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java @@ -18,7 +18,7 @@ */ package org.apache.commons.compress.compressors; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -43,7 +43,7 @@ import org.apache.commons.io.input.BrokenInputStream; import org.junit.jupiter.api.Test; @SuppressWarnings("deprecation") // deliberately tests setDecompressConcatenated -public final class DetectCompressorTestCase { +public final class DetectCompressorTest { static class TestData { diff --git a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java index 145fb031..1153983a 100644 --- a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java @@ -28,13 +28,13 @@ import java.io.OutputStream; import java.nio.file.Files; import java.util.Random; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class FramedSnappyTestCase - extends AbstractTestCase { +public final class FramedSnappyTest + extends AbstractTest { @Test public void testDefaultExtraction() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/GZipTest.java index f56f1f6f..0a0d9d45 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java @@ -32,7 +32,7 @@ import java.nio.file.Files; import java.util.zip.Deflater; import java.util.zip.GZIPInputStream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream; import org.apache.commons.compress.compressors.gzip.GzipParameters; @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -public final class GZipTestCase extends AbstractTestCase { +public final class GZipTest extends AbstractTest { @Test public void testConcatenatedStreamsReadFirstOnly() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/compressors/GzipUtilsTestCase.java b/src/test/java/org/apache/commons/compress/compressors/GzipUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/GzipUtilsTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/GzipUtilsTest.java index cb873caf..027afdc2 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GzipUtilsTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/GzipUtilsTest.java @@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.commons.compress.compressors.gzip.GzipUtils; import org.junit.jupiter.api.Test; -public class GzipUtilsTestCase { +public class GzipUtilsTest { @SuppressWarnings("deprecation") @Test diff --git a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java similarity index 97% rename from src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java rename to src/test/java/org/apache/commons/compress/compressors/LZMATest.java index eb25730b..ac082774 100644 --- a/src/test/java/org/apache/commons/compress/compressors/LZMATestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java @@ -28,12 +28,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class LZMATestCase extends AbstractTestCase { +public final class LZMATest extends AbstractTest { @Test public void testLzmaRoundtrip() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java b/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java similarity index 98% rename from src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java rename to src/test/java/org/apache/commons/compress/compressors/Pack200Test.java index b224fa42..cf98b2ed 100644 --- a/src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java @@ -31,7 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; @@ -43,7 +43,7 @@ import org.apache.commons.compress.compressors.pack200.Pack200Strategy; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class Pack200TestCase extends AbstractTestCase { +public final class Pack200Test extends AbstractTest { private void jarArchiveCreation(final Pack200Strategy mode) throws Exception { final File output = new File(getTempDirFile(), "bla.pack"); diff --git a/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java b/src/test/java/org/apache/commons/compress/compressors/XZTest.java similarity index 96% rename from src/test/java/org/apache/commons/compress/compressors/XZTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/XZTest.java index 97a75dcd..f71357b1 100644 --- a/src/test/java/org/apache/commons/compress/compressors/XZTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/XZTest.java @@ -26,11 +26,11 @@ import java.io.OutputStream; import java.lang.management.ManagementFactory; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.xz.XZCompressorInputStream; import org.junit.jupiter.api.Test; -public final class XZTestCase extends AbstractTestCase { +public final class XZTest extends AbstractTest { @Test public void testConcatenatedStreamsReadFirstOnly() throws Exception { diff --git a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java b/src/test/java/org/apache/commons/compress/compressors/ZTest.java similarity index 96% rename from src/test/java/org/apache/commons/compress/compressors/ZTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/ZTest.java index 96c353c2..0449b3e0 100644 --- a/src/test/java/org/apache/commons/compress/compressors/ZTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/ZTest.java @@ -26,11 +26,11 @@ import java.io.File; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; import org.junit.jupiter.api.Test; -public final class ZTestCase extends AbstractTestCase { +public final class ZTest extends AbstractTest { @Test public void testMatches() { diff --git a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java index b40ac932..66c906ff 100644 --- a/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/brotli/BrotliCompressorInputStreamTest.java @@ -27,13 +27,13 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.CompressorInputStream; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class BrotliCompressorInputStreamTest extends AbstractTestCase { +public class BrotliCompressorInputStreamTest extends AbstractTest { @Test public void testAvailableShouldReturnZero() throws IOException { diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java index 1aa9e75b..cdfaa745 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStreamTest.java @@ -28,14 +28,14 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class BZip2CompressorInputStreamTest extends AbstractTestCase { +public class BZip2CompressorInputStreamTest extends AbstractTest { private void fuzzingTest(final int[] bytes) throws IOException, ArchiveException { final int len = bytes.length; diff --git a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java index e928fcf0..dc5babbf 100644 --- a/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/bzip2/BZip2NSelectorsOverflowTest.java @@ -24,10 +24,10 @@ import java.io.File; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.junit.jupiter.api.Test; -public class BZip2NSelectorsOverflowTest extends AbstractTestCase { +public class BZip2NSelectorsOverflowTest extends AbstractTest { /** * See https://sourceware.org/ml/bzip2-devel/2019-q3/msg00007.html diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java index a5e38308..610bc6cb 100644 --- a/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/deflate/DeflateCompressorInputStreamTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; @@ -33,7 +33,7 @@ public class DeflateCompressorInputStreamTest { @Test public void testAvailableShouldReturnNonZero() throws IOException { - try (InputStream is = Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez")); + try (InputStream is = Files.newInputStream(AbstractTest.getPath("bla.tar.deflatez")); DeflateCompressorInputStream in = new DeflateCompressorInputStream(is)) { assertTrue(in.available() > 0); } @@ -42,7 +42,7 @@ public class DeflateCompressorInputStreamTest { @Test public void testMultiByteReadConsistentlyReturnsMinusOneAtEof() throws IOException { final byte[] buf = new byte[2]; - try (InputStream is = Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez")); + try (InputStream is = Files.newInputStream(AbstractTest.getPath("bla.tar.deflatez")); DeflateCompressorInputStream in = new DeflateCompressorInputStream(is)) { IOUtils.toByteArray(in); assertEquals(-1, in.read(buf)); @@ -52,7 +52,7 @@ public class DeflateCompressorInputStreamTest { @Test public void testShouldBeAbleToSkipAByte() throws IOException { - try (InputStream is = Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez")); + try (InputStream is = Files.newInputStream(AbstractTest.getPath("bla.tar.deflatez")); DeflateCompressorInputStream in = new DeflateCompressorInputStream(is)) { assertEquals(1, in.skip(1)); } @@ -60,7 +60,7 @@ public class DeflateCompressorInputStreamTest { @Test public void testSingleByteReadConsistentlyReturnsMinusOneAtEof() throws IOException { - try (InputStream is = Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez")); + try (InputStream is = Files.newInputStream(AbstractTest.getPath("bla.tar.deflatez")); DeflateCompressorInputStream in = new DeflateCompressorInputStream(is)) { IOUtils.toByteArray(in); assertEquals(-1, in.read()); @@ -70,7 +70,7 @@ public class DeflateCompressorInputStreamTest { @Test public void testSingleByteReadWorksAsExpected() throws IOException { - try (InputStream is = Files.newInputStream(AbstractTestCase.getPath("bla.tar.deflatez")); + try (InputStream is = Files.newInputStream(AbstractTest.getPath("bla.tar.deflatez")); DeflateCompressorInputStream in = new DeflateCompressorInputStream(is)) { // tar header starts with file name "test1.xml" assertEquals('t', in.read()); diff --git a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java index 0200be2e..c8fcc079 100644 --- a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64BugsTest.java @@ -16,7 +16,7 @@ */ package org.apache.commons.compress.compressors.deflate64; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import java.io.InputStream; import java.util.Enumeration; diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStreamTest.java index 5a9a5f44..9c58e57e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorInputStreamTest.java @@ -26,11 +26,11 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class BlockLZ4CompressorInputStreamTest extends AbstractTestCase { +public class BlockLZ4CompressorInputStreamTest extends AbstractTest { @Test public void testMultiByteReadConsistentlyReturnsMinusOneAtEof() throws IOException { diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java index 3682096d..ccb9b949 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java @@ -27,14 +27,14 @@ import java.io.OutputStream; import java.nio.file.Files; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.lz77support.Parameters; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -public final class BlockLZ4CompressorRoundtripTest extends AbstractTestCase { +public final class BlockLZ4CompressorRoundtripTest extends AbstractTest { public static Stream<Arguments> factory() { return Stream.of( diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/FactoryTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/FactoryTest.java index 8f4745d6..82d3f60c 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/FactoryTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/FactoryTest.java @@ -25,12 +25,12 @@ import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class FactoryTest extends AbstractTestCase { +public class FactoryTest extends AbstractTest { private void roundtripViaFactory(final String format) throws Exception { final Path input = getPath("bla.tar"); diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java index 931f5be8..0e123fff 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java @@ -35,12 +35,12 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.Arrays; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class FramedLZ4CompressorInputStreamTest extends AbstractTestCase { +public final class FramedLZ4CompressorInputStreamTest extends AbstractTest { interface StreamWrapper { InputStream wrap(InputStream in) throws Exception; diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java index c772bc8c..02a6ae49 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorRoundtripTest.java @@ -28,13 +28,13 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -public final class FramedLZ4CompressorRoundtripTest extends AbstractTestCase { +public final class FramedLZ4CompressorRoundtripTest extends AbstractTest { public static Stream<Arguments> factory() { return Stream.of( diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java b/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java index e7cbbdd2..7c813fe7 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java +++ b/src/test/java/org/apache/commons/compress/compressors/lz4/XXHash32Test.java @@ -26,7 +26,7 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.stream.Stream; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -47,7 +47,7 @@ public class XXHash32Test { @MethodSource("factory") public void verifyChecksum(final String fileName, final String expectedChecksum) throws IOException { final XXHash32 h = new XXHash32(); - final File file = AbstractTestCase.getFile(fileName); + final File file = AbstractTest.getFile(fileName); try (InputStream s = Files.newInputStream(file.toPath())) { final byte[] b = IOUtils.toByteArray(s); h.update(b, 0, b.length); diff --git a/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java b/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTest.java index d6b02e20..6b89f967 100644 --- a/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/lzma/LZMAUtilsTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -public class LZMAUtilsTestCase { +public class LZMAUtilsTest { @Test public void testCachingIsEnabledByDefaultAndLZMAIsPresent() { diff --git a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java index b060eade..b4001cac 100644 --- a/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/pack200/Pack200UtilsTest.java @@ -24,13 +24,13 @@ import java.nio.file.Files; import java.nio.file.StandardCopyOption; import java.util.HashMap; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.ArchiveEntry; import org.apache.commons.compress.archivers.ArchiveInputStream; import org.apache.commons.compress.archivers.ArchiveStreamFactory; import org.junit.jupiter.api.Test; -public final class Pack200UtilsTest extends AbstractTestCase { +public final class Pack200UtilsTest extends AbstractTest { @Test public void testNormalize() throws Throwable { diff --git a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java index 70eb4d09..6219ba2f 100644 --- a/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/snappy/FramedSnappyCompressorInputStreamTest.java @@ -31,13 +31,13 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.ZipFile; import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class FramedSnappyCompressorInputStreamTest extends AbstractTestCase { +public final class FramedSnappyCompressorInputStreamTest extends AbstractTest { private long mask(final long x) { return (x >>> 15 | x << 17) + FramedSnappyCompressorInputStream.MASK_OFFSET & 0xffffFFFFL; diff --git a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java index 4445aaa7..f5e2144e 100644 --- a/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/snappy/SnappyRoundtripTest.java @@ -29,12 +29,12 @@ import java.io.OutputStream; import java.nio.file.Files; import java.util.Random; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.lz77support.Parameters; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public final class SnappyRoundtripTest extends AbstractTestCase { +public final class SnappyRoundtripTest extends AbstractTest { private static Parameters newParameters(final int windowSize, final int minBackReferenceLength, final int maxBackReferenceLength, final int maxOffset, final int maxLiteralLength) { diff --git a/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStreamTest.java index 597e8a3e..0a1fe732 100644 --- a/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/xz/XZCompressorInputStreamTest.java @@ -18,7 +18,7 @@ */ package org.apache.commons.compress.compressors.xz; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java b/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTest.java similarity index 99% rename from src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java rename to src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTest.java index 8dada436..56086949 100644 --- a/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTestCase.java +++ b/src/test/java/org/apache/commons/compress/compressors/xz/XZUtilsTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -public class XZUtilsTestCase { +public class XZUtilsTest { @Test public void testCachingIsEnabledByDefaultAndXZIsPresent() { diff --git a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java index d73250a4..793360f0 100644 --- a/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java @@ -18,7 +18,7 @@ */ package org.apache.commons.compress.compressors.z; -import static org.apache.commons.compress.AbstractTestCase.getFile; +import static org.apache.commons.compress.AbstractTest.getFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java index 7837eb7f..61437f88 100644 --- a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdCompressorInputStreamTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.CompressorInputStream; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.utils.IOUtils; @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; import com.github.luben.zstd.NoPool; import com.github.luben.zstd.RecyclingBufferPool; -public class ZstdCompressorInputStreamTest extends AbstractTestCase { +public class ZstdCompressorInputStreamTest extends AbstractTest { @Test public void testCachingIsEnabledByDefaultAndZstdUtilsPresent() { diff --git a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java index 7c817048..8dce6fea 100644 --- a/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/zstandard/ZstdRoundtripTest.java @@ -26,14 +26,14 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.file.Files; -import org.apache.commons.compress.AbstractTestCase; +import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.compressors.CompressorInputStream; import org.apache.commons.compress.compressors.CompressorOutputStream; import org.apache.commons.compress.compressors.CompressorStreamFactory; import org.apache.commons.compress.utils.IOUtils; import org.junit.jupiter.api.Test; -public class ZstdRoundtripTest extends AbstractTestCase { +public class ZstdRoundtripTest extends AbstractTest { private interface OutputStreamCreator { ZstdCompressorOutputStream wrap(FileOutputStream os) throws IOException; diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java similarity index 98% rename from src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java rename to src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java index 51cd1912..dec7e0f4 100644 --- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTestCase.java +++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/AbstractBandsTest.java @@ -27,7 +27,7 @@ import org.apache.commons.compress.harmony.unpack200.SegmentOptions; /** */ -public abstract class AbstractBandsTestCase { +public abstract class AbstractBandsTest { public class MockAttributeDefinitionBands extends AttrDefinitionBands { diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java index 781790c9..0f9648ce 100644 --- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/BcBandsTest.java @@ -54,7 +54,7 @@ import org.junit.jupiter.api.Test; * should be replaced with properly encoded byte arrays when encoding is * implemented. */ -public class BcBandsTest extends AbstractBandsTestCase { +public class BcBandsTest extends AbstractBandsTest { public class MockClassBands extends ClassBands { @@ -231,7 +231,7 @@ public class BcBandsTest extends AbstractBandsTestCase { } } - public class MockSegment extends AbstractBandsTestCase.MockSegment { + public class MockSegment extends AbstractBandsTest.MockSegment { public CpBands cpBands; diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java index acff5a75..4483bb75 100644 --- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/ClassBandsTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; /** */ -public class ClassBandsTest extends AbstractBandsTestCase { +public class ClassBandsTest extends AbstractBandsTest { public class MockCpBands extends CpBands { @@ -78,7 +78,7 @@ public class ClassBandsTest extends AbstractBandsTestCase { return cpUTF8; } } - public class MockSegment extends AbstractBandsTestCase.MockSegment { + public class MockSegment extends AbstractBandsTest.MockSegment { @Override protected CpBands getCpBands() { diff --git a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java index 8ea3b3bf..26a506d2 100644 --- a/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java +++ b/src/test/java/org/apache/commons/compress/harmony/unpack200/tests/NewAttributeBandsTest.java @@ -41,7 +41,7 @@ import org.junit.jupiter.params.provider.ValueSource; /** * Tests for unpack200 support for non-predefined attributes */ -public class NewAttributeBandsTest extends AbstractBandsTestCase { +public class NewAttributeBandsTest extends AbstractBandsTest { private class MockNewAttributeBands extends NewAttributeBands { diff --git a/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java b/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java index fceb1647..77ffd6ee 100644 --- a/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java +++ b/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java @@ -17,8 +17,8 @@ package org.apache.commons.compress.utils; -import static org.apache.commons.compress.AbstractTestCase.getFile; -import static org.apache.commons.compress.AbstractTestCase.getPath; +import static org.apache.commons.compress.AbstractTest.getFile; +import static org.apache.commons.compress.AbstractTest.getPath; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows;
