Title: [232549] trunk/Tools
- Revision
- 232549
- Author
- [email protected]
- Date
- 2018-06-06 11:07:50 -0700 (Wed, 06 Jun 2018)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (232548 => 232549)
--- trunk/Tools/ChangeLog 2018-06-06 18:02:02 UTC (rev 232548)
+++ trunk/Tools/ChangeLog 2018-06-06 18:07:50 UTC (rev 232549)
@@ -1,3 +1,26 @@
+2018-06-06 Brent Fulgham <[email protected]>
+
+ 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 Chris Dumez <[email protected]>
Regression(r232082): Websites get loaded inside of Messages App chat transcript
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm (232548 => 232549)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm 2018-06-06 18:02:02 UTC (rev 232548)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InjectedBundleNodeHandleIsTextField.mm 2018-06-06 18:07:50 UTC (rev 232549)
@@ -77,7 +77,9 @@
[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];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (232548 => 232549)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm 2018-06-06 18:02:02 UTC (rev 232548)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm 2018-06-06 18:07:50 UTC (rev 232549)
@@ -523,9 +523,9 @@
- (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 @@
- (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 @@
- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
{
completionHandler();
+ done = true;
ASSERT_STREQ(message.UTF8String, "autofill available");
- done = true;
}
@end
@@ -635,8 +635,8 @@
- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
{
completionHandler();
+ done = true;
ASSERT_STREQ(message.UTF8String, "isTextField success");
- done = true;
}
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
