Changeset 48937 for trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php

Timestamp:

09/02/2020 12:35:36 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: First pass at using assertSame() instead of assertEquals() in most of the unit 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.

Props johnbillion, jrf, SergeyBiryukov.
See #38266.

File:

• trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php (modified) (15 diffs)

trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php

@@ -79 +79 @@
 
         $this->assertArrayHasKey( 'X-WP-Total', $headers );
-        $this->assertEquals( 1, $headers['X-WP-Total'] );
+        $this->assertSame( 1, $headers['X-WP-Total'] );
         $this->assertArrayHasKey( 'X-WP-TotalPages', $headers );
-        $this->assertEquals( 1, $headers['X-WP-TotalPages'] );
+        $this->assertSame( 1, $headers['X-WP-TotalPages'] );
     }
 
@@ -147 +147 @@
         $response = self::perform_active_theme_request();
 
-        $this->assertEquals( 200, $response->get_status() );
+        $this->assertSame( 200, $response->get_status() );
         $data = $response->get_data();
 
@@ -199 +199 @@
 
         $response = self::perform_active_theme_request();
-        $this->assertEquals( 200, $response->get_status() );
+        $this->assertSame( 200, $response->get_status() );
     }
 
@@ -209 +209 @@
     public function test_prepare_item() {
         $response = self::perform_active_theme_request();
-        $this->assertEquals( 200, $response->get_status() );
+        $this->assertSame( 200, $response->get_status() );
         $this->check_get_theme_response( $response );
     }
@@ -222 +222 @@
         $data       = $response->get_data();
         $properties = $data['schema']['properties'];
-        $this->assertEquals( 14, count( $properties ) );
+        $this->assertSame( 14, count( $properties ) );
 
         $this->assertArrayHasKey( 'author', $properties );
@@ -530 +530 @@
         $result   = $response->get_data();
         $this->assertArrayHasKey( 'theme_supports', $result[0] );
-        $this->assertEquals( array( $wordpress_blue ), $result[0]['theme_supports']['editor-color-palette'] );
+        $this->assertSame( array( $wordpress_blue ), $result[0]['theme_supports']['editor-color-palette'] );
     }
 
@@ -575 +575 @@
         remove_theme_support( 'custom-logo' );
         $wordpress_logo = array(
+            'width'                => 400,
             'height'               => 100,
-            'width'                => 400,
+            'flex-width'           => true,
             'flex-height'          => true,
-            'flex-width'           => true,
             'header-text'          => array( 'site-title', 'site-description' ),
             'unlink-homepage-logo' => false,
@@ -586 +586 @@
         $result   = $response->get_data();
         $this->assertArrayHasKey( 'theme_supports', $result[0] );
-        $this->assertEquals( $wordpress_logo, $result[0]['theme_supports']['custom-logo'] );
+        $this->assertSame( $wordpress_logo, $result[0]['theme_supports']['custom-logo'] );
     }
 
@@ -634 +634 @@
 
         $expected = array_diff_key( $wordpress_header, array_flip( $excluded ) );
-        $this->assertEquals( $expected, $result[0]['theme_supports']['custom-header'] );
+        $this->assertSame( $expected, $result[0]['theme_supports']['custom-header'] );
     }
 
@@ -678 +678 @@
 
         $expected = array_diff_key( $background, array_flip( $excluded ) );
-        $this->assertEquals( $expected, $result[0]['theme_supports']['custom-background'] );
+        $this->assertSame( $expected, $result[0]['theme_supports']['custom-background'] );
     }
 
@@ -711 +711 @@
         $result   = $response->get_data();
         $this->assertArrayHasKey( 'theme_supports', $result[0] );
-        $this->assertEquals( $html5, $result[0]['theme_supports']['html5'] );
+        $this->assertSame( $html5, $result[0]['theme_supports']['html5'] );
     }
 
@@ -896 +896 @@
         $result   = $response->get_data();
         $this->assertArrayHasKey( 'theme_supports', $result[0] );
-        $this->assertEquals( array( $gradient ), $result[0]['theme_supports']['editor-gradient-presets'] );
+        $this->assertSame( array( $gradient ), $result[0]['theme_supports']['editor-gradient-presets'] );
     }
 
@@ -996 +996 @@
         $result   = $response->get_data();
         $this->assertTrue( isset( $result[0]['theme_supports'] ) );
-        $this->assertEquals( array( 'post' ), $result[0]['theme_supports']['post-thumbnails'] );
+        $this->assertSame( array( 'post' ), $result[0]['theme_supports']['post-thumbnails'] );
     }
 
@@ -1022 +1022 @@
         $result   = $response->get_data();
         $this->assertTrue( isset( $result[0]['theme_supports'] ) );
-        $this->assertEquals( array( 'a', 'b', 'c' ), $result[0]['theme_supports']['test-feature'] );
+        $this->assertSame( array( 'a', 'b', 'c' ), $result[0]['theme_supports']['test-feature'] );
     }
 
@@ -1050 +1050 @@
 
         $this->assertArrayHasKey( 'my_custom_int', $data['schema']['properties'] );
-        $this->assertEquals( $schema, $data['schema']['properties']['my_custom_int'] );
+        $this->assertSame( $schema, $data['schema']['properties']['my_custom_int'] );
 
         $response = self::perform_active_theme_request( 'GET' );