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-imaging.git
commit 053e3f9d52a90644a448151fdf6a5d0a16146cdf Author: Gary Gregory <[email protected]> AuthorDate: Tue May 9 08:37:33 2023 -0400 Reorg imports (static imports first) --- .../java/org/apache/commons/imaging/Imaging.java | 20 +++++++------- .../imaging/formats/rgbe/RgbeImageParser.java | 16 +++++------ .../formats/tiff/datareaders/DataReaderStrips.java | 2 +- .../formats/tiff/datareaders/DataReaderTiled.java | 2 +- .../formats/tiff/datareaders/ImageDataReader.java | 6 ++-- .../formats/tiff/write/TiffImageWriterBase.java | 4 +-- .../org/apache/commons/imaging/ImagingTest.java | 2 +- .../commons/imaging/common/ImageBuilderTest.java | 6 +++- .../commons/imaging/common/RationalNumberTest.java | 8 +++--- .../common/bytesource/ByteSourceImageTest.java | 32 +++++++++++----------- .../bytesource/ByteSourceInputStreamTest.java | 12 ++++---- .../commons/imaging/examples/ImageReadExample.java | 10 +++---- .../imaging/examples/ImageWriteExample.java | 10 +++---- .../commons/imaging/examples/SampleUsage.java | 14 +++++----- .../imaging/examples/tiff/ReadTagsAndImages.java | 2 ++ .../imaging/formats/bmp/BmpRoundtripTest.java | 14 +++++----- .../commons/imaging/formats/dcx/DcxReadTest.java | 12 ++++---- .../commons/imaging/formats/icns/IcnsReadTest.java | 20 +++++++------- .../commons/imaging/formats/ico/IcoReadTest.java | 12 ++++---- .../commons/imaging/formats/jpeg/JpegReadTest.java | 16 +++++------ .../jpeg/JpegWithInvalidDhtSegmentTest.java | 4 +-- .../formats/jpeg/JpegWithJpegThumbnailTest.java | 10 +++---- .../imaging/formats/jpeg/exif/AsciiFieldTest.java | 18 ++++++------ .../imaging/formats/jpeg/exif/ExifDumpTest.java | 10 +++---- .../commons/imaging/formats/jpeg/exif/GpsTest.java | 6 ++-- .../formats/jpeg/exif/SpecificExifTagTest.java | 10 +++---- .../imaging/formats/jpeg/iptc/IptcDumpTest.java | 12 ++++---- .../commons/imaging/formats/pam/PamReadTest.java | 12 ++++---- .../commons/imaging/formats/pcx/PcxReadTest.java | 12 ++++---- .../imaging/formats/png/ConvertPngToGifTest.java | 10 +++---- .../formats/png/PngMultipleRoundtripTest.java | 14 +++++----- .../commons/imaging/formats/png/PngTextTest.java | 11 ++++---- .../png/PngWithInvalidPngChunkSizeTest.java | 4 +-- .../formats/png/PngWriteForceTrueColorText.java | 6 ++-- .../imaging/formats/png/PngWritePredictorTest.java | 7 +++-- .../imaging/formats/png/PngWriteReadTest.java | 24 ++++++++-------- .../imaging/formats/pnm/PnmImageParserTest.java | 18 ++++++------ .../commons/imaging/formats/psd/PsdReadTest.java | 12 ++++---- .../formats/tiff/TiffAlphaRoundTripTest.java | 20 +++++++------- .../imaging/formats/tiff/TiffReadAlphaTest.java | 5 ++-- .../imaging/formats/tiff/TiffRoundtripTest.java | 14 +++++----- .../imaging/formats/tiff/TiffSubImageTest.java | 12 ++++---- .../commons/imaging/formats/wbmp/WbmpReadTest.java | 12 ++++---- .../commons/imaging/formats/xbm/XbmReadTest.java | 12 ++++---- .../commons/imaging/formats/xpm/XpmReadTest.java | 12 ++++---- .../roundtrip/NullParametersRoundtripTest.java | 8 +++--- .../imaging/roundtrip/PixelDensityRoundtrip.java | 12 ++++---- .../commons/imaging/roundtrip/RoundtripBase.java | 16 +++++------ 48 files changed, 276 insertions(+), 267 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/Imaging.java b/src/main/java/org/apache/commons/imaging/Imaging.java index 3e6fd062..bcf9b7f7 100644 --- a/src/main/java/org/apache/commons/imaging/Imaging.java +++ b/src/main/java/org/apache/commons/imaging/Imaging.java @@ -16,16 +16,6 @@ */ package org.apache.commons.imaging; -import org.apache.commons.imaging.common.ImageMetadata; -import org.apache.commons.imaging.common.XmpEmbeddable; -import org.apache.commons.imaging.common.bytesource.ByteSource; -import org.apache.commons.imaging.common.bytesource.ByteSourceArray; -import org.apache.commons.imaging.common.bytesource.ByteSourceFile; -import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream; -import org.apache.commons.imaging.icc.IccProfileInfo; -import org.apache.commons.imaging.icc.IccProfileParser; -import org.apache.commons.imaging.internal.ImageParserFactory; - import java.awt.Dimension; import java.awt.color.ICC_Profile; import java.awt.image.BufferedImage; @@ -41,6 +31,16 @@ import java.util.Locale; import java.util.Objects; import java.util.stream.Stream; +import org.apache.commons.imaging.common.ImageMetadata; +import org.apache.commons.imaging.common.XmpEmbeddable; +import org.apache.commons.imaging.common.bytesource.ByteSource; +import org.apache.commons.imaging.common.bytesource.ByteSourceArray; +import org.apache.commons.imaging.common.bytesource.ByteSourceFile; +import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream; +import org.apache.commons.imaging.icc.IccProfileInfo; +import org.apache.commons.imaging.icc.IccProfileParser; +import org.apache.commons.imaging.internal.ImageParserFactory; + /** * The primary application programming interface (API) to the Imaging library. * diff --git a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java index 03d490ff..6889d8e0 100644 --- a/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java @@ -16,14 +16,6 @@ */ package org.apache.commons.imaging.formats.rgbe; -import org.apache.commons.imaging.ImageFormat; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.ImageInfo; -import org.apache.commons.imaging.ImageParser; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.common.ImageMetadata; -import org.apache.commons.imaging.common.bytesource.ByteSource; - import java.awt.Dimension; import java.awt.Point; import java.awt.Transparency; @@ -38,6 +30,14 @@ import java.io.IOException; import java.nio.ByteOrder; import java.util.ArrayList; +import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.ImageParser; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.common.ImageMetadata; +import org.apache.commons.imaging.common.bytesource.ByteSource; + /** * Parser for Radiance HDR images */ diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java index 2cd4b87f..c9347870 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java @@ -23,9 +23,9 @@ import java.nio.ByteOrder; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.common.ImageBuilder; -import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.TiffDirectory; import org.apache.commons.imaging.formats.tiff.TiffImageData; +import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.TiffRasterDataFloat; import org.apache.commons.imaging.formats.tiff.TiffRasterDataInt; import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration; diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java index a1374848..2cebc9da 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java @@ -29,9 +29,9 @@ import java.nio.ByteOrder; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.common.ImageBuilder; -import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.TiffDirectory; import org.apache.commons.imaging.formats.tiff.TiffImageData; +import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.TiffRasterDataFloat; import org.apache.commons.imaging.formats.tiff.TiffRasterDataInt; import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration; diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java index 47c31122..dcb12fb5 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/ImageDataReader.java @@ -19,8 +19,8 @@ package org.apache.commons.imaging.formats.tiff.datareaders; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4; -import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE; +import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_PKZIP; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED; @@ -39,12 +39,12 @@ import java.util.Arrays; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.common.ImageBuilder; import org.apache.commons.imaging.common.PackBits; +import org.apache.commons.imaging.common.ZlibDeflate; import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression; import org.apache.commons.imaging.common.mylzw.MyLzwDecompressor; -import org.apache.commons.imaging.common.ZlibDeflate; -import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.TiffDirectory; import org.apache.commons.imaging.formats.tiff.TiffField; +import org.apache.commons.imaging.formats.tiff.TiffRasterData; import org.apache.commons.imaging.formats.tiff.constants.TiffPlanarConfiguration; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.apache.commons.imaging.formats.tiff.photometricinterpreters.PhotometricInterpreter; diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java index 5c16bd16..bfe3b011 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java @@ -20,10 +20,10 @@ import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.DE import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_1D; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_3; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_CCITT_GROUP_4; +import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_LZW; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_PACKBITS; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_UNCOMPRESSED; -import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_COMPRESSION_DEFLATE_ADOBE; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_FLAG_T6_OPTIONS_UNCOMPRESSED_MODE; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.TIFF_HEADER_SIZE; @@ -46,9 +46,9 @@ import org.apache.commons.imaging.PixelDensity; import org.apache.commons.imaging.common.BinaryOutputStream; import org.apache.commons.imaging.common.PackBits; import org.apache.commons.imaging.common.RationalNumber; +import org.apache.commons.imaging.common.ZlibDeflate; import org.apache.commons.imaging.common.itu_t4.T4AndT6Compression; import org.apache.commons.imaging.common.mylzw.MyLzwCompressor; -import org.apache.commons.imaging.common.ZlibDeflate; import org.apache.commons.imaging.formats.tiff.TiffElement; import org.apache.commons.imaging.formats.tiff.TiffImageData; import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; diff --git a/src/test/java/org/apache/commons/imaging/ImagingTest.java b/src/test/java/org/apache/commons/imaging/ImagingTest.java index 8b32487c..f5a5a526 100644 --- a/src/test/java/org/apache/commons/imaging/ImagingTest.java +++ b/src/test/java/org/apache/commons/imaging/ImagingTest.java @@ -17,8 +17,8 @@ package org.apache.commons.imaging; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; diff --git a/src/test/java/org/apache/commons/imaging/common/ImageBuilderTest.java b/src/test/java/org/apache/commons/imaging/common/ImageBuilderTest.java index 2f2fab96..697ab0b9 100644 --- a/src/test/java/org/apache/commons/imaging/common/ImageBuilderTest.java +++ b/src/test/java/org/apache/commons/imaging/common/ImageBuilderTest.java @@ -16,12 +16,16 @@ */ package org.apache.commons.imaging.common; +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.fail; + import java.awt.image.BufferedImage; import java.awt.image.ColorModel; import java.awt.image.RasterFormatException; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; /** * Provides unit tests for the ImageBuilder class. diff --git a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java index 8f40bd71..f50482d4 100644 --- a/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java +++ b/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java @@ -17,19 +17,19 @@ package org.apache.commons.imaging.common; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.text.NumberFormat; import java.util.Arrays; import java.util.stream.Stream; import org.apache.commons.imaging.ImagingTest; import org.apache.commons.imaging.internal.Debug; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - public class RationalNumberTest extends ImagingTest { public static Stream<Double> data() { 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 dd42e596..aea30de7 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 @@ -17,6 +17,22 @@ 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; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.stream.Stream; + import org.apache.commons.imaging.ImageFormat; import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageInfo; @@ -32,22 +48,6 @@ import org.apache.commons.io.FileUtils; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.awt.Dimension; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.stream.Stream; - -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; - public class ByteSourceImageTest extends ByteSourceTest { public static Stream<File> data() throws Exception { diff --git a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStreamTest.java b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStreamTest.java index 375d82c2..e30fbfed 100644 --- a/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStreamTest.java +++ b/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceInputStreamTest.java @@ -16,11 +16,7 @@ */ package org.apache.commons.imaging.common.bytesource; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.ImagingTestConstants; -import org.apache.commons.io.FilenameUtils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.awt.image.BufferedImage; import java.io.BufferedInputStream; @@ -28,7 +24,11 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTestConstants; +import org.apache.commons.io.FilenameUtils; +import org.junit.jupiter.api.Test; class ByteSourceInputStreamTest { diff --git a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java index c886faf7..20b4fc03 100644 --- a/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java +++ b/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java @@ -16,11 +16,6 @@ */ package org.apache.commons.imaging.examples; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.common.BufferedImageFactory; -import org.apache.commons.imaging.formats.tiff.TiffImageParser; -import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; - import java.awt.GraphicsConfiguration; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; @@ -29,6 +24,11 @@ import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.common.BufferedImageFactory; +import org.apache.commons.imaging.formats.tiff.TiffImageParser; +import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; + public class ImageReadExample { public static BufferedImage imageReadExample(final File file) throws ImageReadException, IOException { diff --git a/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java b/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java index 1fb8604e..e5c436c1 100644 --- a/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java +++ b/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java @@ -16,6 +16,11 @@ */ package org.apache.commons.imaging.examples; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; + import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.Imaging; @@ -23,11 +28,6 @@ import org.apache.commons.imaging.formats.tiff.TiffImageParser; import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; - public class ImageWriteExample { public static byte[] imageWriteExample(final File file) throws ImageReadException, ImageWriteException, IOException { diff --git a/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java b/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java index f3549142..5ee4fa20 100644 --- a/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java +++ b/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java @@ -16,13 +16,6 @@ */ package org.apache.commons.imaging.examples; -import org.apache.commons.imaging.FormatCompliance; -import org.apache.commons.imaging.ImageFormat; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.ImageInfo; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.common.ImageMetadata; - import java.awt.Dimension; import java.awt.color.ICC_Profile; import java.awt.image.BufferedImage; @@ -30,6 +23,13 @@ import java.io.File; import java.io.InputStream; import java.io.OutputStream; +import org.apache.commons.imaging.FormatCompliance; +import org.apache.commons.imaging.ImageFormat; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.common.ImageMetadata; + public class SampleUsage { @SuppressWarnings("unused") diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java index 9e90136c..7edde2af 100644 --- a/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java +++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ReadTagsAndImages.java @@ -22,7 +22,9 @@ import java.io.IOException; import java.io.PrintStream; import java.util.HashMap; import java.util.List; + import javax.imageio.ImageIO; + import org.apache.commons.imaging.FormatCompliance; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.common.bytesource.ByteSourceFile; 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 df9f688c..8292bf36 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,6 +17,13 @@ package org.apache.commons.imaging.formats.bmp; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.Random; + import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; @@ -24,13 +31,6 @@ import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.Random; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class BmpRoundtripTest extends BmpBaseTest { private int[][] getSimpleRawData(final int width, final int height, final int value) { diff --git a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java index 09711fb7..9a42cf1e 100644 --- a/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java @@ -17,17 +17,17 @@ package org.apache.commons.imaging.formats.dcx; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.File; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class DcxReadTest extends DcxBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java index cd1f3279..15212f63 100644 --- a/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java @@ -17,14 +17,8 @@ package org.apache.commons.imaging.formats.icns; -import org.apache.commons.imaging.ImageInfo; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.File; @@ -33,8 +27,14 @@ import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; public class IcnsReadTest extends IcnsBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java index fef844fa..0376087b 100644 --- a/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java @@ -17,17 +17,17 @@ package org.apache.commons.imaging.formats.ico; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.File; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class IcoReadTest extends IcoBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java index 39e6708b..243f3cd4 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java @@ -17,6 +17,14 @@ package org.apache.commons.imaging.formats.jpeg; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.stream.Stream; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; @@ -28,14 +36,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; - public class JpegReadTest extends JpegBaseTest { public static Stream<File> data() throws Exception{ diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java index 3803c882..6286c26d 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithInvalidDhtSegmentTest.java @@ -17,13 +17,13 @@ package org.apache.commons.imaging.formats.jpeg; +import java.io.File; + import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.File; - /** * Test that an invalid segment will not cause an ArrayIndexOutOfBoundsException * when the huffman table is created in a DHT segment. diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java index 11ad7d32..05621e9e 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java @@ -17,15 +17,15 @@ package org.apache.commons.imaging.formats.jpeg; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.ImagingTest; -import org.apache.commons.imaging.common.ImageMetadata; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.File; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTest; +import org.apache.commons.imaging.common.ImageMetadata; +import org.junit.jupiter.api.Test; public class JpegWithJpegThumbnailTest extends ImagingTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java index 9d8c8d72..dfa32061 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java @@ -17,6 +17,15 @@ package org.apache.commons.imaging.formats.jpeg.exif; +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.File; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; @@ -25,15 +34,6 @@ import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.junit.jupiter.api.Test; -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class AsciiFieldTest extends ExifBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java index 3ee53aeb..642f72c6 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java @@ -17,6 +17,11 @@ package org.apache.commons.imaging.formats.jpeg.exif; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.File; +import java.util.stream.Stream; + import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.bytesource.ByteSource; import org.apache.commons.imaging.common.bytesource.ByteSourceFile; @@ -27,11 +32,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.io.File; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class ExifDumpTest extends ExifBaseTest { public static Stream<File> data() throws Exception { diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java index 43ad1547..b1e9d693 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java @@ -17,6 +17,9 @@ package org.apache.commons.imaging.formats.jpeg.exif; +import java.io.File; +import java.util.stream.Stream; + import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; @@ -24,9 +27,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.io.File; -import java.util.stream.Stream; - public class GpsTest extends ExifBaseTest { public static Stream<File> data() throws Exception { diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java index 5bd1138f..53b35252 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java @@ -17,6 +17,11 @@ package org.apache.commons.imaging.formats.jpeg.exif; +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.stream.Stream; + import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.Imaging; @@ -28,11 +33,6 @@ import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.stream.Stream; - public abstract class SpecificExifTagTest extends ExifBaseTest { public static Stream<File> data() throws Exception { diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java index afdeb60c..64e03dc7 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java @@ -17,6 +17,12 @@ package org.apache.commons.imaging.formats.jpeg.iptc; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.File; +import java.util.List; +import java.util.stream.Stream; + import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata; @@ -24,12 +30,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.io.File; -import java.util.List; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class IptcDumpTest extends IptcBaseTest { public static Stream<File> data() throws Exception { diff --git a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java index 88f5fbf9..41ab3e61 100644 --- a/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java @@ -17,6 +17,12 @@ package org.apache.commons.imaging.formats.pam; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -24,12 +30,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class PamReadTest extends PamBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java index 8be578a1..b2febf5d 100644 --- a/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java @@ -17,6 +17,12 @@ package org.apache.commons.imaging.formats.pcx; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -24,12 +30,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class PcxReadTest extends PcxBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java index 6b419569..4dd86df7 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java @@ -17,17 +17,17 @@ package org.apache.commons.imaging.formats.png; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.internal.Debug; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.File; import java.nio.file.Files; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.internal.Debug; +import org.junit.jupiter.api.Test; public class ConvertPngToGifTest extends PngBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java index 39eb192d..35a6f488 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java @@ -17,18 +17,18 @@ package org.apache.commons.imaging.formats.png; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.internal.Debug; -import org.apache.commons.io.FilenameUtils; -import org.junit.jupiter.api.Test; +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; import java.nio.file.Files; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.internal.Debug; +import org.apache.commons.io.FilenameUtils; +import org.junit.jupiter.api.Test; public class PngMultipleRoundtripTest extends PngBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java index f49f97b4..b04a3831 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java @@ -17,9 +17,9 @@ package org.apache.commons.imaging.formats.png; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.io.FileUtils; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; import java.awt.Color; import java.awt.image.BufferedImage; @@ -27,9 +27,8 @@ import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.fail; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Test; public class PngTextTest extends PngBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java index be2e13f9..eb451513 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWithInvalidPngChunkSizeTest.java @@ -17,14 +17,14 @@ package org.apache.commons.imaging.formats.png; +import java.io.File; + import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.examples.ImageReadExample.ManagedImageBufferedImageFactory; import org.apache.commons.imaging.formats.jpeg.JpegWithInvalidDhtSegmentTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.io.File; - /** * Tests for PNG files with invalid chunk sizes. */ diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java index 98846930..0e8b220c 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java @@ -17,15 +17,15 @@ package org.apache.commons.imaging.formats.png; -import org.apache.commons.imaging.internal.Debug; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.internal.Debug; +import org.junit.jupiter.api.Test; public class PngWriteForceTrueColorText extends PngBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/png/PngWritePredictorTest.java b/src/test/java/org/apache/commons/imaging/formats/png/PngWritePredictorTest.java index 0fdd9973..8f16f42f 100644 --- a/src/test/java/org/apache/commons/imaging/formats/png/PngWritePredictorTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/png/PngWritePredictorTest.java @@ -19,17 +19,20 @@ package org.apache.commons.imaging.formats.png; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import javax.imageio.ImageIO; + import org.apache.commons.imaging.ImageWriteException; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; /** * Provides a test for the PngWriter using predictors 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 3e6825cc..6ba59b49 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 @@ -17,14 +17,10 @@ package org.apache.commons.imaging.formats.png; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.ImageWriteException; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.ImagingTest; -import org.apache.commons.imaging.common.GenericImageMetadata; -import org.apache.commons.imaging.common.ImageMetadata; -import org.junit.jupiter.api.Test; +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.assertTrue; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -33,10 +29,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; -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.assertTrue; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTest; +import org.apache.commons.imaging.common.GenericImageMetadata; +import org.apache.commons.imaging.common.ImageMetadata; +import org.junit.jupiter.api.Test; public class PngWriteReadTest extends ImagingTest { 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 6aa3b51c..fbe59a7f 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 @@ -16,13 +16,8 @@ */ package org.apache.commons.imaging.formats.pnm; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.ImageInfo; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.ImageWriteException; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; @@ -30,8 +25,13 @@ import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class PnmImageParserTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java b/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java index 85087559..072dd4a5 100644 --- a/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java @@ -16,6 +16,12 @@ */ package org.apache.commons.imaging.formats.psd; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -23,12 +29,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class PsdReadTest extends PsdBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java index 35e55d45..16ca6d37 100644 --- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffAlphaRoundTripTest.java @@ -16,14 +16,8 @@ */ package org.apache.commons.imaging.formats.tiff; -import org.apache.commons.imaging.ImageFormats; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; -import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; -import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory; -import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.awt.AlphaComposite; import java.awt.Color; @@ -35,8 +29,14 @@ import java.io.FileOutputStream; import java.nio.ByteOrder; import java.nio.file.Path; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import org.apache.commons.imaging.ImageFormats; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; +import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; +import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory; +import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; /** * Performs a round-trip that writes an image containing Alpha and then reads it diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java index aa0553d1..b7e2c6a7 100644 --- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadAlphaTest.java @@ -16,6 +16,9 @@ */ package org.apache.commons.imaging.formats.tiff; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import java.awt.Color; import java.awt.Graphics2D; import java.awt.image.BufferedImage; @@ -25,9 +28,7 @@ import java.io.IOException; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.ImagingTestConstants; - import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; /** * Performs tests that access the content of TIFF files diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java index e0f53b7c..22c0fc98 100644 --- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java @@ -17,19 +17,19 @@ package org.apache.commons.imaging.formats.tiff; -import org.apache.commons.imaging.ImageInfo; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.common.ImageMetadata; -import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; -import org.apache.commons.imaging.internal.Debug; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.File; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.common.ImageMetadata; +import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; +import org.apache.commons.imaging.internal.Debug; +import org.junit.jupiter.api.Test; public class TiffRoundtripTest extends TiffBaseTest { diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java index 5784704e..11352ca0 100644 --- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java @@ -16,10 +16,8 @@ */ package org.apache.commons.imaging.formats.tiff; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.ImageWriteException; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -27,8 +25,10 @@ import java.io.File; import java.io.IOException; import java.util.List; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import org.apache.commons.imaging.ImageReadException; +import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.api.Test; public class TiffSubImageTest extends TiffBaseTest { final List<File> imageFileList; diff --git a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java index 8543eb05..24183532 100644 --- a/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java @@ -14,6 +14,12 @@ */ package org.apache.commons.imaging.formats.wbmp; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -21,12 +27,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class WbmpReadTest extends WbmpBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java index f2224be4..73646fd2 100644 --- a/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java @@ -14,6 +14,12 @@ */ package org.apache.commons.imaging.formats.xbm; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -21,12 +27,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class XbmReadTest extends XbmBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java index 8ad62f31..0cfca34a 100644 --- a/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java @@ -14,6 +14,12 @@ */ package org.apache.commons.imaging.formats.xpm; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.File; +import java.util.List; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.common.ImageMetadata; @@ -21,12 +27,6 @@ import org.apache.commons.imaging.internal.Debug; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.List; - -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class XpmReadTest extends XpmBaseTest { @Test diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/NullParametersRoundtripTest.java b/src/test/java/org/apache/commons/imaging/roundtrip/NullParametersRoundtripTest.java index 6415a010..ee3d61e9 100644 --- a/src/test/java/org/apache/commons/imaging/roundtrip/NullParametersRoundtripTest.java +++ b/src/test/java/org/apache/commons/imaging/roundtrip/NullParametersRoundtripTest.java @@ -17,16 +17,16 @@ package org.apache.commons.imaging.roundtrip; -import org.apache.commons.imaging.Imaging; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.stream.Stream; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.apache.commons.imaging.Imaging; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; public class NullParametersRoundtripTest extends RoundtripBase { diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java b/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java index 2a0e8040..78f393ae 100644 --- a/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java +++ b/src/test/java/org/apache/commons/imaging/roundtrip/PixelDensityRoundtrip.java @@ -17,6 +17,12 @@ package org.apache.commons.imaging.roundtrip; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.util.stream.Stream; + import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; import org.apache.commons.imaging.PixelDensity; @@ -25,12 +31,6 @@ import org.apache.commons.imaging.formats.tiff.TiffImagingParameters; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertTrue; - public class PixelDensityRoundtrip extends RoundtripBase { public static Stream<FormatInfo> testPixelDensityRoundtrip() { diff --git a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java index c46cc698..83aa84c8 100644 --- a/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java +++ b/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripBase.java @@ -16,6 +16,14 @@ */ package org.apache.commons.imaging.roundtrip; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.stream.Stream; + import org.apache.commons.imaging.ImageParser; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; @@ -24,14 +32,6 @@ import org.apache.commons.imaging.common.RgbBufferedImageFactory; import org.apache.commons.imaging.internal.ImageParserFactory; import org.junit.jupiter.params.provider.Arguments; -import java.awt.image.BufferedImage; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - public class RoundtripBase { protected void roundtrip(final FormatInfo formatInfo, final BufferedImage testImage,
