Title: [222743] trunk/Tools
- Revision
- 222743
- Author
- [email protected]
- Date
- 2017-10-02 14:31:46 -0700 (Mon, 02 Oct 2017)
Log Message
Guard iOS webkitGetAsEntry API tests on older iOS versions
Unreviewed test gardening. After r222688, these tests require custom pasteboard data to be enabled by default,
so don't run them against shipping iOS.
* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (222742 => 222743)
--- trunk/Tools/ChangeLog 2017-10-02 21:31:35 UTC (rev 222742)
+++ trunk/Tools/ChangeLog 2017-10-02 21:31:46 UTC (rev 222743)
@@ -1,3 +1,12 @@
+2017-10-02 Wenson Hsieh <[email protected]>
+
+ Guard iOS webkitGetAsEntry API tests on older iOS versions
+
+ Unreviewed test gardening. After r222688, these tests require custom pasteboard data to be enabled by default,
+ so don't run them against shipping iOS.
+
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+
2017-10-02 Carlos Garcia Campos <[email protected]>
[WPE][GTK] Crash in webkit_web_resource_get_data_finish()
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (222742 => 222743)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-10-02 21:31:35 UTC (rev 222742)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2017-10-02 21:31:46 UTC (rev 222743)
@@ -184,8 +184,6 @@
NSLog(@"Expected JSON: %@ to match values: %@", jsonString, expected);
}
-#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300
-
static void runTestWithTemporaryTextFile(void(^runTest)(NSURL *fileURL))
{
NSString *fileName = [NSString stringWithFormat:@"drag-drop-text-file-%@.txt", [NSUUID UUID].UUIDString];
@@ -235,6 +233,8 @@
}
}
+#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300
+
namespace TestWebKitAPI {
TEST(DataInteractionTests, ImageToContentEditable)
@@ -983,6 +983,8 @@
EXPECT_WK_STREQ("text/html", outputValue.UTF8String);
}
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300
+
static RetainPtr<TestWKWebView> setUpTestWebViewForDataTransferItems()
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
@@ -1063,6 +1065,8 @@
EXPECT_WK_STREQ([expectedOutput componentsJoinedByString:@"\n"], [webView stringByEvaluatingJavaScript:@"output.value"]);
}
+#endif // __IPHONE_OS_VERSION_MIN_REQUIRED >= 110300
+
TEST(DataInteractionTests, ExternalSourceOverrideDropInsertURL)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
