Title: [207315] trunk/Tools
- Revision
- 207315
- Author
- achristen...@apple.com
- Date
- 2016-10-13 16:38:48 -0700 (Thu, 13 Oct 2016)
Log Message
Rebase API tests after r207305.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
Actually build Tests/mac/LoadInvalidURLRequest.mm so we are running the WebKit1.LoadInvalidURLRequest API test.
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:
(-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):
* TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:
(-[LoadInvalidURLWebFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
Change results back to what they were before r207162, r207167, and r207184.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (207314 => 207315)
--- trunk/Tools/ChangeLog 2016-10-13 22:52:17 UTC (rev 207314)
+++ trunk/Tools/ChangeLog 2016-10-13 23:38:48 UTC (rev 207315)
@@ -1,5 +1,17 @@
2016-10-13 Alex Christensen <achristen...@webkit.org>
+ Rebase API tests after r207305.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ Actually build Tests/mac/LoadInvalidURLRequest.mm so we are running the WebKit1.LoadInvalidURLRequest API test.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:
+ (-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):
+ * TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:
+ (-[LoadInvalidURLWebFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
+ Change results back to what they were before r207162, r207167, and r207184.
+
+2016-10-13 Alex Christensen <achristen...@webkit.org>
+
Disable URLParser for non-Safari iOS and Mac apps for now
https://bugs.webkit.org/show_bug.cgi?id=163397
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (207314 => 207315)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-13 22:52:17 UTC (rev 207314)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-10-13 23:38:48 UTC (rev 207315)
@@ -151,6 +151,7 @@
5C2936961D5C00ED00DEAB1E /* CookieMessage.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C2936941D5BFD1900DEAB1E /* CookieMessage.html */; };
5C6E65441D5CEFD400F7862E /* URLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6E65411D5CEF8500F7862E /* URLParser.cpp */; };
5C726D6F1D3EE06E00C5E1A1 /* InstanceMethodSwizzler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C726D6E1D3EE06800C5E1A1 /* InstanceMethodSwizzler.mm */; };
+ 5C838F7F1DB04F900082858F /* LoadInvalidURLRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 57901FAE1CAF137100ED64F9 /* LoadInvalidURLRequest.mm */; };
5C9E59411D3EB5AC00E3C62E /* ApplicationCache.db in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C9E593E1D3EB1DE00E3C62E /* ApplicationCache.db */; };
5C9E59421D3EB5AC00E3C62E /* ApplicationCache.db-shm in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C9E593F1D3EB1DE00E3C62E /* ApplicationCache.db-shm */; };
5C9E59431D3EB5AC00E3C62E /* ApplicationCache.db-wal in Copy Resources */ = {isa = PBXBuildFile; fileRef = 5C9E59401D3EB1DE00E3C62E /* ApplicationCache.db-wal */; };
@@ -2330,6 +2331,7 @@
1C2B81801C891E7C00A5529F /* CancelFontSubresource.mm in Sources */,
7CCE7EB61A411A7E00447C4C /* CancelLoadFromResourceLoadDelegate.mm in Sources */,
7C83E0411D0A63F200FEBCF3 /* CandidateTests.mm in Sources */,
+ 5C838F7F1DB04F900082858F /* LoadInvalidURLRequest.mm in Sources */,
7CCE7EE71A411AE600447C4C /* CanHandleRequest.cpp in Sources */,
7CCE7EE61A411AE600447C4C /* CloseFromWithinCreatePage.cpp in Sources */,
7CCE7EB71A411A7E00447C4C /* CloseNewWindowInNavigationPolicyDelegate.mm in Sources */,
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (207314 => 207315)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-13 22:52:17 UTC (rev 207314)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-10-13 23:38:48 UTC (rev 207315)
@@ -54,8 +54,8 @@
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
{
- EXPECT_WK_STREQ(error.domain, @"NSURLErrorDomain");
- EXPECT_EQ(error.code, -1003);
+ EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
+ EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)]);
didFailProvisionalLoad = true;
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (207314 => 207315)
--- trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-13 22:52:17 UTC (rev 207314)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-10-13 23:38:48 UTC (rev 207315)
@@ -47,8 +47,8 @@
- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
{
- EXPECT_WK_STREQ(error.domain, @"NSURLErrorDomain");
- EXPECT_EQ(error.code, -1003);
+ EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
+ EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
static char literal[] = "https://www.example.com<>/";
NSURL *failedURL = WebCore::URLWithData([NSData dataWithBytes:literal length:strlen(literal)], nil);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
