Title: [199018] trunk/Tools
- Revision
- 199018
- Author
- [email protected]
- Date
- 2016-04-04 13:16:50 -0700 (Mon, 04 Apr 2016)
Log Message
Build fix for r198956.
Unreviewed.
* TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:
(-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):
* TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:
(-[LoadInvalidURLWebFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (199017 => 199018)
--- trunk/Tools/ChangeLog 2016-04-04 20:01:38 UTC (rev 199017)
+++ trunk/Tools/ChangeLog 2016-04-04 20:16:50 UTC (rev 199018)
@@ -1,3 +1,14 @@
+2016-04-04 Jiewen Tan <[email protected]>
+
+ Build fix for r198956.
+
+ Unreviewed.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm:
+ (-[LoadInvalidURLNavigationActionDelegate webView:didFailProvisionalNavigation:withError:]):
+ * TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm:
+ (-[LoadInvalidURLWebFrameLoadDelegate webView:didFailProvisionalLoadWithError:forFrame:]):
+
2016-04-04 Bill Ming <[email protected]>
[win] prepare-ChangeLog should treat windows path differently.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (199017 => 199018)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-04-04 20:01:38 UTC (rev 199017)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm 2016-04-04 20:16:50 UTC (rev 199018)
@@ -54,10 +54,11 @@
- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
{
- if ([error.domain isEqual:@"WebKitErrorDomain"]
- && error.code == WebKitErrorCannotShowURL
- && [error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)])
- didFailProvisionalLoad = true;
+ EXPECT_WK_STREQ(error.domain, @"WebKitErrorDomain");
+ EXPECT_EQ(error.code, WebKitErrorCannotShowURL);
+ EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:literalURL(literal)]);
+
+ didFailProvisionalLoad = true;
didFinishTest = true;
}
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (199017 => 199018)
--- trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-04-04 20:01:38 UTC (rev 199017)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm 2016-04-04 20:16:50 UTC (rev 199018)
@@ -47,12 +47,14 @@
- (void)webView:(WebView *)sender didFailProvisionalLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
{
+ 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);
- if ([error.domain isEqual:@"WebKitErrorDomain"]
- && error.code == WebKitErrorCannotShowURL
- && [error.userInfo[@"NSErrorFailingURLKey"] isEqual:failedURL])
- didFailProvisionalLoad = true;
+ EXPECT_TRUE([error.userInfo[@"NSErrorFailingURLKey"] isEqual:failedURL]);
+
+ didFailProvisionalLoad = true;
didFinishTest = true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
