platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 182 matching lines @@
       : m_baseURL("http://internal.test/"),
         m_notBaseURL("http://external.test/"),
         m_chromeURL("chrome://") {}
 
   ~WebFrameTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()));
+    registerMockedURLLoadFromBase(m_baseURL, fileName);
   }
 
   void registerMockedChromeURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_chromeURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()));
+    registerMockedURLLoadFromBase(m_chromeURL, fileName);
+  }
+
+  void registerMockedURLLoadFromBase(const std::string& baseURL,
+                                     const std::string& fileName) {
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),

[Takashi Toyoshima, 2017/01/26 11:36:02]

Oops, just there is a bug, and I can repro it on local.

+        WebString::fromUTF8(fileName));
   }
 
   void registerMockedHttpURLLoadWithCSP(const std::string& fileName,
                                         const std::string& csp,
                                         bool reportOnly = false) {
     WebURLResponse response;
     response.setMIMEType("text/html");
     response.addHTTPHeaderField(
         reportOnly ? WebString("Content-Security-Policy-Report-Only")
                    : WebString("Content-Security-Policy"),
         WebString::fromUTF8(csp));
     std::string fullString = m_baseURL + fileName;
     URLTestHelpers::registerMockedURLLoadWithCustomResponse(
-        toKURL(fullString.c_str()), WebString::fromUTF8(fileName.c_str()),
-        WebString::fromUTF8(""), response);
+        toKURL(fullString), testing::webTestDataPath(fileName), response);
   }
 
   void registerMockedHttpURLLoadWithMimeType(const std::string& fileName,
                                              const std::string& mimeType) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
