More minor cleanups for LinkHeaderTest.

third_party/WebKit/Source/core/loader/LinkHeaderTest.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/LinkHeader.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include <base/macros.h>
 
 namespace blink {
@@ skipping 75 matching lines @@
     {"<simple.css>; rel=''; title=", "simple.css", "", "", false},
     {"<simple.css>; rel=''; title", "simple.css", "", "", false},
     {"<simple.css>; rel=''; media", "simple.css", "", "", false},
     {"<simple.css>; rel=''; hreflang", "simple.css", "", "", false},
     {"<simple.css>; rel=''; type", "simple.css", "", "", false},
     {"<simple.css>; rel=''; rev", "simple.css", "", "", false},
     {"<simple.css>; rel=''; bla", "simple.css", "", "", true},
     {"<simple.css>; rel='prefetch", "simple.css", "", "", false},
     {"<simple.css>; rel=\"prefetch", "simple.css", "", "", false},
     {"<simple.css>; rel=\"", "simple.css", "", "", false},
+    {"<http://whatever.com>; rel=preconnect; valid!", "http://whatever.com", "preconnect", "", true},
+    {"<http://whatever.com>; rel=preconnect; valid$", "http://whatever.com", "preconnect", "", true},
+    {"<http://whatever.com>; rel=preconnect; invalid@", "http://whatever.com", "preconnect", "", false},
+    {"<http://whatever.com>; rel=preconnect; invalid*", "http://whatever.com", "preconnect", "", false},
 };
 
 void PrintTo(const SingleTestCase& test, std::ostream* os)
 {
     *os << ::testing::PrintToString(test.headerValue);
 }
 
 class SingleLinkHeaderTest : public ::testing::TestWithParam<SingleTestCase> {};
 
 // Test the cases with a single header
 TEST_P(SingleLinkHeaderTest, Single)
 {
     const SingleTestCase testCase = GetParam();
     LinkHeaderSet headerSet(testCase.headerValue);
+    ASSERT_EQ(1u, headerSet.size());
     LinkHeader& header = headerSet[0];
-    ASSERT_STREQ(testCase.url, header.url().ascii().data());
-    ASSERT_STREQ(testCase.rel, header.rel().ascii().data());
-    ASSERT_EQ(testCase.valid, header.valid());
+    EXPECT_STREQ(testCase.url, header.url().ascii().data());
+    EXPECT_STREQ(testCase.rel, header.rel().ascii().data());
+    EXPECT_EQ(testCase.valid, header.valid());
 }
 
 INSTANTIATE_TEST_CASE_P(LinkHeaderTest, SingleLinkHeaderTest, testing::ValuesIn(singleTestCases));
 
 struct DoubleTestCase {
     const char* headerValue;
     const char* url;
     const char* rel;
     bool valid;
     const char* url2;
     const char* rel2;
     bool valid2;
 } doubleTestCases[] = {
     {"<ybg.css>; rel=stylesheet, <simple.css>; rel=stylesheet", "ybg.css", "stylesheet", true, "simple.css", "stylesheet", true},
     {"<ybg.css>; rel=stylesheet,<simple.css>; rel=stylesheet", "ybg.css", "stylesheet", true, "simple.css", "stylesheet", true},
     {"<ybg.css>; rel=stylesheet;crossorigin,<simple.css>; rel=stylesheet", "ybg.css", "stylesheet", true, "simple.css", "stylesheet", true},
 };
 
 void PrintTo(const DoubleTestCase& test, std::ostream* os)
 {
     *os << ::testing::PrintToString(test.headerValue);
 }
 
 class DoubleLinkHeaderTest : public ::testing::TestWithParam<DoubleTestCase> {};
 
 TEST_P(DoubleLinkHeaderTest, Double)
 {
     const DoubleTestCase testCase = GetParam();
     LinkHeaderSet headerSet(testCase.headerValue);
+    ASSERT_EQ(2u, headerSet.size());
     LinkHeader& header1 = headerSet[0];
     LinkHeader& header2 = headerSet[1];
-    ASSERT_STREQ(testCase.url, header1.url().ascii().data());
-    ASSERT_STREQ(testCase.rel, header1.rel().ascii().data());
-    ASSERT_EQ(testCase.valid, header1.valid());
-    ASSERT_STREQ(testCase.url2, header2.url().ascii().data());
-    ASSERT_STREQ(testCase.rel2, header2.rel().ascii().data());
-    ASSERT_EQ(testCase.valid2, header2.valid());
+    EXPECT_STREQ(testCase.url, header1.url().ascii().data());
+    EXPECT_STREQ(testCase.rel, header1.rel().ascii().data());
+    EXPECT_EQ(testCase.valid, header1.valid());
+    EXPECT_STREQ(testCase.url2, header2.url().ascii().data());
+    EXPECT_STREQ(testCase.rel2, header2.rel().ascii().data());
+    EXPECT_EQ(testCase.valid2, header2.valid());
 }
 
 INSTANTIATE_TEST_CASE_P(LinkHeaderTest, DoubleLinkHeaderTest, testing::ValuesIn(doubleTestCases));
 
 struct CrossOriginTestCase {
     const char* headerValue;
     const char* url;
     const char* rel;
     const CrossOriginAttributeValue crossorigin;
     bool valid;
 } crossOriginTestCases[] = {
     {"<http://whatever.com>; rel=preconnect", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin=", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin ", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin;", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin, <http://whatever2.com>; rel=preconnect", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin , <http://whatever2.com>; rel=preconnect", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin,<http://whatever2.com>; rel=preconnect", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin=anonymous", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
     {"<http://whatever.com>; rel=preconnect; crossorigin=use-credentials", "http://whatever.com", "preconnect", CrossOriginAttributeUseCredentials, true},
-    {"<http://whatever.com>; rel=preconnect; crossorigin=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous,  true},
-    {"<http://whatever.com>; rel=preconnect; crossorig|in=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  true},
-    {"<http://whatever.com>; rel=preconnect; crossorigin|=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  true},
-    {"<http://whatever.com>; rel=preconnect; valid!", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  true},
-    {"<http://whatever.com>; rel=preconnect; valid$", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  true},
-    {"<http://whatever.com>; rel=preconnect; invalid@", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  false},
-    {"<http://whatever.com>; rel=preconnect; invalid*", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet,  false},
+    {"<http://whatever.com>; rel=preconnect; crossorigin=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeAnonymous, true},
+    {"<http://whatever.com>; rel=preconnect; crossorig|in=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet, true},
+    {"<http://whatever.com>; rel=preconnect; crossorigin|=whatever", "http://whatever.com", "preconnect", CrossOriginAttributeNotSet, true},
 };
 
 void PrintTo(const CrossOriginTestCase& test, std::ostream* os)
 {
     *os << ::testing::PrintToString(test.headerValue);
 }
 
 class CrossOriginLinkHeaderTest : public ::testing::TestWithParam<CrossOriginTestCase> {};
 
 TEST_P(CrossOriginLinkHeaderTest, CrossOrigin)
 {
     const CrossOriginTestCase testCase = GetParam();
     LinkHeaderSet headerSet(testCase.headerValue);
+    ASSERT_GE(headerSet.size(), 1u);
     LinkHeader& header = headerSet[0];
-    ASSERT_STREQ(testCase.url, header.url().ascii().data());
-    ASSERT_STREQ(testCase.rel, header.rel().ascii().data());
-    ASSERT_EQ(testCase.crossorigin, header.crossOrigin());
-    ASSERT_EQ(testCase.valid, header.valid());
+    EXPECT_STREQ(testCase.url, header.url().ascii().data());
+    EXPECT_STREQ(testCase.rel, header.rel().ascii().data());
+    EXPECT_EQ(testCase.crossorigin, header.crossOrigin());
+    EXPECT_EQ(testCase.valid, header.valid());
 }
 
 INSTANTIATE_TEST_CASE_P(LinkHeaderTest, CrossOriginLinkHeaderTest, testing::ValuesIn(crossOriginTestCases));
 
 } // namespace
 } // namespace blink