Changeset 206220 in webkit
- Timestamp:
- Sep 21, 2016 11:04:39 AM (8 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r206219 r206220 1 2016-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 1 15 2016-09-21 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Tools/TestWebKitAPI/Tests/WebCore/URLParser.cpp
r206219 r206220 60 60 static void checkURL(const String& urlString, const ExpectedParts& parts) 61 61 { 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 64 69 EXPECT_TRUE(eq(parts.protocol, url.protocol())); 65 70 EXPECT_TRUE(eq(parts.user, url.user())); … … 72 77 EXPECT_TRUE(eq(parts.string, url.string())); 73 78 74 auto oldURL = URL(URL(), urlString);75 79 EXPECT_TRUE(eq(parts.protocol, oldURL.protocol())); 76 80 EXPECT_TRUE(eq(parts.user, oldURL.user())); … … 225 229 static void checkRelativeURL(const String& urlString, const String& baseURLString, const ExpectedParts& parts) 226 230 { 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 232 238 EXPECT_TRUE(eq(parts.protocol, url.protocol())); 233 239 EXPECT_TRUE(eq(parts.user, url.user())); … … 240 246 EXPECT_TRUE(eq(parts.string, url.string())); 241 247 242 auto oldURL = URL(URL(URL(), baseURLString), urlString);243 248 EXPECT_TRUE(eq(parts.protocol, oldURL.protocol())); 244 249 EXPECT_TRUE(eq(parts.user, oldURL.user())); … … 315 320 static void checkURLDifferences(const String& urlString, const ExpectedParts& partsNew, const ExpectedParts& partsOld) 316 321 { 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 319 329 EXPECT_TRUE(eq(partsNew.protocol, url.protocol())); 320 330 EXPECT_TRUE(eq(partsNew.user, url.user())); … … 327 337 EXPECT_TRUE(eq(partsNew.string, url.string())); 328 338 329 auto oldURL = URL(URL(), urlString);330 339 EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol())); 331 340 EXPECT_TRUE(eq(partsOld.user, oldURL.user())); … … 345 354 static void checkRelativeURLDifferences(const String& urlString, const String& baseURLString, const ExpectedParts& partsNew, const ExpectedParts& partsOld) 346 355 { 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 352 363 EXPECT_TRUE(eq(partsNew.protocol, url.protocol())); 353 364 EXPECT_TRUE(eq(partsNew.user, url.user())); … … 360 371 EXPECT_TRUE(eq(partsNew.string, url.string())); 361 372 362 auto oldURL = URL(URL(URL(), baseURLString), urlString);363 373 EXPECT_TRUE(eq(partsOld.protocol, oldURL.protocol())); 364 374 EXPECT_TRUE(eq(partsOld.user, oldURL.user())); … … 662 672 static void shouldFail(const String& urlString) 663 673 { 664 URLParser parser;665 auto invalidURL = parser.parse(urlString);666 674 checkURL(urlString, {"", "", "", "", 0, "", "", "", urlString}); 667 675 } … … 669 677 static void shouldFail(const String& urlString, const String& baseString) 670 678 { 671 URLParser parser;672 auto invalidURL = parser.parse(urlString);673 679 checkRelativeURL(urlString, baseString, {"", "", "", "", 0, "", "", "", urlString}); 674 680 } 675 681 676 682 TEST_F(URLParserTest, ParserFailures) 677 683 {
Note: See TracChangeset
for help on using the changeset viewer.