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 f11fe5aa1 Use Assertions.assertInstanceOf()
f11fe5aa1 is described below
commit f11fe5aa19c83939ccd55f8df08472faf2e711f9
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Sep 1 18:49:10 2024 -0400
Use Assertions.assertInstanceOf()
---
.../commons/compress/DetectArchiverTest.java | 22 +++++++++----------
.../archivers/ArchiveStreamFactoryTest.java | 3 ++-
.../commons/compress/archivers/LongPathTest.java | 9 ++++----
.../compress/archivers/LongSymLinkTest.java | 9 ++++----
.../archivers/zip/ZipMemoryFileSystemTest.java | 5 +++--
.../compress/compressors/DetectCompressorTest.java | 25 +++++++++++-----------
.../ZipSplitReadOnlySeekableByteChannelTest.java | 14 ++++++------
7 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/DetectArchiverTest.java
b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java
index 623edbc1b..ca97900b7 100644
--- a/src/test/java/org/apache/commons/compress/DetectArchiverTest.java
+++ b/src/test/java/org/apache/commons/compress/DetectArchiverTest.java
@@ -21,9 +21,9 @@ package org.apache.commons.compress;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -79,7 +79,7 @@ public final class DetectArchiverTest extends AbstractTest {
public void testCOMPRESS_117() throws Exception {
try (ArchiveInputStream<?> tar =
createArchiveInputStream("COMPRESS-117.tar")) {
assertNotNull(tar);
- assertTrue(tar instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, tar);
}
}
@@ -87,7 +87,7 @@ public final class DetectArchiverTest extends AbstractTest {
public void testCOMPRESS_335() throws Exception {
try (ArchiveInputStream<?> tar =
createArchiveInputStream("COMPRESS-335.tar")) {
assertNotNull(tar);
- assertTrue(tar instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, tar);
}
}
@@ -96,38 +96,38 @@ public final class DetectArchiverTest extends AbstractTest {
try (ArchiveInputStream<?> ar = createArchiveInputStream("bla.ar")) {
assertNotNull(ar);
- assertTrue(ar instanceof ArArchiveInputStream);
+ assertInstanceOf(ArArchiveInputStream.class, ar);
}
try (ArchiveInputStream<?> tar = createArchiveInputStream("bla.tar")) {
assertNotNull(tar);
- assertTrue(tar instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, tar);
}
try (ArchiveInputStream<?> zip = createArchiveInputStream("bla.zip")) {
assertNotNull(zip);
- assertTrue(zip instanceof ZipArchiveInputStream);
+ assertInstanceOf(ZipArchiveInputStream.class, zip);
}
try (ArchiveInputStream<?> jar = createArchiveInputStream("bla.jar")) {
assertNotNull(jar);
- assertTrue(jar instanceof ZipArchiveInputStream);
+ assertInstanceOf(ZipArchiveInputStream.class, jar);
}
try (ArchiveInputStream<?> cpio =
createArchiveInputStream("bla.cpio")) {
assertNotNull(cpio);
- assertTrue(cpio instanceof CpioArchiveInputStream);
+ assertInstanceOf(CpioArchiveInputStream.class, cpio);
}
try (ArchiveInputStream<?> arj = createArchiveInputStream("bla.arj")) {
assertNotNull(arj);
- assertTrue(arj instanceof ArjArchiveInputStream);
+ assertInstanceOf(ArjArchiveInputStream.class, arj);
}
// Not yet implemented
// final ArchiveInputStream<?> tgz = getStreamFor("bla.tgz");
// assertNotNull(tgz);
-// assertTrue(tgz instanceof TarArchiveInputStream);
+// assertInstanceOf(TarArchiveInputStream.class, tgz);
}
@@ -147,7 +147,7 @@ public final class DetectArchiverTest extends AbstractTest {
public void testDetectOldTarFormatArchive() throws Exception {
try (ArchiveInputStream<?> tar =
createArchiveInputStream("COMPRESS-612/test-times-star-folder.tar")) {
assertNotNull(tar);
- assertTrue(tar instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, tar);
}
}
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 3cfb6c30c..033794b1c 100644
---
a/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/ArchiveStreamFactoryTest.java
@@ -19,6 +19,7 @@
package org.apache.commons.compress.archivers;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -414,7 +415,7 @@ public class ArchiveStreamFactoryTest extends AbstractTest {
try (InputStream fis = newInputStream("COMPRESS-208.zip")) {
try (InputStream bis = new BufferedInputStream(fis)) {
try (ArchiveInputStream<?> ais =
ArchiveStreamFactory.DEFAULT.createArchiveInputStream(bis)) {
- assertTrue(ais instanceof ZipArchiveInputStream);
+ assertInstanceOf(ZipArchiveInputStream.class, ais);
}
}
}
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 39eac81dd..211a0585b 100644
--- a/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/LongPathTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.compress.archivers;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -107,11 +108,11 @@ public class LongPathTest extends AbstractTest {
try (ArchiveInputStream<?> ais = factory.createArchiveInputStream(new
BufferedInputStream(Files.newInputStream(file.toPath())))) {
// check if expected type recognized
if (name.endsWith(".tar")) {
- assertTrue(ais instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, ais);
} else if (name.endsWith(".jar") || name.endsWith(".zip")) {
- assertTrue(ais instanceof ZipArchiveInputStream);
+ assertInstanceOf(ZipArchiveInputStream.class, ais);
} else if (name.endsWith(".cpio")) {
- assertTrue(ais instanceof CpioArchiveInputStream);
+ assertInstanceOf(CpioArchiveInputStream.class, ais);
// Hack: cpio does not add trailing "/" to directory names
for (int i = 0; i < expected.size(); i++) {
final String ent = expected.get(i);
@@ -120,7 +121,7 @@ public class LongPathTest extends AbstractTest {
}
}
} else if (name.endsWith(".ar")) {
- assertTrue(ais instanceof ArArchiveInputStream);
+ assertInstanceOf(ArArchiveInputStream.class, ais);
// CPIO does not store directories or directory names
expected.clear();
for (final String ent : FILELIST) {
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 1ae22f1ed..b9ee38ed3 100644
--- a/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/LongSymLinkTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.compress.archivers;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -106,11 +107,11 @@ public class LongSymLinkTest extends AbstractTest {
try (ArchiveInputStream<?> ais = factory.createArchiveInputStream(new
BufferedInputStream(Files.newInputStream(file.toPath())))) {
// check if expected type recognized
if (name.endsWith(".tar")) {
- assertTrue(ais instanceof TarArchiveInputStream);
+ assertInstanceOf(TarArchiveInputStream.class, ais);
} else if (name.endsWith(".jar") || name.endsWith(".zip")) {
- assertTrue(ais instanceof ZipArchiveInputStream);
+ assertInstanceOf(ZipArchiveInputStream.class, ais);
} else if (name.endsWith(".cpio")) {
- assertTrue(ais instanceof CpioArchiveInputStream);
+ assertInstanceOf(CpioArchiveInputStream.class, ais);
// Hack: cpio does not add trailing "/" to directory names
for (int i = 0; i < expected.size(); i++) {
final String ent = expected.get(i);
@@ -119,7 +120,7 @@ public class LongSymLinkTest extends AbstractTest {
}
}
} else if (name.endsWith(".ar")) {
- assertTrue(ais instanceof ArArchiveInputStream);
+ assertInstanceOf(ArArchiveInputStream.class, ais);
// CPIO does not store directories or directory names
expected.clear();
for (final String ent : FILELIST) {
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 68d5f48a6..ef22f11b8 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
@@ -22,6 +22,7 @@ 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;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
@@ -107,11 +108,11 @@ public class ZipMemoryFileSystemTest {
list.add(secondFile);
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forPaths(lastFile, list)) {
- assertTrue(channel instanceof
ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forPaths(firstFile, secondFile, lastFile)) {
- assertTrue(channel instanceof
ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
index 3fae47b8f..bfc04f82f 100644
---
a/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/DetectCompressorTest.java
@@ -21,6 +21,7 @@ package org.apache.commons.compress.compressors;
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.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -168,32 +169,32 @@ public final class DetectCompressorTest {
public void testCreateLimitedByName() throws Exception {
try (CompressorInputStream bzip2 =
createCompressorInputStream("bla.txt.bz2",
Collections.singleton(CompressorStreamFactory.BZIP2))) {
assertNotNull(bzip2);
- assertTrue(bzip2 instanceof BZip2CompressorInputStream);
+ assertInstanceOf(BZip2CompressorInputStream.class, bzip2);
}
try (CompressorInputStream gzip =
createCompressorInputStream("bla.tgz",
Collections.singleton(CompressorStreamFactory.GZIP))) {
assertNotNull(gzip);
- assertTrue(gzip instanceof GzipCompressorInputStream);
+ assertInstanceOf(GzipCompressorInputStream.class, gzip);
}
try (CompressorInputStream pack200 =
createCompressorInputStream("bla.pack",
Collections.singleton(CompressorStreamFactory.PACK200))) {
assertNotNull(pack200);
- assertTrue(pack200 instanceof Pack200CompressorInputStream);
+ assertInstanceOf(Pack200CompressorInputStream.class, pack200);
}
try (CompressorInputStream xz =
createCompressorInputStream("bla.tar.xz",
Collections.singleton(CompressorStreamFactory.XZ))) {
assertNotNull(xz);
- assertTrue(xz instanceof XZCompressorInputStream);
+ assertInstanceOf(XZCompressorInputStream.class, xz);
}
try (CompressorInputStream zlib =
createCompressorInputStream("bla.tar.deflatez",
Collections.singleton(CompressorStreamFactory.DEFLATE))) {
assertNotNull(zlib);
- assertTrue(zlib instanceof DeflateCompressorInputStream);
+ assertInstanceOf(DeflateCompressorInputStream.class, zlib);
}
try (CompressorInputStream zstd =
createCompressorInputStream("bla.tar.zst",
Collections.singleton(CompressorStreamFactory.ZSTANDARD))) {
assertNotNull(zstd);
- assertTrue(zstd instanceof ZstdCompressorInputStream);
+ assertInstanceOf(ZstdCompressorInputStream.class, zstd);
}
}
@@ -211,32 +212,32 @@ public final class DetectCompressorTest {
public void testCreateWithAutoDetection() throws Exception {
try (CompressorInputStream bzip2 =
createCompressorInputStream("bla.txt.bz2")) {
assertNotNull(bzip2);
- assertTrue(bzip2 instanceof BZip2CompressorInputStream);
+ assertInstanceOf(BZip2CompressorInputStream.class, bzip2);
}
try (CompressorInputStream gzip =
createCompressorInputStream("bla.tgz")) {
assertNotNull(gzip);
- assertTrue(gzip instanceof GzipCompressorInputStream);
+ assertInstanceOf(GzipCompressorInputStream.class, gzip);
}
try (CompressorInputStream pack200 =
createCompressorInputStream("bla.pack")) {
assertNotNull(pack200);
- assertTrue(pack200 instanceof Pack200CompressorInputStream);
+ assertInstanceOf(Pack200CompressorInputStream.class, pack200);
}
try (CompressorInputStream xz =
createCompressorInputStream("bla.tar.xz")) {
assertNotNull(xz);
- assertTrue(xz instanceof XZCompressorInputStream);
+ assertInstanceOf(XZCompressorInputStream.class, xz);
}
try (CompressorInputStream zlib =
createCompressorInputStream("bla.tar.deflatez")) {
assertNotNull(zlib);
- assertTrue(zlib instanceof DeflateCompressorInputStream);
+ assertInstanceOf(DeflateCompressorInputStream.class, zlib);
}
try (CompressorInputStream zstd =
createCompressorInputStream("bla.tar.zst")) {
assertNotNull(zstd);
- assertTrue(zstd instanceof ZstdCompressorInputStream);
+ assertInstanceOf(ZstdCompressorInputStream.class, zstd);
}
assertThrows(CompressorException.class, () ->
factory.createCompressorInputStream(new
ByteArrayInputStream(ByteUtils.EMPTY_BYTE_ARRAY)));
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 6ab21ef79..5a66585a5 100644
---
a/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/ZipSplitReadOnlySeekableByteChannelTest.java
@@ -20,9 +20,9 @@ package org.apache.commons.compress.utils;
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.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
@@ -100,11 +100,11 @@ public class ZipSplitReadOnlySeekableByteChannelTest {
list.add(secondFile);
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forFiles(lastFile, list)) {
- assertTrue(channel instanceof ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forFiles(firstFile, secondFile, lastFile)) {
- assertTrue(channel instanceof ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
}
@@ -134,11 +134,11 @@ public class ZipSplitReadOnlySeekableByteChannelTest {
@SuppressWarnings("resource") // try-with-resources closes
final SeekableByteChannel channel1 =
ZipSplitReadOnlySeekableByteChannel.forOrderedSeekableByteChannels(lastChannel,
channels);
- assertTrue(channel1 instanceof
ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel1);
@SuppressWarnings("resource") // try-with-resources closes
final SeekableByteChannel channel2 =
ZipSplitReadOnlySeekableByteChannel.forOrderedSeekableByteChannels(firstChannel,
secondChannel, lastChannel);
- assertTrue(channel2 instanceof
ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel2);
}
}
@@ -171,11 +171,11 @@ public class ZipSplitReadOnlySeekableByteChannelTest {
list.add(secondFile);
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forPaths(lastFile, list)) {
- assertTrue(channel instanceof ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
try (SeekableByteChannel channel =
ZipSplitReadOnlySeekableByteChannel.forPaths(firstFile, secondFile, lastFile)) {
- assertTrue(channel instanceof ZipSplitReadOnlySeekableByteChannel);
+ assertInstanceOf(ZipSplitReadOnlySeekableByteChannel.class,
channel);
}
}
