Changeset 39167

Timestamp:

11/08/2016 10:31:51 PM (7 years ago)

Author:

swissspidy

Message:

Date/Time: Improve date_i18n() timezone tests.

This uses a timezone without DST for the tests covering date_i18n().

Fixes #37910.

File:

• trunk/tests/phpunit/tests/date/dateI18n.php (modified) (4 diffs)

trunk/tests/phpunit/tests/date/dateI18n.php

@@ -23 +23 @@
 
     public function test_custom_timezone_setting() {
-        update_option( 'timezone_string', 'Europe/Zurich' );
+        update_option( 'timezone_string', 'America/Regina' );
 
         $this->assertEquals( strtotime( date( 'Y-m-d H:i:s', time() + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ), strtotime( date_i18n( 'Y-m-d H:i:s' ) ), 'The dates should be equal', 2 );
@@ -29 +29 @@
 
     public function test_date_should_be_in_gmt_with_custom_timezone_setting() {
-        update_option( 'timezone_string', 'Europe/Zurich' );
+        update_option( 'timezone_string', 'America/Regina' );
 
         $this->assertEquals( strtotime( date( 'Y-m-d H:i:s' ) ), strtotime( date_i18n( 'Y-m-d H:i:s', false, true ) ), 'The dates should be equal', 2 );
@@ -35 +35 @@
 
     public function test_date_should_be_in_gmt_with_custom_timezone_setting_and_timestamp() {
-        update_option( 'timezone_string', 'Europe/Zurich' );
+        update_option( 'timezone_string', 'America/Regina' );
 
         $this->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );
@@ -64 +64 @@
 
     public function test_adjusts_format_based_on_timezone_string() {
-        update_option( 'timezone_string', 'Europe/Zurich' );
+        update_option( 'timezone_string', 'America/Regina' );
 
-        $this->assertEquals( '2012-12-01 00:00:00 CET +01:00 Europe/Zurich', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );
+        $this->assertEquals( '2012-12-01 00:00:00 CST -06:00 America/Regina', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );
     }
 }