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
The following commit(s) were added to refs/heads/master by this push: new 0549c03a Use try-with-resources 0549c03a is described below commit 0549c03a187713cdc091b4f084d5f9f4c4b7019b Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sat Nov 4 06:37:02 2023 -0400 Use try-with-resources --- .../archivers/zip/ZipSplitOutputStreamTest.java | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) 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 6d74839e..20eaf954 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 @@ -34,19 +34,16 @@ public class ZipSplitOutputStreamTest extends AbstractTestCase { public void testCreateSplittedFiles() throws IOException { final File testOutputFile = new File(getTempDirFile(), "testCreateSplittedFiles.zip"); final int splitSize = 100 * 1024; /* 100 KB */ - final ZipSplitOutputStream zipSplitOutputStream = new ZipSplitOutputStream(testOutputFile, splitSize); - final File fileToTest = getFile("COMPRESS-477/split_zip_created_by_zip/zip_to_compare_created_by_zip.zip"); - try (InputStream inputStream = Files.newInputStream(fileToTest.toPath())) { - final byte[] buffer = new byte[4096]; - int readLen; - - while ((readLen = inputStream.read(buffer)) > 0) { - zipSplitOutputStream.write(buffer, 0, readLen); + try (ZipSplitOutputStream zipSplitOutputStream = new ZipSplitOutputStream(testOutputFile, splitSize)) { + try (InputStream inputStream = Files.newInputStream(fileToTest.toPath())) { + final byte[] buffer = new byte[4096]; + int readLen; + while ((readLen = inputStream.read(buffer)) > 0) { + zipSplitOutputStream.write(buffer, 0, readLen); + } } - } - zipSplitOutputStream.close(); File zipFile = new File(getTempDirFile().getPath(), "testCreateSplittedFiles.z01"); assertEquals(zipFile.length(), splitSize); @@ -70,13 +67,12 @@ public class ZipSplitOutputStreamTest extends AbstractTestCase { @Test public void testSplitZipBeginsWithZipSplitSignature() throws IOException { final File tempFile = createTempFile("temp", "zip"); - new ZipSplitOutputStream(tempFile, 100 * 1024L); - - final InputStream inputStream = Files.newInputStream(tempFile.toPath()); - final byte[] buffer = new byte[4]; - inputStream.read(buffer); - - assertEquals(ByteBuffer.wrap(ZipArchiveOutputStream.DD_SIG).getInt(), ByteBuffer.wrap(buffer).getInt()); + try (ZipSplitOutputStream is = new ZipSplitOutputStream(tempFile, 100 * 1024L); + InputStream inputStream = Files.newInputStream(tempFile.toPath())) { + final byte[] buffer = new byte[4]; + inputStream.read(buffer); + assertEquals(ByteBuffer.wrap(ZipArchiveOutputStream.DD_SIG).getInt(), ByteBuffer.wrap(buffer).getInt()); + } } @Test