platform/testing/{URL|Unit}TestHelpers improvements

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "public/web/WebDocument.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/HTMLNames.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLElement.h"
 #include "core/html/HTMLLinkElement.h"
 #include "core/page/Page.h"
 #include "core/style/ComputedStyle.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/graphics/Color.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
 using blink::FrameTestHelpers::WebViewHelper;
 using blink::URLTestHelpers::toKURL;
 
 const char kDefaultOrigin[] = "https://example.test/";
 const char kManifestDummyFilePath[] = "manifest-dummy.html";
 
 class WebDocumentTest : public ::testing::Test {
  protected:
   static void SetUpTestCase();
 
   void loadURL(const std::string& url);
   Document* topDocument() const;
   WebDocument topWebDocument() const;
 
   WebViewHelper m_webViewHelper;
 };
 
 void WebDocumentTest::SetUpTestCase() {
   URLTestHelpers::registerMockedURLLoad(
       toKURL(std::string(kDefaultOrigin) + kManifestDummyFilePath),
-      WebString::fromUTF8(kManifestDummyFilePath));
+      testing::webTestDataPath(kManifestDummyFilePath));
 }
 
 void WebDocumentTest::loadURL(const std::string& url) {
   m_webViewHelper.initializeAndLoad(url);
 }
 
 Document* WebDocumentTest::topDocument() const {
   return toLocalFrame(m_webViewHelper.webView()->page()->mainFrame())
       ->document();
 }
@@ skipping 111 matching lines @@
 }
 
 KURL toOriginSecureA(const char* file) {
   return toKURL(std::string(baseURLOriginSecureA) + file);
 }
 
 KURL toOriginB(const char* file) {
   return toKURL(std::string(baseURLOriginB) + file);
 }
 
+void registerMockedURLLoad(const KURL& url, const char* path) {
+  URLTestHelpers::registerMockedURLLoad(url, testing::webTestDataPath(path));
+}
+
 }  // anonymous namespace
 
 class WebDocumentFirstPartyTest : public WebDocumentTest {
  public:
   static void SetUpTestCase();
 
  protected:
   void load(const char*);
   Document* nestedDocument() const;
   Document* nestedNestedDocument() const;
 };
 
 void WebDocumentFirstPartyTest::SetUpTestCase() {
-  URLTestHelpers::registerMockedURLLoad(toOriginA(emptyFile),
-                                        WebString::fromUTF8(emptyFile));
-  URLTestHelpers::registerMockedURLLoad(toOriginA(nestedData),
-                                        WebString::fromUTF8(nestedData));
-  URLTestHelpers::registerMockedURLLoad(toOriginA(nestedOriginA),
-                                        WebString::fromUTF8(nestedOriginA));
-  URLTestHelpers::registerMockedURLLoad(toOriginA(nestedOriginSubA),
-                                        WebString::fromUTF8(nestedOriginSubA));
-  URLTestHelpers::registerMockedURLLoad(
-      toOriginA(nestedOriginSecureA), WebString::fromUTF8(nestedOriginSecureA));
-  URLTestHelpers::registerMockedURLLoad(
-      toOriginA(nestedOriginAInOriginA),
-      WebString::fromUTF8(nestedOriginAInOriginA));
-  URLTestHelpers::registerMockedURLLoad(
-      toOriginA(nestedOriginAInOriginB),
-      WebString::fromUTF8(nestedOriginAInOriginB));
-  URLTestHelpers::registerMockedURLLoad(toOriginA(nestedOriginB),
-                                        WebString::fromUTF8(nestedOriginB));
-  URLTestHelpers::registerMockedURLLoad(
-      toOriginA(nestedOriginBInOriginA),
-      WebString::fromUTF8(nestedOriginBInOriginA));
-  URLTestHelpers::registerMockedURLLoad(
-      toOriginA(nestedOriginBInOriginB),
-      WebString::fromUTF8(nestedOriginBInOriginB));
-  URLTestHelpers::registerMockedURLLoad(toOriginA(nestedSrcDoc),
-                                        WebString::fromUTF8(nestedSrcDoc));
+  registerMockedURLLoad(toOriginA(emptyFile), emptyFile);
+  registerMockedURLLoad(toOriginA(nestedData), nestedData);
+  registerMockedURLLoad(toOriginA(nestedOriginA), nestedOriginA);
+  registerMockedURLLoad(toOriginA(nestedOriginSubA), nestedOriginSubA);
+  registerMockedURLLoad(toOriginA(nestedOriginSecureA), nestedOriginSecureA);
+  registerMockedURLLoad(toOriginA(nestedOriginAInOriginA),
+                        nestedOriginAInOriginA);
+  registerMockedURLLoad(toOriginA(nestedOriginAInOriginB),
+                        nestedOriginAInOriginB);
+  registerMockedURLLoad(toOriginA(nestedOriginB), nestedOriginB);
+  registerMockedURLLoad(toOriginA(nestedOriginBInOriginA),
+                        nestedOriginBInOriginA);
+  registerMockedURLLoad(toOriginA(nestedOriginBInOriginB),
+                        nestedOriginBInOriginB);
+  registerMockedURLLoad(toOriginA(nestedSrcDoc), nestedSrcDoc);
 
-  URLTestHelpers::registerMockedURLLoad(toOriginSubA(emptyFile),
-                                        WebString::fromUTF8(emptyFile));
-  URLTestHelpers::registerMockedURLLoad(toOriginSecureA(emptyFile),
-                                        WebString::fromUTF8(emptyFile));
+  registerMockedURLLoad(toOriginSubA(emptyFile), emptyFile);
+  registerMockedURLLoad(toOriginSecureA(emptyFile), emptyFile);
 
-  URLTestHelpers::registerMockedURLLoad(toOriginB(emptyFile),
-                                        WebString::fromUTF8(emptyFile));
-  URLTestHelpers::registerMockedURLLoad(toOriginB(nestedOriginA),
-                                        WebString::fromUTF8(nestedOriginA));
-  URLTestHelpers::registerMockedURLLoad(toOriginB(nestedOriginB),
-                                        WebString::fromUTF8(nestedOriginB));
+  registerMockedURLLoad(toOriginB(emptyFile), emptyFile);
+  registerMockedURLLoad(toOriginB(nestedOriginA), nestedOriginA);
+  registerMockedURLLoad(toOriginB(nestedOriginB), nestedOriginB);
 }
 
 void WebDocumentFirstPartyTest::load(const char* file) {
   m_webViewHelper.initializeAndLoad(std::string(baseURLOriginA) + file);
 }
 
 Document* WebDocumentFirstPartyTest::nestedDocument() const {
   return toLocalFrame(m_webViewHelper.webView()
                           ->page()
                           ->mainFrame()
@@ skipping 118 matching lines @@
 
   ASSERT_EQ(toOriginA(nestedOriginAInOriginB),
             topDocument()->firstPartyForCookies());
   ASSERT_EQ(toOriginA(nestedOriginAInOriginB),
             nestedDocument()->firstPartyForCookies());
   ASSERT_EQ(toOriginA(nestedOriginAInOriginB),
             nestedNestedDocument()->firstPartyForCookies());
 }
 
 }  // namespace blink