-        WebString::fromUTF8(fileName.c_str()), WebString::fromUTF8(mimeType));
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL), testing::webTestDataPath(),
+        WebString::fromUTF8(fileName), WebString::fromUTF8(mimeType));
   }
 
   void applyViewportStyleOverride(
       FrameTestHelpers::WebViewHelper* webViewHelper) {
     webViewHelper->webView()->settings()->setViewportStyle(
         WebViewportStyle::Mobile);
   }
 
   static void configureCompositingWebView(WebSettings* settings) {
     settings->setAcceleratedCompositingEnabled(true);
@@ skipping 374 matching lines @@
   // javascript.
   std::string content =
       WebFrameContentDumper::dumpWebViewAsText(webViewHelper.webView(), 1024)
           .utf8();
   EXPECT_EQ(std::string::npos, content.find("Clobbered"));
 }
 
 TEST_P(ParameterizedWebFrameTest, LocationSetHostWithMissingPort) {
   std::string fileName = "print-location-href.html";
   registerMockedHttpURLLoad(fileName);
-  URLTestHelpers::registerMockedURLLoad(
-      toKURL("http://internal.test:0/" + fileName),
-      WebString::fromUTF8(fileName));
+  registerMockedURLLoadFromBase("http://internal.test:0/", fileName);
 
   FrameTestHelpers::WebViewHelper webViewHelper;
 
   /// Pass true to enable JavaScript.
   webViewHelper.initializeAndLoad(m_baseURL + fileName, true);
 
   // Setting host to "hostname:" should be treated as "hostname:0".
   FrameTestHelpers::loadFrame(
       webViewHelper.webView()->mainFrame(),
       "javascript:location.host = 'internal.test:'; void 0;");
 
   FrameTestHelpers::loadFrame(
       webViewHelper.webView()->mainFrame(),
       "javascript:document.body.textContent = location.href; void 0;");
 
   std::string content =
       WebFrameContentDumper::dumpWebViewAsText(webViewHelper.webView(), 1024)
           .utf8();
   EXPECT_EQ("http://internal.test:0/" + fileName, content);
 }
 
 TEST_P(ParameterizedWebFrameTest, LocationSetEmptyPort) {
   std::string fileName = "print-location-href.html";
   registerMockedHttpURLLoad(fileName);
-  URLTestHelpers::registerMockedURLLoad(
-      toKURL("http://internal.test:0/" + fileName),
-      WebString::fromUTF8(fileName));
+  registerMockedURLLoadFromBase("http://internal.test:0/", fileName);
 
   FrameTestHelpers::WebViewHelper webViewHelper;
 
   /// Pass true to enable JavaScript.
   webViewHelper.initializeAndLoad(m_baseURL + fileName, true);
 
   FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(),
                               "javascript:location.port = ''; void 0;");
 
   FrameTestHelpers::loadFrame(
@@ skipping 6149 matching lines @@
   client.reset();
 
   // Programmatic scroll to same offset. No scroll event should be generated.
   frameImpl->executeScript(WebScriptSource("window.scrollTo(0, 20);"));
   EXPECT_FALSE(client.wasFrameScrolled());
   EXPECT_FALSE(initialScrollState.wasScrolledByUser);
   client.reset();
 }
 
 TEST_P(ParameterizedWebFrameTest, FirstPartyForCookiesForRedirect) {
-  String filePath = testing::blinkRootDir();
-  filePath.append("/Source/web/tests/data/first_party.html");
+  String filePath = testing::webTestDataPath("first_party.html");
 
   WebURL testURL(toKURL("http://internal.test/first_party_redirect.html"));
   char redirect[] = "http://internal.test/first_party.html";
   WebURL redirectURL(toKURL(redirect));
   WebURLResponse redirectResponse;
   redirectResponse.setMIMEType("text/html");
   redirectResponse.setHTTPStatusCode(302);
   redirectResponse.setHTTPHeaderField("Location", redirect);
   Platform::current()->getURLLoaderMockFactory()->registerURL(
       testURL, redirectResponse, filePath);
@@ skipping 1402 matching lines @@
   Document* document =
       webViewHelper.webView()->mainFrameImpl()->frame()->document();
 
   Resource* resource =
       fetchManifest(document, toKURL(m_baseURL + "link-manifest-fetch.json"));
 
   EXPECT_TRUE(resource->isLoaded());
 }
 
 TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchAllow) {
-  URLTestHelpers::registerMockedURLLoad(
-      toKURL(m_notBaseURL + "link-manifest-fetch.json"),
-      "link-manifest-fetch.json");
+  registerMockedURLLoadFromBase(m_notBaseURL, "link-manifest-fetch.json");
   registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src *");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
   Document* document =
       webViewHelper.webView()->mainFrameImpl()->frame()->document();
 
   Resource* resource = fetchManifest(
       document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));
 
   EXPECT_TRUE(resource->isLoaded());
 }
 
 TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelf) {
-  URLTestHelpers::registerMockedURLLoad(
-      toKURL(m_notBaseURL + "link-manifest-fetch.json"),
-      "link-manifest-fetch.json");
+  registerMockedURLLoadFromBase(m_notBaseURL, "link-manifest-fetch.json");
   registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src 'self'");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
   Document* document =
       webViewHelper.webView()->mainFrameImpl()->frame()->document();
 
   Resource* resource = fetchManifest(
       document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));
 
   // Fetching resource wasn't allowed.
   ASSERT_TRUE(resource);
   EXPECT_TRUE(resource->errorOccurred());
   EXPECT_TRUE(resource->resourceError().isAccessCheck());
 }
 
 TEST_P(ParameterizedWebFrameTest, ManifestCSPFetchSelfReportOnly) {
-  URLTestHelpers::registerMockedURLLoad(
-      toKURL(m_notBaseURL + "link-manifest-fetch.json"),
-      "link-manifest-fetch.json");
+  registerMockedURLLoadFromBase(m_notBaseURL, "link-manifest-fetch.json");
   registerMockedHttpURLLoadWithCSP("foo.html", "manifest-src 'self'",
                                    /* report only */ true);
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   webViewHelper.initializeAndLoad(m_baseURL + "foo.html");
   Document* document =
       webViewHelper.webView()->mainFrameImpl()->frame()->document();
 
   Resource* resource = fetchManifest(
       document, toKURL(m_notBaseURL + "link-manifest-fetch.json"));
@@ skipping 1974 matching lines @@
   // Local methods
   const WebString& result() const { return m_dataURL; }
   void reset() { m_dataURL = WebString(); }
 
  private:
   WebString m_dataURL;
 };
 
 TEST_F(WebFrameTest, SaveImageAt) {
   std::string url = m_baseURL + "image-with-data-url.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url),
-                                        "image-with-data-url.html");
-  URLTestHelpers::registerMockedURLLoad(toKURL("http://test"), "white-1x1.png");
+  registerMockedURLLoadFromBase(m_baseURL, "image-with-data-url.html");
+  URLTestHelpers::registerMockedURLLoad(
+      toKURL("http://test"), testing::webTestDataPath("white-1x1.png"));
 
   FrameTestHelpers::WebViewHelper helper;
   SaveImageFromDataURLWebFrameClient client;
   WebViewImpl* webView = helper.initializeAndLoad(url, true, &client);
   webView->resize(WebSize(400, 400));
   webView->updateAllLifecyclePhases();
 
   WebLocalFrame* localFrame = webView->mainFrameImpl();
 
   client.reset();
