This is an automated email from the ASF dual-hosted git repository.
bodewig 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 e893413 COMPRESS-577 - Simplify assertion
new e404cbc Merge pull request #193 from
arturobernalg/feature/COMPRESS-577
e893413 is described below
commit e893413aed7433646989a3f2ef7d7cc9491d9d7b
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sat May 22 14:01:11 2021 +0200
COMPRESS-577 - Simplify assertion
---
.../apache/commons/compress/ArchiveUtilsTest.java | 3 +-
.../compress/archivers/sevenz/SevenZFileTest.java | 3 +-
.../archivers/sevenz/SevenZOutputFileTest.java | 2 +-
.../archivers/tar/TarArchiveInputStreamTest.java | 7 ++--
.../compress/archivers/zip/AsiExtraFieldTest.java | 9 ++---
.../archivers/zip/GeneralPurposeBitTest.java | 13 ++++---
.../compress/archivers/zip/X000A_NTFSTest.java | 3 +-
.../archivers/zip/X5455_ExtendedTimestampTest.java | 20 +++++------
.../compress/archivers/zip/X7875_NewUnixTest.java | 42 +++++++++++-----------
.../archivers/zip/ZipArchiveEntryTest.java | 9 ++---
.../archivers/zip/ZipEightByteIntegerTest.java | 14 ++++----
.../compress/archivers/zip/ZipLongTest.java | 14 ++++----
.../compress/archivers/zip/ZipShortTest.java | 14 ++++----
.../compress/archivers/zip/ZipUtilTest.java | 8 ++---
.../brotli/BrotliCompressorInputStreamTest.java | 2 +-
.../Deflate64CompressorInputStreamTest.java | 7 ++--
.../utils/ChecksumCalculatingInputStreamTest.java | 4 +--
17 files changed, 89 insertions(+), 85 deletions(-)
diff --git a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
index 5ee9a43..c361ebf 100644
--- a/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
+++ b/src/test/java/org/apache/commons/compress/ArchiveUtilsTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
public class ArchiveUtilsTest extends AbstractTestCase {
@@ -151,6 +152,6 @@ public class ArchiveUtilsTest extends AbstractTestCase {
}
private void asciiToByteAndBackFail(final String inputString) {
-
assertFalse(inputString.equals(ArchiveUtils.toAsciiString(ArchiveUtils.toAsciiBytes(inputString))));
+ assertNotEquals(inputString,
ArchiveUtils.toAsciiString(ArchiveUtils.toAsciiBytes(inputString)));
}
}
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 7691a01..7dde40a 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
@@ -107,8 +107,7 @@ public class SevenZFileTest extends AbstractTestCase {
if (entry.hasStream()) {
assertTrue(entriesByName.containsKey(entry.getName()));
final byte[] content = readFully(archive);
- assertTrue("Content mismatch on: " + fileName + "!" +
entry.getName(),
- Arrays.equals(content,
entriesByName.get(entry.getName())));
+ assertArrayEquals("Content mismatch on: " + fileName +
"!" + entry.getName(), content, entriesByName.get(entry.getName()));
}
}
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 6ff0e20..43237ad 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
@@ -542,7 +542,7 @@ public class SevenZOutputFileTest extends AbstractTestCase {
return null;
}
assertEquals("foo/" + index + ".txt", entry.getName());
- assertEquals(false, entry.isDirectory());
+ assertFalse(entry.isDirectory());
if (entry.getSize() == 0) {
return Boolean.FALSE;
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
index 03d1318..a49ade9 100644
---
a/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStreamTest.java
@@ -20,8 +20,9 @@ package org.apache.commons.compress.archivers.tar;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -254,8 +255,8 @@ public class TarArchiveInputStreamTest extends
AbstractTestCase {
weaselEntry.setSize(entry.getSize());
is.setCurrentEntry(weaselEntry);
assertEquals(entry,is.getCurrentEntry());
- assertFalse(entry == is.getCurrentEntry());
- assertTrue(weaselEntry == is.getCurrentEntry());
+ assertNotSame(entry, is.getCurrentEntry());
+ assertSame(weaselEntry, is.getCurrentEntry());
try {
is.setCurrentEntry(null);
is.read();
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
index a45200e..eee2c46 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
@@ -19,6 +19,7 @@
package org.apache.commons.compress.archivers.zip;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -94,8 +95,8 @@ public class AsiExtraFieldTest implements UnixStat {
a.parseFromLocalFileData(data, 0, data.length);
assertEquals("length plain file", data.length,
a.getLocalFileDataLength().getValue());
- assertTrue("plain file, no link", !a.isLink());
- assertTrue("plain file, no dir", !a.isDirectory());
+ assertFalse("plain file, no link", a.isLink());
+ assertFalse("plain file, no dir", a.isDirectory());
assertEquals("mode plain file", FILE_FLAG | 0123, a.getMode());
assertEquals("uid plain file", 5, a.getUserId());
assertEquals("gid plain file", 6, a.getGroupId());
@@ -110,7 +111,7 @@ public class AsiExtraFieldTest implements UnixStat {
assertEquals("length link", data.length,
a.getLocalFileDataLength().getValue());
assertTrue("link, is link", a.isLink());
- assertTrue("link, no dir", !a.isDirectory());
+ assertFalse("link, no dir", a.isDirectory());
assertEquals("mode link", LINK_FLAG | 0123, a.getMode());
assertEquals("uid link", 5, a.getUserId());
assertEquals("gid link", 6, a.getGroupId());
@@ -124,7 +125,7 @@ public class AsiExtraFieldTest implements UnixStat {
a.parseFromLocalFileData(data, 0, data.length);
assertEquals("length dir", data.length,
a.getLocalFileDataLength().getValue());
- assertTrue("dir, no link", !a.isLink());
+ assertFalse("dir, no link", a.isLink());
assertTrue("dir, is dir", a.isDirectory());
assertEquals("mode dir", DIR_FLAG | 0123, a.getMode());
assertEquals("uid dir", 5, a.getUserId());
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBitTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBitTest.java
index 8d64d1c..329413a 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBitTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/GeneralPurposeBitTest.java
@@ -19,13 +19,12 @@
package org.apache.commons.compress.archivers.zip;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
-import java.util.Arrays;
-
import org.junit.Test;
public class GeneralPurposeBitTest {
@@ -37,7 +36,7 @@ public class GeneralPurposeBitTest {
assertFalse(new GeneralPurposeBit().usesEncryption());
assertFalse(new GeneralPurposeBit().usesStrongEncryption());
final byte[] b = new byte[2];
- assertTrue(Arrays.equals(b, new GeneralPurposeBit().encode()));
+ assertArrayEquals(b, new GeneralPurposeBit().encode());
}
@Test
@@ -70,7 +69,7 @@ public class GeneralPurposeBitTest {
assertTrue(GeneralPurposeBit.parse(flags, 0).usesDataDescriptor());
final GeneralPurposeBit b = new GeneralPurposeBit();
b.useDataDescriptor(true);
- assertTrue(Arrays.equals(flags, b.encode()));
+ assertArrayEquals(flags, b.encode());
}
@Test
@@ -79,7 +78,7 @@ public class GeneralPurposeBitTest {
assertTrue(GeneralPurposeBit.parse(flags, 0).usesUTF8ForNames());
final GeneralPurposeBit b = new GeneralPurposeBit();
b.useUTF8ForNames(true);
- assertTrue(Arrays.equals(flags, b.encode()));
+ assertArrayEquals(flags, b.encode());
}
@Test
@@ -88,7 +87,7 @@ public class GeneralPurposeBitTest {
assertTrue(GeneralPurposeBit.parse(flags, 0).usesEncryption());
final GeneralPurposeBit b = new GeneralPurposeBit();
b.useEncryption(true);
- assertTrue(Arrays.equals(flags, b.encode()));
+ assertArrayEquals(flags, b.encode());
}
@Test
@@ -98,7 +97,7 @@ public class GeneralPurposeBitTest {
final GeneralPurposeBit b = new GeneralPurposeBit();
b.useStrongEncryption(true);
assertTrue(b.usesEncryption());
- assertTrue(Arrays.equals(flags, b.encode()));
+ assertArrayEquals(flags, b.encode());
flags = new byte[] {(byte) 64, (byte) 0};
assertFalse(GeneralPurposeBit.parse(flags, 0).usesStrongEncryption());
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
index 65ba934..41f6dd5 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/X000A_NTFSTest.java
@@ -22,6 +22,7 @@ import org.junit.Test;
import java.util.Date;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
public class X000A_NTFSTest {
@@ -38,6 +39,6 @@ public class X000A_NTFSTest {
xf2.parseFromLocalFileData(b, 0, b.length);
assertEquals(new Date(0), xf2.getModifyJavaTime());
assertEquals(new Date(-11644473601000L), xf2.getAccessJavaTime());
- assertEquals(null, xf2.getCreateJavaTime());
+ assertNull(xf2.getCreateJavaTime());
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
index bb7969d..ba7476b 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestampTest.java
@@ -26,7 +26,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Enumeration;
@@ -42,6 +41,7 @@ import static
org.apache.commons.compress.archivers.zip.X5455_ExtendedTimestamp.
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -193,27 +193,27 @@ public class X5455_ExtendedTimestampTest {
@Test
public void testMisc() throws Exception {
- assertFalse(xf.equals(new Object()));
+ assertNotEquals(xf, new Object());
assertTrue(xf.toString().startsWith("0x5455 Zip Extra Field"));
- assertTrue(!xf.toString().contains(" Modify:"));
- assertTrue(!xf.toString().contains(" Access:"));
- assertTrue(!xf.toString().contains(" Create:"));
+ assertFalse(xf.toString().contains(" Modify:"));
+ assertFalse(xf.toString().contains(" Access:"));
+ assertFalse(xf.toString().contains(" Create:"));
Object o = xf.clone();
assertEquals(o.hashCode(), xf.hashCode());
- assertTrue(xf.equals(o));
+ assertEquals(xf, o);
xf.setModifyJavaTime(new Date(1111));
xf.setAccessJavaTime(new Date(2222));
xf.setCreateJavaTime(new Date(3333));
xf.setFlags((byte) 7);
- assertFalse(xf.equals(o));
+ assertNotEquals(xf, o);
assertTrue(xf.toString().startsWith("0x5455 Zip Extra Field"));
assertTrue(xf.toString().contains(" Modify:"));
assertTrue(xf.toString().contains(" Access:"));
assertTrue(xf.toString().contains(" Create:"));
o = xf.clone();
assertEquals(o.hashCode(), xf.hashCode());
- assertTrue(xf.equals(o));
+ assertEquals(xf, o);
}
@Test
@@ -494,7 +494,7 @@ public class X5455_ExtendedTimestampTest {
xf.setCreateTime(time);
xf.setFlags(providedFlags);
byte[] result = xf.getLocalFileDataData();
- assertTrue(Arrays.equals(expectedLocal, result));
+ assertArrayEquals(expectedLocal, result);
// And now we re-parse:
xf.parseFromLocalFileData(result, 0, result.length);
@@ -518,7 +518,7 @@ public class X5455_ExtendedTimestampTest {
xf.setCreateTime(time);
xf.setFlags(providedFlags);
result = xf.getCentralDirectoryData();
- assertTrue(Arrays.equals(expectedCentral, result));
+ assertArrayEquals(expectedCentral, result);
// And now we re-parse:
xf.parseFromCentralDirectoryData(result, 0, result.length);
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
index 1b963f6..9a40f58 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/X7875_NewUnixTest.java
@@ -23,14 +23,14 @@ import org.junit.Before;
import org.junit.Test;
import java.io.File;
-import java.util.Arrays;
import java.util.Enumeration;
import java.util.zip.ZipException;
import static org.apache.commons.compress.AbstractTestCase.getFile;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
public class X7875_NewUnixTest {
@@ -90,13 +90,13 @@ public class X7875_NewUnixTest {
@Test
public void testMisc() throws Exception {
- assertFalse(xf.equals(new Object()));
+ assertNotEquals(xf, new Object());
assertTrue(xf.toString().startsWith("0x7875 Zip Extra Field"));
final Object o = xf.clone();
assertEquals(o.hashCode(), xf.hashCode());
- assertTrue(xf.equals(o));
+ assertEquals(xf, o);
xf.setUID(12345);
- assertFalse(xf.equals(o));
+ assertNotEquals(xf, o);
}
@Test
@@ -114,18 +114,18 @@ public class X7875_NewUnixTest {
final byte[] SEQUENCE6 = {1, 2, 3, 4, 5, 6};
final byte[] SEQUENCE6_LEADING_ZERO = {0, 1, 2, 3, 4, 5, 6};
- assertTrue(NULL == trimTest(NULL));
- assertTrue(Arrays.equals(ONE_ZERO, trimTest(EMPTY)));
- assertTrue(Arrays.equals(ONE_ZERO, trimTest(ONE_ZERO)));
- assertTrue(Arrays.equals(ONE_ZERO, trimTest(TWO_ZEROES)));
- assertTrue(Arrays.equals(ONE_ZERO, trimTest(FOUR_ZEROES)));
- assertTrue(Arrays.equals(SEQUENCE, trimTest(SEQUENCE)));
- assertTrue(Arrays.equals(SEQUENCE, trimTest(SEQUENCE_LEADING_ZERO)));
- assertTrue(Arrays.equals(SEQUENCE, trimTest(SEQUENCE_LEADING_ZEROES)));
- assertTrue(Arrays.equals(TRAILING_ZERO, trimTest(TRAILING_ZERO)));
- assertTrue(Arrays.equals(TRAILING_ZERO, trimTest(PADDING_ZERO)));
- assertTrue(Arrays.equals(SEQUENCE6, trimTest(SEQUENCE6)));
- assertTrue(Arrays.equals(SEQUENCE6, trimTest(SEQUENCE6_LEADING_ZERO)));
+ assertSame(NULL, trimTest(NULL));
+ assertArrayEquals(ONE_ZERO, trimTest(EMPTY));
+ assertArrayEquals(ONE_ZERO, trimTest(ONE_ZERO));
+ assertArrayEquals(ONE_ZERO, trimTest(TWO_ZEROES));
+ assertArrayEquals(ONE_ZERO, trimTest(FOUR_ZEROES));
+ assertArrayEquals(SEQUENCE, trimTest(SEQUENCE));
+ assertArrayEquals(SEQUENCE, trimTest(SEQUENCE_LEADING_ZERO));
+ assertArrayEquals(SEQUENCE, trimTest(SEQUENCE_LEADING_ZEROES));
+ assertArrayEquals(TRAILING_ZERO, trimTest(TRAILING_ZERO));
+ assertArrayEquals(TRAILING_ZERO, trimTest(PADDING_ZERO));
+ assertArrayEquals(SEQUENCE6, trimTest(SEQUENCE6));
+ assertArrayEquals(SEQUENCE6, trimTest(SEQUENCE6_LEADING_ZERO));
}
private static byte[] trimTest(final byte[] b) { return
X7875_NewUnix.trimLeadingZeroesForceMinLength(b); }
@@ -176,7 +176,7 @@ public class X7875_NewUnixTest {
assertEquals(255, xf.getUID());
assertEquals(128, xf.getGID());
- assertTrue(Arrays.equals(EXPECTED_1, xf.getLocalFileDataData()));
+ assertArrayEquals(EXPECTED_1, xf.getLocalFileDataData());
final byte[] SPURIOUS_ZEROES_2 = {1, 4, -1, -1, 0, 0, 4, 1, 2, 0, 0};
final byte[] EXPECTED_2 = {1, 2, -1, -1, 2, 1, 2};
@@ -184,7 +184,7 @@ public class X7875_NewUnixTest {
assertEquals(65535, xf.getUID());
assertEquals(513, xf.getGID());
- assertTrue(Arrays.equals(EXPECTED_2, xf.getLocalFileDataData()));
+ assertArrayEquals(EXPECTED_2, xf.getLocalFileDataData());
}
@@ -214,9 +214,9 @@ public class X7875_NewUnixTest {
byte[] result = xf.getLocalFileDataData();
if (expected.length < 5) {
// We never emit zero-length entries.
- assertTrue(Arrays.equals(new byte[]{1,1,0,1,0}, result));
+ assertArrayEquals(new byte[]{1, 1, 0, 1, 0}, result);
} else {
- assertTrue(Arrays.equals(expected, result));
+ assertArrayEquals(expected, result);
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
index ba0fef4..972acf4 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
@@ -21,6 +21,7 @@ package org.apache.commons.compress.archivers.zip;
import static org.apache.commons.compress.AbstractTestCase.getFile;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -251,7 +252,7 @@ public class ZipArchiveEntryTest {
public void testNotEquals() {
final ZipArchiveEntry entry1 = new ZipArchiveEntry("foo");
final ZipArchiveEntry entry2 = new ZipArchiveEntry("bar");
- assertFalse(entry1.equals(entry2));
+ assertNotEquals(entry1, entry2);
}
/**
@@ -267,8 +268,8 @@ public class ZipArchiveEntryTest {
entry2.setComment("");
entry3.setComment("bar");
assertEquals(entry1, entry2);
- assertFalse(entry1.equals(entry3));
- assertFalse(entry2.equals(entry3));
+ assertNotEquals(entry1, entry3);
+ assertNotEquals(entry2, entry3);
}
@Test
@@ -378,7 +379,7 @@ public class ZipArchiveEntryTest {
try (ZipFile zf = new ZipFile(getFile("COMPRESS-479.zip"))) {
final ZipArchiveEntry ze = zf.getEntry("%U20AC_for_Dollar.txt");
final ZipArchiveEntry clonedZe = (ZipArchiveEntry) ze.clone();
- assertTrue(ze.equals(clonedZe));
+ assertEquals(ze, clonedZe);
}
}
}
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java
index 65af021..c595ccc 100644
---
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java
+++
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipEightByteIntegerTest.java
@@ -19,7 +19,7 @@
package org.apache.commons.compress.archivers.zip;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import java.math.BigInteger;
@@ -100,15 +100,15 @@ public class ZipEightByteIntegerTest {
final ZipEightByteInteger zl2 = new ZipEightByteInteger(0x12345678);
final ZipEightByteInteger zl3 = new ZipEightByteInteger(0x87654321);
- assertTrue("reflexive", zl.equals(zl));
+ assertEquals("reflexive", zl, zl);
- assertTrue("works", zl.equals(zl2));
- assertTrue("works, part two", !zl.equals(zl3));
+ assertEquals("works", zl, zl2);
+ assertFalse("works, part two", zl.equals(zl3));
- assertTrue("symmetric", zl2.equals(zl));
+ assertEquals("symmetric", zl2, zl);
- assertTrue("null handling", !zl.equals(null));
- assertTrue("non ZipEightByteInteger handling", !zl.equals(new
Integer(0x1234)));
+ assertFalse("null handling", zl.equals(null));
+ assertFalse("non ZipEightByteInteger handling", zl.equals(new
Integer(0x1234)));
}
/**
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
index 1d8234b..6e52997 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
@@ -21,8 +21,8 @@ package org.apache.commons.compress.archivers.zip;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
/**
* JUnit testcases for org.apache.commons.compress.archivers.zip.ZipLong.
@@ -76,15 +76,15 @@ public class ZipLongTest {
final ZipLong zl2 = new ZipLong(0x12345678);
final ZipLong zl3 = new ZipLong(0x87654321);
- assertTrue("reflexive", zl.equals(zl));
+ assertEquals("reflexive", zl, zl);
- assertTrue("works", zl.equals(zl2));
- assertTrue("works, part two", !zl.equals(zl3));
+ assertEquals("works", zl, zl2);
+ assertFalse("works, part two", zl.equals(zl3));
- assertTrue("symmetric", zl2.equals(zl));
+ assertEquals("symmetric", zl2, zl);
- assertTrue("null handling", !zl.equals(null));
- assertTrue("non ZipLong handling", !zl.equals(new Integer(0x1234)));
+ assertFalse("null handling", zl.equals(null));
+ assertFalse("non ZipLong handling", zl.equals(new Integer(0x1234)));
}
/**
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
index ae51f4a..a55ae9e 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
@@ -19,8 +19,8 @@
package org.apache.commons.compress.archivers.zip;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertTrue;
import org.junit.Test;
@@ -74,15 +74,15 @@ public class ZipShortTest {
final ZipShort zs2 = new ZipShort(0x1234);
final ZipShort zs3 = new ZipShort(0x5678);
- assertTrue("reflexive", zs.equals(zs));
+ assertEquals("reflexive", zs, zs);
- assertTrue("works", zs.equals(zs2));
- assertTrue("works, part two", !zs.equals(zs3));
+ assertEquals("works", zs, zs2);
+ assertFalse("works, part two", zs.equals(zs3));
- assertTrue("symmetric", zs2.equals(zs));
+ assertEquals("symmetric", zs2, zs);
- assertTrue("null handling", !zs.equals(null));
- assertTrue("non ZipShort handling", !zs.equals(new Integer(0x1234)));
+ assertFalse("null handling", zs.equals(null));
+ assertFalse("non ZipShort handling", zs.equals(new Integer(0x1234)));
}
/**
diff --git
a/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
b/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
index 018c314..14e6a4d 100644
--- a/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
+++ b/src/test/java/org/apache/commons/compress/archivers/zip/ZipUtilTest.java
@@ -18,12 +18,12 @@
package org.apache.commons.compress.archivers.zip;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.fail;
import java.math.BigInteger;
-import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
@@ -125,8 +125,8 @@ public class ZipUtilTest {
for (int i = 0; i < bTest.length; i++) {
final byte[] result = ZipUtil.reverse(bTest[i]);
- assertTrue("reverse mutates in-place", bTest[i] == result);
- assertTrue("reverse actually reverses", Arrays.equals(rTest[i],
result));
+ assertSame("reverse mutates in-place", bTest[i], result);
+ assertArrayEquals("reverse actually reverses", rTest[i], result);
}
}
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 7ebaf28..90218ea 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
@@ -93,7 +93,7 @@ public class BrotliCompressorInputStreamTest extends
AbstractTestCase {
try (InputStream is = Files.newInputStream(input.toPath())) {
final BrotliCompressorInputStream in =
new BrotliCompressorInputStream(is);
- Assert.assertTrue(in.available() == 0);
+ assertEquals(0, in.available());
in.close();
}
}
diff --git
a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
index db8bef2..5bc7714 100644
---
a/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/compressors/deflate64/Deflate64CompressorInputStreamTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.compress.compressors.deflate64;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.times;
import java.io.BufferedReader;
@@ -98,7 +99,7 @@ public class Deflate64CompressorInputStreamTest {
try (Deflate64CompressorInputStream input = new
Deflate64CompressorInputStream(new ByteArrayInputStream(data));
BufferedReader br = new BufferedReader(new
InputStreamReader(input))) {
assertEquals("Hello World", br.readLine());
- assertEquals(null, br.readLine());
+ assertNull(br.readLine());
}
}
@@ -113,7 +114,7 @@ public class Deflate64CompressorInputStreamTest {
.createCompressorInputStream(CompressorStreamFactory.DEFLATE64,
new ByteArrayInputStream(data));
BufferedReader br = new BufferedReader(new
InputStreamReader(input))) {
assertEquals("Hello World", br.readLine());
- assertEquals(null, br.readLine());
+ assertNull(br.readLine());
}
}
@@ -141,7 +142,7 @@ public class Deflate64CompressorInputStreamTest {
try (Deflate64CompressorInputStream input = new
Deflate64CompressorInputStream(new ByteArrayInputStream(data));
BufferedReader br = new BufferedReader(new
InputStreamReader(input))) {
assertEquals("Hello World", br.readLine());
- assertEquals(null, br.readLine());
+ assertNull(br.readLine());
}
}
diff --git
a/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
b/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
index d36d376..c28cd61 100644
---
a/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
+++
b/src/test/java/org/apache/commons/compress/utils/ChecksumCalculatingInputStreamTest.java
@@ -25,7 +25,7 @@ import java.util.zip.Adler32;
import java.util.zip.CRC32;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
/**
* Unit tests for class {@link ChecksumCalculatingInputStream
org.apache.commons.compress.utils.ChecksumCalculatingInputStream}.
@@ -80,7 +80,7 @@ public class ChecksumCalculatingInputStreamTest {
final int inputStreamReadResult = bufferedInputStream.read(byteArray,
0, 1);
final int checkSumCalculationReadResult =
checksumCalculatingInputStream.read();
- assertFalse(checkSumCalculationReadResult == inputStreamReadResult);
+ assertNotEquals(checkSumCalculationReadResult, inputStreamReadResult);
assertEquals((-1), checkSumCalculationReadResult);
assertEquals(0, byteArrayInputStream.available());
