[commons-imaging] 23/24: [IMAGING-159][IMAGING-320] Update test to use new TiffImagingParameter class

[kinow]

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 78b5b25d6199f82df56860fa2d7ada0141a1ae13
Author: Bruno P. Kinoshita <ki...@apache.org>
AuthorDate: Sun Jan 9 08:33:44 2022 +1300

    [IMAGING-159][IMAGING-320] Update test to use new TiffImagingParameter class
---
 .../imaging/formats/tiff/TiffRoundTripInt32Test.java    | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
 
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
index f0b9811..1efd0b7 100644
--- 
a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
+++ 
b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundTripInt32Test.java
@@ -25,14 +25,11 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.ByteOrder;
 import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.apache.commons.imaging.FormatCompliance;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.ImageWriteException;
 import org.apache.commons.imaging.common.bytesource.ByteSourceFile;
-import org.apache.commons.imaging.formats.tiff.constants.TiffConstants;
 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;
@@ -92,11 +89,8 @@ public class TiffRoundTripInt32Test extends TiffBaseTest {
                 "Extracted data does not match original, test "+name+": "
                 + i + ", index " + j);
             }
-            final Map<String, Object> params = new HashMap<>();
-            params.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2);
-            params.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2);
-            params.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width-4);
-            params.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height-4);
+            final TiffImagingParameters params = new TiffImagingParameters();
+            params.setSubImage(2, 2, width-4, height-4);
             TiffRasterData rdSub = directory.getRasterData(params);
             assertEquals(width-4, rdSub.getWidth(), "Invalid sub-image width");
             assertEquals(height-4, rdSub.getHeight(), "Invalid sub-image 
height");
@@ -107,11 +101,8 @@ public class TiffRoundTripInt32Test extends TiffBaseTest {
                     assertEquals(a, b, "Sub Image test failed at (" + x + "," 
+ y + ")");
                 }
             }
-            final Map<String, Object> xparams = new HashMap<>();
-            xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_X, 2);
-            xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_Y, 2);
-            xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_WIDTH, width);
-            xparams.put(TiffConstants.PARAM_KEY_SUBIMAGE_HEIGHT, height);
+            final TiffImagingParameters xparams = new TiffImagingParameters();
+            xparams.setSubImage(2, 2, width, height);
             assertThrows(ImageReadException.class, 
()->directory.getRasterData(xparams),
                 "Failed to catch bad subimage for test "+name);
         }