Merge pull request #6 from romankh3/refactoring

Refactoring

Author: romankh3

src/main/java/ua/comparison/image/ImageComparison.java

@@ -26,9 +26,7 @@ public static void main( String[] args ) throws IOException, URISyntaxException
         // Draw rectangles on the image.
         BufferedImage drawnDifferences = drawTheDifference( "image1.png", "image2.png" );
 
-        // make dir if it's not using from Gradle.
-        new File( "build" );
-        ImageIO.write( drawnDifferences, "png", new File( "build/result.png" ) );
+        saveImage( "build/result.png", drawnDifferences );
 
         createGUI( drawnDifferences );
     }

src/main/java/ua/comparison/image/ImageComparisonTools.java

@@ -20,22 +20,22 @@ public class ImageComparisonTools {
      * @param image resulting image.
      */
     public static Frame createGUI(BufferedImage image ) {
-        JFrame frame = new JFrame("The result of the comparison");
+        JFrame frame = new JFrame("The result of the comparison" );
         frame.setDefaultCloseOperation( WindowConstants.EXIT_ON_CLOSE );
         JLabel label = new JLabel();
-        label.setIcon(new ImageIcon(image, "Result"));
+        label.setIcon( new ImageIcon( image, "Result") );
         frame.getContentPane().add(label, BorderLayout.CENTER);
-        frame.setPreferredSize(new Dimension( (image.getWidth() ), image.getHeight() ) );
+        frame.setPreferredSize(new Dimension( image.getWidth(), ( int )( image.getHeight() * 1.1 ) ) );
         frame.pack();
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
+        frame.setLocationRelativeTo( null );
+        frame.setVisible( true );
         return frame;
     }
 
-    static BufferedImage deepCopy( BufferedImage iamge ) {
-        ColorModel cm = iamge.getColorModel();
+    static BufferedImage deepCopy( BufferedImage image ) {
+        ColorModel cm = image.getColorModel();
         boolean isAlphaPremultiplied = cm.isAlphaPremultiplied();
-        WritableRaster raster = iamge.copyData(null);
+        WritableRaster raster = image.copyData(null);
         return new BufferedImage(cm, raster, isAlphaPremultiplied, null);
     }
 
@@ -85,4 +85,16 @@ public static boolean isDifferent( int x, int y, BufferedImage image1, BufferedI
     public static BufferedImage readImageFromResources( String path ) throws IOException, URISyntaxException {
         return ImageIO.read( new File( ImageComparison.class.getClassLoader().getResource ( path ).toURI().getPath() ) );
     }
+
+    /**
+     * Save image to the provided path.
+     * @param path the path to the saving image.
+     * @param image the {@code BufferedImage} object of this specific image.
+     * @throws IOException
+     */
+    public static void saveImage(String path, BufferedImage image ) throws IOException {
+        // make dir if it's not using from Gradle.
+        new File( path ).mkdirs();
+        ImageIO.write( image, "png", new File( path ) );
+    }
 }

src/test/java/ua/comparison/image/ImageComparisonToolsUnitTest.java

@@ -4,10 +4,12 @@
 import static ua.comparison.image.ImageComparisonTools.createGUI;
 import static ua.comparison.image.ImageComparisonTools.readImageFromResources;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
@@ -20,7 +22,23 @@ public class ImageComparisonToolsUnitTest {
     public void testFrameMethod() throws IOException, URISyntaxException {
         BufferedImage image = readImageFromResources( "result.png" );
         Frame resultFrame = createGUI( image );
-        assertEquals( resultFrame.getHeight(), image.getHeight() );
+        assertEquals( resultFrame.getHeight(), ( int ) ( image.getHeight() * 1.1 ) );
         assertEquals( resultFrame.getWidth(), image.getWidth() );
     }
+
+    @Test( expected = IllegalArgumentException.class )
+    public void testCheckCorrectImageSize() {
+        BufferedImage image1 = new BufferedImage(10, 10, 10);
+        BufferedImage image2 = new BufferedImage(12, 12, 10);
+
+        ImageComparisonTools.checkCorrectImageSize( image1, image2 );
+    }
+
+    @Test
+    public void testSaveImage() throws IOException, URISyntaxException {
+        BufferedImage image = readImageFromResources( "result.png" );
+        String path = "build/test/correct/save/image.png";
+        ImageComparisonTools.saveImage( path, image );
+        Assert.assertTrue( new File( path ).exists() );
+    }
 }