platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (C) 2014 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 18 matching lines @@
  */
 
 #include "core/layout/LayoutGeometryMap.h"
 
 #include "core/dom/Document.h"
 #include "core/layout/LayoutBox.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebFrameClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
 typedef bool TestParamRootLayerScrolling;
 class LayoutGeometryMapTest
-    : public testing::Test,
-      public testing::WithParamInterface<TestParamRootLayerScrolling>,
+    : public ::testing::Test,
+      public ::testing::WithParamInterface<TestParamRootLayerScrolling>,
       private ScopedRootLayerScrollingForTest {
  public:
   LayoutGeometryMapTest()
       : ScopedRootLayerScrollingForTest(GetParam()),
         m_baseURL("http://www.test.com/") {}
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
@@ skipping 88 matching lines @@
                                         const FloatRect& rect) {
     FloatRect result(rect);
     LocalFrame* frame = toWebViewImpl(webView)->mainFrameImpl()->frame();
     LayoutView* layoutView = frame->document()->layoutView();
     if (layoutView->hasOverflowClip())
       result.move(layoutView->scrolledContentOffset());
     return result;
   }
 
   void registerMockedHttpURLLoad(const std::string& fileName) {
-    URLTestHelpers::registerMockedURLFromBaseURL(
-        WebString::fromUTF8(m_baseURL.c_str()),
+    URLTestHelpers::registerMockedURLLoadFromBase(
+        WebString::fromUTF8(m_baseURL.c_str()), testing::webTestDataPath(),
         WebString::fromUTF8(fileName.c_str()));

[kinuko, 2017/01/26 09:32:41]

Not from your change, but no need of .c_str() (and we can save strlen() cost)

[Takashi Toyoshima, 2017/01/26 10:57:58]

Done.

   }
 
   const std::string m_baseURL;
   FrameTestHelpers::TestWebFrameClient m_mockWebViewClient;
 };
 
 INSTANTIATE_TEST_CASE_P(All, LayoutGeometryMapTest, ::testing::Bool());
 
 TEST_P(LayoutGeometryMapTest, SimpleGeometryMapTest) {
   registerMockedHttpURLLoad("rgm_test.html");
@@ skipping 353 matching lines @@
   EXPECT_EQ(FloatRect(263.0f, 154.0f, 10.0f, 8.0f),
             rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
 
   rgm.pushMappingsToAncestor(floating, span);
   EXPECT_EQ(rect, rectFromQuad(rgm.mapToAncestor(rect, container)));
   EXPECT_EQ(FloatRect(63.0f, 54.0f, 10.0f, 8.0f),
             rectFromQuad(rgm.mapToAncestor(rect, nullptr)));
 }
 
 }  // namespace blink