garydgregory commented on code in PR #337: URL: https://github.com/apache/commons-imaging/pull/337#discussion_r1402031806
########## src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadImageInfoTest.java: ########## @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.imaging.formats.tiff; + +import java.io.File; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTestConstants; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +/** + * Performs a test on the ImageInfo returned from TIFF to confirm + * that it contains the specified value for a particular target. + * This test is used to confirm that the TiffImageParser is correctly + * interpreting the ImageInfo values. + */ +public class TiffReadImageInfoTest extends TiffBaseTest { + + // The form of the test set is + // 0. target file name + // 1. Parameter field in ImageInfo + // 2. Expected value + static final String[][] testSet = { + {"1/matthew2.tif", "Color Type", "Black and White"}, + {"7/Oregon Scientific DS6639 - DSC_0307 - small - CMYK.tiff", "Color Type", "CMYK"}, + {"10/Imaging247.tiff", "Uses Palette", "true"}, + {"12/TransparencyTestStripAssociated.tif", "Is Transparent", "true"}, + {"14/TestJpegStrips.tiff", "Color Type", "YCbCr"} + Review Comment: No need for extra whitespace. ########## src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadImageInfoTest.java: ########## @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.imaging.formats.tiff; + +import java.io.File; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTestConstants; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +/** + * Performs a test on the ImageInfo returned from TIFF to confirm + * that it contains the specified value for a particular target. + * This test is used to confirm that the TiffImageParser is correctly + * interpreting the ImageInfo values. + */ +public class TiffReadImageInfoTest extends TiffBaseTest { + + // The form of the test set is + // 0. target file name + // 1. Parameter field in ImageInfo + // 2. Expected value + static final String[][] testSet = { + {"1/matthew2.tif", "Color Type", "Black and White"}, + {"7/Oregon Scientific DS6639 - DSC_0307 - small - CMYK.tiff", "Color Type", "CMYK"}, + {"10/Imaging247.tiff", "Uses Palette", "true"}, + {"12/TransparencyTestStripAssociated.tif", "Is Transparent", "true"}, + {"14/TestJpegStrips.tiff", "Color Type", "YCbCr"} + + }; + + /** + * Gets the value for the target data field within the ImageInfo string. + * This method expects data fields to be given in the form: + * parameter name, colon, value, end-of-line + * + * @param info a valid instance obtained from TiffImageParser + * @param target the target data field string + * @return the value + */ + private String getValue(ImageInfo info, String target) { + String s = info.toString(); + int i = s.indexOf(target); + if (i < 0) { + return ""; + } + int j = s.indexOf(':', i); + if (j < 0) { + return ""; + } + int k = s.indexOf('\n', j); + if (k < j) { + return ""; + } + String q = s.substring(j + 1, k).trim(); Review Comment: No need for `q` local variable. ########## src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadImageInfoTest.java: ########## @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.imaging.formats.tiff; + +import java.io.File; +import org.apache.commons.imaging.ImageInfo; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingTestConstants; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + +/** + * Performs a test on the ImageInfo returned from TIFF to confirm + * that it contains the specified value for a particular target. + * This test is used to confirm that the TiffImageParser is correctly + * interpreting the ImageInfo values. + */ +public class TiffReadImageInfoTest extends TiffBaseTest { + + // The form of the test set is + // 0. target file name + // 1. Parameter field in ImageInfo + // 2. Expected value + static final String[][] testSet = { + {"1/matthew2.tif", "Color Type", "Black and White"}, + {"7/Oregon Scientific DS6639 - DSC_0307 - small - CMYK.tiff", "Color Type", "CMYK"}, + {"10/Imaging247.tiff", "Uses Palette", "true"}, + {"12/TransparencyTestStripAssociated.tif", "Is Transparent", "true"}, + {"14/TestJpegStrips.tiff", "Color Type", "YCbCr"} + + }; + + /** + * Gets the value for the target data field within the ImageInfo string. + * This method expects data fields to be given in the form: + * parameter name, colon, value, end-of-line + * + * @param info a valid instance obtained from TiffImageParser + * @param target the target data field string + * @return the value + */ + private String getValue(ImageInfo info, String target) { + String s = info.toString(); Review Comment: Use final where you can. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
