Changeset 50284 for trunk/tests/phpunit/tests/https-detection.php

Timestamp:

02/10/2021 01:24:24 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use assertSame() in some newly introduced tests.

This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using assertSame() should generally be preferred to assertEquals() where appropriate, to make the tests more reliable.

Follow-up to [49904], [49925], [49992], [50012], [50013], [50065], [50075], [50131], [50150], [50157].

See #38266, #52482.

File:

• trunk/tests/phpunit/tests/https-detection.php (modified) (11 diffs)

trunk/tests/phpunit/tests/https-detection.php

@@ -66 +66 @@
                 add_filter( 'pre_http_request', array( $this, 'mock_success_with_sslverify' ), 10, 2 );
                 wp_update_https_detection_errors();
-                $this->assertEquals( array(), get_option( 'https_detection_errors' ) );
+                $this->assertSame( array(), get_option( 'https_detection_errors' ) );
 
                 // If initial request fails and request without SSL verification succeeds,
@@ -73 +73 @@
                 add_filter( 'pre_http_request', array( $this, 'mock_success_without_sslverify' ), 10, 2 );
                 wp_update_https_detection_errors();
-                $this->assertEquals(
+                $this->assertSame(
                         array( 'ssl_verification_failed' => array( 'Bad SSL certificate.' ) ),
                         get_option( 'https_detection_errors' )
@@ -83 +83 @@
                 add_filter( 'pre_http_request', array( $this, 'mock_error_without_sslverify' ), 10, 2 );
                 wp_update_https_detection_errors();
-                $this->assertEquals(
+                $this->assertSame(
                         array( 'bad_ssl_certificate' => array( 'Bad SSL certificate.' ) ),
                         get_option( 'https_detection_errors' )
@@ -92 +92 @@
                 add_filter( 'pre_http_request', array( $this, 'mock_not_found' ), 10, 2 );
                 wp_update_https_detection_errors();
-                $this->assertEquals(
+                $this->assertSame(
                         array( 'bad_response_code' => array( 'Not Found' ) ),
                         get_option( 'https_detection_errors' )
@@ -101 +101 @@
                 add_filter( 'pre_http_request', array( $this, 'mock_bad_source' ), 10, 2 );
                 wp_update_https_detection_errors();
-                $this->assertEquals(
+                $this->assertSame(
                         array( 'bad_response_source' => array( 'It looks like the response did not come from this site.' ) ),
                         get_option( 'https_detection_errors' )
@@ -107 +107 @@
 
                 // Check that the requests are made to the correct URL.
-                $this->assertEquals( 'https://example.com/', $this->last_request_url );
+                $this->assertSame( 'https://example.com/', $this->last_request_url );
         }
 
@@ -122 +122 @@
                 );
                 wp_update_https_detection_errors();
-                $this->assertEquals( array(), get_option( 'https_detection_errors' ) );
+                $this->assertSame( array(), get_option( 'https_detection_errors' ) );
 
                 // Override to enforce an error being detected.
@@ -135 +135 @@
                 );
                 wp_update_https_detection_errors();
-                $this->assertEquals(
+                $this->assertSame(
                         array( 'ssl_verification_failed' => array( 'Bad SSL certificate.' ) ),
                         get_option( 'https_detection_errors' )
@@ -146 +146 @@
         public function test_wp_schedule_https_detection() {
                 wp_schedule_https_detection();
-                $this->assertEquals( 'twicedaily', wp_get_schedule( 'wp_https_detection' ) );
+                $this->assertSame( 'twicedaily', wp_get_schedule( 'wp_https_detection' ) );
         }
 
@@ -158 +158 @@
                         'args' => array( 'sslverify' => true ),
                 );
-                $this->assertEquals( $request, wp_cron_conditionally_prevent_sslverify( $request ) );
+                $this->assertSame( $request, wp_cron_conditionally_prevent_sslverify( $request ) );
 
                 // If URL is using HTTPS, set 'sslverify' to false.
@@ -167 +167 @@
                 $expected                      = $request;
                 $expected['args']['sslverify'] = false;
-                $this->assertEquals( $expected, wp_cron_conditionally_prevent_sslverify( $request ) );
+                $this->assertSame( $expected, wp_cron_conditionally_prevent_sslverify( $request ) );
         }