Title: [166458] trunk/Tools
- Revision
- 166458
- Author
- a...@apple.com
- Date
- 2014-03-29 22:57:40 -0700 (Sat, 29 Mar 2014)
Log Message
Update WebKit1.StringTruncator for Mountain Lion.
* TestWebKitAPI/Tests/mac/StringTruncator.mm: Looks like one subtest was failing
due to different font metrics on 10.8.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (166457 => 166458)
--- trunk/Tools/ChangeLog 2014-03-29 23:18:31 UTC (rev 166457)
+++ trunk/Tools/ChangeLog 2014-03-30 05:57:40 UTC (rev 166458)
@@ -1,3 +1,10 @@
+2014-03-29 Alexey Proskuryakov <a...@apple.com>
+
+ Update WebKit1.StringTruncator for Mountain Lion.
+
+ * TestWebKitAPI/Tests/mac/StringTruncator.mm: Looks like one subtest was failing
+ due to different font metrics on 10.8.
+
2014-03-28 Darin Adler <da...@apple.com>
Fix recently-introduced off-by-one error in centerTruncateToBuffer
Modified: trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm (166457 => 166458)
--- trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2014-03-29 23:18:31 UTC (rev 166457)
+++ trunk/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm 2014-03-30 05:57:40 UTC (rev 166458)
@@ -33,7 +33,11 @@
TEST(WebKit1, StringTruncator)
{
@autoreleasepool {
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdef…tuvwxyz");
+#else
+ EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String], "abcdefg…tuvwxyz");
+#endif
EXPECT_STREQ([[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100] UTF8String], "abcde…uvwxyz");
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");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