@@ skipping 16 matching lines @@
       WebString::fromUTF8("data:image/gif;base64"
                           ",R0lGODlhAQABAIAAAAUEBAAAACwAAAAAAQABAAACAkQBADs="),
       client.result());
 
   // Explicitly reset to break dependency on locally scoped client.
   helper.reset();
 }
 
 TEST_F(WebFrameTest, SaveImageWithImageMap) {
   std::string url = m_baseURL + "image-map.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-map.html");
+  registerMockedURLLoadFromBase(m_baseURL, "image-map.html");
 
   FrameTestHelpers::WebViewHelper helper;
   SaveImageFromDataURLWebFrameClient client;
   WebViewImpl* webView = helper.initializeAndLoad(url, true, &client);
   webView->resize(WebSize(400, 400));
 
   WebLocalFrame* localFrame = webView->mainFrameImpl();
 
   client.reset();
   localFrame->saveImageAt(WebPoint(25, 25));
@@ skipping 12 matching lines @@
   client.reset();
   localFrame->saveImageAt(WebPoint(125, 25));
   EXPECT_EQ(WebString(), client.result());
 
   // Explicitly reset to break dependency on locally scoped client.
   helper.reset();
 }
 
 TEST_F(WebFrameTest, CopyImageAt) {
   std::string url = m_baseURL + "canvas-copy-image.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url), "canvas-copy-image.html");
+  registerMockedURLLoadFromBase(m_baseURL, "canvas-copy-image.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewImpl* webView = helper.initializeAndLoad(url, true, 0);
   webView->resize(WebSize(400, 400));
 
   uint64_t sequence = Platform::current()->clipboard()->sequenceNumber(
       WebClipboard::BufferStandard);
 
   WebLocalFrame* localFrame = webView->mainFrameImpl();
   localFrame->copyImageAt(WebPoint(50, 50));
 
   EXPECT_NE(sequence, Platform::current()->clipboard()->sequenceNumber(
                           WebClipboard::BufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::current()->clipboard())
           ->readRawImage(WebClipboard::Buffer());
 
   SkAutoLockPixels autoLock(image.getSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.getSkBitmap().getColor(0, 0));
 };
 
 TEST_F(WebFrameTest, CopyImageAtWithPinchZoom) {
   std::string url = m_baseURL + "canvas-copy-image.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url), "canvas-copy-image.html");
+  registerMockedURLLoadFromBase(m_baseURL, "canvas-copy-image.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewImpl* webView = helper.initializeAndLoad(url, true, 0);
   webView->resize(WebSize(400, 400));
   webView->updateAllLifecyclePhases();
   webView->setPageScaleFactor(2);
   webView->setVisualViewportOffset(WebFloatPoint(200, 200));
 
   uint64_t sequence = Platform::current()->clipboard()->sequenceNumber(
       WebClipboard::BufferStandard);
 
   WebLocalFrame* localFrame = webView->mainFrameImpl();
   localFrame->copyImageAt(WebPoint(0, 0));
 
   EXPECT_NE(sequence, Platform::current()->clipboard()->sequenceNumber(
                           WebClipboard::BufferStandard));
 
   WebImage image =
       static_cast<WebMockClipboard*>(Platform::current()->clipboard())
           ->readRawImage(WebClipboard::Buffer());
 
   SkAutoLockPixels autoLock(image.getSkBitmap());
   EXPECT_EQ(SkColorSetARGB(255, 255, 0, 0), image.getSkBitmap().getColor(0, 0));
 };
 
 TEST_F(WebFrameTest, CopyImageWithImageMap) {
   SaveImageFromDataURLWebFrameClient client;
 
   std::string url = m_baseURL + "image-map.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url), "image-map.html");
+  registerMockedURLLoadFromBase(m_baseURL, "image-map.html");
 
   FrameTestHelpers::WebViewHelper helper;
   WebViewImpl* webView = helper.initializeAndLoad(url, true, &client);
   webView->resize(WebSize(400, 400));
 
   client.reset();
   WebLocalFrame* localFrame = webView->mainFrameImpl();
   localFrame->saveImageAt(WebPoint(25, 25));
   EXPECT_EQ(
       WebString::fromUTF8("data:image/gif;base64"
@@ skipping 12 matching lines @@
   EXPECT_EQ(WebString(), client.result());
   // Explicitly reset to break dependency on locally scoped client.
   helper.reset();
 }
 
 TEST_F(WebFrameTest, LoadJavascriptURLInNewFrame) {
   FrameTestHelpers::WebViewHelper helper;
   helper.initialize(true);
 
   std::string redirectURL = m_baseURL + "foo.html";
-  URLTestHelpers::registerMockedURLLoad(toKURL(redirectURL), "foo.html");
+  URLTestHelpers::registerMockedURLLoad(toKURL(redirectURL),
+                                        testing::webTestDataPath("foo.html"));
   WebURLRequest request(toKURL("javascript:location='" + redirectURL + "'"));
   helper.webView()->mainFrameImpl()->loadRequest(request);
 
   // Normally, the result of the JS url replaces the existing contents on the
   // Document. However, if the JS triggers a navigation, the contents should
   // not be replaced.
   EXPECT_EQ("", toLocalFrame(helper.webView()->page()->mainFrame())
                     ->document()
                     ->documentElement()
                     ->innerText());
@@ skipping 111 matching lines @@
                       int dataLength) override {
     EXPECT_GT(dataLength, 16);
     originalClient->didReceiveData(data, 16);
     // This didReceiveData call shouldn't crash due to a failed assertion.
     originalClient->didReceiveData(data + 16, dataLength - 16);
   }
 };
 
 TEST_F(WebFrameTest, ImageDocumentDecodeError) {
   std::string url = m_baseURL + "not_an_image.ico";
-  URLTestHelpers::registerMockedURLLoad(toKURL(url), "not_an_image.ico",
-                                        "image/x-icon");
+  URLTestHelpers::registerMockedURLLoad(
+      toKURL(url), testing::webTestDataPath("not_an_image.ico"),
+      "image/x-icon");
   MultipleDataChunkDelegate delegate;
   Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(&delegate);
   FrameTestHelpers::WebViewHelper helper;
   helper.initializeAndLoad(url, true);
   Platform::current()->getURLLoaderMockFactory()->setLoaderDelegate(nullptr);
 
   Document* document =
       toLocalFrame(helper.webView()->page()->mainFrame())->document();
   EXPECT_TRUE(document->isImageDocument());
   EXPECT_EQ(ResourceStatus::DecodeError,
@@ skipping 631 matching lines @@
 
     LoadingObserverFrameClient& childClient() { return m_childClient; }
 
    private:
     LoadingObserverFrameClient m_childClient;
   };
 
   registerMockedHttpURLLoad("single_iframe.html");
   URLTestHelpers::registerMockedURLLoad(
       toKURL(m_baseURL + "visible_iframe.html"),
-      WebString::fromUTF8("frame_with_frame.html"));
+      testing::webTestDataPath("frame_with_frame.html"));
   registerMockedHttpURLLoad("parent_detaching_frame.html");
 
   FrameTestHelpers::WebViewHelper webViewHelper;
   MainFrameClient mainFrameClient;
   webViewHelper.initializeAndLoad(m_baseURL + "single_iframe.html", true,
                                   &mainFrameClient);
 
   EXPECT_TRUE(mainFrameClient.childClient().didCallFrameDetached());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidStopLoading());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidFinishDocumentLoad());
   EXPECT_TRUE(mainFrameClient.childClient().didCallDidHandleOnloadEvents());
 
   webViewHelper.reset();
 }
 
 }  // namespace blink