diff options
| author | Remi Collet <remi@php.net> | 2015-04-18 07:47:47 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-04-28 12:48:13 +0200 |
| commit | c39e777722f9b566ecff521602fb49ea20bb2961 (patch) | |
| tree | ecd7debd3edd575d770dc574bd669dcc6861d33b | |
| parent | b5e5098c50397ed910a79ac1d64b7d0fff2c02e1 (diff) | |
| download | php-git-c39e777722f9b566ecff521602fb49ea20bb2961.tar.gz | |
Make date transitions tests more flexible
zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)
| -rw-r--r-- | ext/date/tests/DateTimeZone_getTransitions_basic1.phpt | 6 | ||||
| -rw-r--r-- | ext/date/tests/timezone_transitions_get_basic1.phpt | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index f3640d1c1a..d17808035b 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -16,7 +16,7 @@ date_default_timezone_set("Europe/London"); // Create a DateTimeZone object $tz = new DateTimeZone("Europe/London"); -$tran = $tz->getTransitions(); +$tran = $tz->getTransitions(-306972000, -37241999); if (!is_array($tran)) { echo "TEST FAILED: Expected an array\n"; @@ -25,14 +25,14 @@ if (!is_array($tran)) { echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry for Spring 1963 --\n"; -var_dump( $tran[97] ); +var_dump( $tran[6] ); ?> ===DONE=== --EXPECT-- *** Testing DateTimeZone::getTransitions() : basic functionality *** --- Total number of transitions: 243 -- +-- Total number of transitions: 18 -- -- Format a sample entry for Spring 1963 -- array(5) { diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index eb6cf99342..97c5f0ccc1 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -18,24 +18,24 @@ $tz = timezone_open("Europe/London"); $tran = timezone_transitions_get($tz); -echo "\n-- Get all transitions --\n"; -$tran = timezone_transitions_get($tz); +echo "\n-- Get all 60s transitions --\n"; +$tran = timezone_transitions_get($tz, -306972000, -37241999); var_dump( gettype($tran) ); echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry pfor Spring 1963 --\n"; -var_dump( $tran[97] ); +var_dump( $tran[6] ); ?> ===DONE=== --EXPECT-- *** Testing timezone_transitions_get() : basic functionality *** --- Get all transitions -- +-- Get all 60s transitions -- string(5) "array" --- Total number of transitions: 243 -- +-- Total number of transitions: 18 -- -- Format a sample entry pfor Spring 1963 -- array(5) { |