You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/04/25 08:31:55 UTC
[commons-imaging] 01/03: [IMAGING-287] Simplify assertions in tests
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit de17e9b76b3beb7733cc3ed9d97a16845a444b1f
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Wed Apr 21 11:03:11 2021 +0200
[IMAGING-287] Simplify assertions in tests
---
.../apache/commons/imaging/color/ColorCmyTest.java | 4 ++--
.../apache/commons/imaging/color/ColorHslTest.java | 4 ++--
.../common/bytesource/ByteSourceDataTest.java | 9 ++++----
.../common/bytesource/ByteSourceImageTest.java | 25 ++++++++++++---------
.../imaging/common/bytesource/ByteSourceTest.java | 4 ++--
.../common/itu_t4/HuffmanTreeExceptionTest.java | 4 ++--
.../imaging/formats/bmp/BmpRoundtripTest.java | 14 ++++++------
.../commons/imaging/formats/gif/GifReadTest.java | 2 +-
.../imaging/formats/icns/IcnsRoundTripTest.java | 11 ++++-----
.../imaging/formats/ico/IcoRoundtripTest.java | 11 ++++-----
.../imaging/formats/jpeg/exif/ExifRewriteTest.java | 7 +++---
.../imaging/formats/jpeg/iptc/IptcAddTest.java | 4 ++--
.../imaging/formats/jpeg/iptc/IptcUpdateTest.java | 7 +++---
.../formats/jpeg/segments/App2SegmentTest.java | 7 +++---
.../imaging/formats/png/PngWriteReadTest.java | 8 +++----
.../imaging/formats/pnm/PnmImageParserTest.java | 5 ++---
.../imaging/formats/tiff/TiffCcittTest.java | 26 +++++++++++-----------
.../floatingpoint/PaletteEntryForValueTest.java | 10 +++++----
18 files changed, 85 insertions(+), 77 deletions(-)
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
index 5692d89..9a4498f 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorCmyTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.color;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeEach;
@@ -61,7 +61,7 @@ public class ColorCmyTest {
final ColorCmy colorCmy = new ColorCmy(0.0, (-1668.733868772), (-1568.733868772));
final ColorCmy colorCmyTwo = ColorCmy.YELLOW;
- assertFalse(colorCmy.equals(colorCmyTwo));
+ assertNotEquals(colorCmy, colorCmyTwo);
assertEquals((-1568.733868772), colorCmy.Y, 0.01);
assertEquals((-1668.733868772), colorCmy.M, 0.01);
}
diff --git a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
index 8bdcd1a..72bc733 100644
--- a/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
+++ b/src/test/java/org/apache/commons/imaging/color/ColorHslTest.java
@@ -19,7 +19,7 @@ package org.apache.commons.imaging.color;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeEach;
@@ -70,7 +70,7 @@ public class ColorHslTest {
assertEquals(667.226, colorHslTwo.S, 0.01);
assertEquals(100.0, colorHslTwo.H, 0.01);
assertEquals((-687.72287636), colorHslTwo.L, 0.01);
- assertFalse(colorHsl.equals(colorHslTwo));
+ assertNotEquals(colorHsl, colorHslTwo);
}
}
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
index c0eb8fb..837be34 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.java
@@ -18,6 +18,7 @@
package org.apache.commons.imaging.common.bytesource;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayInputStream;
@@ -48,7 +49,7 @@ public class ByteSourceDataTest extends ByteSourceTest {
final File file = createTempFile(src);
// test that all bytes written to file.
- assertTrue(src.length == file.length());
+ assertEquals(src.length, file.length());
return new ByteSourceFile(file);
}
@@ -88,7 +89,7 @@ public class ByteSourceDataTest extends ByteSourceTest {
assertTrue(read <= src.length);
for (int i = 0; i < read; i++) {
- assertTrue(src[i] == prefix[i]);
+ assertEquals(src[i], prefix[i]);
}
}
}
@@ -116,9 +117,9 @@ public class ByteSourceDataTest extends ByteSourceTest {
try (InputStream is = byteSource.getInputStream(start)) {
final byte dst[] = IOUtils.toByteArray(is);
- assertTrue(src.length == dst.length + start);
+ assertEquals(src.length, dst.length + start);
for (int i = 0; i < dst.length; i++) {
- assertTrue(dst[i] == src[i + start]);
+ assertEquals(dst[i], src[i + start]);
}
}
}
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
index 143baa5..3c32d80 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
@@ -18,7 +18,10 @@
package org.apache.commons.imaging.common.bytesource;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.Dimension;
@@ -57,7 +60,7 @@ public class ByteSourceImageTest extends ByteSourceTest {
final byte imageFileBytes[] = FileUtils.readFileToByteArray(imageFile);
assertNotNull(imageFileBytes);
- assertTrue(imageFileBytes.length == imageFile.length());
+ assertEquals(imageFileBytes.length, imageFile.length());
if (imageFile.getName().toLowerCase().endsWith(".ico")
|| imageFile.getName().toLowerCase().endsWith(".tga")
@@ -106,8 +109,8 @@ public class ByteSourceImageTest extends ByteSourceTest {
final BufferedImage imageBytes = Imaging.getBufferedImage(bytes);
assertNotNull(imageBytes);
- assertTrue(imageFileWidth == imageBytes.getWidth());
- assertTrue(imageFileHeight == imageBytes.getHeight());
+ assertEquals(imageFileWidth, imageBytes.getWidth());
+ assertEquals(imageFileHeight, imageBytes.getHeight());
}
public void checkGetImageSize(final File imageFile, final byte[] imageFileBytes)
@@ -119,8 +122,8 @@ public class ByteSourceImageTest extends ByteSourceTest {
final Dimension imageSizeBytes = Imaging.getImageSize(imageFileBytes);
assertNotNull(imageSizeBytes);
- assertTrue(imageSizeFile.width == imageSizeBytes.width);
- assertTrue(imageSizeFile.height == imageSizeBytes.height);
+ assertEquals(imageSizeFile.width, imageSizeBytes.width);
+ assertEquals(imageSizeFile.height, imageSizeBytes.height);
}
public void checkGuessFormat(final File imageFile, final byte[] imageFileBytes)
@@ -128,15 +131,15 @@ public class ByteSourceImageTest extends ByteSourceTest {
// check guessFormat()
final ImageFormat imageFormatFile = Imaging.guessFormat(imageFile);
assertNotNull(imageFormatFile);
- assertTrue(imageFormatFile != ImageFormats.UNKNOWN);
+ assertNotSame(imageFormatFile, ImageFormats.UNKNOWN);
// Debug.debug("imageFormatFile", imageFormatFile);
final ImageFormat imageFormatBytes = Imaging.guessFormat(imageFileBytes);
assertNotNull(imageFormatBytes);
- assertTrue(imageFormatBytes != ImageFormats.UNKNOWN);
+ assertNotSame(imageFormatBytes, ImageFormats.UNKNOWN);
// Debug.debug("imageFormatBytes", imageFormatBytes);
- assertTrue(imageFormatBytes == imageFormatFile);
+ assertSame(imageFormatBytes, imageFormatFile);
}
public void checkGetICCProfileBytes(final File imageFile, final byte[] imageFileBytes)
@@ -146,7 +149,7 @@ public class ByteSourceImageTest extends ByteSourceTest {
final byte iccBytesBytes[] = Imaging.getICCProfileBytes(imageFileBytes);
- assertTrue((iccBytesFile != null) == (iccBytesBytes != null));
+ assertEquals((iccBytesFile != null), (iccBytesBytes != null));
if (iccBytesFile == null) {
return;
@@ -193,7 +196,7 @@ public class ByteSourceImageTest extends ByteSourceTest {
final Object valueFile = method.invoke(imageInfoFile, (Object[])null);
final Object valueBytes = method.invoke(imageInfoBytes, (Object[])null);
- assertTrue(valueFile.equals(valueBytes));
+ assertEquals(valueFile, valueBytes);
}
// only have to test values from imageInfoFile; we already know values
@@ -201,7 +204,7 @@ public class ByteSourceImageTest extends ByteSourceTest {
assertTrue(imageInfoFile.getBitsPerPixel() > 0);
assertNotNull(imageInfoFile.getFormat());
- assertTrue(imageInfoFile.getFormat() != ImageFormats.UNKNOWN);
+ assertNotSame(imageInfoFile.getFormat(), ImageFormats.UNKNOWN);
assertNotNull(imageInfoFile.getFormatName());
diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
index d88af1d..ba285b4 100644
--- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.imaging.common.bytesource;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
@@ -41,7 +41,7 @@ public abstract class ByteSourceTest extends ImagingTest {
}
// test that all bytes written to file.
- assertTrue(src.length == file.length());
+ assertEquals(src.length, file.length());
return file;
}
diff --git a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java b/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
index 5c8722a..2b6feaf 100644
--- a/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
+++ b/src/test/java/org/apache/commons/imaging/common/itu_t4/HuffmanTreeExceptionTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.commons.imaging.common.itu_t4;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import org.junit.jupiter.api.Test;
@@ -27,7 +27,7 @@ public class HuffmanTreeExceptionTest{
final HuffmanTreeException huffmanTreeException = new HuffmanTreeException("");
final HuffmanTreeException huffmanTreeExceptionTwo = new HuffmanTreeException("", huffmanTreeException);
- assertFalse(huffmanTreeExceptionTwo.equals(huffmanTreeException));
+ assertNotEquals(huffmanTreeExceptionTwo, huffmanTreeException);
}
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
index 0934f08..197d3e2 100644
--- a/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
@@ -17,8 +17,8 @@
package org.apache.commons.imaging.formats.bmp;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.image.BufferedImage;
import java.io.File;
@@ -157,8 +157,8 @@ public class BmpRoundtripTest extends BmpBaseTest {
final BufferedImage dstImage = Imaging.getBufferedImage(bytes);
assertNotNull(dstImage);
- assertTrue(srcImage.getWidth() == dstImage.getWidth());
- assertTrue(srcImage.getHeight() == dstImage.getHeight());
+ assertEquals(srcImage.getWidth(), dstImage.getWidth());
+ assertEquals(srcImage.getHeight(), dstImage.getHeight());
final int dstData[][] = bufferedImageToImageData(dstImage);
compare(rawData, dstData);
@@ -167,12 +167,12 @@ public class BmpRoundtripTest extends BmpBaseTest {
private void compare(final int[][] a, final int[][] b) {
assertNotNull(a);
assertNotNull(b);
- assertTrue(a.length == b.length);
+ assertEquals(a.length, b.length);
for (int y = 0; y < a.length; y++) {
- assertTrue(a[y].length == b[y].length);
+ assertEquals(a[y].length, b[y].length);
// make sure row lengths consistent.
- assertTrue(a[0].length == b[y].length);
+ assertEquals(a[0].length, b[y].length);
for (int x = 0; x < a[y].length; x++) {
// ignore alpha channel - BMP has no transparency.
final int rgbA = 0xffffff & a[y][x];
@@ -184,7 +184,7 @@ public class BmpRoundtripTest extends BmpBaseTest {
+ ", rgbB: " + rgbB + " (0x"
+ Integer.toHexString(rgbB) + ")");
}
- assertTrue(rgbA == rgbB);
+ assertEquals(rgbA, rgbB);
}
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
index 9f41a6e..f856407 100644
--- a/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
@@ -100,7 +100,7 @@ public class GifReadTest extends GifBaseTest {
@MethodSource("singleImageData")
public void testBufferedImagesForSingleImageGif(final File imageFile) throws Exception {
final List<BufferedImage> images = Imaging.getAllBufferedImages(imageFile);
- assertTrue(images.size() == 1);
+ assertEquals(1, images.size());
}
@ParameterizedTest
diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
index 023ad56..cc02b93 100644
--- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsRoundTripTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.formats.icns;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -412,18 +413,18 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
final BufferedImage dstImage = Imaging.getBufferedImage(exportFile);
assertNotNull(dstImage);
- assertTrue(dstImage.getWidth() == IMAGE[0].length);
- assertTrue(dstImage.getHeight() == IMAGE.length);
+ assertEquals(dstImage.getWidth(), IMAGE[0].length);
+ assertEquals(dstImage.getHeight(), IMAGE.length);
verify(dstImage, foreground, background);
}
private void verify(final BufferedImage data, final int foreground, final int background) {
assertNotNull(data);
- assertTrue(data.getHeight() == IMAGE.length);
+ assertEquals(data.getHeight(), IMAGE.length);
for (int y = 0; y < data.getHeight(); y++) {
- assertTrue(data.getWidth() == IMAGE[y].length);
+ assertEquals(data.getWidth(), IMAGE[y].length);
for (int x = 0; x < data.getWidth(); x++) {
final int imageARGB = (IMAGE[y][x] == 1) ? foreground : background;
final int dataARGB = data.getRGB(x, y);
@@ -435,7 +436,7 @@ public class IcnsRoundTripTest extends IcnsBaseTest {
+ dataARGB + " (0x" + Integer.toHexString(dataARGB)
+ ")");
}
- assertTrue(imageARGB == dataARGB);
+ assertEquals(imageARGB, dataARGB);
}
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
index 257706e..fb8a136 100644
--- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoRoundtripTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.formats.ico;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -543,18 +544,18 @@ public class IcoRoundtripTest extends IcoBaseTest {
final BufferedImage dstImage = Imaging.getBufferedImage(tempFile);
assertNotNull(dstImage);
- assertTrue(dstImage.getWidth() == IMAGE[0].length);
- assertTrue(dstImage.getHeight() == IMAGE.length);
+ assertEquals(dstImage.getWidth(), IMAGE[0].length);
+ assertEquals(dstImage.getHeight(), IMAGE.length);
verify(dstImage, foreground, background);
}
private void verify(final BufferedImage data, final int foreground, final int background) {
assertNotNull(data);
- assertTrue(data.getHeight() == IMAGE.length);
+ assertEquals(data.getHeight(), IMAGE.length);
for (int y = 0; y < data.getHeight(); y++) {
- assertTrue(data.getWidth() == IMAGE[y].length);
+ assertEquals(data.getWidth(), IMAGE[y].length);
for (int x = 0; x < data.getWidth(); x++) {
final int imageARGB = (IMAGE[y][x] == 1) ? foreground : background;
final int dataARGB = data.getRGB(x, y);
@@ -566,7 +567,7 @@ public class IcoRoundtripTest extends IcoBaseTest {
+ dataARGB + " (0x" + Integer.toHexString(dataARGB)
+ ")");
}
- assertTrue(imageARGB == dataARGB);
+ assertEquals(imageARGB, dataARGB);
}
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
index c4fe772..7b94610 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.imaging.formats.jpeg.exif;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -90,7 +91,7 @@ public class ExifRewriteTest extends ExifBaseTest {
Debug.debug("Output Segments:");
new JpegUtils().dumpJFIF(new ByteSourceArray(bytes));
- assertTrue(!hasExifData(tempFile));
+ assertFalse(hasExifData(tempFile));
}
}
}
@@ -130,7 +131,7 @@ public class ExifRewriteTest extends ExifBaseTest {
stripped = new ByteSourceArray(bytes);
new JpegUtils().dumpJFIF(stripped);
- assertTrue(!hasExifData(tempFile));
+ assertFalse(hasExifData(tempFile));
}
{
@@ -283,7 +284,7 @@ public class ExifRewriteTest extends ExifBaseTest {
final List<? extends ImageMetadataItem> oldDirectories = oldExifMetadata.getDirectories();
final List<? extends ImageMetadataItem> newDirectories = newExifMetadata.getDirectories();
- assertTrue(oldDirectories.size() == newDirectories.size());
+ assertEquals(oldDirectories.size(), newDirectories.size());
final Map<Integer,TiffImageMetadata.Directory> oldDirectoryMap = makeDirectoryMap(oldDirectories);
final Map<Integer,TiffImageMetadata.Directory> newDirectoryMap = makeDirectoryMap(newDirectories);
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
index 89f5608..cd9d1bd 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java
@@ -17,8 +17,8 @@
package org.apache.commons.imaging.formats.jpeg.iptc;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -90,6 +90,6 @@ public class IptcAddTest extends IptcBaseTest {
updateByteSource, params);
assertNotNull(outMetadata);
- assertTrue(outMetadata.getItems().size() == newRecords.size());
+ assertEquals(outMetadata.getItems().size(), newRecords.size());
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
index b46568d..8adb66b 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
@@ -17,6 +17,7 @@
package org.apache.commons.imaging.formats.jpeg.iptc;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -120,7 +121,7 @@ public class IptcUpdateTest extends IptcBaseTest {
updateByteSource, params);
assertNotNull(outMetadata);
- assertTrue(outMetadata.getItems().size() == 2);
+ assertEquals(2, outMetadata.getItems().size());
}
@ParameterizedTest
@@ -152,7 +153,7 @@ public class IptcUpdateTest extends IptcBaseTest {
updateByteSource, params);
assertNotNull(outMetadata);
- assertTrue(outMetadata.getItems().size() == 2);
+ assertEquals(2, outMetadata.getItems().size());
}
public File writeIptc(final ByteSource byteSource, final PhotoshopApp13Data newData, final File imageFile) throws IOException, ImageReadException, ImageWriteException {
@@ -198,7 +199,7 @@ public class IptcUpdateTest extends IptcBaseTest {
final JpegPhotoshopMetadata outMetadata = new JpegImageParser().getPhotoshopMetadata(updateByteSource, params);
assertNotNull(outMetadata);
- assertTrue(outMetadata.getItems().size() == newRecords.size());
+ assertEquals(outMetadata.getItems().size(), newRecords.size());
}
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/App2SegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/App2SegmentTest.java
index 5ad7161..1c0f081 100644
--- a/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/App2SegmentTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/segments/App2SegmentTest.java
@@ -17,8 +17,7 @@
package org.apache.commons.imaging.formats.jpeg.segments;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import java.io.IOException;
@@ -35,7 +34,7 @@ public class App2SegmentTest {
public void testEqualsReturningTrue() throws IOException, ImageReadException {
final App2Segment app2Segment = new App2Segment(0, 0, null);
- assertTrue(app2Segment.equals(app2Segment));
+ assertEquals(app2Segment, app2Segment);
}
@Test
@@ -43,7 +42,7 @@ public class App2SegmentTest {
final byte[] byteArray = new byte[3];
final App2Segment app2Segment = new App2Segment(65475, byteArray);
- assertFalse(app2Segment.equals(byteArray));
+ assertNotEquals(app2Segment, byteArray);
}
@Test
diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
index 57a4aa8..fa3f5e4 100644
--- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
@@ -198,8 +198,8 @@ public class PngWriteReadTest extends ImagingTest {
final BufferedImage dstImage = Imaging.getBufferedImage(bytes);
assertNotNull(dstImage);
- assertTrue(srcImage.getWidth() == dstImage.getWidth());
- assertTrue(srcImage.getHeight() == dstImage.getHeight());
+ assertEquals(srcImage.getWidth(), dstImage.getWidth());
+ assertEquals(srcImage.getHeight(), dstImage.getHeight());
final int dstData[][] = bufferedImageToImageData(dstImage);
assertArrayEquals(rawData, dstData);
@@ -227,8 +227,8 @@ public class PngWriteReadTest extends ImagingTest {
final BufferedImage dstImage = Imaging.getBufferedImage(bytes);
assertNotNull(dstImage);
- assertTrue(srcImage.getWidth() == dstImage.getWidth());
- assertTrue(srcImage.getHeight() == dstImage.getHeight());
+ assertEquals(srcImage.getWidth(), dstImage.getWidth());
+ assertEquals(srcImage.getHeight(), dstImage.getHeight());
final int dstData[][] = bufferedImageToImageData(dstImage);
assertArrayEquals(rawData, dstData);
diff --git a/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java b/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
index 6d7d638..270fa5f 100644
--- a/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/pnm/PnmImageParserTest.java
@@ -18,7 +18,6 @@ package org.apache.commons.imaging.formats.pnm;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import java.awt.image.BufferedImage;
import java.awt.image.DataBufferInt;
@@ -63,8 +62,8 @@ public class PnmImageParserTest {
final byte[] dstBytes = Imaging.writeImageToBytes(srcImage, ImageFormats.PNM, params);
final BufferedImage dstImage = Imaging.getBufferedImage(dstBytes);
- assertTrue(srcImage.getWidth() == dstImage.getWidth());
- assertTrue(srcImage.getHeight() == dstImage.getHeight());
+ assertEquals(srcImage.getWidth(), dstImage.getWidth());
+ assertEquals(srcImage.getHeight(), dstImage.getHeight());
final DataBufferInt srcData = (DataBufferInt) srcImage.getRaster().getDataBuffer();
final DataBufferInt dstData = (DataBufferInt) dstImage.getRaster().getDataBuffer();
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
index 569f29e..729fb12 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
@@ -18,7 +18,7 @@
package org.apache.commons.imaging.formats.tiff;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
import java.awt.image.BufferedImage;
import java.io.IOException;
@@ -63,7 +63,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -77,7 +77,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -91,7 +91,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -105,7 +105,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -119,7 +119,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -133,7 +133,7 @@ public class TiffCcittTest extends TiffBaseTest {
}
} catch (final ImageWriteException | ImageReadException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
} while (nextCombination(combinations, 1));
}
@@ -169,7 +169,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -183,7 +183,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -197,7 +197,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -211,7 +211,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -225,7 +225,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
try {
@@ -238,7 +238,7 @@ public class TiffCcittTest extends TiffBaseTest {
compareImages(image, result);
} catch (final ImageWriteException | ImageReadException | IOException ex) {
Debug.debug(ex);
- assertFalse(true);
+ fail();
}
} while (nextCombination(combinations, 1));
}
diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
index d8e5af7..0ae9dd2 100644
--- a/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
+++ b/src/test/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/floatingpoint/PaletteEntryForValueTest.java
@@ -18,6 +18,8 @@ package org.apache.commons.imaging.formats.tiff.photometricinterpreters.floating
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -79,14 +81,14 @@ public class PaletteEntryForValueTest {
final int a0 = c0.getRGB();
assertEquals(0xff0000ff, a0, "Invalid value for 0.0f");
c0 = instance.getColor(1f);
- assertTrue(c0 == null, "Non-null return for invalid target 1.0f");
+ assertNull(c0, "Non-null return for invalid target 1.0f");
c0 = instance.getColor(Float.NaN);
- assertTrue(c0 == null, "Non-null return for invalid target 1.0f");
+ assertNull(c0, "Non-null return for invalid target 1.0f");
instance = new PaletteEntryForValue(Float.NaN, cTest);
c0 = instance.getColor(Float.NaN);
- assertTrue(c0 != null, "Invalid return for valid target Float.NaN");
+ assertNotNull(c0, "Invalid return for valid target Float.NaN");
c0 = instance.getColor(1.0f);
- assertTrue(c0 == null, "Invalid return for invalid valid target 1.0f");
+ assertNull(c0, "Invalid return for invalid valid target 1.0f");
}