Use the ICU syntax message for plural formatting

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 141 matching lines @@
     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_));
 
     // Test English strings (detailed, singular and plural).
-    EXPECT_EQ(ASCIIToUTF16("1 minute 2 seconds"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("1 minute and 2 seconds"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_1m2s_));
-    EXPECT_EQ(ASCIIToUTF16("2 minutes 1 second"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("2 minutes and 1 second"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_2m1s_));
-    EXPECT_EQ(ASCIIToUTF16("1 hour 2 minutes"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("1 hour and 2 minutes"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_1h2m_));
-    EXPECT_EQ(ASCIIToUTF16("2 hours 1 minute"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("2 hours and 1 minute"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_2h1m_));
-    EXPECT_EQ(ASCIIToUTF16("1 day 2 hours"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("1 day and 2 hours"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_1d2h_));
-    EXPECT_EQ(ASCIIToUTF16("2 days 1 hour"), TimeFormat::Detailed(
+    EXPECT_EQ(ASCIIToUTF16("2 days and 1 hour"), TimeFormat::Detailed(
         TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 3, delta_2d1h_));
   }
 
   TimeDelta delta_0s_;
   TimeDelta delta_1ms_;
   TimeDelta delta_499ms_;
   TimeDelta delta_500ms_;
   TimeDelta delta_999ms_;
   TimeDelta delta_1s_;
   TimeDelta delta_1s499ms_;
@@ skipping 77 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("1 day"), TimeFormat::Simple(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT,
       delta_1d11h59m59s999ms_));
   EXPECT_EQ(ASCIIToUTF16("2 days"), TimeFormat::Simple(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_SHORT, delta_1d12h_));
 
   // Test rounding behavior (detailed).
   EXPECT_EQ(ASCIIToUTF16("59 seconds"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 100,
       delta_59s499ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 minute 0 seconds"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 minute and 0 seconds"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 2,
       delta_59s500ms_));
   EXPECT_EQ(ASCIIToUTF16("1 minute"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 1,
       delta_59s500ms_));
-  EXPECT_EQ(ASCIIToUTF16("59 minutes 59 seconds"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("59 minutes and 59 seconds"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 60,
       delta_59m59s499ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 hour 0 minutes"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 hour and 0 minutes"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 59,
       delta_59m59s499ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 hour 0 minutes"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 hour and 0 minutes"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 2,
       delta_59m59s499ms_));
   EXPECT_EQ(ASCIIToUTF16("1 hour"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 1,
       delta_59m59s499ms_));
   EXPECT_EQ(ASCIIToUTF16("1 hour"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 1,
       delta_59m59s500ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 hour 0 minutes"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 hour and 0 minutes"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 2,
       delta_59m59s500ms_));
-  EXPECT_EQ(ASCIIToUTF16("23 hours 59 minutes"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("23 hours and 59 minutes"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 24,
       delta_23h59m29s999ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 day 0 hours"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 day and 0 hours"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 23,
       delta_23h59m29s999ms_));
-  EXPECT_EQ(ASCIIToUTF16("1 day 0 hours"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 day and 0 hours"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 2,
       delta_23h59m29s999ms_));
   EXPECT_EQ(ASCIIToUTF16("1 day"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 1,
       delta_23h59m29s999ms_));
   EXPECT_EQ(ASCIIToUTF16("1 day"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 1,
       delta_23h59m30s_));
-  EXPECT_EQ(ASCIIToUTF16("1 day 0 hours"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 day and 0 hours"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, 2,
       delta_23h59m30s_));
-  EXPECT_EQ(ASCIIToUTF16("1 day 0 hours"), TimeFormat::Detailed(
+  EXPECT_EQ(ASCIIToUTF16("1 day and 0 hours"), TimeFormat::Detailed(
       TimeFormat::FORMAT_DURATION, TimeFormat::LENGTH_LONG, -1,
       delta_23h59m30s_));
 }
 
 // Test strings in default code path.
 TEST_F(TimeFormatTest, SimpleAndDetailedStrings) {
   TestStrings();
 }
 
 // Test strings in fallback path in case of translator error.
@@ skipping 20 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