Title: [226484] trunk/Tools
- Revision
- 226484
- Author
- [email protected]
- Date
- 2018-01-05 19:48:05 -0800 (Fri, 05 Jan 2018)
Log Message
REGRESSION(r226396) DataInteractionTests: ContentEditableToContentEditable and ContentEditableToTextarea are failing
https://bugs.webkit.org/show_bug.cgi?id=181359
Reviewed by Tim Horton.
Ensure that these tests still pass using older SDKs.
* TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (226483 => 226484)
--- trunk/Tools/ChangeLog 2018-01-06 03:19:57 UTC (rev 226483)
+++ trunk/Tools/ChangeLog 2018-01-06 03:48:05 UTC (rev 226484)
@@ -1,3 +1,15 @@
+2018-01-05 Wenson Hsieh <[email protected]>
+
+ REGRESSION(r226396) DataInteractionTests: ContentEditableToContentEditable and ContentEditableToTextarea are failing
+ https://bugs.webkit.org/show_bug.cgi?id=181359
+
+ Reviewed by Tim Horton.
+
+ Ensure that these tests still pass using older SDKs.
+
+ * TestWebKitAPI/Tests/ios/DataInteractionTests.mm:
+ (TestWebKitAPI::TEST):
+
2018-01-05 Alex Christensen <[email protected]>
Rebase API test after r226469
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm (226483 => 226484)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2018-01-06 03:19:57 UTC (rev 226483)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DataInteractionTests.mm 2018-01-06 03:48:05 UTC (rev 226484)
@@ -344,7 +344,12 @@
EXPECT_TRUE([observedEventNames containsObject:DataInteractionOverEventName]);
EXPECT_TRUE([observedEventNames containsObject:DataInteractionPerformOperationEventName]);
checkSelectionRectsWithLogging(@[ makeCGRectValue(1, 201, 961, 227) ], [dataInteractionSimulator finalSelectionRects]);
- checkTypeIdentifierPrecedesOtherTypeIdentifier(dataInteractionSimulator.get(), (NSString *)kUTTypeRTF, (NSString *)kUTTypeUTF8PlainText);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+ NSString *richTextTypeIdentifier = (NSString *)kUTTypeRTF;
+#else
+ NSString *richTextTypeIdentifier = (NSString *)kUTTypeRTFD;
+#endif
+ checkTypeIdentifierPrecedesOtherTypeIdentifier(dataInteractionSimulator.get(), richTextTypeIdentifier, (NSString *)kUTTypeUTF8PlainText);
}
TEST(DataInteractionTests, ContentEditableToTextarea)
@@ -364,7 +369,12 @@
EXPECT_TRUE([observedEventNames containsObject:DataInteractionOverEventName]);
EXPECT_TRUE([observedEventNames containsObject:DataInteractionPerformOperationEventName]);
checkSelectionRectsWithLogging(@[ makeCGRectValue(6, 203, 990, 232) ], [dataInteractionSimulator finalSelectionRects]);
- checkTypeIdentifierPrecedesOtherTypeIdentifier(dataInteractionSimulator.get(), (NSString *)kUTTypeRTF, (NSString *)kUTTypeUTF8PlainText);
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000
+ NSString *richTextTypeIdentifier = (NSString *)kUTTypeRTF;
+#else
+ NSString *richTextTypeIdentifier = (NSString *)kUTTypeRTFD;
+#endif
+ checkTypeIdentifierPrecedesOtherTypeIdentifier(dataInteractionSimulator.get(), richTextTypeIdentifier, (NSString *)kUTTypeUTF8PlainText);
}
TEST(DataInteractionTests, ContentEditableMoveParagraphs)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
