R move method to GifSequenceWriter

Author: actions-user

approvaltests-tests/src/test/java/org/approvaltests/awt/ApprovalsTest.java

@@ -1,5 +1,7 @@
 package org.approvaltests.awt;
 
+import com.spun.util.Tuple;
+import java.time.Duration;
 import org.approvaltests.core.Options;
 import org.approvaltests.reporters.*;
 import org.junit.jupiter.api.Disabled;
@@ -39,5 +41,7 @@ void testSequence()
   {
     SquareDrawer squareDrawer = new SquareDrawer();
     AwtApprovals.verifySequence(5, f -> squareDrawer.setSquareSize(f * 10));
+//    AwtApprovals.verifySequence(5, Duration.ofMillis(500), f -> squareDrawer.setSquareSize(f * 10));
+//    AwtApprovals.verifySequence(5, f -> new Tuple(squareDrawer.setSquareSize(f * 10), Duration.ofMillis(500));
   }
 }

approvaltests/src/main/java/org/approvaltests/awt/GifSequenceWriter.java

@@ -8,13 +8,26 @@
 // License. To view a copy of this license, visit
 // http://creativecommons.org/licenses/by/3.0/ or send a letter to Creative
 // Commons, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.
-import javax.imageio.*;
-import javax.imageio.metadata.*;
-import javax.imageio.stream.*;
-import java.awt.image.*;
-import java.io.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.RenderedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Iterator;
 
+import javax.imageio.IIOException;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataNode;
+import javax.imageio.stream.FileImageOutputStream;
+import javax.imageio.stream.ImageOutputStream;
+
+import com.spun.util.ObjectUtils;
+
 public class GifSequenceWriter implements AutoCloseable
 {
   protected ImageWriter     gifWriter;
@@ -60,6 +73,25 @@ public GifSequenceWriter(ImageOutputStream outputStream, int imageType, int time
     gifWriter.setOutput(outputStream);
     gifWriter.prepareWriteSequence(null);
   }
+  static File writeAnimatedGif(File imageFile, ArrayList<BufferedImage> images, int timeBetweenFramesMS)
+  {
+    try (ImageOutputStream output = new FileImageOutputStream(imageFile))
+    {
+      try (GifSequenceWriter writer = new GifSequenceWriter(output, images.get(0).getType(), timeBetweenFramesMS,
+          true))
+      {
+        for (BufferedImage image : images)
+        {
+          writer.writeToSequence(image);
+        }
+      }
+    }
+    catch (Exception e)
+    {
+      throw ObjectUtils.throwAsError(e);
+    }
+    return imageFile;
+  }
   public void writeToSequence(RenderedImage img) throws IOException
   {
     gifWriter.writeToSequence(new IIOImage(img, null, imageMetaData), imageWriteParam);
@@ -112,37 +144,4 @@ private static IIOMetadataNode getNode(IIOMetadataNode rootNode, String nodeName
     rootNode.appendChild(node);
     return (node);
   }
-  /**
-   public GifSequenceWriter(
-   BufferedOutputStream outputStream,
-   int imageType,
-   int timeBetweenFramesMS,
-   boolean loopContinuously) {
-   */
-  public static void main(String[] args) throws Exception
-  {
-    if (args.length > 1)
-    {
-      // grab the output image type from the first image in the sequence
-      BufferedImage firstImage = ImageIO.read(new File(args[0]));
-      // create a new BufferedOutputStream with the last argument
-      ImageOutputStream output = new FileImageOutputStream(new File(args[args.length - 1]));
-      // create a gif sequence with the type of the first image, 1 second
-      // between frames, which loops continuously
-      GifSequenceWriter writer = new GifSequenceWriter(output, firstImage.getType(), 1, false);
-      // write out the first image to our sequence...
-      writer.writeToSequence(firstImage);
-      for (int i = 1; i < args.length - 1; i++)
-      {
-        BufferedImage nextImage = ImageIO.read(new File(args[i]));
-        writer.writeToSequence(nextImage);
-      }
-      writer.close();
-      output.close();
-    }
-    else
-    {
-      System.out.println("Usage: java GifSequenceWriter [list of gif files] [output file]");
-    }
-  }
 }

approvaltests/src/main/java/org/approvaltests/awt/PaintableMultiframeWriter.java

@@ -1,20 +1,14 @@
 package org.approvaltests.awt;
 
-import com.spun.swing.Paintable;
-import com.spun.util.ObjectUtils;
-import com.spun.util.persistence.ExecutableQuery;
-import org.approvaltests.approvers.ApprovalApprover;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.ArrayList;
+
 import org.approvaltests.core.ApprovalWriter;
 import org.approvaltests.writers.PaintableApprovalWriter;
 import org.lambda.functions.Function1;
 
-import javax.imageio.stream.FileImageOutputStream;
-import javax.imageio.stream.ImageOutputStream;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Map;
+import com.spun.swing.Paintable;
 
 public class PaintableMultiframeWriter implements ApprovalWriter
 {
@@ -28,25 +22,7 @@ public PaintableMultiframeWriter(int numberOfFrames, Function1<Integer, Paintabl
   @Override
   public File writeReceivedFile(File received)
   {
-    try
-    {
-      ArrayList<BufferedImage> images = getBufferedImages();
-      try (ImageOutputStream output = new FileImageOutputStream(received))
-      {
-        try (GifSequenceWriter writer = new GifSequenceWriter(output, images.get(0).getType(), 500, true))
-        {
-          for (BufferedImage image : images)
-          {
-            writer.writeToSequence(image);
-          }
-        }
-      }
-      return received;
-    }
-    catch (Exception e)
-    {
-      throw ObjectUtils.throwAsError(e);
-    }
+    return GifSequenceWriter.writeAnimatedGif(received, getBufferedImages(), 500);
   }
   private ArrayList<BufferedImage> getBufferedImages()
   {
@@ -63,4 +39,4 @@ public String getFileExtensionWithDot()
   {
     return ".gif";
   }
-}
+}