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

third_party/WebKit/Source/core/loader/LinkLoaderTest.cpp

 // Copyright 2015 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 "core/loader/LinkLoader.h"
 
 #include "core/fetch/MemoryCache.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/Settings.h"
 #include "core/html/LinkRelAttribute.h"
@@ skipping 132 matching lines @@
         KURL hrefURL = KURL(KURL(), testCase.href);
         URLTestHelpers::registerMockedErrorURLLoad(hrefURL);
         loader->loadLink(LinkRelAttribute("preload"),
             CrossOriginAttributeNotSet,
             testCase.type,
             testCase.as,
             testCase.media,
             hrefURL,
             dummyPageHolder->document(),
             NetworkHintsMock());
-        ASSERT(dummyPageHolder->document().fetcher());
+        ASSERT_TRUE(dummyPageHolder->document().fetcher());
         HeapListHashSet<Member<Resource>>* preloads = dummyPageHolder->document().fetcher()->preloads();
         if (testCase.expectingLoad) {
             if (!preloads)
                 fprintf(stderr, "Unexpected result %s %s %s\n", testCase.href, testCase.as, testCase.type);
-            ASSERT_NE(nullptr, preloads);
+            EXPECT_NE(nullptr, preloads);

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

[optional] EXPECT_TRUE for consistency?

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

Done.

         } else {
-            ASSERT_EQ(nullptr, preloads);
+            EXPECT_EQ(nullptr, preloads);

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

[optional] ditto

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

Done.

         }
         if (preloads) {
             if (testCase.priority == ResourceLoadPriorityUnresolved) {
-                ASSERT_EQ((unsigned)0, preloads->size());
+                EXPECT_EQ(0u, preloads->size());
             } else {
-                ASSERT_EQ((unsigned)1, preloads->size());
+                EXPECT_EQ(1u, preloads->size());
                 if (preloads->size() > 0) {
                     Resource* resource = preloads->begin().get()->get();
-                    ASSERT_EQ(testCase.priority, resource->resourceRequest().priority());
-                    ASSERT_EQ(testCase.context, resource->resourceRequest().requestContext());
+                    EXPECT_EQ(testCase.priority, resource->resourceRequest().priority());
+                    EXPECT_EQ(testCase.context, resource->resourceRequest().requestContext());
                 }
             }
             dummyPageHolder->document().fetcher()->clearPreloads();
         }
         memoryCache()->evictResources();
         Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
     }
 }
 
 TEST(LinkLoaderTest, DNSPrefetch)
@@ skipping 18 matching lines @@
         KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
         NetworkHintsMock networkHints;
         loader->loadLink(LinkRelAttribute("dns-prefetch"),
             CrossOriginAttributeNotSet,
             String(),
             String(),
             String(),
             hrefURL,
             dummyPageHolder->document(),
             networkHints);
-        ASSERT_FALSE(networkHints.didPreconnect());
-        ASSERT_EQ(testCase.shouldLoad, networkHints.didDnsPrefetch());
+        EXPECT_FALSE(networkHints.didPreconnect());
+        EXPECT_EQ(testCase.shouldLoad, networkHints.didDnsPrefetch());
     }
 }
 
 TEST(LinkLoaderTest, Preconnect)
 {
     struct {
         const char* href;
         CrossOriginAttributeValue crossOrigin;
         const bool shouldLoad;
         const bool isHTTPS;
@@ skipping 13 matching lines @@
         KURL hrefURL = KURL(KURL(ParsedURLStringTag(), String("http://example.com")), testCase.href);
         NetworkHintsMock networkHints;
         loader->loadLink(LinkRelAttribute("preconnect"),
             testCase.crossOrigin,
             String(),
             String(),
             String(),
             hrefURL,
             dummyPageHolder->document(),
             networkHints);
-        ASSERT_EQ(testCase.shouldLoad, networkHints.didPreconnect());
-        ASSERT_EQ(testCase.isHTTPS, networkHints.isHTTPS());
-        ASSERT_EQ(testCase.isCrossOrigin, networkHints.isCrossOrigin());
+        EXPECT_EQ(testCase.shouldLoad, networkHints.didPreconnect());
+        EXPECT_EQ(testCase.isHTTPS, networkHints.isHTTPS());
+        EXPECT_EQ(testCase.isCrossOrigin, networkHints.isCrossOrigin());
     }
 }
 
 } // namespace blink