Move and refactor the method for comparing animated images

pagespeed/kernel/image/test_utils.cc

@@ -21,6 +21,7 @@
 #include <math.h>
 #include <cstdlib>
 #include <cstdint>
+#include <vector>
 
 #include "pagespeed/kernel/base/basictypes.h"
 #include "pagespeed/kernel/base/gtest.h"
@@ -35,6 +36,7 @@
 #include "pagespeed/kernel/image/scanline_interface.h"
 #include "pagespeed/kernel/image/scanline_utils.h"
 
+
 namespace pagespeed {
 
 namespace {
@@ -284,6 +286,14 @@ void SynthesizeImage(int width, int height, int bytes_per_line,
   }
 }
 
+// Returns true if 2 animated images are identical.
+bool CompareAnimatedImages(const GoogleString& expected_image_filename,
+                           const GoogleString& actual_image_content,
+                           MessageHandler* message_handler) {
+  // TODO(vchudnov): Fill this in.
+  return true;
+}
+
 }  // namespace image_compression
 
 }  // namespace pagespeed

pagespeed/kernel/image/test_utils.h

@@ -263,6 +263,11 @@ inline uint32_t RgbaToPackedRgba(const PixelRgbaChannels rgba) {
                     rgba[RGBA_BLUE]);
 }
 
+// Returns true if 2 animated images are identical.
+bool CompareAnimatedImages(const GoogleString& expected_image_filename,
+                           const GoogleString& actual_image_content,
+                           MessageHandler* message_handler);
+
 }  // namespace image_compression
 
 }  // namespace pagespeed

pagespeed/kernel/image/webp_optimizer_test.cc

@@ -16,14 +16,11 @@
 
 // Author: Huibao Lin
 
-#include <vector>
-
 #include "base/logging.h"
 #include "pagespeed/kernel/base/gtest.h"
 #include "pagespeed/kernel/base/message_handler.h"
 #include "pagespeed/kernel/base/mock_message_handler.h"
 #include "pagespeed/kernel/base/null_mutex.h"
-#include "pagespeed/kernel/base/stdio_file_system.h"
 #include "pagespeed/kernel/base/string.h"
 #include "pagespeed/kernel/base/string_util.h"
 #include "pagespeed/kernel/image/image_converter.h"
@@ -292,13 +289,6 @@ class AnimatedWebpTest : public testing::Test {
         << " for '" << filename << "'";
   }
 
-  bool PicturesEqual(const GoogleString& compare,
-                     const GoogleString& input_file_name,
-                     const GoogleString& output_file_name) {
-    // TODO(vchudnov): Fill this in.
-    return true;
-  }
-
   void CheckGifVsWebP(const char* filename, WebpConfiguration* webp_config,
                       bool check_pixels) {
     GoogleString input_path = net_instaweb::StrCat(net_instaweb::GTestSrcDir(),
@@ -311,19 +301,10 @@ class AnimatedWebpTest : public testing::Test {
     GoogleString output_image;
     ConvertGifToWebp(filename, input_image, webp_config, &output_image);
 
-    GoogleString output_path =
-        net_instaweb::StrCat(net_instaweb::GTestTempDir(),
-                             kTestRootDir,
-                             filename, ".webp");
-
-    net_instaweb::StdioFileSystem file_system;
-    file_system.WriteFile(output_path.c_str(), output_image, &message_handler_);
-    DVLOG(1) << "Wrote image: " << output_path;
-
     if (check_pixels) {
-      // TODO(vchudnov): Employ a pixel-by-pixel comparison program.
-      GoogleString compare;
-      EXPECT_TRUE(PicturesEqual(compare, input_path, output_path));
+      EXPECT_TRUE(
+          pagespeed::image_compression::CompareAnimatedImages(
+              filename, output_image, &message_handler_));
     }
   }