Changeset 48952 for trunk/tests/phpunit/tests/date/currentTime.php

Timestamp:

09/07/2020 03:12:17 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Add a polyfill for assertEqualsWithDelta() to WP_UnitTestCase and use it where appropriate.

assertEqualsWithDelta() was added in PHPUnit 7.5, while WordPress still supports PHPUnit 5.4.x as the minimum version.

See #38266.

File:

• trunk/tests/phpunit/tests/date/currentTime.php (modified) (6 diffs)

trunk/tests/phpunit/tests/date/currentTime.php

@@ -17 +17 @@
         $wp_timestamp = $timestamp + 6 * HOUR_IN_SECONDS;
 
-        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( current_time( $format, true ) ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( gmdate( $format, $wp_timestamp ) ), strtotime( current_time( $format ) ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format ) ), strtotime( current_time( $format, true ) ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format, $wp_timestamp ) ), strtotime( current_time( $format ) ), 2, 'The dates should be equal' );
     }
 
@@ -31 +31 @@
         $wp_timestamp = $timestamp + 6 * HOUR_IN_SECONDS;
 
-        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( current_time( 'mysql', true ) ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( gmdate( $format, $wp_timestamp ) ), strtotime( current_time( 'mysql' ) ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format ) ), strtotime( current_time( 'mysql', true ) ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format, $wp_timestamp ) ), strtotime( current_time( 'mysql' ) ), 2, 'The dates should be equal' );
     }
 
@@ -45 +45 @@
 
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.RequestedUTC
-        $this->assertEquals( $timestamp, current_time( 'timestamp', true ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $timestamp, current_time( 'timestamp', true ), 2, 'The dates should be equal' );
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
-        $this->assertEquals( $wp_timestamp, current_time( 'timestamp' ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $wp_timestamp, current_time( 'timestamp' ), 2, 'The dates should be equal' );
     }
 
@@ -71 +71 @@
         $current_time     = current_time( $format );
 
-        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( $current_time_custom_timezone_gmt ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( $datetime->format( $format ) ), strtotime( $current_time_custom_timezone ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( gmdate( $format ) ), strtotime( $current_time_gmt ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( $datetime->format( $format ) ), strtotime( $current_time ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format ) ), strtotime( $current_time_custom_timezone_gmt ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( $datetime->format( $format ) ), strtotime( $current_time_custom_timezone ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( gmdate( $format ) ), strtotime( $current_time_gmt ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( $datetime->format( $format ) ), strtotime( $current_time ), 2, 'The dates should be equal' );
     }
 
@@ -89 +89 @@
 
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.RequestedUTC
-        $this->assertEquals( $timestamp, current_time( 'timestamp', true ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $timestamp, current_time( 'timestamp', true ), 2, 'The dates should be equal' );
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.RequestedUTC
-        $this->assertEquals( $timestamp, current_time( 'U', true ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $timestamp, current_time( 'U', true ), 2, 'The dates should be equal' );
 
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
-        $this->assertEquals( $wp_timestamp, current_time( 'timestamp' ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $wp_timestamp, current_time( 'timestamp' ), 2, 'The dates should be equal' );
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
-        $this->assertEquals( $wp_timestamp, current_time( 'U' ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( $wp_timestamp, current_time( 'U' ), 2, 'The dates should be equal' );
 
         // phpcs:ignore WordPress.DateTime.CurrentTimeTimestamp.Requested
@@ -114 +114 @@
         $datetime_utc->setTimezone( new DateTimeZone( 'UTC' ) );
 
-        $this->assertEquals( strtotime( $datetime_local->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C ) ), 'The dates should be equal', 2 );
-        $this->assertEquals( strtotime( $datetime_utc->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C, true ) ), 'The dates should be equal', 2 );
+        $this->assertEqualsWithDelta( strtotime( $datetime_local->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C ) ), 2, 'The dates should be equal' );
+        $this->assertEqualsWithDelta( strtotime( $datetime_utc->format( DATE_W3C ) ), strtotime( current_time( DATE_W3C, true ) ), 2, 'The dates should be equal' );
     }
 }