Attachment 342063 Details for Bug 186319 – Patch for landing

[patch] Patch for landing

bug-186319-20180606105530.patch (text/plain), 5.63 KB, created by Brent Fulgham on 2018-06-06 10:55:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2018-06-06 10:55:31 PDT

Size: 5.63 KB

patch

obsolete

>Subversion Revision: 232524
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b08218d76f5e6653b3edb78e11f6bfa749669e33..35538b2ce8dc3672081a1c3ef4f836d67399636f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,26 @@
>+2018-06-06  Brent Fulgham  <bfulgham@apple.com>
>+
>+        Adjust compile and runtime flags to match shippable state of features (Part 2)
>+        https://bugs.webkit.org/show_bug.cgi?id=186319
>+        <rdar://problem/40352045>
>+
>+        Unreviewed test fix.
>+
>+        TestWebKitAPI was timing out because 'color' input types are no longer support. I also discovered that the
>+        ASSERT_STREQ macro returns on error, which causes tests to time out whenever a 'done = true' call (needed to
>+        end the test) is done after ASSERT_STREQ, which might fail and return early, preventing the flag from being
>+        set.
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm:
>+        (-[InjectedBundleNodeHandleIsTextField webProcessPlugIn:didCreateBrowserContextController:]): Make testing of
>+        the 'color' input type conditional on the feature being part of the build.
>+        * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
>+        (-[AutoFillDelegate _webView:didClickAutoFillButtonWithUserInfo:]): Set the 'done=true' state before performing
>+        string equality assertions, since they do an early return and bypass the end state of the test.
>+        (-[DidResignInputElementStrongPasswordAppearanceDelegate _webView:didResignInputElementStrongPasswordAppearanceWithUserInfo:]): Ditto.
>+        (-[AutoFillAvailableDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]): Ditto.
>+        (-[InjectedBundleNodeHandleIsTextFieldDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]): Ditto.
>+
> 2018-06-05  Saam Barati  <sbarati@apple.com>
> 
>         run-testmem should have a dry run option and an option to parse the stdout of executing the dry run
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm
>index a512c3d00689e996b7d35dea1e69314c6eaed89c..a3a41e0f26e37833a6fcbab2e3aeb5b543cae192 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm
>@@ -77,7 +77,9 @@ - (void)webProcessPlugIn:(WKWebProcessPlugInController *)plugInController didCre
>     [self verifyTextFieldForHTMLInputType:@"week" document:document jsContext:jsContext expectedResult:YES failedInputTypes:failedInputTypes];
> 
>     [self verifyTextFieldForHTMLInputType:@"button" document:document jsContext:jsContext expectedResult:NO failedInputTypes:failedInputTypes];
>+#if ENABLE_INPUT_TYPE_COLOR
>     [self verifyTextFieldForHTMLInputType:@"color" document:document jsContext:jsContext expectedResult:NO failedInputTypes:failedInputTypes];
>+#endif
>     [self verifyTextFieldForHTMLInputType:@"file" document:document jsContext:jsContext expectedResult:NO failedInputTypes:failedInputTypes];
>     [self verifyTextFieldForHTMLInputType:@"hidden" document:document jsContext:jsContext expectedResult:NO failedInputTypes:failedInputTypes];
>     [self verifyTextFieldForHTMLInputType:@"image" document:document jsContext:jsContext expectedResult:NO failedInputTypes:failedInputTypes];
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm
>index b24cdd85519403239782841757891c666385de75..cb33c439617c99c44076ac7b982cbeec32f3597f 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm
>@@ -523,9 +523,9 @@ @implementation AutoFillDelegate
> 
> - (void)_webView:(WKWebView *)webView didClickAutoFillButtonWithUserInfo:(id <NSSecureCoding>)userInfo
> {
>+    done = true;
>     ASSERT_TRUE([(id<NSObject>)userInfo isKindOfClass:[NSString class]]);
>     ASSERT_STREQ([(NSString*)userInfo UTF8String], "user data string");
>-    done = true;
> }
> 
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
>@@ -560,9 +560,9 @@ @implementation DidResignInputElementStrongPasswordAppearanceDelegate
> 
> - (void)_webView:(WKWebView *)webView didResignInputElementStrongPasswordAppearanceWithUserInfo:(id <NSSecureCoding>)userInfo
> {
>+    done = true;
>     ASSERT_TRUE([(id<NSObject>)userInfo isKindOfClass:[NSString class]]);
>     ASSERT_STREQ([(NSString*)userInfo UTF8String], "user data string");
>-    done = true;
> }
> 
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
>@@ -611,8 +611,8 @@ @implementation AutoFillAvailableDelegate
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
> {
>     completionHandler();
>-    ASSERT_STREQ(message.UTF8String, "autofill available");
>     done = true;
>+    ASSERT_STREQ(message.UTF8String, "autofill available");
> }
> 
> @end
>@@ -635,8 +635,8 @@ @implementation InjectedBundleNodeHandleIsTextFieldDelegate
> - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
> {
>     completionHandler();
>-    ASSERT_STREQ(message.UTF8String, "isTextField success");
>     done = true;
>+    ASSERT_STREQ(message.UTF8String, "isTextField success");
> }
> 
> @end

Flags:

bfulgham: commit-queue+

Actions: View | Formatted Diff | Diff

Attachments on bug 186319: 341991 | 341998 | 341999 | 342000 | 342001 | 342002 | 342063