Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2741)

Unified Diff: Source/web/tests/PageSerializerTest.cpp

Issue 1177733002: Merge page serializers [11/12] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix issues Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/tests/PageSerializerTest.cpp
diff --git a/Source/web/tests/PageSerializerTest.cpp b/Source/web/tests/PageSerializerTest.cpp
index 4b846945a1ac8950b7db9737525ed7537dce22d0..8c16980db700e3dfe71f356bce50bed603c68428 100644
--- a/Source/web/tests/PageSerializerTest.cpp
+++ b/Source/web/tests/PageSerializerTest.cpp
@@ -81,6 +81,11 @@ protected:
m_folder = WebString::fromUTF8(folder);
}
+ void setRewriteURLFolder(const char* folder)
+ {
+ m_rewriteFolder = folder;
+ }
+
void registerURL(const char* url, const char* file, const char* mimeType)
{
registerMockedURLLoad(KURL(m_baseUrl, url), WebString::fromUTF8(file), m_folder, WebString::fromUTF8(mimeType));
@@ -105,10 +110,16 @@ protected:
Platform::current()->unitTestSupport()->registerMockedErrorURL(KURL(m_baseUrl, file), response, error);
}
+ void registerRewriteURL(const char* fromURL, const char* toURL)
+ {
+ m_rewriteURLs.add(fromURL, toURL);
+ }
+
void serialize(const char* url)
{
FrameTestHelpers::loadFrame(m_helper.webView()->mainFrame(), KURL(m_baseUrl, url).string().utf8().data());
- PageSerializer serializer(&m_resources, nullptr);
+ PageSerializer serializer(&m_resources, nullptr,
+ m_rewriteURLs.isEmpty() ? 0: &m_rewriteURLs, m_rewriteFolder);
yosin_UTC9 2015/06/15 09:34:37 s/0:/nullptr :/
Tiger (Sony Mobile) 2015/06/15 11:26:45 Done.
serializer.serialize(m_helper.webViewImpl()->mainFrameImpl()->frame()->page());
}
@@ -156,6 +167,8 @@ private:
WebString m_folder;
KURL m_baseUrl;
Vector<SerializedResource> m_resources;
+ LinkLocalPathMap m_rewriteURLs;
+ String m_rewriteFolder;
};
TEST_F(PageSerializerTest, HTMLElements)
@@ -391,6 +404,45 @@ TEST_F(PageSerializerTest, DataURIMorphing)
EXPECT_TRUE(isSerialized("page_with_morphing_data.html", "text/html"));
}
+TEST_F(PageSerializerTest, RewriteLinksSimple)
+{
+ setBaseFolder("pageserializer/rewritelinks/");
+ setRewriteURLFolder("folder");
+
+ registerURL("rewritelinks_simple.html", "text/html");
+ registerURL("absolute.png", "image.png", "image/png");
+ registerURL("relative.png", "image.png", "image/png");
+ registerRewriteURL("http://www.test.com/absolute.png", "a.png");
+ registerRewriteURL("http://www.test.com/relative.png", "b.png");
+
+ serialize("rewritelinks_simple.html");
+
+ EXPECT_EQ(3U, getResources().size());
+ EXPECT_NE(getSerializedData("rewritelinks_simple.html", "text/html").find("./folder/a.png"), kNotFound);
+ EXPECT_NE(getSerializedData("rewritelinks_simple.html", "text/html").find("./folder/b.png"), kNotFound);
+}
+
+TEST_F(PageSerializerTest, RewriteLinksBase)
+{
+ setBaseFolder("pageserializer/rewritelinks/");
+ setRewriteURLFolder("folder");
+
+ registerURL("rewritelinks_base.html", "text/html");
+ registerURL("images/here/image.png", "image.png", "image/png");
+ registerURL("images/here/or/in/here/image.png", "image.png", "image/png");
+ registerURL("or/absolute.png", "image.png", "image/png");
+ registerRewriteURL("http://www.test.com/images/here/image.png", "a.png");
+ registerRewriteURL("http://www.test.com/images/here/or/in/here/image.png", "b.png");
+ registerRewriteURL("http://www.test.com/or/absolute.png", "c.png");
+
+ serialize("rewritelinks_base.html");
+
+ EXPECT_EQ(4U, getResources().size());
+ EXPECT_NE(getSerializedData("rewritelinks_base.html", "text/html").find("./folder/a.png"), kNotFound);
+ EXPECT_NE(getSerializedData("rewritelinks_base.html", "text/html").find("./folder/b.png"), kNotFound);
+ EXPECT_NE(getSerializedData("rewritelinks_base.html", "text/html").find("./folder/c.png"), kNotFound);
+}
+
// Test that we don't regress https://bugs.webkit.org/show_bug.cgi?id=99105
TEST_F(PageSerializerTest, SVGImageDontCrash)
{

Powered by Google App Engine
This is Rietveld 408576698