Further tweak results of WebKit1.StringTruncator after r184965.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Jun 2015 16:57:23 +0000 (16:57 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Jun 2015 16:57:23 +0000 (16:57 +0000)
* TestWebKitAPI/Tests/mac/StringTruncator.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm

index 0d8a3179dee7a8b6e59aa5c458e646a0639c23ba..1a8f13d011c80408393da28f8ad8e752b7fe7509 100644 (file)
@@ -1,3 +1,9 @@
+2015-06-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Further tweak results of WebKit1.StringTruncator after r184965.
+
+        * TestWebKitAPI/Tests/mac/StringTruncator.mm:
+
 2015-06-01  Csaba Osztrogonác  <ossy@webkit.org>
 
         [cmake] Suppress unused parameter warnings in WebKit2 and TestNetscapePlugIn
index 577d035f6edfbb72e6741ae8d35d5fb635e50cda..4c0b682c6892d95b8d0614a8e5ea94ef9a1f2119 100644 (file)
@@ -34,7 +34,11 @@ TEST(WebKit1, StringTruncator)
 {
     @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…");