Cleanup EXPECT/ASSERTs in unit tests in core/fetch and core/loader

third_party/WebKit/Source/core/fetch/ResourceFetcherTest.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 103 matching lines @@
 };
 
 TEST_F(ResourceFetcherTest, StartLoadAfterFrameDetach)
 {
     KURL secureURL(ParsedURLString, "https://secureorigin.test/image.png");
     // Try to request a url. The request should fail, no resource should be returned,
     // and no resource should be present in the cache.
     ResourceFetcher* fetcher = ResourceFetcher::create(nullptr);
     FetchRequest fetchRequest = FetchRequest(ResourceRequest(secureURL), FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequest, TestResourceFactory());
-    EXPECT_EQ(resource, static_cast<Resource*>(nullptr));
-    EXPECT_EQ(memoryCache()->resourceForURL(secureURL), static_cast<Resource*>(nullptr));
+    EXPECT_FALSE(resource);
+    EXPECT_FALSE(memoryCache()->resourceForURL(secureURL));
 
     // Start by calling startLoad() directly, rather than via requestResource().
     // This shouldn't crash.
     fetcher->startLoad(Resource::create(secureURL, Resource::Raw));
 }
 
 TEST_F(ResourceFetcherTest, UseExistingResource)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
@@ skipping 18 matching lines @@
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     Resource* resource = Resource::create(url, Resource::Raw);
     memoryCache()->add(resource);
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
     response.setHTTPHeaderField(HTTPNames::Vary, "*");
     resource->responseReceived(response, nullptr);
     resource->finish();
     ASSERT_TRUE(resource->hasVaryHeader());

[yhirano, 2016/09/09 07:34:47]

expect?

[hiroshige, 2016/09/09 08:11:35]

I leave this ASSERT because Vary-related tests would have no meaning if
resource->hasVaryHeader() is false and thus it wouldn't be worth continuing.

 
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Platform::current()->getURLLoaderMockFactory()->registerURL(url, WebURLResponse(), "");
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
     EXPECT_NE(resource, newResource);
     newResource->loader()->cancel();
     memoryCache()->remove(newResource);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 
     memoryCache()->remove(resource);
 }
 
 TEST_F(ResourceFetcherTest, VaryOnBack)
 {
     ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
     context->setCachePolicy(CachePolicyHistoryBuffer);
     ResourceFetcher* fetcher = ResourceFetcher::create(context);
 
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     Resource* resource = Resource::create(url, Resource::Raw);
     memoryCache()->add(resource);
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
     response.setHTTPHeaderField(HTTPNames::Vary, "*");
     resource->responseReceived(response, nullptr);
     resource->finish();
     ASSERT_TRUE(resource->hasVaryHeader());

[yhirano, 2016/09/09 07:34:47]

ditto

[hiroshige, 2016/09/09 08:11:35]

ditto.

 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory());
     EXPECT_EQ(resource, newResource);
 
     memoryCache()->remove(newResource);
 }
 
 TEST_F(ResourceFetcherTest, VaryImage)
 {
     ResourceFetcher* fetcher = ResourceFetcher::create(ResourceFetcherTestMockFetchContext::create());
 
     KURL url(ParsedURLString, "http://127.0.0.1:8000/foo.html");
     ResourceResponse response;
     response.setURL(url);
     response.setHTTPStatusCode(200);
     response.setHTTPHeaderField(HTTPNames::Cache_Control, "max-age=3600");
     response.setHTTPHeaderField(HTTPNames::Vary, "*");
     URLTestHelpers::registerMockedURLLoadWithCustomResponse(url, testImageFilename, WebString::fromUTF8(""), WrappedResourceResponse(response));
 
     FetchRequest fetchRequestOriginal = FetchRequest(url, FetchInitiatorInfo());
     Resource* resource = fetcher->requestResource(fetchRequestOriginal, TestResourceFactory(Resource::Image));
     ASSERT_TRUE(resource);
     Platform::current()->getURLLoaderMockFactory()->serveAsynchronousRequests();
     ASSERT_TRUE(resource->hasVaryHeader());

[yhirano, 2016/09/09 07:34:47]

ditto

[hiroshige, 2016/09/09 08:11:35]

ditto.

 
     FetchRequest fetchRequest = FetchRequest(url, FetchInitiatorInfo());
     Resource* newResource = fetcher->requestResource(fetchRequest, TestResourceFactory(Resource::Image));
     EXPECT_EQ(resource, newResource);
 
     memoryCache()->remove(newResource);
     Platform::current()->getURLLoaderMockFactory()->unregisterURL(url);
 }
 
 class RequestSameResourceOnComplete : public GarbageCollectedFinalized<RequestSameResourceOnComplete>, public RawResourceClient {
     USING_GARBAGE_COLLECTED_MIXIN(RequestSameResourceOnComplete);
 public:
     explicit RequestSameResourceOnComplete(Resource* resource)
         : m_resource(resource)
         , m_notifyFinishedCalled(false)
     {
     }
 
     void notifyFinished(Resource* resource) override
     {
         ASSERT_EQ(m_resource, resource);

[yhirano, 2016/09/09 07:34:47]

expect?

[hiroshige, 2016/09/09 08:11:35]

Done.

         ResourceFetcherTestMockFetchContext* context = ResourceFetcherTestMockFetchContext::create();
         context->setCachePolicy(CachePolicyRevalidate);
         ResourceFetcher* fetcher2 = ResourceFetcher::create(context);
         FetchRequest fetchRequest2(m_resource->url(), FetchInitiatorInfo());
         Resource* resource2 = fetcher2->requestResource(fetchRequest2, TestResourceFactory(Resource::Image));
         EXPECT_EQ(m_resource, resource2);
         m_notifyFinishedCalled = true;
     }
     bool notifyFinishedCalled() const { return m_notifyFinishedCalled; }
 
@@ skipping 259 matching lines @@
     FetchRequest request(url, FetchInitiatorInfo());
     request.makeSynchronous();
     Resource* resource = fetcher->requestResource(request, TestResourceFactory());
     EXPECT_TRUE(resource->isLoaded());
     EXPECT_EQ(ResourceLoadPriorityHighest, resource->resourceRequest().priority());
 
     memoryCache()->remove(resource);
 }
 
 } // namespace blink