Changeset 206220 in webkit


Ignore:
Timestamp:
Sep 21, 2016 11:04:39 AM (8 years ago)
Author:
achristensen@apple.com
Message:

Prepare API tests for enabling URLParser by default
https://bugs.webkit.org/show_bug.cgi?id=162341

Reviewed by Tim Horton.

  • TestWebKitAPI/Tests/WebCore/URLParser.cpp:

(TestWebKitAPI::checkURL):
(TestWebKitAPI::checkRelativeURL):
(TestWebKitAPI::checkURLDifferences):
(TestWebKitAPI::checkRelativeURLDifferences):
(TestWebKitAPI::shouldFail):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r206219 r206220  
     12016-09-21  Alex Christensen  <achristensen@webkit.org>
     2
     3        Prepare API tests for enabling URLParser by default
     4        https://bugs.webkit.org/show_bug.cgi?id=162341
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/WebCore/URLParser.cpp:
     9        (TestWebKitAPI::checkURL):
     10        (TestWebKitAPI::checkRelativeURL):
     11        (TestWebKitAPI::checkURLDifferences):
     12        (TestWebKitAPI::checkRelativeURLDifferences):
     13        (TestWebKitAPI::shouldFail):
     14
    1152016-09-21  Alex Christensen  <achristensen@webkit.org>
    216
  • trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp

    r206219 r206220  
    6060static void checkURL(const String& urlString, const ExpectedParts& parts)
    6161{
    62     URLParser parser;
    63     auto url = parser.parse(urlString);
     62    bool wasEnabled = URLParser::enabled();
     63    URLParser::setEnabled(true);
     64    auto url = URL(URL(), urlString);
     65    URLParser::setEnabled(false);
     66    auto oldURL = URL(URL(), urlString);
     67    URLParser::setEnabled(wasEnabled);
     68   
    6469    EXPECT_TRUE(eq(parts.protocol, url.protocol()));
    6570    EXPECT_TRUE(eq(parts.user, url.user()));
     
    7277    EXPECT_TRUE(eq(parts.string, url.string()));
    7378   
    74     auto oldURL = URL(URL(), urlString);
    7579    EXPECT_TRUE(eq(parts.protocol, oldURL.protocol()));
    7680    EXPECT_TRUE(eq(parts.user, oldURL.user()));
     
    225229static void checkRelativeURL(const String& urlString, const String& baseURLString, const ExpectedParts& parts)
    226230{
    227     URLParser baseParser;
    228     auto base = baseParser.parse(baseURLString);
    229 
    230     URLParser parser;
    231     auto url = parser.parse(urlString, base);
     231    bool wasEnabled = URLParser::enabled();
     232    URLParser::setEnabled(true);
     233    auto url = URL(URL(URL(), baseURLString), urlString);
     234    URLParser::setEnabled(false);
     235    auto oldURL = URL(URL(URL(), baseURLString), urlString);
     236    URLParser::setEnabled(wasEnabled);
     237
    232238    EXPECT_TRUE(eq(parts.protocol, url.protocol()));
    233239    EXPECT_TRUE(eq(parts.user, url.user()));
     
    240246    EXPECT_TRUE(eq(parts.string, url.string()));
    241247
    242     auto oldURL = URL(URL(URL(), baseURLString), urlString);
    243248    EXPECT_TRUE(eq(parts.protocol, oldURL.protocol()));
    244249    EXPECT_TRUE(eq(parts.user, oldURL.user()));
     
    315320static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
    316321{
    317     URLParser parser;
    318     auto url = parser.parse(urlString);
     322    bool wasEnabled = URLParser::enabled();
     323    URLParser::setEnabled(true);
     324    auto url = URL(URL(), urlString);
     325    URLParser::setEnabled(false);
     326    auto oldURL = URL(URL(), urlString);
     327    URLParser::setEnabled(wasEnabled);
     328
    319329    EXPECT_TRUE(eq(partsNew.protocol, url.protocol()));
    320330    EXPECT_TRUE(eq(partsNew.user, url.user()));
     
    327337    EXPECT_TRUE(eq(partsNew.string, url.string()));
    328338   
    329     auto oldURL = URL(URL(), urlString);
    330339    EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol()));
    331340    EXPECT_TRUE(eq(partsOld.user, oldURL.user()));
     
    345354static void checkRelativeURLDifferences(const String& urlString, const String& baseURLString, const ExpectedParts& partsNew, const ExpectedParts& partsOld)
    346355{
    347     URLParser baseParser;
    348     auto base = baseParser.parse(baseURLString);
    349    
    350     URLParser parser;
    351     auto url = parser.parse(urlString, base);
     356    bool wasEnabled = URLParser::enabled();
     357    URLParser::setEnabled(true);
     358    auto url = URL(URL(URL(), baseURLString), urlString);
     359    URLParser::setEnabled(false);
     360    auto oldURL = URL(URL(URL(), baseURLString), urlString);
     361    URLParser::setEnabled(wasEnabled);
     362
    352363    EXPECT_TRUE(eq(partsNew.protocol, url.protocol()));
    353364    EXPECT_TRUE(eq(partsNew.user, url.user()));
     
    360371    EXPECT_TRUE(eq(partsNew.string, url.string()));
    361372   
    362     auto oldURL = URL(URL(URL(), baseURLString), urlString);
    363373    EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol()));
    364374    EXPECT_TRUE(eq(partsOld.user, oldURL.user()));
     
    662672static void shouldFail(const String& urlString)
    663673{
    664     URLParser parser;
    665     auto invalidURL = parser.parse(urlString);
    666674    checkURL(urlString, {"", "", "", "", 0, "", "", "", urlString});
    667675}
     
    669677static void shouldFail(const String& urlString, const String& baseString)
    670678{
    671     URLParser parser;
    672     auto invalidURL = parser.parse(urlString);
    673679    checkRelativeURL(urlString, baseString, {"", "", "", "", 0, "", "", "", urlString});
    674680}
    675    
     681
    676682TEST_F(URLParserTest, ParserFailures)
    677683{
Note: See TracChangeset for help on using the changeset viewer.