Add tests for TimeRemainingLong() and TimeDurationLong()

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/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using base::ASCIIToUTF16;
 
 namespace ui {
 namespace {
 
 using base::TimeDelta;
 
 void TestTimeFormats(const TimeDelta& delta, const char* expected_ascii) {
-  base::string16 expected = ASCIIToUTF16(expected_ascii);
-  base::string16 expected_left = expected + ASCIIToUTF16(" left");
-  base::string16 expected_ago = expected + ASCIIToUTF16(" ago");
+  const base::string16 expected(ASCIIToUTF16(expected_ascii));
+  const base::string16 sec(ASCIIToUTF16("sec"));
+  const base::string16 min(ASCIIToUTF16("min"));
+
+  // expected_long_minute has "min" replaced by "minute".
+  base::string16 expected_long_minute = expected;
+  if (expected_long_minute.find(min) != base::string16::npos)
+    expected_long_minute.insert(expected_long_minute.find(min) + min.length(),
+                                ASCIIToUTF16("ute"));
+
+  // expected_long has {"sec","min"} replaced by {"second","minute"}.
+  base::string16 expected_long = expected_long_minute;
+  if (expected_long.find(sec) != base::string16::npos)
+    expected_long.insert(expected_long.find(sec) + sec.length(),
+                         ASCIIToUTF16("ond"));

[jungshik at Google, 2014/02/03 18:03:01]

This string manipulation is really hacky, I'm afraid. Instead, it'd be much
cleaner to add a separate helper function for long or extend TestTimeFormats to
accept a parameter to specify 'long' or 'short'. Then, TimeFormat:FormatTime can
call TestTimeFormats with different format indicator (long, short). 

Actually, the current version of TestTimeFormats also does something not very
expandable to non-English locales by appending 'left' and 'ago'. While you're at
it, you may as well parameterize it, too. 

It'd make # of lines in FormatTime test 6 times as many as the current. If
that's a problem, you can also make a loop around them to keep the # of lines
the same. 

+
+  EXPECT_EQ(expected + ASCIIToUTF16(" ago"), TimeFormat::TimeElapsed(delta));
+  EXPECT_EQ(expected + ASCIIToUTF16(" left"), TimeFormat::TimeRemaining(delta));
+  EXPECT_EQ(expected_long_minute + ASCIIToUTF16(" left"),
+            TimeFormat::TimeRemainingLong(delta));
   EXPECT_EQ(expected, TimeFormat::TimeRemainingShort(delta));
-  EXPECT_EQ(expected_left, TimeFormat::TimeRemaining(delta));
-  EXPECT_EQ(expected_ago, TimeFormat::TimeElapsed(delta));
+  EXPECT_EQ(expected_long, TimeFormat::TimeDurationLong(delta));
 }
 
 TEST(TimeFormat, FormatTime) {
   const TimeDelta one_day = TimeDelta::FromDays(1);
   const TimeDelta one_hour = TimeDelta::FromHours(1);
   const TimeDelta one_min = TimeDelta::FromMinutes(1);
   const TimeDelta one_second = TimeDelta::FromSeconds(1);
   const TimeDelta one_millisecond = TimeDelta::FromMilliseconds(1);
   const TimeDelta zero = TimeDelta::FromMilliseconds(0);
 
@@ skipping 33 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