platform/testing/{URL|Unit}TestHelpers improvements

third_party/WebKit/Source/core/loader/resource/ImageResourceTest.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 184 matching lines @@
       : m_runner(adoptRef(new scheduler::FakeWebTaskRunner)) {}
 
   RefPtr<scheduler::FakeWebTaskRunner> m_runner;
 };
 
 // Convenience class that registers a mocked URL load on construction, and
 // unregisters it on destruction. This allows for a test to use constructs like
 // ASSERT_TRUE() without needing to worry about unregistering the mocked URL
 // load to avoid putting other tests into inconsistent states in case the
 // assertion fails.
 class ScopedRegisteredURL {

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

A generalized form of this class could be probably put in URLTestHelpers (no
need to be considered in this change)

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

Acknowledged.

  public:
   ScopedRegisteredURL(const KURL& url,
                       const String& fileName = "cancelTest.html",
                       const String& mimeType = "text/html")
       : m_url(url) {
-    URLTestHelpers::registerMockedURLLoad(m_url, fileName, mimeType);
+    URLTestHelpers::registerMockedURLLoad(
+        m_url, testing::webTestDataPath(fileName.utf8().data()), mimeType);
   }
 
   ~ScopedRegisteredURL() {
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(m_url);
   }
 
  private:
   KURL m_url;
 };
 
@@ skipping 962 matching lines @@
       static_cast<int>(WebCachePolicy::UseProtocolCachePolicy),
       static_cast<int>(imageResource->resourceRequest().getCachePolicy()));
 
   imageResource->loader()->cancel();
 }
 
 TEST(ImageResourceTest, PeriodicFlushTest) {
   ScopedTestingPlatformSupport<TestingPlatformSupportWithMockScheduler>
       platform;
   KURL testURL(ParsedURLString, "http://www.test.com/cancelTest.html");
-  URLTestHelpers::registerMockedURLLoad(testURL, "cancelTest.html",
-                                        "text/html");
+  ScopedRegisteredURL scopedRegisteredURL(testURL);
   ResourceRequest request = ResourceRequest(testURL);
   ImageResource* imageResource = ImageResource::create(request);
   imageResource->setStatus(ResourceStatus::Pending);
 
   std::unique_ptr<MockImageResourceObserver> observer =
       MockImageResourceObserver::create(imageResource->getContent());
 
   // Send the image response.
   ResourceResponse resourceResponse(KURL(), "image/jpeg", sizeof(kJpegImage2),
                                     nullAtom, String());
@@ skipping 63 matching lines @@
   EXPECT_TRUE(observer->imageNotifyFinishedCalled());
   EXPECT_TRUE(imageResource->getContent()->getImage()->isBitmapImage());
   EXPECT_EQ(50, imageResource->getContent()->getImage()->width());
   EXPECT_EQ(50, imageResource->getContent()->getImage()->height());
 
   WTF::setTimeFunctionsForTesting(nullptr);
 }
 
 }  // namespace
 }  // namespace blink