Modify ui::ElideRectangleText() to honor trailing newlines.

ui/base/text/text_elider_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Unit tests for eliding and formatting utility functions.
 
 #include "ui/base/text/text_elider.h"
 
 #include "base/file_path.h"
 #include "base/i18n/rtl.h"
@@ skipping 512 matching lines @@
     { "Test Test", test_width, line_height * 2, false, "Test|Test" },
     { "Test Test", test_width, line_height * 3, false, "Test|Test" },
     { "Test Test", test_width * 2, line_height * 2, false, "Test|Test" },
     { "Test Test", test_width * 3, line_height, false, "Test Test" },
     { "Test\nTest", test_width * 3, line_height * 2, false, "Test|Test" },
     { "Te\nst Te", test_width, line_height * 3, false, "Te|st|Te" },
     { "\nTest", test_width, line_height * 2, false, "|Test" },
     { "\nTest", test_width, line_height, true, "" },
     { "\n\nTest", test_width, line_height * 3, false, "||Test" },
     { "\n\nTest", test_width, line_height * 2, true, "|" },
+    { "Test\n", 2 * test_width, line_height * 5, false, "Test|" },
+    { "Test\n\n", 2 * test_width, line_height * 5, false, "Test||" },
+    { "Test\n\n\n", 2 * test_width, line_height * 5, false, "Test|||" },
+    { "Test\nTest\n\n", 2 * test_width, line_height * 5, false, "Test|Test||" },
+    { "Test\n\nTest\n", 2 * test_width, line_height * 5, false, "Test||Test|" },
+    { "Test\n\n\nTest", 2 * test_width, line_height * 5, false, "Test|||Test" },
+    { "Te ", test_width, line_height, false, "Te" },
+    { "Te  Te Test", test_width, 3 * line_height, false, "Te|Te|Test" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     std::vector<string16> lines;
     EXPECT_EQ(cases[i].truncated,
               ElideRectangleText(UTF8ToUTF16(cases[i].input),
                                  font,
                                  cases[i].available_pixel_width,
                                  cases[i].available_pixel_height,
                                  TRUNCATE_LONG_WORDS,
                                  &lines));
-    if (cases[i].output)
-      EXPECT_EQ(cases[i].output, UTF16ToUTF8(JoinString(lines, '|')));
-    else
-      EXPECT_TRUE(lines.empty());
+    if (cases[i].output) {
+      const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
+      EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
+    } else {
+      EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!";
+    }
   }
 }
 
 TEST(TextEliderTest, ElideRectangleTextPunctuation) {
   const gfx::Font font;
   const int line_height = font.GetHeight();
   const int test_width = font.GetStringWidth(ASCIIToUTF16("Test"));
   const int test_t_width = font.GetStringWidth(ASCIIToUTF16("Test T"));
 
   struct TestData {
@@ skipping 14 matching lines @@
     std::vector<string16> lines;
     const WordWrapBehavior wrap_behavior =
         (cases[i].wrap_words ? WRAP_LONG_WORDS : TRUNCATE_LONG_WORDS);
     EXPECT_EQ(cases[i].truncated,
               ElideRectangleText(UTF8ToUTF16(cases[i].input),
                                  font,
                                  cases[i].available_pixel_width,
                                  cases[i].available_pixel_height,
                                  wrap_behavior,
                                  &lines));
-    if (cases[i].output)
-      EXPECT_EQ(cases[i].output, UTF16ToUTF8(JoinString(lines, '|')));
-    else
-      EXPECT_TRUE(lines.empty());
+    if (cases[i].output) {
+      const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
+      EXPECT_EQ(cases[i].output, result) << "Case " << i << " failed!";
+    } else {
+      EXPECT_TRUE(lines.empty()) << "Case " << i << " failed!";
+    }
   }
 }
 
 TEST(TextEliderTest, ElideRectangleTextLongWords) {
   const gfx::Font font;
   const int kAvailableHeight = 1000;
   const string16 kElidedTesting = UTF8ToUTF16(std::string("Tes") + kEllipsis);
   const int elided_width = font.GetStringWidth(kElidedTesting);
   const int test_width = font.GetStringWidth(ASCIIToUTF16("Test"));
 
@@ skipping 35 matching lines @@
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     std::vector<string16> lines;
     ElideRectangleText(UTF8ToUTF16(cases[i].input),
                        font,
                        cases[i].available_pixel_width,
                        kAvailableHeight,
                        cases[i].wrap_behavior,
                        &lines);
     std::string expected_output(cases[i].output);
     ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis);
-    EXPECT_EQ(expected_output, UTF16ToUTF8(JoinString(lines, '|')));
+    const std::string result = UTF16ToUTF8(JoinString(lines, '|'));
+    EXPECT_EQ(expected_output, result) << "Case " << i << " failed!";
   }
 }
 
 TEST(TextEliderTest, ElideRectangleString) {
   struct TestData {
     const char* input;
     int max_rows;
     int max_cols;
     bool result;
     const char* output;
@@ skipping 208 matching lines @@
 
   // Test adds ... at right spot when there is not enough room to break at a
   // word boundary.
   EXPECT_EQ(L"foooooey\x2026", UTF16ToWide(TruncateString(string, 11)));
 
   // Test completely truncates string if break is on initial whitespace.
   EXPECT_EQ(L"\x2026", UTF16ToWide(TruncateString(ASCIIToUTF16("   "), 2)));
 }
 
 }  // namespace ui