Implement (FORMAT_ELAPSED, LENGTH_LONG) in time_format

ui/base/l10n/time_format_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "ui/base/l10n/time_format.h"
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 97 matching lines @@
     EXPECT_EQ(ASCIIToUTF16("1 day left"), TimeFormat::Simple(
         TimeFormat::FORMAT_REMAINING, TimeFormat::LENGTH_LONG, delta_1d_));
     EXPECT_EQ(ASCIIToUTF16("1 sec ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_1s_));
     EXPECT_EQ(ASCIIToUTF16("1 min ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_1m_));
     EXPECT_EQ(ASCIIToUTF16("1 hour ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_1h_));
     EXPECT_EQ(ASCIIToUTF16("1 day ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_1d_));
+    EXPECT_EQ(ASCIIToUTF16("1 second ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_1s_));
+    EXPECT_EQ(ASCIIToUTF16("1 minute ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_1m_));
+    EXPECT_EQ(ASCIIToUTF16("1 hour ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_1h_));
+    EXPECT_EQ(ASCIIToUTF16("1 day ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_1d_));
 
     // Test English strings (simple, plural).
     EXPECT_EQ(ASCIIToUTF16("2 secs"), TimeFormat::Simple(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT, delta_2s_));
     EXPECT_EQ(ASCIIToUTF16("2 mins"), TimeFormat::Simple(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT, delta_2m_));
     EXPECT_EQ(ASCIIToUTF16("2 hours"), TimeFormat::Simple(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT, delta_2h_));
     EXPECT_EQ(ASCIIToUTF16("2 days"), TimeFormat::Simple(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT, delta_2d_));
@@ skipping 22 matching lines @@
     EXPECT_EQ(ASCIIToUTF16("2 days left"), TimeFormat::Simple(
         TimeFormat::FORMAT_REMAINING, TimeFormat::LENGTH_LONG, delta_2d_));
     EXPECT_EQ(ASCIIToUTF16("2 secs ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_2s_));
     EXPECT_EQ(ASCIIToUTF16("2 mins ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_2m_));
     EXPECT_EQ(ASCIIToUTF16("2 hours ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_2h_));
     EXPECT_EQ(ASCIIToUTF16("2 days ago"), TimeFormat::Simple(
         TimeFormat::FORMAT_ELAPSED, TimeFormat::LENGTH_SHORT, delta_2d_));
+    EXPECT_EQ(ASCIIToUTF16("2 seconds ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_2s_));
+    EXPECT_EQ(ASCIIToUTF16("2 minutes ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_LONG, delta_2m_));
+    EXPECT_EQ(ASCIIToUTF16("2 hours ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_SHORT, delta_2h_));
+    EXPECT_EQ(ASCIIToUTF16("2 days ago"),
+              TimeFormat::Simple(TimeFormat::FORMAT_ELAPSED,
+                                 TimeFormat::LENGTH_SHORT, delta_2d_));
 
     // Test English strings (detailed, singular and plural).
     EXPECT_EQ(ASCIIToUTF16("1 minute and 2 seconds"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_1m2s_));
     EXPECT_EQ(ASCIIToUTF16("2 minutes and 1 second"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_2m1s_));
     EXPECT_EQ(ASCIIToUTF16("1 hour and 2 minutes"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_1h2m_));
     EXPECT_EQ(ASCIIToUTF16("2 hours and 1 minute"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_2h1m_));
@@ skipping 173 matching lines @@
       TimeFormat::RelativeDate(two_days_ago, NULL);
   EXPECT_TRUE(two_days_ago_str.empty());
 
   base::Time a_week_ago = now - TimeDelta::FromDays(7);
   base::string16 a_week_ago_str = TimeFormat::RelativeDate(a_week_ago, NULL);
   EXPECT_TRUE(a_week_ago_str.empty());
 }
 
 }  // namespace
 }  // namespace ui