Title: [185060] trunk/Tools
- Revision
- 185060
- Author
- [email protected]
- Date
- 2015-06-01 09:57:23 -0700 (Mon, 01 Jun 2015)
Log Message
Further tweak results of WebKit1.StringTruncator after r184965.
* TestWebKitAPI/Tests/mac/StringTruncator.mm:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (185059 => 185060)
--- trunk/Tools/ChangeLog 2015-06-01 15:40:43 UTC (rev 185059)
+++ trunk/Tools/ChangeLog 2015-06-01 16:57:23 UTC (rev 185060)
@@ -1,3 +1,9 @@
+2015-06-01 Alexey Proskuryakov <[email protected]>
+
+ Further tweak results of WebKit1.StringTruncator after r184965.
+
+ * TestWebKitAPI/Tests/mac/StringTruncator.mm:
+
2015-06-01 Csaba Osztrogonác <[email protected]>
[cmake] Suppress unused parameter warnings in WebKit2 and TestNetscapePlugIn
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm (185059 => 185060)
--- trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2015-06-01 15:40:43 UTC (rev 185059)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2015-06-01 16:57:23 UTC (rev 185060)
@@ -34,7 +34,11 @@
{
@autoreleasepool {
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
+#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
+ EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…uvwxyz");
+#else
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcdef…vwxyz");
+#endif
EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefghijklmno…");
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"ābcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "ābcdefg…tuvwxyz");
EXPECT_STREQ([[WebStringTruncator rightTruncateString:@"ābcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "ābcdefghijklmno…");
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
