Add support for all TIF files

Author: valandi

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.applitools.imagetester</groupId>
 	<artifactId>ImageTester</artifactId>
-	<version>3.6.4</version>
+	<version>3.7.0</version>
 	<packaging>jar</packaging>
 	<properties>
 		<maven.compiler.source>1.8</maven.compiler.source>
@@ -112,6 +112,11 @@
 			<version>1.7.32</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.twelvemonkeys.imageio</groupId>
+			<artifactId>imageio-jpeg</artifactId>
+			<version>3.12.0</version>
+		</dependency>
 		<dependency>
 			<groupId>com.applitools</groupId>
 			<artifactId>eyes-sdk-core-java5</artifactId>

src/main/java/com/applitools/imagetester/ImageTester.java

@@ -26,7 +26,7 @@
 import com.applitools.imagetester.lib.Utils;
 
 public class ImageTester {
-    private static final String cur_ver = "3.6.4";
+    private static final String cur_ver = "3.7.0";
 
     public static void main(String[] args) {
 

src/main/java/com/applitools/imagetester/TestObjects/ImageFileTest.java

@@ -4,28 +4,75 @@
 import com.applitools.eyes.images.Eyes;
 import com.applitools.imagetester.lib.Config;
 
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.IOException;
 
 public class ImageFileTest extends TestBase {
-    public ImageFileTest(File file, Config conf) {
-        super(file, conf);
+
+    public ImageFileTest(File file, Config config) {
+        super(file, config);
     }
 
     @Override
     public TestResults run(Eyes eyes) throws Exception {
-        BufferedImage image = getImage(file());
+        File actualFile = prepareImageFile(file());
+
+        BufferedImage image = getImage(actualFile);
         eyes.open(appName(), name(), viewport(image));
         eyes.check(
-                file().getName(),
-                new ImagesCheckSettingsFactory(image, config(), viewport(image)).create()
+            actualFile.getName(),
+            new ImagesCheckSettingsFactory(image, config(), viewport(image)).create()
         );
-        image = null;
-        return eyes.close(false);
+        return eyes.close(true);
+    }
+
+    private File prepareImageFile(File inputFile) throws IOException {
+        return isTiff(inputFile) ? convertTiffToPng(inputFile) : inputFile;
+    }
+
+    private boolean isTiff(File file) {
+        String name = file.getName().toLowerCase();
+        return name.endsWith(".tif") || name.endsWith(".tiff");
+    }
+
+    private File convertTiffToPng(File tiffFile) throws IOException {
+        BufferedImage image = readImageAsRgb(tiffFile);
+        File output = new File(tiffFile.getParent(), replaceExtension(tiffFile.getName(), "png"));
+        ImageIO.write(image, "png", output);
+        return output;
+    }
+
+    private BufferedImage readImageAsRgb(File file) throws IOException {
+        BufferedImage image = ImageIO.read(file);
+        if (image == null) {
+            throw new IOException("Unsupported image format or corrupt file: " + file.getAbsolutePath());
+        }
+
+        if (image.getType() != BufferedImage.TYPE_INT_RGB) {
+            BufferedImage rgbImage = new BufferedImage(
+                image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB
+            );
+            Graphics2D g = rgbImage.createGraphics();
+            g.drawImage(image, 0, 0, null);
+            g.dispose();
+            return rgbImage;
+        }
+
+        return image;
+    }
+
+    private String replaceExtension(String filename, String newExt) {
+        int dotIndex = filename.lastIndexOf('.');
+        return (dotIndex == -1)
+            ? filename + "." + newExt
+            : filename.substring(0, dotIndex) + "." + newExt;
     }
 
     @Override
     public boolean isEmpty() {
         return false;
     }
-}
+}