Title: [238485] trunk/Tools
- Revision
- 238485
- Author
- wenson_hs...@apple.com
- Date
- 2018-11-25 14:59:07 -0800 (Sun, 25 Nov 2018)
Log Message
Unreviewed, fix the internal iOS 12 build after r238471
* TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm:
(TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (238484 => 238485)
--- trunk/Tools/ChangeLog 2018-11-25 22:11:24 UTC (rev 238484)
+++ trunk/Tools/ChangeLog 2018-11-25 22:59:07 UTC (rev 238485)
@@ -1,3 +1,10 @@
+2018-11-25 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, fix the internal iOS 12 build after r238471
+
+ * TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm:
+ (TEST):
+
2018-11-25 Tim Horton <timothy_hor...@apple.com>
Make it possible to insert editable images with a gesture
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm (238484 => 238485)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm 2018-11-25 22:11:24 UTC (rev 238484)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DataDetection.mm 2018-11-25 22:59:07 UTC (rev 238485)
@@ -135,17 +135,20 @@
auto checkDataDetectionResults = [] (NSArray<DDScannerResult *> *results) {
EXPECT_EQ(3U, results.count);
- EXPECT_EQ(DDResultCategoryUnknown, results[0].category);
EXPECT_TRUE([results[0].value containsString:@"+1-234-567-8900"]);
EXPECT_TRUE([results[0].value containsString:@"https://www.apple.com"]);
EXPECT_TRUE([results[0].value containsString:@"2 Apple Park Way, Cupertino 95014"]);
EXPECT_WK_STREQ("SignatureBlock", results[0].type);
- EXPECT_EQ(DDResultCategoryCalendarEvent, results[1].category);
EXPECT_WK_STREQ("Date", results[1].type);
EXPECT_WK_STREQ("December 21, 2021", results[1].value);
- EXPECT_EQ(DDResultCategoryMisc, results[2].category);
EXPECT_WK_STREQ("FlightInformation", results[2].type);
EXPECT_WK_STREQ("AC780", results[2].value);
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
+ EXPECT_EQ(DDResultCategoryUnknown, results[0].category);
+ EXPECT_EQ(DDResultCategoryCalendarEvent, results[1].category);
+ EXPECT_EQ(DDResultCategoryMisc, results[2].category);
+#endif
};
[webView synchronouslyDetectDataWithTypes:WKDataDetectorTypeAll];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes