platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/modules/notifications/NotificationResourcesLoaderTest.cpp

 // Copyright 2016 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 "modules/notifications/NotificationResourcesLoader.h"
 
+#include <memory>
 #include "core/testing/DummyPageHolder.h"
 #include "platform/heap/Heap.h"
 #include "platform/loader/fetch/MemoryCache.h"
 #include "platform/testing/URLTestHelpers.h"
+#include "platform/testing/UnitTestHelpers.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/platform/WebURLResponse.h"
 #include "public/platform/modules/notifications/WebNotificationConstants.h"
 #include "public/platform/modules/notifications/WebNotificationData.h"
 #include "public/platform/modules/notifications/WebNotificationResources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/Functional.h"
 #include "wtf/text/WTFString.h"
-#include <memory>
 
 namespace blink {
 namespace {
 
-const char kBaseUrl[] = "http://test.com/";
-const char kIcon48x48[] = "48x48.png";
-const char kIcon100x100[] = "100x100.png";
-const char kIcon110x110[] = "110x110.png";
-const char kIcon120x120[] = "120x120.png";
-const char kIcon500x500[] = "500x500.png";
-const char kIcon3000x1000[] = "3000x1000.png";
-const char kIcon3000x2000[] = "3000x2000.png";
+constexpr char kBaseUrl[] = "http://test.com/";
+constexpr char kBaseDir[] = "notifications/";
+constexpr char kIcon48x48[] = "48x48.png";
+constexpr char kIcon100x100[] = "100x100.png";
+constexpr char kIcon110x110[] = "110x110.png";
+constexpr char kIcon120x120[] = "120x120.png";
+constexpr char kIcon500x500[] = "500x500.png";
+constexpr char kIcon3000x1000[] = "3000x1000.png";
+constexpr char kIcon3000x2000[] = "3000x2000.png";
 
 class NotificationResourcesLoaderTest : public ::testing::Test {
  public:
   NotificationResourcesLoaderTest()
       : m_page(DummyPageHolder::create()),
         m_loader(new NotificationResourcesLoader(
             bind(&NotificationResourcesLoaderTest::didFetchResources,
                  WTF::unretained(this)))) {}
 
   ~NotificationResourcesLoaderTest() override {
     m_loader->stop();
     Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     memoryCache()->evictResources();
   }
 
  protected:
   ExecutionContext* executionContext() const { return &m_page->document(); }
 
   NotificationResourcesLoader* loader() const { return m_loader.get(); }
 
   WebNotificationResources* resources() const { return m_resources.get(); }
 
   void didFetchResources(NotificationResourcesLoader* loader) {
     m_resources = loader->getResources();
   }
 
   // Registers a mocked url. When fetched, |fileName| will be loaded from the
   // test data directory.
   WebURL registerMockedURL(const String& fileName) {
-    WebURL url(KURL(ParsedURLString, kBaseUrl + fileName));
-
-    URLTestHelpers::registerMockedURLLoad(url, fileName, "notifications/",
-                                          "image/png");
-
-    return url;
+    WebURL registeredUrl = URLTestHelpers::registerMockedURLLoadFromBase(
+        kBaseUrl, testing::webTestDataPath(kBaseDir), fileName, "image/png");
+    return registeredUrl;
   }
 
   // Registers a mocked url that will fail to be fetched, with a 404 error.
   WebURL registerMockedErrorURL(const String& fileName) {
     WebURL url(KURL(ParsedURLString, kBaseUrl + fileName));
     URLTestHelpers::registerMockedErrorURLLoad(url);
     return url;
   }
 
  private:
@@ skipping 186 matching lines @@
   Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
 
   // Loading should have been cancelled when |stop| was called so no resources
   // should have been received by the test even though
   // |serveAsynchronousRequests| was called.
   ASSERT_FALSE(resources());
 }
 
 }  // namespace
 }  // namespace blink