com php-src: Relax 4 dateformat tests for ICU 4.8: ext/intl/tes ts/dateformat_create_cal_arg.phpt ext/intl/tests/date
format_formatObject_calendar.phpt ext/intl/tests/datefo rmat_formatObject_datetime.phpt ext/intl/tests/dateform at_get_set_timezone.phpt
| From: | Gustavo André dos Santos Lopes | Date: | Sun, 26 Aug 2012 18:42:54 +0000 |
| Subject: | com php-src: Relax 4 dateformat tests for ICU 4.8: ext/intl/tes ts/dateformat_create_cal_arg.phpt ext/intl/tests/date format_formatObject_calendar.phpt ext/intl/tests/datefo rmat_formatObject_datetime.phpt ext/intl/tests/dateform at_get_set_timezone.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69977@lists.php.net to get a copy of this message | ||
Commit: e95ad46186068cfe95cf54bc2f0085f393b62e58
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Sun, 26 Aug 2012 20:42:18 +0200
Parents: 8788cddfb36480cd4f0cb5c3aeec69134764ecfc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e95ad46186068cfe95cf54bc2f0085f393b62e58
Log:
Relax 4 dateformat tests for ICU 4.8
Changed paths:
M ext/intl/tests/dateformat_create_cal_arg.phpt
M ext/intl/tests/dateformat_formatObject_calendar.phpt
M ext/intl/tests/dateformat_formatObject_datetime.phpt
M ext/intl/tests/dateformat_get_set_timezone.phpt
Diff:
diff --git a/ext/intl/tests/dateformat_create_cal_arg.phpt
b/ext/intl/tests/dateformat_create_cal_arg.phpt
index 7490ece..53fb084 100644
--- a/ext/intl/tests/dateformat_create_cal_arg.phpt
+++ b/ext/intl/tests/dateformat_create_cal_arg.phpt
@@ -42,12 +42,12 @@ echo $df->format($ts), "\n";
?>
==DONE==
---EXPECT--
-domingo, 1 de enero de 2012 00:00:00 GMT
-domingo, 8 de Safar de 1433 00:00:00 GMT
-domingo, 1 de enero de 2012 01:00:00 Hora estándar de Europa Central
-sábado, 31 de diciembre de 2011 d.C. 23:00:00 Hora estándar de las Azores
-sábado, 7 de Safar de 1433 AH 23:00:00 Hora estándar de las Azores
-domingo, 8 de Safar de 1433 AH 00:00:00 GMT
-domingo, 1 de enero de 2012 00:00:00 GMT
+--EXPECTF--
+domingo%S 1 de enero de 2012 00:00:00 GMT
+domingo%S 8 de Safar de 1433 00:00:00 GMT
+domingo%S 1 de enero de 2012 01:00:00 Hora estándar de Europa Central
+sábado%S 31 de diciembre de 2011 d.C. 23:00:00 Hora %Sde las Azores
+sábado%S 7 de Safar de 1433 AH 23:00:00 Hora %Sde las Azores
+domingo%S 8 de Safar de 1433 AH 00:00:00 GMT
+domingo%S 1 de enero de 2012 00:00:00 GMT
==DONE==
diff --git a/ext/intl/tests/dateformat_formatObject_calendar.phpt
b/ext/intl/tests/dateformat_formatObject_calendar.phpt
index 03371a9..0c61e4f 100644
--- a/ext/intl/tests/dateformat_formatObject_calendar.phpt
+++ b/ext/intl/tests/dateformat_formatObject_calendar.phpt
@@ -28,14 +28,14 @@ echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL,
"en-US"), "\
?>
==DONE==
---EXPECT--
+--EXPECTF--
01/01/2012 00:00:00
-Domingo, 1 de Janeiro de 2012 0:00:00 Hora Padrão da Europa Ocidental
+Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental
Jan 1, 2012 12:00:00 AM
-1/1/12 12:00:00 AM Western European Standard Time
+1/1/12 12:00:00 AM Western European %STime
Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon)
Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00
06/02/1433 00:00:00
-Sunday, Safar 6, 1433 12:00:00 AM Western European Standard Time
+Sunday, Safar 6, 1433 12:00:00 AM Western European %STime
==DONE==
diff --git a/ext/intl/tests/dateformat_formatObject_datetime.phpt
b/ext/intl/tests/dateformat_formatObject_datetime.phpt
index bfc26cb..6427ad5 100644
--- a/ext/intl/tests/dateformat_formatObject_datetime.phpt
+++ b/ext/intl/tests/dateformat_formatObject_datetime.phpt
@@ -23,11 +23,11 @@ echo IntlDateFormatter::formatObject($dt, IntlDateFormatter::FULL),
"\n";
?>
==DONE==
---EXPECT--
+--EXPECTF--
01/01/2012 00:00:00
-Domingo, 1 de Janeiro de 2012 0:00:00 Hora Padrão da Europa Ocidental
+Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental
Jan 1, 2012 12:00:00 AM
-1/1/12 12:00:00 AM Western European Standard Time
+1/1/12 12:00:00 AM Western European %STime
Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon)
Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00
==DONE==
diff --git a/ext/intl/tests/dateformat_get_set_timezone.phpt
b/ext/intl/tests/dateformat_get_set_timezone..phpt
index b66653d..41aa35b 100644
--- a/ext/intl/tests/dateformat_get_set_timezone.phpt
+++ b/ext/intl/tests/dateformat_get_set_timezone.phpt
@@ -38,24 +38,24 @@ d($df);
?>
==DONE==
---EXPECT--
+--EXPECTF--
Domingo, 1 de Janeiro de 2012 3:00:00 GMT+03:00
string(12) "Europe/Minsk"
string(12) "Europe/Minsk"
-Sábado, 31 de Dezembro de 2011 23:00:00 Hora Padrão dos Açores
+Sábado, 31 de Dezembro de 2011 23:00:00 Hor%s %Sdos Açores
string(15) "Atlantic/Azores"
string(15) "Atlantic/Azores"
-Domingo, 1 de Janeiro de 2012 1:00:00 Hora Padrão da Europa Central
+Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central
string(13) "Europe/Madrid"
string(13) "Europe/Madrid"
-Domingo, 1 de Janeiro de 2012 1:00:00 Hora Padrão da Europa Central
+Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central
string(12) "Europe/Paris"
string(12) "Europe/Paris"
-Domingo, 1 de Janeiro de 2012 1:00:00 Hora Padrão da Europa Central
+Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central
string(16) "Europe/Amsterdam"
string(16) "Europe/Amsterdam"