Fix tests with icu-50, bug #444886 by floppym.

(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 30427902)

3 files changed, 61 insertions, 2 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 2c9afd08d2c7..b57d554515e0 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.789 2013/01/11 12:20:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.790 2013/01/14 01:52:06 phajdan.jr Exp $
+
+  14 Jan 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-icu50-tests-r0.patch, chromium-25.0.1364.26.ebuild:
+  Fix tests with icu-50, bug #444886 by floppym.
 
   11 Jan 2013; Agostino Sarubbo <ago@gentoo.org> -chromium-23.0.1271.97.ebuild,
   -chromium-24.0.1312.45.ebuild, -chromium-24.0.1312.49.ebuild:
diff --git a/www-client/chromium/chromium-25.0.1364.26.ebuild b/www-client/chromium/chromium-25.0.1364.26.ebuild
index 45e7735b11f6..cbcc6e2eaa7a 100644
--- a/www-client/chromium/chromium-25.0.1364.26.ebuild
+++ b/www-client/chromium/chromium-25.0.1364.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.26.ebuild,v 1.1 2013/01/09 04:17:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-25.0.1364.26.ebuild,v 1.2 2013/01/14 01:52:06 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_DEPEND="2:2.6"
@@ -139,6 +139,9 @@ src_prepare() {
 	# Fix build with system opus, bug #439884.
 	epatch "${FILESDIR}/${PN}-system-opus-r0.patch"
 
+	# Backport fix for test expectations, bug #444886.
+	epatch "${FILESDIR}/${PN}-icu50-tests-r0.patch"
+
 	# Missing gyp files in tarball.
 	# https://code.google.com/p/chromium/issues/detail?id=144823
 	if [[ -e chrome/test/data/nacl/nacl_test_data.gyp ]]; then
diff --git a/www-client/chromium/files/chromium-icu50-tests-r0.patch b/www-client/chromium/files/chromium-icu50-tests-r0.patch
new file mode 100644
index 000000000000..8c5daba7ddac
--- /dev/null
+++ b/www-client/chromium/files/chromium-icu50-tests-r0.patch
@@ -0,0 +1,52 @@
+Index: base/i18n/time_formatting_unittest.cc
+diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
+index 76ffa5d178147f99ec300b2a5d398dc40582f911..1d4bc311f3cb8dea90622a5964a613435378caa8 100644
+--- a/base/i18n/time_formatting_unittest.cc
++++ b/base/i18n/time_formatting_unittest.cc
+@@ -8,6 +8,7 @@
+ #include "base/time.h"
+ #include "base/utf_string_conversions.h"
+ #include "testing/gtest/include/gtest/gtest.h"
++#include "unicode/uversion.h"
+ 
+ namespace base {
+ namespace {
+@@ -57,7 +58,12 @@ TEST(TimeFormattingTest, TimeFormatTimeOfDayDefault24h) {
+ 
+   Time time(Time::FromLocalExploded(kTestDateTimeExploded));
+   string16 clock24h(ASCIIToUTF16("15:42"));
++#if U_ICU_VERSION_MAJOR_NUM >= 50
++  string16 clock12h_pm(ASCIIToUTF16("3:42 pm"));
++#else
++  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
+   string16 clock12h_pm(ASCIIToUTF16("3:42 PM"));
++#endif
+   string16 clock12h(ASCIIToUTF16("3:42"));
+ 
+   // The default is 24h clock.
+@@ -125,10 +131,25 @@ TEST(TimeFormattingTest, TimeFormatDateUS) {
+ 
+   EXPECT_EQ(ASCIIToUTF16("Apr 30, 2011"), TimeFormatShortDate(time));
+   EXPECT_EQ(ASCIIToUTF16("4/30/11"), TimeFormatShortDateNumeric(time));
++
++#if U_ICU_VERSION_MAJOR_NUM >= 50
++  EXPECT_EQ(ASCIIToUTF16("4/30/11, 3:42:07 PM"),
++            TimeFormatShortDateAndTime(time));
++#else
++  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
+   EXPECT_EQ(ASCIIToUTF16("4/30/11 3:42:07 PM"),
+             TimeFormatShortDateAndTime(time));
++#endif
++
++#if U_ICU_VERSION_MAJOR_NUM >= 50
++  EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 at 3:42:07 PM"),
++            TimeFormatFriendlyDateAndTime(time));
++#else
++  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
+   EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 3:42:07 PM"),
+             TimeFormatFriendlyDateAndTime(time));
++#endif
++
+   EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011"),
+             TimeFormatFriendlyDate(time));
+ }