Merge page serializers [1/12]

Source/web/tests/PageSerializerTest.cpp

 /*
  * Copyright (c) 2013, Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
+#include "core/page/PageSerializer.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "core/page/Page.h"
-#include "core/page/PageSerializer.h"
 #include "platform/SerializedResource.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebSettings.h"
@@ skipping 85 matching lines @@
     }
 
     String getSerializedData(const char* url, const char* mimeType = 0)
     {
         const SerializedResource* resource = getResource(url, mimeType);
         if (resource)
             return String(resource->data->data(), resource->data->size());
         return String();
     }
 
+    // For debugging
+    void printResources()

[philipj_slow, 2015/06/05 11:59:16]

I don't know, I'd probably leave this out. If you do want it, #ifndef NDEBUG and
calling it showResources() would make it more in line with things like
DocumentMarkerController::showMarkers() and Node::showNode().

[Tiger (Sony Mobile), 2015/06/05 13:47:50]

Agreed, it is not that important.

+    {
+        printf("Printing resources (%zu resources in total)\n", m_resources.size());
+        for (size_t i = 0; i < m_resources.size(); ++i) {
+            printf("%zu. '%s', '%s'\n", i, m_resources[i].url.string().utf8().data(),
+                m_resources[i].mimeType.utf8().data());
+        }
+    }
+
 private:
     static void configureSettings(WebSettings* settings)
     {
         settings->setImagesEnabled(true);
         settings->setLoadsImagesAutomatically(true);
         settings->setJavaScriptEnabled(true);
     }
 
     FrameTestHelpers::WebViewHelper m_helper;
     WebString m_folder;
@@ skipping 61 matching lines @@
     setBaseFolder("pageserializer/font/");
 
     registerURL("font.html", "text/html");
     registerURL("font.ttf", "application/octet-stream");
 
     serialize("font.html");
 
     EXPECT_TRUE(isSerialized("font.ttf", "application/octet-stream"));
 }
 
+TEST_F(PageSerializerTest, DontIncludeErrorImage)
+{
+    setBaseFolder("pageserializer/image/");
+
+    registerURL("page_with_img_error.html", "text/html");
+    registerURL("error_image.png", "image/png");
+
+    serialize("page_with_img_error.html");
+
+    EXPECT_EQ(1U, getResources().size());
+    EXPECT_TRUE(isSerialized("page_with_img_error.html", "text/html"));
+    EXPECT_FALSE(isSerialized("error_image.png", "image/png"));
 }
+
+}