platform/testing/{URL|Unit}TestHelpers improvements

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

 /*
  * Copyright (c) 2013, Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * (INCLUDING, BUT NOT 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 "core/frame/FrameSerializer.h"
 
+#include <string>
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
 #include "platform/SerializedResource.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLRequest.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebSettings.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/Assertions.h"
 #include "wtf/Deque.h"
 #include "wtf/Vector.h"
 
 using blink::URLTestHelpers::toKURL;
 using blink::URLTestHelpers::registerMockedURLLoad;
 
 namespace blink {
 
-class FrameSerializerTest : public testing::Test,
+class FrameSerializerTest : public ::testing::Test,
                             public FrameSerializer::Delegate {
  public:
   FrameSerializerTest()
-      : m_folder(WebString::fromUTF8("frameserializer/")),
+      : m_folder("frameserializer/"),
         m_baseUrl(toKURL("http://www.test.com")) {}
 
  protected:
   void SetUp() override {
     // We want the images to load and JavaScript to be on.
     m_helper.initialize(true, nullptr, nullptr, nullptr, &configureSettings);
   }
 
   void TearDown() override {
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     WebCache::clear();
   }
 
-  void setBaseFolder(const char* folder) {
-    m_folder = WebString::fromUTF8(folder);
-  }
+  void setBaseFolder(const char* folder) { m_folder = folder; }
 
   void setRewriteURLFolder(const char* folder) { m_rewriteFolder = folder; }
 
   void registerURL(const KURL& url, const char* file, const char* mimeType) {
-    registerMockedURLLoad(url, WebString::fromUTF8(file), m_folder,
-                          WebString::fromUTF8(mimeType));
+    registerMockedURLLoad(
+        url, testing::webTestDataPath(WebString::fromUTF8(m_folder + file)),
+        WebString::fromUTF8(mimeType));
   }
 
   void registerURL(const char* url, const char* file, const char* mimeType) {
     registerURL(KURL(m_baseUrl, url), file, mimeType);
   }
 
   void registerURL(const char* file, const char* mimeType) {
     registerURL(file, file, mimeType);
   }
 
@@ skipping 85 matching lines @@
     uriBuilder.append(m_rewriteURLs.get(completeURL));
     rewrittenLink = uriBuilder.toString();
     return true;
   }
 
   bool shouldSkipResourceWithURL(const KURL& url) {
     return m_skipURLs.contains(url);
   }
 
   FrameTestHelpers::WebViewHelper m_helper;
-  WebString m_folder;
+  std::string m_folder;
   KURL m_baseUrl;
   Deque<SerializedResource> m_resources;
   HashMap<String, String> m_rewriteURLs;
   Vector<String> m_skipURLs;
   String m_rewriteFolder;
 };
 
 TEST_F(FrameSerializerTest, HTMLElements) {
   setBaseFolder("frameserializer/elements/");
 
@@ skipping 351 matching lines @@
                 KURL(ParsedURLString, "http://foo.com?--")));
   EXPECT_EQ("saved from url=(0020)http://foo.com/#-%2D",
             FrameSerializer::markOfTheWebDeclaration(
                 KURL(ParsedURLString, "http://foo.com#--")));
   EXPECT_EQ("saved from url=(0026)http://foo.com/#bar-%2Dbaz",
             FrameSerializer::markOfTheWebDeclaration(
                 KURL(ParsedURLString, "http://foo.com#bar--baz")));
 }
 
 }  // namespace blink