Changeset 38871

Timestamp:

10/23/2016 07:18:21 AM (9 years ago)

Author:

swissspidy

Message:

Date/Time: Fix unit tests after [38804].

The tests for date_i18n() need to use a delta for comparing timestamps.

Fixes #38381. See #37910.

File:

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

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

@@ -7 +7 @@
 class Tests_Date_I18n extends WP_UnitTestCase {
     public function test_should_format_date() {
-        $expected = date( 'Y-m-d H:i:s' );
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s' ) );
+        $this->assertEquals( strtotime( date( 'Y-m-d H:i:s' ) ), strtotime( date_i18n( 'Y-m-d H:i:s' ) ), 'The dates should be equal', 2 );
     }
 
     public function test_should_use_custom_timestamp() {
-        $expected = '2012-12-01 00:00:00';
-
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );
+        $this->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );
     }
 
     public function test_date_should_be_in_gmt() {
-        $expected = date( 'Y-m-d H:i:s' );
-
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', false, true ) );
+        $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 );
     }
 
     public function test_custom_timestamp_ignores_gmt_setting() {
-        $expected = '2012-12-01 00:00:00';
-
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ), false ) );
+        $this->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );
     }
 
     public function test_custom_timezone_setting() {
-        update_option( 'timezone_string', 'Europe/London' );
-        $expected = date( 'Y-m-d H:i:s', strtotime( date( 'Y-m-d H:i:s' ) ) + HOUR_IN_SECONDS );
+        update_option( 'timezone_string', 'Europe/Zurich' );
 
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s' ) );
+        $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 );
     }
 
     public function test_date_should_be_in_gmt_with_custom_timezone_setting() {
-        update_option( 'timezone_string', 'Europe/London' );
-        $expected = date( 'Y-m-d H:i:s' );
+        update_option( 'timezone_string', 'Europe/Zurich' );
 
-        $this->assertNotEquals( date_i18n( 'Y-m-d H:i:s', false, false ), date_i18n( 'Y-m-d H:i:s', false, true ) );
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', false, true ) );
+        $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 );
     }
 
     public function test_date_should_be_in_gmt_with_custom_timezone_setting_and_timestamp() {
-        update_option( 'timezone_string', 'Europe/London' );
+        update_option( 'timezone_string', 'Europe/Zurich' );
 
-        $expected = '2012-12-01 00:00:00';
-
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ), false ) );
-        $this->assertEquals( $expected, date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ), true ) );
+        $this->assertEquals( '2012-12-01 00:00:00', date_i18n( 'Y-m-d H:i:s', strtotime( '2012-12-01 00:00:00' ) ) );
     }
 
@@ -68 +55 @@
 
         $expected = 'Saturday_Translated (Sat_Translated) 01 December_Translated (Dec_Translated) 00:00:00 am_Translated AM_Translated';
-        $actual = date_i18n( 'l (D) d F (M) H:i:s a A', strtotime( '2012-12-01 00:00:00' ), false );
+        $actual = date_i18n( 'l (D) d F (M) H:i:s a A', strtotime( '2012-12-01 00:00:00' ) );
 
         // Restore original locale.
@@ -79 +66 @@
         update_option( 'timezone_string', 'Europe/Zurich' );
 
-        $this->assertEquals( '2012-12-01 00:00:00 CEST +02:00 Europe/Zurich', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ), false ) );
+        $this->assertEquals( '2012-12-01 00:00:00 CEST +02:00 Europe/Zurich', date_i18n( 'Y-m-d H:i:s T P e', strtotime( '2012-12-01 00:00:00' ) ) );
     }
 }