platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (C) 2013 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 13 matching lines @@
  * 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 "public/web/WebSearchableFormData.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/WebDocument.h"
 #include "public/web/WebFrame.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/tests/FrameTestHelpers.h"
 
 namespace blink {
 
-class WebSearchableFormDataTest : public testing::Test {
+namespace {
+
+void registerMockedURLLoadFromBaseURL(const std::string& baseURL,
+                                      const std::string& fileName) {
+  URLTestHelpers::registerMockedURLLoadFromBase(
+      WebString::fromUTF8(baseURL.c_str()), testing::webTestDataPath(),

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

removing c_str

+      WebString::fromUTF8(fileName.c_str()));
+}
+
+class WebSearchableFormDataTest : public ::testing::Test {
  protected:
   WebSearchableFormDataTest() {}
 
   ~WebSearchableFormDataTest() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
   FrameTestHelpers::WebViewHelper m_webViewHelper;
 };
 
+}  // namespace
 TEST_F(WebSearchableFormDataTest, HttpSearchString) {
   std::string baseURL("http://www.test.com/");
-  URLTestHelpers::registerMockedURLFromBaseURL(
-      WebString::fromUTF8(baseURL.c_str()), "search_form_http.html");
+  registerMockedURLLoadFromBaseURL(baseURL, "search_form_http.html");
   WebView* webView =
       m_webViewHelper.initializeAndLoad(baseURL + "search_form_http.html");
 
   WebVector<WebFormElement> forms;
   webView->mainFrame()->document().forms(forms);
 
   EXPECT_EQ(forms.size(), 1U);
 
   WebSearchableFormData searchableFormData(forms[0]);
   EXPECT_EQ("http://www.mock.url/search?hl=en&q={searchTerms}&btnM=Mock+Search",
             searchableFormData.url().string());
 }
 
 TEST_F(WebSearchableFormDataTest, HttpsSearchString) {
   std::string baseURL("https://www.test.com/");
-  URLTestHelpers::registerMockedURLFromBaseURL(
-      WebString::fromUTF8(baseURL.c_str()), "search_form_https.html");
+  registerMockedURLLoadFromBaseURL(baseURL, "search_form_https.html");
   WebView* webView =
       m_webViewHelper.initializeAndLoad(baseURL + "search_form_https.html");
 
   WebVector<WebFormElement> forms;
   webView->mainFrame()->document().forms(forms);
 
   EXPECT_EQ(forms.size(), 1U);
 
   WebSearchableFormData searchableFormData(forms[0]);
   EXPECT_EQ(
       "https://www.mock.url/search?hl=en&q={searchTerms}&btnM=Mock+Search",
       searchableFormData.url().string());
 }
 
 }  // namespace blink