Fix rounding of time interval strings

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");
   EXPECT_EQ(expected, TimeFormat::TimeRemainingShort(delta));
   EXPECT_EQ(expected_left, TimeFormat::TimeRemaining(delta));
   EXPECT_EQ(expected_ago, TimeFormat::TimeElapsed(delta));
 }
 
 TEST(TimeFormat, FormatTime) {
-  const TimeDelta one_day = TimeDelta::FromDays(1);
-  const TimeDelta three_days = TimeDelta::FromDays(3);
-  const TimeDelta one_hour = TimeDelta::FromHours(1);
-  const TimeDelta four_hours = TimeDelta::FromHours(4);
-  const TimeDelta one_min = TimeDelta::FromMinutes(1);
-  const TimeDelta three_mins = TimeDelta::FromMinutes(3);
-  const TimeDelta one_sec = TimeDelta::FromSeconds(1);
-  const TimeDelta five_secs = TimeDelta::FromSeconds(5);
-  const TimeDelta twohundred_millisecs = TimeDelta::FromMilliseconds(200);
+  const TimeDelta day  = TimeDelta::FromDays(1);
+  const TimeDelta hour = TimeDelta::FromHours(1);
+  const TimeDelta min  = TimeDelta::FromMinutes(1);

[bartfab (slow), 2014/01/28 15:16:46]

Nit: Please avoid abbreviations where possible. There is plenty of space here to
write out "minutes," "seconds," etc.

[Thiemo Nagel, 2014/01/28 16:08:59]

There might be plenty of space here, but it will cause ugly line wrapping below,
so I'd like to keep that, if I may.

+  const TimeDelta sec  = TimeDelta::FromSeconds(1);
+  const TimeDelta msec = TimeDelta::FromMilliseconds(1);
+  const TimeDelta zero = TimeDelta::FromMilliseconds(0);
 
   // TODO(jungshik) : These test only pass when the OS locale is 'en'.
   // We need to add SetUp() and TearDown() to set the locale to 'en'.
-  TestTimeFormats(twohundred_millisecs, "0 secs");
-  TestTimeFormats(one_sec - twohundred_millisecs, "0 secs");
-  TestTimeFormats(one_sec + twohundred_millisecs, "1 sec");
-  TestTimeFormats(five_secs + twohundred_millisecs, "5 secs");
-  TestTimeFormats(one_min + five_secs, "1 min");
-  TestTimeFormats(three_mins + twohundred_millisecs, "3 mins");
-  TestTimeFormats(one_hour + five_secs, "1 hour");
-  TestTimeFormats(four_hours + five_secs, "4 hours");
-  TestTimeFormats(one_day + five_secs, "1 day");
-  TestTimeFormats(three_days, "3 days");
-  TestTimeFormats(three_days + four_hours, "3 days");
+  TestTimeFormats(zero, "0 secs");
+  TestTimeFormats(499*msec, "0 secs");
+  TestTimeFormats(500*msec, "1 sec");
+  TestTimeFormats(1*sec + 499*msec, "1 sec");
+  TestTimeFormats(1*sec + 500*msec, "2 secs");
+  TestTimeFormats(59*sec + 499*msec, "59 secs");
+  TestTimeFormats(59*sec + 500*msec, "1 min");
+  TestTimeFormats(1*min + 29*sec + 999*msec, "1 min");
+  TestTimeFormats(1*min + 30*sec, "2 mins");
+  TestTimeFormats(59*min + 29*sec + 999*msec, "59 mins");
+  TestTimeFormats(59*min + 30*sec, "1 hour");
+  TestTimeFormats(1*hour + 29*min + 59*sec + 999*msec, "1 hour");
+  TestTimeFormats(1*hour + 30*min, "2 hours");
+  TestTimeFormats(23*hour + 29*min + 59*sec + 999*msec, "23 hours");
+  TestTimeFormats(23*hour + 30*min, "1 day");
+  TestTimeFormats(1*day + 11*hour + 59*min + 59*sec + 999*msec, "1 day");
+  TestTimeFormats(1*day + 12*hour, "2 days");
 }
 
 // crbug.com/159388: This test fails when daylight savings time ends.
 TEST(TimeFormat, RelativeDate) {
   base::Time now = base::Time::Now();
   base::string16 today_str = TimeFormat::RelativeDate(now, NULL);
   EXPECT_EQ(ASCIIToUTF16("Today"), today_str);
 
   base::Time yesterday = now - TimeDelta::FromDays(1);
   base::string16 yesterday_str = TimeFormat::RelativeDate(yesterday, NULL);
   EXPECT_EQ(ASCIIToUTF16("Yesterday"), yesterday_str);
 
   base::Time two_days_ago = now - TimeDelta::FromDays(2);
   base::string16 two_days_ago_str =
       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