Changeset 207315 in webkit

Timestamp:

Oct 13, 2016 4:38:48 PM (8 years ago)

Author:

achristensen@apple.com

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (2 diffs)
• TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm (modified) (1 diff)
• TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-13  Alex Christensen  <achristensen@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  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -152 +152 @@
                 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 */; };
@@ -2331 +2332 @@
                                 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 */,

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/LoadInvalidURLRequest.mm

@@ -55 +55 @@
 - (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)]);
 

trunk/Tools/TestWebKitAPI/Tests/mac/LoadInvalidURLRequest.mm

@@ -48 +48 @@
 - (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<>/";