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 f2321ec58137efc5598c88236ee1be3421357810 Author: Gary Gregory <[email protected]> AuthorDate: Sat Nov 4 12:23:42 2023 -0400 Let JUnit manage temporary files --- .../commons/compress/AbstractTempDirTest.java | 9 ++ .../org/apache/commons/compress/AbstractTest.java | 10 +- .../commons/compress/DetectArchiverTest.java | 1 - .../org/apache/commons/compress/IOMethodsTest.java | 4 +- .../apache/commons/compress/archivers/ArTest.java | 10 +- .../commons/compress/archivers/CpioTest.java | 6 +- .../commons/compress/archivers/DumpTest.java | 2 +- .../apache/commons/compress/archivers/JarTest.java | 10 +- .../commons/compress/archivers/SevenZTest.java | 2 +- .../apache/commons/compress/archivers/TarTest.java | 11 +- .../apache/commons/compress/archivers/ZipTest.java | 16 +-- .../cpio/CpioArchiveOutputStreamTest.java | 2 +- .../compress/archivers/examples/ExpanderTest.java | 20 +-- .../examples/ParameterizedArchiverTest.java | 6 +- .../examples/ParameterizedExpanderTest.java | 4 +- .../archivers/examples/SevenZArchiverTest.java | 6 +- .../archivers/jar/JarArchiveOutputStreamTest.java | 6 +- .../compress/archivers/sevenz/SevenZFileTest.java | 10 +- .../archivers/sevenz/SevenZOutputFileTest.java | 135 +++++++++------------ .../archivers/zip/ZipSplitOutputStreamTest.java | 2 +- .../compress/changes/ChangeSetRawTypesTest.java | 8 +- .../compress/changes/ChangeSetSafeTypesTest.java | 12 +- .../commons/compress/compressors/BZip2Test.java | 6 +- .../commons/compress/compressors/DeflateTest.java | 8 +- .../compress/compressors/FramedSnappyTest.java | 8 +- .../commons/compress/compressors/GZipTest.java | 4 +- .../commons/compress/compressors/LZMATest.java | 6 +- .../commons/compress/compressors/Pack200Test.java | 6 +- .../commons/compress/compressors/XZTest.java | 4 +- .../apache/commons/compress/compressors/ZTest.java | 2 +- .../brotli/BrotliCompressorInputStreamTest.java | 2 +- .../lz4/BlockLZ4CompressorRoundtripTest.java | 2 +- .../lz4/FramedLZ4CompressorRoundtripTest.java | 2 +- .../compressors/pack200/Pack200UtilsTest.java | 4 +- .../FramedSnappyCompressorInputStreamTest.java | 8 +- .../compressors/snappy/SnappyRoundtripTest.java | 6 +- .../zstandard/ZstdCompressorInputStreamTest.java | 2 +- .../compressors/zstandard/ZstdRoundtripTest.java | 4 +- 38 files changed, 175 insertions(+), 191 deletions(-) diff --git a/src/test/java/org/apache/commons/compress/AbstractTempDirTest.java b/src/test/java/org/apache/commons/compress/AbstractTempDirTest.java index 5e6d9312..12ca94c3 100644 --- a/src/test/java/org/apache/commons/compress/AbstractTempDirTest.java +++ b/src/test/java/org/apache/commons/compress/AbstractTempDirTest.java @@ -21,6 +21,7 @@ package org.apache.commons.compress; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; import org.junit.jupiter.api.io.TempDir; @@ -41,6 +42,10 @@ public class AbstractTempDirTest { return File.createTempFile(prefix, suffix, getTempDirFile()); } + public Path createTempPath(final String prefix, final String suffix) throws IOException { + return Files.createTempFile(getTempDirPath(), prefix, suffix); + } + public File getTempDirFile() { return tempDirFile; } @@ -49,4 +54,8 @@ public class AbstractTempDirTest { return tempDirFile.toPath(); } + protected File newTempFile(final String child) { + return new File(getTempDirFile(), child); + } + } diff --git a/src/test/java/org/apache/commons/compress/AbstractTest.java b/src/test/java/org/apache/commons/compress/AbstractTest.java index 8d1093d4..0b3c5604 100644 --- a/src/test/java/org/apache/commons/compress/AbstractTest.java +++ b/src/test/java/org/apache/commons/compress/AbstractTest.java @@ -155,7 +155,6 @@ public abstract class AbstractTest extends AbstractTempDirTest { protected File checkArchiveContent(final ArchiveInputStream<?> inputStream, final List<String> expected, final boolean cleanUp) throws Exception { final File result = createTempDirectory("dir-result"); - result.deleteOnExit(); try { ArchiveEntry entry; @@ -249,8 +248,7 @@ public abstract class AbstractTest extends AbstractTempDirTest { * in case something goes wrong */ protected Path createArchive(final String archiveName) throws Exception { - archivePath = Files.createTempFile("test", "." + archiveName); - archivePath.toFile().deleteOnExit(); + archivePath = createTempPath("test", "." + archiveName); archiveList = new ArrayList<>(); try (OutputStream outputStream = Files.newOutputStream(archivePath); ArchiveOutputStream<ArchiveEntry> archiveOutputStream = factory.createArchiveOutputStream(archiveName, outputStream)) { @@ -285,8 +283,7 @@ public abstract class AbstractTest extends AbstractTempDirTest { */ protected Path createEmptyArchive(final String archiveName) throws Exception { archiveList = new ArrayList<>(); - archivePath = Files.createTempFile("empty", "." + archiveName); - archivePath.toFile().deleteOnExit(); + archivePath = createTempPath("empty", "." + archiveName); try (OutputStream outputStream = Files.newOutputStream(archivePath); ArchiveOutputStream<?> archiveOutputStream = factory.createArchiveOutputStream(archiveName, outputStream)) { archiveOutputStream.finish(); @@ -303,8 +300,7 @@ public abstract class AbstractTest extends AbstractTempDirTest { */ protected Path createSingleEntryArchive(final String archiveName) throws Exception { archiveList = new ArrayList<>(); - archivePath = Files.createTempFile("empty", "." + archiveName); - archivePath.toFile().deleteOnExit(); + archivePath = createTempPath("empty", "." + archiveName); try (OutputStream outputStream = Files.newOutputStream(archivePath); ArchiveOutputStream<?> archiveOutputStream = factory.createArchiveOutputStream(archiveName, outputStream)) { // Use short file name so does not cause problems for ar diff --git a/src/test/java/org/apache/commons/compress/DetectArchiverTest.java b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java index ff3216ae..2a9f0d40 100644 --- a/src/test/java/org/apache/commons/compress/DetectArchiverTest.java +++ b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java @@ -44,7 +44,6 @@ public final class DetectArchiverTest extends AbstractTest { private void checkEmptyArchive(final String type) throws Exception { final Path ar = createEmptyArchive(type); // will be deleted by tearDown() - ar.toFile().deleteOnExit(); // Just in case file cannot be deleted assertDoesNotThrow(() -> { try (BufferedInputStream inputStream = new BufferedInputStream(Files.newInputStream(ar)); ArchiveInputStream<?> ais = factory.createArchiveInputStream(inputStream)) { diff --git a/src/test/java/org/apache/commons/compress/IOMethodsTest.java b/src/test/java/org/apache/commons/compress/IOMethodsTest.java index 412d2ae7..1dff82ad 100644 --- a/src/test/java/org/apache/commons/compress/IOMethodsTest.java +++ b/src/test/java/org/apache/commons/compress/IOMethodsTest.java @@ -58,7 +58,6 @@ public class IOMethodsTest extends AbstractTest { final OutputStream out2 = new ByteArrayOutputStream(); final OutputStream out3 = new ByteArrayOutputStream(); final Path file = createSingleEntryArchive(archiverName); - file.toFile().deleteOnExit(); final InputStream is1 = Files.newInputStream(file); final ArchiveInputStream<?> ais1 = factory.createArchiveInputStream(archiverName, is1); @@ -164,8 +163,7 @@ public class IOMethodsTest extends AbstractTest { @Test public void testWriteAr() throws Exception { - final ArchiveEntry entry = new ArArchiveEntry("dummy", bytesToTest); - compareWrites("ar", entry); + compareWrites("ar", new ArArchiveEntry("dummy", bytesToTest)); } @Test diff --git a/src/test/java/org/apache/commons/compress/archivers/ArTest.java b/src/test/java/org/apache/commons/compress/archivers/ArTest.java index 337095f8..bd79e57c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ArTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ArTest.java @@ -42,7 +42,7 @@ public final class ArTest extends AbstractTest { @Test public void testArArchiveCreation() throws Exception { - final File output = new File(getTempDirFile(), "bla.ar"); + final File output = newTempFile("bla.ar"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -61,7 +61,7 @@ public final class ArTest extends AbstractTest { @Test public void testArDelete() throws Exception { - final File output = new File(getTempDirFile(), "bla.ar"); + final File output = newTempFile("bla.ar"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -81,7 +81,7 @@ public final class ArTest extends AbstractTest { assertEquals(8 + 60 + file1.length() + file1.length() % 2 + 60 + file2.length() + file2.length() % 2, output.length()); - final File output2 = new File(getTempDirFile(), "bla2.ar"); + final File output2 = newTempFile("bla2.ar"); int copied = 0; int deleted = 0; @@ -140,7 +140,7 @@ public final class ArTest extends AbstractTest { @Test public void testArUnarchive() throws Exception { - final File output = new File(getTempDirFile(), "bla.ar"); + final File output = newTempFile("bla.ar"); { final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -162,7 +162,7 @@ public final class ArTest extends AbstractTest { final ArchiveInputStream<ArArchiveEntry> in = new ArchiveStreamFactory().createArchiveInputStream(new BufferedInputStream(is))) { final ArArchiveEntry entry = in.getNextEntry(); - final File target = new File(getTempDirFile(), entry.getName()); + final File target = newTempFile(entry.getName()); Files.copy(in, target.toPath()); } } diff --git a/src/test/java/org/apache/commons/compress/archivers/CpioTest.java b/src/test/java/org/apache/commons/compress/archivers/CpioTest.java index b28c6a2f..1164ea5f 100644 --- a/src/test/java/org/apache/commons/compress/archivers/CpioTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/CpioTest.java @@ -41,7 +41,7 @@ public final class CpioTest extends AbstractTest { @Test public void testCpioArchiveCreation() throws Exception { - final File output = new File(getTempDirFile(), "bla.cpio"); + final File output = newTempFile("bla.cpio"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -61,7 +61,7 @@ public final class CpioTest extends AbstractTest { @Test public void testCpioUnarchive() throws Exception { - final File output = new File(getTempDirFile(), "bla.cpio"); + final File output = newTempFile("bla.cpio"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); final long file1Length = file1.length(); @@ -91,7 +91,7 @@ public final class CpioTest extends AbstractTest { ArchiveInputStream<?> archiveInputStream = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("cpio", inputStream)) { ArchiveEntry entry; while ((entry = archiveInputStream.getNextEntry()) != null) { - final File cpioget = new File(getTempDirFile(), entry.getName()); + final File cpioget = newTempFile(entry.getName()); Files.copy(archiveInputStream, cpioget.toPath()); result.put(entry.getName(), cpioget); } diff --git a/src/test/java/org/apache/commons/compress/archivers/DumpTest.java b/src/test/java/org/apache/commons/compress/archivers/DumpTest.java index b1180b3c..580fb510 100644 --- a/src/test/java/org/apache/commons/compress/archivers/DumpTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/DumpTest.java @@ -87,7 +87,7 @@ public final class DumpTest extends AbstractTest { ArchiveInputStream<?> in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("dump", is)) { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - final File archiveEntry = new File(getTempDirFile(), entry.getName()); + final File archiveEntry = newTempFile(entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); diff --git a/src/test/java/org/apache/commons/compress/archivers/JarTest.java b/src/test/java/org/apache/commons/compress/archivers/JarTest.java index 270a9f99..1fdb070d 100644 --- a/src/test/java/org/apache/commons/compress/archivers/JarTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/JarTest.java @@ -32,7 +32,7 @@ public final class JarTest extends AbstractTest { @Test public void testJarArchiveCreation() throws Exception { - final File output = new File(getTempDirFile(), "bla.jar"); + final File output = newTempFile("bla.jar"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -57,17 +57,17 @@ public final class JarTest extends AbstractTest { ZipArchiveInputStream in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("jar", is)) { ZipArchiveEntry entry = in.getNextEntry(); - File o = new File(getTempDirFile(), entry.getName()); + File o = newTempFile(entry.getName()); o.getParentFile().mkdirs(); Files.copy(in, o.toPath()); entry = in.getNextEntry(); - o = new File(getTempDirFile(), entry.getName()); + o = newTempFile(entry.getName()); o.getParentFile().mkdirs(); Files.copy(in, o.toPath()); entry = in.getNextEntry(); - o = new File(getTempDirFile(), entry.getName()); + o = newTempFile(entry.getName()); o.getParentFile().mkdirs(); Files.copy(in, o.toPath()); } @@ -81,7 +81,7 @@ public final class JarTest extends AbstractTest { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - final File archiveEntry = new File(getTempDirFile(), entry.getName()); + final File archiveEntry = newTempFile(entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); diff --git a/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java index 972e162e..9aec40ed 100644 --- a/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/SevenZTest.java @@ -108,7 +108,7 @@ public class SevenZTest extends AbstractTest { @BeforeEach public void setUp() throws Exception { super.setUp(); - output = new File(getTempDirFile(), "bla.7z"); + output = newTempFile("bla.7z"); } private void singleByteReadConsistentlyReturnsMinusOneAtEof(final SevenZFile archive) throws Exception { diff --git a/src/test/java/org/apache/commons/compress/archivers/TarTest.java b/src/test/java/org/apache/commons/compress/archivers/TarTest.java index 65038a96..a1cf0b1c 100644 --- a/src/test/java/org/apache/commons/compress/archivers/TarTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/TarTest.java @@ -144,7 +144,6 @@ public final class TarTest extends AbstractTest { @Test public void testExplicitDirectoryEntry() throws Exception { final File archive = createTempFile("test.", ".tar"); - archive.deleteOnExit(); final long beforeArchiveWrite; final TarArchiveEntry in = new TarArchiveEntry("foo/"); try (TarArchiveOutputStream tos = new TarArchiveOutputStream(Files.newOutputStream(archive.toPath()))) { @@ -238,7 +237,7 @@ public final class TarTest extends AbstractTest { @Test public void testTarArchiveCreation() throws Exception { - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); final File file1 = getFile("test1.xml"); try (OutputStream out = Files.newOutputStream(output.toPath()); TarArchiveOutputStream os = ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("tar", out)) { @@ -262,7 +261,7 @@ public final class TarTest extends AbstractTest { final byte[] bytes = name.getBytes(UTF_8); assertEquals(bytes.length, 99); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); final File file1 = getFile("test1.xml"); final TarArchiveEntry entry = new TarArchiveEntry(name); try (OutputStream out = Files.newOutputStream(output.toPath()); @@ -280,7 +279,7 @@ public final class TarTest extends AbstractTest { } final String toLongName = "testdata/123456789012345678901234567890123456789012345678901234567890123456789012345678901234567.xml"; - final File output2 = new File(getTempDirFile(), "bla.tar"); + final File output2 = newTempFile("bla.tar"); try (OutputStream out2 = Files.newOutputStream(output2.toPath()); TarArchiveOutputStream os2 = ArchiveStreamFactory.DEFAULT.createArchiveOutputStream("tar", out2);) { final TarArchiveEntry entry2 = new TarArchiveEntry(toLongName); @@ -471,7 +470,7 @@ public final class TarTest extends AbstractTest { try (TarFile tarFile = new TarFile(file)) { final TarArchiveEntry entry = tarFile.getEntries().get(0); try (InputStream inputStream = tarFile.getInputStream(entry)) { - Files.copy(inputStream, new File(getTempDirFile(), entry.getName()).toPath()); + Files.copy(inputStream, newTempFile(entry.getName()).toPath()); } } } @@ -482,7 +481,7 @@ public final class TarTest extends AbstractTest { try (final InputStream is = Files.newInputStream(input.toPath()); final TarArchiveInputStream in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("tar", is)) { final TarArchiveEntry entry = in.getNextEntry(); - Files.copy(in, new File(getTempDirFile(), entry.getName()).toPath()); + Files.copy(in, newTempFile(entry.getName()).toPath()); } } } diff --git a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java index f499dc70..81008c25 100644 --- a/src/test/java/org/apache/commons/compress/archivers/ZipTest.java +++ b/src/test/java/org/apache/commons/compress/archivers/ZipTest.java @@ -164,7 +164,7 @@ public final class ZipTest extends AbstractTest { private void createTestSplitZipSegments() throws IOException { final File directoryToZip = getFilesToZip(); - final File outputZipFile = new File(getTempDirFile(), "splitZip.zip"); + final File outputZipFile = newTempFile("splitZip.zip"); final long splitSize = 100 * 1024L; /* 100 KB */ try (final ZipArchiveOutputStream zipArchiveOutputStream = new ZipArchiveOutputStream(outputZipFile, splitSize)) { addFilesToZip(zipArchiveOutputStream, directoryToZip); @@ -186,11 +186,11 @@ public final class ZipTest extends AbstractTest { continue; } - outputFile = new File(getTempDirFile(), zipEntry.getName()); + outputFile = newTempFile(zipEntry.getName()); if (!outputFile.getParentFile().exists()) { outputFile.getParentFile().mkdirs(); } - outputFile = new File(getTempDirFile(), zipEntry.getName()); + outputFile = newTempFile(zipEntry.getName()); try (InputStream inputStream = zipFile.getInputStream(zipEntry); OutputStream outputStream = Files.newOutputStream(outputFile.toPath())) { @@ -224,7 +224,7 @@ public final class ZipTest extends AbstractTest { final File directoryToZip = getFilesToZip(); createTestSplitZipSegments(); - final File lastFile = new File(getTempDirFile(), "splitZip.zip"); + final File lastFile = newTempFile("splitZip.zip"); try (SeekableByteChannel channel = ZipSplitReadOnlySeekableByteChannel.buildFromLastSplitSegment(lastFile); InputStream inputStream = Channels.newInputStream(channel); ZipArchiveInputStream splitInputStream = new ZipArchiveInputStream(inputStream, UTF_8.toString(), true, false, true)) { @@ -251,12 +251,12 @@ public final class ZipTest extends AbstractTest { @Test public void testBuildSplitZipWithSegmentAlreadyExistThrowsException() throws IOException { final File directoryToZip = getFilesToZip(); - final File outputZipFile = new File(getTempDirFile(), "splitZip.zip"); + final File outputZipFile = newTempFile("splitZip.zip"); final long splitSize = 100 * 1024L; /* 100 KB */ try (final ZipArchiveOutputStream zipArchiveOutputStream = new ZipArchiveOutputStream(outputZipFile, splitSize)) { // create a file that has the same name of one of the created split segments - final File sameNameFile = new File(getTempDirFile(), "splitZip.z01"); + final File sameNameFile = newTempFile("splitZip.z01"); sameNameFile.createNewFile(); assertThrows(IOException.class, () -> addFilesToZip(zipArchiveOutputStream, directoryToZip)); @@ -624,7 +624,7 @@ public final class ZipTest extends AbstractTest { @Test public void testZipArchiveCreation() throws Exception { // Archive - final File output = new File(getTempDirFile(), "bla.zip"); + final File output = newTempFile("bla.zip"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -742,7 +742,7 @@ public final class ZipTest extends AbstractTest { try (final InputStream is = Files.newInputStream(input.toPath()); final ArchiveInputStream<ZipArchiveEntry> in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("zip", is)) { final ZipArchiveEntry entry = in.getNextEntry(); - Files.copy(in, new File(getTempDirFile(), entry.getName()).toPath()); + Files.copy(in, newTempFile(entry.getName()).toPath()); } } } 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 f734f5ed..ecd6170f 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 @@ -33,7 +33,7 @@ public class CpioArchiveOutputStreamTest extends AbstractTest { @Test public void testWriteOldBinary() throws Exception { final File f = getFile("test1.xml"); - final File output = new File(getTempDirFile(), "test.cpio"); + final File output = newTempFile("test.cpio"); try (final OutputStream out = Files.newOutputStream(output.toPath()); CpioArchiveOutputStream os = new CpioArchiveOutputStream(out, CpioConstants.FORMAT_OLD_BINARY)) { os.putArchiveEntry(new CpioArchiveEntry(CpioConstants.FORMAT_OLD_BINARY, f, "test1.xml")); 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 b572e9eb..98406d0b 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 @@ -63,8 +63,8 @@ public class ExpanderTest extends AbstractTest { } private void setup7z() throws IOException { - archive = new File(getTempDirFile(), "test.7z"); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test.7z"); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } @@ -86,8 +86,8 @@ public class ExpanderTest extends AbstractTest { } private void setupTar() throws IOException, ArchiveException { - archive = new File(getTempDirFile(), "test.tar"); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test.tar"); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } @@ -110,8 +110,8 @@ public class ExpanderTest extends AbstractTest { } private void setupTarForCompress603() throws IOException, ArchiveException { - archive = new File(getTempDirFile(), "test.tar"); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test.tar"); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } @@ -136,8 +136,8 @@ public class ExpanderTest extends AbstractTest { } private void setupZip() throws IOException, ArchiveException { - archive = new File(getTempDirFile(), "test.zip"); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test.zip"); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } @@ -160,8 +160,8 @@ public class ExpanderTest extends AbstractTest { } private void setupZip(final String entry) throws IOException, ArchiveException { - archive = new File(getTempDirFile(), "test.zip"); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test.zip"); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } 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 16386c72..1b9723d9 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 @@ -124,12 +124,12 @@ public class ParameterizedArchiverTest extends AbstractTest { public void setUp(final String format) throws Exception { super.setUp(); - final File c = new File(getTempDirFile(), "a/b/c"); + final File c = newTempFile("a/b/c"); c.mkdirs(); - try (OutputStream os = Files.newOutputStream(new File(getTempDirFile(), "a/b/d.txt").toPath())) { + try (OutputStream os = Files.newOutputStream(newTempFile("a/b/d.txt").toPath())) { os.write("Hello, world 1".getBytes(UTF_8)); } - try (OutputStream os = Files.newOutputStream(new File(getTempDirFile(), "a/b/c/e.txt").toPath())) { + try (OutputStream os = Files.newOutputStream(newTempFile("a/b/c/e.txt").toPath())) { os.write("Hello, world 2".getBytes(UTF_8)); } target = new File(tempResultDir, "test." + format); 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 61604876..779fb747 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 @@ -132,8 +132,8 @@ public class ParameterizedExpanderTest extends AbstractTest { public void setUp(final String format) throws Exception { super.setUp(); - archive = new File(getTempDirFile(), "test." + format); - final File dummy = new File(getTempDirFile(), "x"); + archive = newTempFile("test." + format); + final File dummy = newTempFile("x"); try (OutputStream o = Files.newOutputStream(dummy.toPath())) { o.write(new byte[14]); } 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 b08233f3..8627ee9b 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 @@ -67,12 +67,12 @@ public class SevenZArchiverTest extends AbstractTest { @Override public void setUp() throws Exception { super.setUp(); - final File c = new File(getTempDirFile(), "a/b/c"); + final File c = newTempFile("a/b/c"); c.mkdirs(); - try (OutputStream os = Files.newOutputStream(new File(getTempDirFile(), "a/b/d.txt").toPath())) { + try (OutputStream os = Files.newOutputStream(newTempFile("a/b/d.txt").toPath())) { os.write("Hello, world 1".getBytes(UTF_8)); } - try (OutputStream os = Files.newOutputStream(new File(getTempDirFile(), "a/b/c/e.txt").toPath())) { + try (OutputStream os = Files.newOutputStream(newTempFile("a/b/c/e.txt").toPath())) { os.write("Hello, world 2".getBytes(UTF_8)); } target = new File(tempResultDir, "test.7z"); 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 0e6d0f43..ee4834c2 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,6 +27,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.time.Instant; +import org.apache.commons.compress.AbstractTempDirTest; import org.apache.commons.compress.AbstractTest; import org.apache.commons.compress.archivers.zip.JarMarker; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; @@ -34,12 +35,11 @@ import org.apache.commons.compress.archivers.zip.ZipExtraField; import org.apache.commons.compress.archivers.zip.ZipFile; import org.junit.jupiter.api.Test; -public class JarArchiveOutputStreamTest { +public class JarArchiveOutputStreamTest extends AbstractTempDirTest { @Test public void testJarMarker() throws IOException { - final Path testArchive = Files.createTempFile("jar-aostest", ".jar"); - testArchive.toFile().deleteOnExit(); + final Path testArchive = createTempPath("jar-aostest", ".jar"); try (JarArchiveOutputStream out = new JarArchiveOutputStream(Files.newOutputStream(testArchive))) { final ZipArchiveEntry ze1 = new ZipArchiveEntry("foo/"); // Ensure we won't accidentally add an Extra field. 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 089ac4be..a922ae03 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 @@ -342,7 +342,7 @@ public class SevenZFileTest extends AbstractTest { */ @Test public void testHandlesEmptyArchiveWithFilesInfo() throws Exception { - final File f = new File(getTempDirFile(), "empty.7z"); + final File f = newTempFile("empty.7z"); try (SevenZOutputFile s = new SevenZOutputFile(f)) { } try (SevenZFile z = new SevenZFile(f)) { @@ -709,7 +709,7 @@ public class SevenZFileTest extends AbstractTest { @Test public void testReadingBackDeltaDistance() throws Exception { - final File output = new File(getTempDirFile(), "delta-distance.7z"); + final File output = newTempFile("delta-distance.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output)) { outArchive.setContentMethods( Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.DELTA_FILTER, 32), new SevenZMethodConfiguration(SevenZMethod.LZMA2))); @@ -730,7 +730,7 @@ public class SevenZFileTest extends AbstractTest { @Test public void testReadingBackLZMA2DictSize() throws Exception { - final File output = new File(getTempDirFile(), "lzma2-dictsize.7z"); + final File output = newTempFile("lzma2-dictsize.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output)) { outArchive.setContentMethods(Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.LZMA2, 1 << 20))); final SevenZArchiveEntry entry = new SevenZArchiveEntry(); @@ -787,7 +787,7 @@ public class SevenZFileTest extends AbstractTest { @Test public void testRetrieveInputStreamForAllEntriesWithoutCRCMultipleTimes() throws IOException { - try (final SevenZOutputFile out = new SevenZOutputFile(new File(getTempDirFile(), "test.7z"))) { + try (final SevenZOutputFile out = new SevenZOutputFile(newTempFile("test.7z"))) { final Path inputFile = Files.createTempFile("SevenZTestTemp", ""); final SevenZArchiveEntry entry = out.createArchiveEntry(inputFile.toFile(), "test.txt"); @@ -798,7 +798,7 @@ public class SevenZFileTest extends AbstractTest { Files.deleteIfExists(inputFile); } - try (SevenZFile sevenZFile = new SevenZFile(new File(getTempDirFile(), "test.7z"))) { + try (SevenZFile sevenZFile = new SevenZFile(newTempFile("test.7z"))) { for (final SevenZArchiveEntry entry : sevenZFile.getEntries()) { final byte[] firstRead = read(sevenZFile, entry); final byte[] secondRead = read(sevenZFile, entry); 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 9ee8701f..1b8512f1 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 @@ -53,13 +53,14 @@ public class SevenZOutputFileTest extends AbstractTest { static { final String version = org.tukaani.xz.XZ.class.getPackage().getImplementationVersion(); - XZ_BCJ_IS_BUGGY= version != null && version.equals("1.4"); + XZ_BCJ_IS_BUGGY = version != null && version.equals("1.4"); if (XZ_BCJ_IS_BUGGY) { System.out.println("XZ version is " + version + " - skipping BCJ tests"); } } + private static void assertContentMethodsEquals(final Iterable<? extends SevenZMethodConfiguration> expected, - final Iterable<? extends SevenZMethodConfiguration> actual) { + final Iterable<? extends SevenZMethodConfiguration> actual) { assertNotNull(actual); final Iterator<? extends SevenZMethodConfiguration> actualIter = actual.iterator(); for (final SevenZMethodConfiguration expConfig : expected) { @@ -70,26 +71,22 @@ public class SevenZOutputFileTest extends AbstractTest { assertFalse(actualIter.hasNext()); } - private File output; - private void addDir(final SevenZOutputFile archive) throws Exception { final SevenZArchiveEntry entry = archive.createArchiveEntry(getTempDirFile(), "foo/"); archive.putArchiveEntry(entry); archive.closeArchiveEntry(); } - private void addFile(final SevenZOutputFile archive, final int index, final boolean nonEmpty) - throws Exception { + private void addFile(final SevenZOutputFile archive, final int index, final boolean nonEmpty) throws Exception { addFile(archive, index, nonEmpty, null); } private void addFile(final SevenZOutputFile archive, final int index, final boolean nonEmpty, final Iterable<SevenZMethodConfiguration> methods) - throws Exception { + throws Exception { addFile(archive, index, nonEmpty ? 1 : 0, methods); } - private void addFile(final SevenZOutputFile archive, final int index, final int size, final Iterable<SevenZMethodConfiguration> methods) - throws Exception { + private void addFile(final SevenZOutputFile archive, final int index, final int size, final Iterable<SevenZMethodConfiguration> methods) throws Exception { final SevenZArchiveEntry entry = new SevenZArchiveEntry(); entry.setName("foo/" + index + ".txt"); entry.setContentMethods(methods); @@ -114,8 +111,7 @@ public class SevenZOutputFileTest extends AbstractTest { outArchive.setContentMethods(methods); addFile(outArchive, 0, true); } - try (SevenZFile archive = - new SevenZFile(new SeekableInMemoryByteChannel(output.array()), "in memory")) { + try (SevenZFile archive = new SevenZFile(new SeekableInMemoryByteChannel(output.array()), "in memory")) { assertEquals(Boolean.TRUE, verifyFile(archive, 0, methods)); } } @@ -138,63 +134,65 @@ public class SevenZOutputFileTest extends AbstractTest { return TimeUtils.truncateToHundredNanos(fileTime); } - @Override - public void tearDown() throws Exception { - if (output != null && !output.delete()) { - output.deleteOnExit(); - } - super.tearDown(); - } - @Test public void testArchiveWithMixedMethods() throws Exception { - output = new File(getTempDirFile(), "mixed-methods.7z"); + final File output = newTempFile("mixed-methods.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output)) { addFile(outArchive, 0, true); addFile(outArchive, 1, true, Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.BZIP2))); } try (SevenZFile archive = new SevenZFile(output)) { - assertEquals(Boolean.TRUE, - verifyFile(archive, 0, Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.LZMA2)))); - assertEquals(Boolean.TRUE, - verifyFile(archive, 1, Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.BZIP2)))); + assertEquals(Boolean.TRUE, verifyFile(archive, 0, Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.LZMA2)))); + assertEquals(Boolean.TRUE, verifyFile(archive, 1, Arrays.asList(new SevenZMethodConfiguration(SevenZMethod.BZIP2)))); } } @Test public void testBCJARMRoundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_ARM_FILTER)); } @Test public void testBCJARMThumbRoundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_ARM_THUMB_FILTER)); } @Test public void testBCJIA64Roundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_IA64_FILTER)); } @Test public void testBCJPPCRoundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_PPC_FILTER)); } @Test public void testBCJSparcRoundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_SPARC_FILTER)); } @Test public void testBCJX86Roundtrip() throws Exception { - if (XZ_BCJ_IS_BUGGY) { return; } + if (XZ_BCJ_IS_BUGGY) { + return; + } testFilterRoundTrip(new SevenZMethodConfiguration(SevenZMethod.BCJ_X86_FILTER)); } @@ -205,35 +203,29 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testBzip2WithConfiguration() throws Exception { - output = new File(getTempDirFile(), "bzip2-options.7z"); + final File output = newTempFile("bzip2-options.7z"); // 400k block size - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.BZIP2, 4))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.BZIP2, 4))); } @Test public void testCantFinishTwice() throws IOException { - output = new File(getTempDirFile(), "finish.7z"); + final File output = newTempFile("finish.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output)) { outArchive.finish(); - final IOException ex = assertThrows(IOException.class, outArchive::finish, - "shouldn't be able to call finish twice"); + final IOException ex = assertThrows(IOException.class, outArchive::finish, "shouldn't be able to call finish twice"); assertEquals("This archive has already been finished", ex.getMessage()); } } - private void testCompress252(final int numberOfFiles, final int numberOfNonEmptyFiles) - throws Exception { - final int nonEmptyModulus = numberOfNonEmptyFiles != 0 - ? numberOfFiles / numberOfNonEmptyFiles - : numberOfFiles + 1; + private void testCompress252(final int numberOfFiles, final int numberOfNonEmptyFiles) throws Exception { + final int nonEmptyModulus = numberOfNonEmptyFiles != 0 ? numberOfFiles / numberOfNonEmptyFiles : numberOfFiles + 1; int nonEmptyFilesAdded = 0; - output = new File(getTempDirFile(), "COMPRESS252-" + numberOfFiles + "-" + numberOfNonEmptyFiles + ".7z"); + final File output = newTempFile("COMPRESS252-" + numberOfFiles + "-" + numberOfNonEmptyFiles + ".7z"); try (SevenZOutputFile archive = new SevenZOutputFile(output)) { addDir(archive); for (int i = 0; i < numberOfFiles; i++) { - addFile(archive, i, - (i + 1) % nonEmptyModulus == 0 && nonEmptyFilesAdded++ < numberOfNonEmptyFiles); + addFile(archive, i, (i + 1) % nonEmptyModulus == 0 && nonEmptyFilesAdded++ < numberOfNonEmptyFiles); } } verifyCompress252(output, numberOfFiles, numberOfNonEmptyFiles); @@ -251,10 +243,9 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testDeflateWithConfiguration() throws Exception { - output = new File(getTempDirFile(), "deflate-options.7z"); + final File output = newTempFile("deflate-options.7z"); // Deflater.BEST_SPEED - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.DEFLATE, 1))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.DEFLATE, 1))); } @Test @@ -264,7 +255,7 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testDirectoriesAndEmptyFiles() throws Exception { - output = new File(getTempDirFile(), "empties.7z"); + final File output = newTempFile("empties.7z"); final FileTime accessTime = getHundredNanosFileTime(); final Date accessDate = new Date(accessTime.toMillis()); @@ -298,7 +289,7 @@ public class SevenZOutputFileTest extends AbstractTest { entry.setCreationDate(creationDate); entry.setAccessTime(accessTime); outArchive.putArchiveEntry(entry); - outArchive.write(new ByteArrayInputStream(new byte[] {'a'})); + outArchive.write(new ByteArrayInputStream(new byte[] { 'a' })); outArchive.closeArchiveEntry(); entry = new SevenZArchiveEntry(); @@ -444,7 +435,7 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testDirectoriesOnly() throws Exception { - output = new File(getTempDirFile(), "dirs.7z"); + final File output = newTempFile("dirs.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output)) { final SevenZArchiveEntry entry = new SevenZArchiveEntry(); entry.setName("foo/"); @@ -479,13 +470,13 @@ public class SevenZOutputFileTest extends AbstractTest { * Test password-based encryption * * <p> - * As AES/CBC Cipher requires a minimum of 16 bytes file data to be encrypted, some padding logic has been implemented. - * This test checks different file sizes (1, 16..) to ensure code coverage + * As AES/CBC Cipher requires a minimum of 16 bytes file data to be encrypted, some padding logic has been implemented. This test checks different file + * sizes (1, 16..) to ensure code coverage * </p> */ @Test public void testEncrypt() throws Exception { - output = new File(getTempDirFile(), "encrypted.7z"); + final File output = newTempFile("encrypted.7z"); try (SevenZOutputFile outArchive = new SevenZOutputFile(output, "foo".toCharArray())) { addFile(outArchive, 0, 1, null); addFile(outArchive, 1, 16, null); @@ -498,8 +489,7 @@ public class SevenZOutputFileTest extends AbstractTest { try (SevenZFile archive = new SevenZFile(output)) { assertThrows( - PasswordRequiredException.class, - () -> verifyFile(archive, 0), "A password should be needed"); + PasswordRequiredException.class, () -> verifyFile(archive, 0), "A password should be needed"); } try (SevenZFile archive = new SevenZFile(output, "foo".toCharArray())) { @@ -512,7 +502,7 @@ public class SevenZOutputFileTest extends AbstractTest { } private void testFilterRoundTrip(final SevenZMethodConfiguration method) throws Exception { - output = new File(getTempDirFile(), method.getMethod() + "-roundtrip.7z"); + final File output = newTempFile(method.getMethod() + "-roundtrip.7z"); final ArrayList<SevenZMethodConfiguration> methods = new ArrayList<>(); methods.add(method); methods.add(new SevenZMethodConfiguration(SevenZMethod.LZMA2)); @@ -526,34 +516,30 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testLzma2WithIntConfiguration() throws Exception { - output = new File(getTempDirFile(), "lzma2-options.7z"); + final File output = newTempFile("lzma2-options.7z"); // 1 MB dictionary - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA2, 1 << 20))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA2, 1 << 20))); } @Test public void testLzma2WithOptionsConfiguration() throws Exception { - output = new File(getTempDirFile(), "lzma2-options2.7z"); + final File output = newTempFile("lzma2-options2.7z"); final LZMA2Options opts = new LZMA2Options(1); - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA2, opts))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA2, opts))); } @Test public void testLzmaWithIntConfiguration() throws Exception { - output = new File(getTempDirFile(), "lzma-options.7z"); + final File output = newTempFile("lzma-options.7z"); // 1 MB dictionary - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA, 1 << 20))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA, 1 << 20))); } @Test public void testLzmaWithOptionsConfiguration() throws Exception { - output = new File(getTempDirFile(), "lzma-options2.7z"); + final File output = newTempFile("lzma-options2.7z"); final LZMA2Options opts = new LZMA2Options(1); - createAndReadBack(output, Collections - .singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA, opts))); + createAndReadBack(output, Collections.singletonList(new SevenZMethodConfiguration(SevenZMethod.LZMA, opts))); } @Test @@ -567,7 +553,7 @@ public class SevenZOutputFileTest extends AbstractTest { } private void testRoundTrip(final SevenZMethod method) throws Exception { - output = new File(getTempDirFile(), method + "-roundtrip.7z"); + final File output = newTempFile(method + "-roundtrip.7z"); final ArrayList<SevenZMethodConfiguration> methods = new ArrayList<>(); methods.add(new SevenZMethodConfiguration(method)); createAndReadBack(output, methods); @@ -595,7 +581,7 @@ public class SevenZOutputFileTest extends AbstractTest { @Test public void testStackOfContentCompressions() throws Exception { - output = new File(getTempDirFile(), "multiple-methods.7z"); + final File output = newTempFile("multiple-methods.7z"); final ArrayList<SevenZMethodConfiguration> methods = new ArrayList<>(); methods.add(new SevenZMethodConfiguration(SevenZMethod.LZMA2)); methods.add(new SevenZMethodConfiguration(SevenZMethod.COPY)); @@ -626,8 +612,7 @@ public class SevenZOutputFileTest extends AbstractTest { testCompress252(29, 7); } - private void verifyCompress252(final File output, final int numberOfFiles, final int numberOfNonEmptyFiles) - throws Exception { + private void verifyCompress252(final File output, final int numberOfFiles, final int numberOfNonEmptyFiles) throws Exception { int filesFound = 0; int nonEmptyFilesFound = 0; try (SevenZFile archive = new SevenZFile(output)) { @@ -655,8 +640,7 @@ public class SevenZOutputFileTest extends AbstractTest { return verifyFile(archive, index, null); } - private Boolean verifyFile(final SevenZFile archive, final int index, final int size, - final Iterable<SevenZMethodConfiguration> methods) throws Exception { + private Boolean verifyFile(final SevenZFile archive, final int index, final int size, final Iterable<SevenZMethodConfiguration> methods) throws Exception { final SevenZArchiveEntry entry = archive.getNextEntry(); if (entry == null) { return null; @@ -683,8 +667,7 @@ public class SevenZOutputFileTest extends AbstractTest { return Boolean.TRUE; } - private Boolean verifyFile(final SevenZFile archive, final int index, - final Iterable<SevenZMethodConfiguration> methods) throws Exception { + private Boolean verifyFile(final SevenZFile archive, final int index, final Iterable<SevenZMethodConfiguration> methods) throws Exception { return verifyFile(archive, index, 1, methods); } } 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 edc1b0d6..987a5b56 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 @@ -32,7 +32,7 @@ public class ZipSplitOutputStreamTest extends AbstractTest { @Test public void testCreateSplittedFiles() throws IOException { - final File testOutputFile = new File(getTempDirFile(), "testCreateSplittedFiles.zip"); + final File testOutputFile = newTempFile("testCreateSplittedFiles.zip"); final int splitSize = 100 * 1024; /* 100 KB */ final File fileToTest = getFile("COMPRESS-477/split_zip_created_by_zip/zip_to_compare_created_by_zip.zip"); try (ZipSplitOutputStream zipSplitOutputStream = new ZipSplitOutputStream(testOutputFile, splitSize)) { 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 6227350b..6a6a7693 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetRawTypesTest.java @@ -604,7 +604,7 @@ public final class ChangeSetRawTypesTest extends AbstractTest { entry.setUserName("avalon"); entry.setGroupName("excalibur"); entry.setMode(0100000); - final File result = new File(getTempDirFile(), "bla.tar"); + final File result = newTempFile("bla.tar"); final String archiverName = "tar"; try (InputStream inputStream = Files.newInputStream(getPath("bla.tar")); ArchiveInputStream archiveInputStream = factory.createArchiveInputStream(archiverName, inputStream); @@ -695,7 +695,7 @@ public final class ChangeSetRawTypesTest extends AbstractTest { final ChangeSet changeSet = new ChangeSet(); changeSet.delete("test2.xml"); final File input = getFile("bla.ar"); - final File result = new File(getTempDirFile(), "bla.ar"); + final File result = newTempFile("bla.ar"); final String archiverName = "ar"; try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream archiveInputStream = factory.createArchiveInputStream(archiverName, inputStream); @@ -725,7 +725,7 @@ public final class ChangeSetRawTypesTest extends AbstractTest { changeSet.delete(".classpath"); changeSet.delete(".project"); final File input = getFile("bla.jar"); - final File result = new File(getTempDirFile(), "bla.jar"); + final File result = newTempFile("bla.jar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream archiveInputStream = factory.createArchiveInputStream(archiverName, inputStream); OutputStream newOutputStream = Files.newOutputStream(result.toPath()); @@ -748,7 +748,7 @@ public final class ChangeSetRawTypesTest extends AbstractTest { public void testDeleteFromTar() throws Exception { final ChangeSet changeSet = new ChangeSet(); changeSet.delete("test2.xml"); - final File result = new File(getTempDirFile(), "bla.tar"); + final File result = newTempFile("bla.tar"); final String archiverName = "tar"; try (InputStream inputStream = Files.newInputStream(getFile("bla.tar").toPath()); ArchiveInputStream archiveInputStream = factory.createArchiveInputStream(archiverName, inputStream); 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 074920ea..c93d0dfd 100644 --- a/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java +++ b/src/test/java/org/apache/commons/compress/changes/ChangeSetSafeTypesTest.java @@ -553,7 +553,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext final File file1 = getFile("test.txt"); final ArArchiveEntry entry = new ArArchiveEntry("test.txt", file1.length()); final File input = getFile("bla.ar"); - final File result = new File(getTempDirFile(), "bla.ar"); + final File result = newTempFile("bla.ar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<ArArchiveEntry> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(result.toPath()); @@ -584,7 +584,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext final File file1 = getFile("test.txt"); final JarArchiveEntry entry = new JarArchiveEntry("testdata/test.txt"); final File input = getFile("bla.jar"); - final File result = new File(getTempDirFile(), "bla.jar"); + final File result = newTempFile("bla.jar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<JarArchiveEntry> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(result.toPath()); @@ -614,7 +614,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext entry.setGroupName("excalibur"); entry.setMode(0100000); final File input = getFile("bla.tar"); - final File result = new File(getTempDirFile(), "bla.tar"); + final File result = newTempFile("bla.tar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<TarArchiveEntry> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(result.toPath()); @@ -699,7 +699,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext final ChangeSet<E> changeSet = createChangeSet(); changeSet.delete("test2.xml"); final File input = getFile("bla.ar"); - final File temp = new File(getTempDirFile(), "bla.ar"); + final File temp = newTempFile("bla.ar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<E> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(temp.toPath()); @@ -728,7 +728,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext changeSet.delete(".project"); final File input = getFile("bla.jar"); - final File temp = new File(getTempDirFile(), "bla.jar"); + final File temp = newTempFile("bla.jar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<E> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(temp.toPath()); @@ -751,7 +751,7 @@ public final class ChangeSetSafeTypesTest<I extends ArchiveInputStream<E>, O ext final ChangeSet<E> changeSet = createChangeSet(); changeSet.delete("test2.xml"); final File input = getFile("bla.tar"); - final File temp = new File(getTempDirFile(), "bla.tar"); + final File temp = newTempFile("bla.tar"); try (InputStream inputStream = Files.newInputStream(input.toPath()); ArchiveInputStream<E> ais = createArchiveInputStream(archiverName, inputStream); OutputStream outputStream = Files.newOutputStream(temp.toPath()); diff --git a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java index 773b1c75..bae2174c 100644 --- a/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java +++ b/src/test/java/org/apache/commons/compress/compressors/BZip2Test.java @@ -34,7 +34,7 @@ public final class BZip2Test extends AbstractTest { @Test public void testBzip2Unarchive() throws Exception { final File input = getFile("bla.txt.bz2"); - final File output = new File(getTempDirFile(), "bla.txt"); + final File output = newTempFile("bla.txt"); try (final InputStream is = Files.newInputStream(input.toPath()); CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("bzip2", is)) { Files.copy(in, output.toPath()); @@ -46,14 +46,14 @@ public final class BZip2Test extends AbstractTest { File output; final File input = getFile("test.txt"); { - output = new File(getTempDirFile(), "test.txt.bz2"); + output = newTempFile("test.txt.bz2"); try (OutputStream out = Files.newOutputStream(output.toPath()); final CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("bzip2", out)) { Files.copy(input.toPath(), cos); } } - final File decompressed = new File(getTempDirFile(), "decompressed.txt"); + final File decompressed = newTempFile("decompressed.txt"); { try (InputStream is = Files.newInputStream(output.toPath()); CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("bzip2", is)) { diff --git a/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java index b2fa598a..3b094d02 100644 --- a/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/DeflateTest.java @@ -39,7 +39,7 @@ public final class DeflateTest extends AbstractTest { @Test public void testDeflateCreation() throws Exception { final File input = getFile("test1.xml"); - final File output = new File(getTempDirFile(), "test1.xml.deflatez"); + final File output = newTempFile("test1.xml.deflatez"); try (OutputStream out = Files.newOutputStream(output.toPath())) { try (CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("deflate", out)) { Files.copy(input.toPath(), cos); @@ -55,7 +55,7 @@ public final class DeflateTest extends AbstractTest { @Test public void testDeflateUnarchive() throws Exception { final File input = getFile("bla.tar.deflatez"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { // zlib header is expected by default try (CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("deflate", is)) { @@ -72,7 +72,7 @@ public final class DeflateTest extends AbstractTest { @Test public void testRawDeflateCreation() throws Exception { final File input = getFile("test1.xml"); - final File output = new File(getTempDirFile(), "test1.xml.deflate"); + final File output = newTempFile("test1.xml.deflate"); try (OutputStream out = Files.newOutputStream(output.toPath())) { final DeflateParameters params = new DeflateParameters(); params.setWithZlibHeader(false); @@ -90,7 +90,7 @@ public final class DeflateTest extends AbstractTest { @Test public void testRawDeflateUnarchive() throws Exception { final File input = getFile("bla.tar.deflate"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { final DeflateParameters params = new DeflateParameters(); params.setWithZlibHeader(false); diff --git a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java index 1153983a..3d3f5983 100644 --- a/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/FramedSnappyTest.java @@ -62,7 +62,7 @@ public final class FramedSnappyTest private void testRoundtrip(final File input) throws Exception { final long start = System.currentTimeMillis(); - final File outputSz = new File(getTempDirFile(), input.getName() + ".sz"); + final File outputSz = newTempFile(input.getName() + ".sz"); try (OutputStream os = Files.newOutputStream(outputSz.toPath()); CompressorOutputStream sos = new CompressorStreamFactory().createCompressorOutputStream("snappy-framed", os)) { Files.copy(input.toPath(), sos); @@ -81,14 +81,14 @@ public final class FramedSnappyTest @Test public void testRoundtripWithOneBigWrite() throws Exception { final Random r = new Random(); - final File input = new File(getTempDirFile(), "bigChunkTest"); + final File input = newTempFile("bigChunkTest"); try (OutputStream fs = Files.newOutputStream(input.toPath())) { for (int i = 0 ; i < 1 << 17; i++) { fs.write(r.nextInt(256)); } } final long start = System.currentTimeMillis(); - final File outputSz = new File(getTempDirFile(), input.getName() + ".sz"); + final File outputSz = newTempFile(input.getName() + ".sz"); try (InputStream is = Files.newInputStream(input.toPath()); OutputStream os = Files.newOutputStream(outputSz.toPath()); CompressorOutputStream sos = new CompressorStreamFactory() @@ -110,7 +110,7 @@ public final class FramedSnappyTest private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.sz"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { // the intermediate BufferedInputStream is there for mark // support in the autodetection test diff --git a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java index 0a0d9d45..e61e48da 100644 --- a/src/test/java/org/apache/commons/compress/compressors/GZipTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/GZipTest.java @@ -115,7 +115,7 @@ public final class GZipTest extends AbstractTest { @Test public void testGzipCreation() throws Exception { final File input = getFile("test1.xml"); - final File output = new File(getTempDirFile(), "test1.xml.gz"); + final File output = newTempFile("test1.xml.gz"); try (OutputStream out = Files.newOutputStream(output.toPath())) { try (CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("gz", out)) { Files.copy(input.toPath(), cos); @@ -126,7 +126,7 @@ public final class GZipTest extends AbstractTest { @Test public void testGzipUnarchive() throws Exception { final File input = getFile("bla.tgz"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { try (CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("gz", is);) { Files.copy(in, output.toPath()); diff --git a/src/test/java/org/apache/commons/compress/compressors/LZMATest.java b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java index ac082774..fe4c47ce 100644 --- a/src/test/java/org/apache/commons/compress/compressors/LZMATest.java +++ b/src/test/java/org/apache/commons/compress/compressors/LZMATest.java @@ -38,7 +38,7 @@ public final class LZMATest extends AbstractTest { @Test public void testLzmaRoundtrip() throws Exception { final File input = getFile("test1.xml"); - final File compressed = new File(getTempDirFile(), "test1.xml.xz"); + final File compressed = newTempFile("test1.xml.xz"); try (OutputStream out = Files.newOutputStream(compressed.toPath())) { try (CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("lzma", out)) { Files.copy(input.toPath(), cos); @@ -55,7 +55,7 @@ public final class LZMATest extends AbstractTest { @Test public void testLZMAUnarchive() throws Exception { final File input = getFile("bla.tar.lzma"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { try (final CompressorInputStream in = new LZMACompressorInputStream(is)) { Files.copy(in, output.toPath()); @@ -66,7 +66,7 @@ public final class LZMATest extends AbstractTest { @Test public void testLZMAUnarchiveWithAutodetection() throws Exception { final File input = getFile("bla.tar.lzma"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = new BufferedInputStream(Files.newInputStream(input.toPath()))) { try (final CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream(is)) { Files.copy(in, output.toPath()); diff --git a/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java b/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java index cf98b2ed..167ddbac 100644 --- a/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java +++ b/src/test/java/org/apache/commons/compress/compressors/Pack200Test.java @@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test; public final class Pack200Test extends AbstractTest { private void jarArchiveCreation(final Pack200Strategy mode) throws Exception { - final File output = new File(getTempDirFile(), "bla.pack"); + final File output = newTempFile("bla.pack"); final File file1 = getFile("test1.xml"); final File file2 = getFile("test2.xml"); @@ -82,7 +82,7 @@ public final class Pack200Test extends AbstractTest { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - final File archiveEntry = new File(getTempDirFile(), entry.getName()); + final File archiveEntry = newTempFile(entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); @@ -197,7 +197,7 @@ public final class Pack200Test extends AbstractTest { @Test public void testOutputStreamMethods() throws Exception { - final File output = new File(getTempDirFile(), "bla.pack"); + final File output = newTempFile("bla.pack"); final Map<String, String> m = new HashMap<>(); m.put("foo", "bar"); try (OutputStream out = Files.newOutputStream(output.toPath()); diff --git a/src/test/java/org/apache/commons/compress/compressors/XZTest.java b/src/test/java/org/apache/commons/compress/compressors/XZTest.java index f71357b1..2eba626b 100644 --- a/src/test/java/org/apache/commons/compress/compressors/XZTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/XZTest.java @@ -61,7 +61,7 @@ public final class XZTest extends AbstractTest { final long max = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax(); System.out.println("XZTestCase: HeapMax=" + max + " bytes " + (double) max / (1024 * 1024) + " MB"); final File input = getFile("test1.xml"); - final File output = new File(getTempDirFile(), "test1.xml.xz"); + final File output = newTempFile("test1.xml.xz"); try (OutputStream out = Files.newOutputStream(output.toPath())) { try (CompressorOutputStream cos = new CompressorStreamFactory().createCompressorOutputStream("xz", out)) { Files.copy(input.toPath(), cos); @@ -72,7 +72,7 @@ public final class XZTest extends AbstractTest { @Test public void testXZUnarchive() throws Exception { final File input = getFile("bla.tar.xz"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { try (CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("xz", is)) { Files.copy(in, output.toPath()); diff --git a/src/test/java/org/apache/commons/compress/compressors/ZTest.java b/src/test/java/org/apache/commons/compress/compressors/ZTest.java index 0449b3e0..80b8e58b 100644 --- a/src/test/java/org/apache/commons/compress/compressors/ZTest.java +++ b/src/test/java/org/apache/commons/compress/compressors/ZTest.java @@ -43,7 +43,7 @@ public final class ZTest extends AbstractTest { private void testUnarchive(final StreamWrapper<CompressorInputStream> wrapper) throws Exception { final File input = getFile("bla.tar.Z"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { try (InputStream in = wrapper.wrap(is)) { Files.copy(in, output.toPath()); 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 66c906ff..0eecbb2c 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 @@ -66,7 +66,7 @@ public class BrotliCompressorInputStreamTest extends AbstractTest { @Test public void testBrotliUnarchive() throws Exception { - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = newInputStream("bla.tar.br")) { try (CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("br", is)) { Files.copy(in, output.toPath()); 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 ccb9b949..08b197ef 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 @@ -67,7 +67,7 @@ public final class BlockLZ4CompressorRoundtripTest extends AbstractTest { private void roundTripTest(final String testFile, final String config, final Parameters params) throws IOException { final File input = getFile(testFile); long start = System.currentTimeMillis(); - final File outputSz = new File(getTempDirFile(), input.getName() + ".block.lz4"); + final File outputSz = newTempFile(input.getName() + ".block.lz4"); try (OutputStream os = Files.newOutputStream(outputSz.toPath()); BlockLZ4CompressorOutputStream los = new BlockLZ4CompressorOutputStream(os, params)) { Files.copy(input.toPath(), los); } 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 02a6ae49..cb31a304 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 @@ -80,7 +80,7 @@ public final class FramedLZ4CompressorRoundtripTest extends AbstractTest { private void roundTripTest(final String testFile, final FramedLZ4CompressorOutputStream.Parameters params) throws IOException { final File input = getFile(testFile); long start = System.currentTimeMillis(); - final File outputSz = new File(getTempDirFile(), input.getName() + ".framed.lz4"); + final File outputSz = newTempFile(input.getName() + ".framed.lz4"); byte[] expected; try (InputStream is = Files.newInputStream(input.toPath())) { expected = IOUtils.toByteArray(is); 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 b4001cac..6781e051 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 @@ -41,7 +41,7 @@ public final class Pack200UtilsTest extends AbstractTest { ArchiveInputStream<?> in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("jar", is)) { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - final File archiveEntry = new File(getTempDirFile(), entry.getName()); + final File archiveEntry = newTempFile(entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); @@ -66,7 +66,7 @@ public final class Pack200UtilsTest extends AbstractTest { ArchiveInputStream<?> in = ArchiveStreamFactory.DEFAULT.createArchiveInputStream("jar", is)) { ArchiveEntry entry = in.getNextEntry(); while (entry != null) { - final File archiveEntry = new File(getTempDirFile(), entry.getName()); + final File archiveEntry = newTempFile(entry.getName()); archiveEntry.getParentFile().mkdirs(); if (entry.isDirectory()) { archiveEntry.mkdir(); 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 6219ba2f..74a7cedc 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 @@ -73,8 +73,8 @@ public final class FramedSnappyCompressorInputStreamTest extends AbstractTest { */ @Test public void testLoremIpsum() throws Exception { - final File outputSz = new File(getTempDirFile(), "lorem-ipsum.1"); - final File outputGz = new File(getTempDirFile(), "lorem-ipsum.2"); + final File outputSz = newTempFile("lorem-ipsum.1"); + final File outputGz = newTempFile("lorem-ipsum.2"); try (InputStream isSz = newInputStream("lorem-ipsum.txt.sz")) { try (InputStream in = new FramedSnappyCompressorInputStream(isSz)) { Files.copy(in, outputSz.toPath()); @@ -115,7 +115,7 @@ public final class FramedSnappyCompressorInputStreamTest extends AbstractTest { try (ZipFile zip = new ZipFile(getFile("testNumbersNew.numbers"))) { try (InputStream is = zip.getInputStream(zip.getEntry("Index/Document.iwa"))) { try (FramedSnappyCompressorInputStream in = new FramedSnappyCompressorInputStream(is, FramedSnappyDialect.IWORK_ARCHIVE)) { - Files.copy(in, new File(getTempDirFile(), "snappyIWATest.raw").toPath()); + Files.copy(in, newTempFile("snappyIWATest.raw").toPath()); } } } @@ -126,7 +126,7 @@ public final class FramedSnappyCompressorInputStreamTest extends AbstractTest { */ @Test public void testReadIWAFileWithBiggerOffset() throws Exception { - final File o = new File(getTempDirFile(), "COMPRESS-358.raw"); + final File o = newTempFile("COMPRESS-358.raw"); try (InputStream is = newInputStream("COMPRESS-358.iwa"); FramedSnappyCompressorInputStream in = new FramedSnappyCompressorInputStream(is, 1 << 16, FramedSnappyDialect.IWORK_ARCHIVE);) { Files.copy(in, o.toPath()); 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 4e403f4b..c77965dc 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 @@ -67,7 +67,7 @@ public final class SnappyRoundtripTest extends AbstractTest { private void roundTripTest(final File input, final Parameters params) throws IOException { long start = System.currentTimeMillis(); - final File outputSz = new File(getTempDirFile(), input.getName() + ".raw.sz"); + final File outputSz = newTempFile(input.getName() + ".raw.sz"); try (OutputStream os = Files.newOutputStream(outputSz.toPath()); SnappyCompressorOutputStream sos = new SnappyCompressorOutputStream(os, input.length(), params)) { Files.copy(input.toPath(), sos); @@ -139,7 +139,7 @@ public final class SnappyRoundtripTest extends AbstractTest { // Start with the four byte sequence 0000 after that add > 64k // of random noise that doesn't contain any 0000 at all, then // add 0000. - final File f = new File(getTempDirFile(), "reallyBigOffsetTest"); + final File f = newTempFile("reallyBigOffsetTest"); final ByteArrayOutputStream fs = new ByteArrayOutputStream((1<<16) + 1024); fs.write(0); fs.write(0); @@ -173,7 +173,7 @@ public final class SnappyRoundtripTest extends AbstractTest { // The four byte methods would require even more luck and a // buffer (and a file written to disk) that was 2^5 bigger // than the buffer used here. - final File f = new File(getTempDirFile(), "reallyBigLiteralTest"); + final File f = newTempFile("reallyBigLiteralTest"); try (OutputStream fs = Files.newOutputStream(f.toPath())) { final int cnt = 1 << 19; final Random r = new Random(); 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 61437f88..0764c9ea 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 @@ -122,7 +122,7 @@ public class ZstdCompressorInputStreamTest extends AbstractTest { @Test public void testZstandardUnarchive() throws Exception { final File input = getFile("bla.tar.zst"); - final File output = new File(getTempDirFile(), "bla.tar"); + final File output = newTempFile("bla.tar"); try (InputStream is = Files.newInputStream(input.toPath())) { try (CompressorInputStream in = new CompressorStreamFactory().createCompressorInputStream("zstd", is);) { Files.copy(in, output.toPath()); 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 8dce6fea..44bab993 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 @@ -42,7 +42,7 @@ public class ZstdRoundtripTest extends AbstractTest { private void roundtrip(final OutputStreamCreator oc) throws IOException { final File input = getFile("bla.tar"); long start = System.currentTimeMillis(); - final File output = new File(getTempDirFile(), input.getName() + ".zstd"); + final File output = newTempFile(input.getName() + ".zstd"); try (FileOutputStream os = new FileOutputStream(output); ZstdCompressorOutputStream zos = oc.wrap(os)) { Files.copy(input.toPath(), zos); @@ -68,7 +68,7 @@ public class ZstdRoundtripTest extends AbstractTest { public void testFactoryRoundtrip() throws Exception { final File input = getFile("bla.tar"); long start = System.currentTimeMillis(); - final File output = new File(getTempDirFile(), input.getName() + ".zstd"); + final File output = newTempFile(input.getName() + ".zstd"); try (OutputStream os = Files.newOutputStream(output.toPath()); CompressorOutputStream zos = new CompressorStreamFactory().createCompressorOutputStream("zstd", os)) { Files.copy(input.toPath(), zos);
