From: Stanislav Malyshev Date: Mon, 5 Sep 2011 00:49:03 +0000 (+0000) Subject: fix tests X-Git-Tag: php-5.3.9RC1~247 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc9483f19eb78f274b1d4f96cab4cf1f5c41bc33;p=php fix tests --- diff --git a/ext/intl/tests/dateformat_parse.phpt b/ext/intl/tests/dateformat_parse.phpt index b3be895e59..67ac42ce6a 100755 --- a/ext/intl/tests/dateformat_parse.phpt +++ b/ext/intl/tests/dateformat_parse.phpt @@ -2,6 +2,8 @@ datefmt_parse_code() --SKIPIF-- +--INI-- +date.timezone="America/Los_Angeles" --FILE-- --EXPECT-- -Input text :Sunday, September 18, 2039 4:06:40 PM PT ; Parsed text : 96000 ; parse_pos : 29 37 -Input text :Wednesday, December 17, 1969 6:40:00 PM PT ; Parsed text : 216000 ; parse_pos : 31 39 -Input text :Thursday, December 18, 1969 8:49:59 AM PST ; Parsed text : 208740 ; parse_pos : 30 38 -Input text :Thursday, December 18, 1969 8:49:59 PM PST ; Parsed text : 251940 ; parse_pos : 30 38 -Input text :December 18, 1969 8:49:59 AM PST ; Parsed text : 208740 ; parse_pos : 20 28 -Input text :12/18/69 8:49 AM ; Parsed text : 60540 ; parse_pos : 8 16 -Input text :19691218 08:49 AM ; Parsed text : 60540 ; parse_pos : 8 17 + +Input text : Sunday, September 18, 2039 4:06:40 PM PT ; DF = 0; TF = 0 +Parsed: 2200000000; parse_pos : 40 + +Input text : Wednesday, December 17, 1969 6:40:00 PM PT ; DF = 0; TF = 0 +Parsed: -1200000; parse_pos : 42 + +Input text : Thursday, December 18, 1969 8:49:59 PM PST ; DF = 0; TF = 0 +Parsed: -1105801; parse_pos : 42 + +Input text : December 18, 1969 8:49:59 AM PST ; DF = 1; TF = 0 +Parsed: -1149001; parse_pos : 32 + +Input text : 12/18/69 8:49 AM ; DF = 3; TF = 3 +Parsed: -1149060; parse_pos : 16 + +Input text : 19691218 08:49 AM ; DF = 3; TF = 3 +Error : Date parsing failed: U_PARSE_ERROR +Parsed: ; parse_pos : 8 + +Input text : Sunday, September 18, 2039 4:06:40 PM PT ; DF = 0; TF = -1 +Parsed: 2199942000; parse_pos : 26 + +Input text : Sunday, September 18, 2039 4:06:40 PM PT ; DF = 0; TF = 3 +Error : Date parsing failed: U_PARSE_ERROR +Parsed: ; parse_pos : 31 + +Input text : December 18, 1969 8:49:59 AM PST ; DF = 1; TF = -1 +Parsed: -1180800; parse_pos : 17 + +Input text : December 18, 1969 8:49:59 AM PST ; DF = 1; TF = 3 +Error : Date parsing failed: U_PARSE_ERROR +Parsed: ; parse_pos : 22 + +Input text : 12/18/69 8:49 AM ; DF = 3; TF = 1 +Error : Date parsing failed: U_PARSE_ERROR +Parsed: ; parse_pos : 13 + +Input text : 19691218 08:49 AM ; DF = 3; TF = 1 +Error : Date parsing failed: U_PARSE_ERROR +Parsed: ; parse_pos : 8 diff --git a/ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt b/ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt index b7e820388a..040f72e47d 100755 --- a/ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt +++ b/ext/intl/tests/dateformat_parse_timestamp_parsepos.phpt @@ -2,6 +2,10 @@ datefmt_parse_timestamp_code() with parse pos --SKIPIF-- +--INI-- +datetime.timezone="America/Los_Angeles" +--ENV-- +TZ=America/Los_Angeles --FILE-- ---EXPECT-- +--EXPECTF-- uk-ua_CALIFORNIA@currency=;currency=GRN: region='UA' root: region='' uk@currency=EURO: region='' @@ -99,8 +99,8 @@ sr-Cyrl: region='' sr-Latn: region='' zh-Hans-CN: region='CN' sr-Latn-CS: region='CS' -sl-rozaj: region='' -sl-nedis: region='' +sl-rozaj: region='%r(ROZAJ)?%r' +sl-nedis: region='%r(NEDIS)?%r' de-CH-1901: region='CH' sl-IT-nedis: region='IT' sl-Latn-IT-nedis: region='IT' @@ -108,7 +108,7 @@ de-DE: region='DE' en-US: region='US' es-419: region='419' de-CH-x-phonebk: region='CH' -az-Arab-x-AZE-derbend: region='' +az-Arab-x-AZE-derbend: region='%r(X)?%r' zh-min: region='' zh-min-nan-Hant-CN: region='MIN' x-whatever: region='' @@ -117,7 +117,7 @@ sr-Latn-QM: region='QM' sr-Qaaa-CS: region='CS' en-US-u-islamCal: region='US' zh-CN-a-myExt-x-private: region='CN' -en-a-myExt-b-another: region='' +en-a-myExt-b-another: region='%r(A)?%r' de-419-DE: region='419' a-DE: region='DE' -ar-a-aaa-b-bbb-a-ccc: region='' +ar-a-aaa-b-bbb-a-ccc: region='%r(A)?%r' diff --git a/ext/intl/tests/locale_parse_locale.phpt b/ext/intl/tests/locale_parse_locale.phpt index e47f71830a..36637f0d81 100755 --- a/ext/intl/tests/locale_parse_locale.phpt +++ b/ext/intl/tests/locale_parse_locale.phpt @@ -6,7 +6,7 @@ locale_parse_locale() $value){ $res_str .= "$key : '$value' , "; } + $res_str = rtrim($res_str); } else{ $res_str .= "No values found from Locale parsing."; @@ -93,109 +94,109 @@ include_once( 'ut_common.inc' ); ut_run(); ?> ---EXPECT-- +--EXPECTF-- --------------------- -uk-ua_CALIFORNIA@currency=;currency=GRN: -language : 'uk' , region : 'UA' , variant0 : 'CALIFORNIA' , +uk-ua_CALIFORNIA@currency=;currency=GRN: +language : 'uk' , region : 'UA' , variant0 : 'CALIFORNIA' , --------------------- -root: -language : 'root' , +root: +language : 'root' , --------------------- -uk@currency=EURO: -language : 'uk' , +uk@currency=EURO: +language : 'uk' , --------------------- -Hindi: -language : 'hindi' , +Hindi: +language : 'hindi' , --------------------- -de: -language : 'de' , +de: +language : 'de' , --------------------- -fr: -language : 'fr' , +fr: +language : 'fr' , --------------------- -ja: -language : 'ja' , +ja: +language : 'ja' , --------------------- -i-enochian: -grandfathered : 'i-enochian' , +i-enochian: +grandfathered : 'i-enochian' , --------------------- -zh-Hant: -language : 'zh' , script : 'Hant' , +zh-Hant: +language : 'zh' , script : 'Hant' , --------------------- -zh-Hans: -language : 'zh' , script : 'Hans' , +zh-Hans: +language : 'zh' , script : 'Hans' , --------------------- -sr-Cyrl: -language : 'sr' , script : 'Cyrl' , +sr-Cyrl: +language : 'sr' , script : 'Cyrl' , --------------------- -sr-Latn: -language : 'sr' , script : 'Latn' , +sr-Latn: +language : 'sr' , script : 'Latn' , --------------------- -zh-Hans-CN: -language : 'zh' , script : 'Hans' , region : 'CN' , +zh-Hans-CN: +language : 'zh' , script : 'Hans' , region : 'CN' , --------------------- -sr-Latn-CS: -language : 'sr' , script : 'Latn' , region : 'CS' , +sr-Latn-CS: +language : 'sr' , script : 'Latn' , region : 'CS' , --------------------- -sl-rozaj: -language : 'sl' , +sl-rozaj: +language : 'sl' ,%r( region : 'ROZAJ' ,)?%r --------------------- -sl-nedis: -language : 'sl' , +sl-nedis: +language : 'sl' ,%r( region : 'NEDIS' ,)?%r --------------------- -de-CH-1901: -language : 'de' , region : 'CH' , variant0 : '1901' , +de-CH-1901: +language : 'de' , region : 'CH' , variant0 : '1901' , --------------------- -sl-IT-nedis: -language : 'sl' , region : 'IT' , variant0 : 'NEDIS' , +sl-IT-nedis: +language : 'sl' , region : 'IT' , variant0 : 'NEDIS' , --------------------- -sl-Latn-IT-nedis: -language : 'sl' , script : 'Latn' , region : 'IT' , variant0 : 'NEDIS' , +sl-Latn-IT-nedis: +language : 'sl' , script : 'Latn' , region : 'IT' , variant0 : 'NEDIS' , --------------------- -de-DE: -language : 'de' , region : 'DE' , +de-DE: +language : 'de' , region : 'DE' , --------------------- -en-US: -language : 'en' , region : 'US' , +en-US: +language : 'en' , region : 'US' , --------------------- -es-419: -language : 'es' , region : '419' , +es-419: +language : 'es' , region : '419' , --------------------- -de-CH-x-phonebk: -language : 'de' , region : 'CH' , private0 : 'phonebk' , +de-CH-x-phonebk: +language : 'de' , region : 'CH' , private0 : 'phonebk' , --------------------- -az-Arab-x-AZE-derbend: -language : 'az' , script : 'Arab' , private0 : 'AZE' , private1 : 'derbend' , +az-Arab-x-AZE-derbend: +language : 'az' , script : 'Arab' , private0 : 'AZE' , private1 : 'derbend' , --------------------- -zh-min: -grandfathered : 'zh-min' , +zh-min: +grandfathered : 'zh-min' , --------------------- -zh-min-nan-Hant-CN: -language : 'zh' , region : 'MIN' , variant0 : 'NAN' , variant1 : 'HANT' , variant2 : 'CN' , +zh-min-nan-Hant-CN: +language : 'zh' , region : 'MIN' , variant0 : 'NAN' , variant1 : 'HANT' , variant2 : 'CN' , --------------------- -qaa-Qaaa-QM-x-southern: -language : 'qaa' , script : 'Qaaa' , region : 'QM' , private0 : 'southern' , +qaa-Qaaa-QM-x-southern: +language : 'qaa' , script : 'Qaaa' , region : 'QM' , private0 : 'southern' , --------------------- -sr-Latn-QM: -language : 'sr' , script : 'Latn' , region : 'QM' , +sr-Latn-QM: +language : 'sr' , script : 'Latn' , region : 'QM' , --------------------- -sr-Qaaa-CS: -language : 'sr' , script : 'Qaaa' , region : 'CS' , +sr-Qaaa-CS: +language : 'sr' , script : 'Qaaa' , region : 'CS' , --------------------- -en-US-u-islamCal: -language : 'en' , region : 'US' , +en-US-u-islamCal: +language : 'en' , region : 'US' , --------------------- -zh-CN-a-myExt-x-private: -language : 'zh' , region : 'CN' , private0 : 'private' , +zh-CN-a-myExt-x-private: +language : 'zh' , region : 'CN' , private0 : 'private' , --------------------- -en-a-myExt-b-another: -language : 'en' , +en-a-myExt-b-another: +language : 'en' , --------------------- -de-419-DE: -language : 'de' , region : '419' , variant0 : 'DE' , +de-419-DE: +language : 'de' , region : '419' , variant0 : 'DE' , --------------------- -a-DE: +a-DE: No values found from Locale parsing. --------------------- -ar-a-aaa-b-bbb-a-ccc: +ar-a-aaa-b-bbb-a-ccc: language : 'ar' ,