Changeset 57244

Timestamp:

01/06/2024 12:59:49 PM (13 months 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 [55859], [56380], [56802], [57115], [57129], [57185].

See #59655.

Location:

trunk/tests/phpunit/tests

Files:

• ajax/wpAjaxImageEditor.php (modified) (1 diff)
• ajax/wpAjaxInlineSave.php (modified) (4 diffs)
• dependencies/scripts.php (modified) (1 diff)
• html-api/wpHtmlProcessorSemanticRules.php (modified) (3 diffs)
• theme.php (modified) (2 diffs)

trunk/tests/phpunit/tests/ajax/wpAjaxImageEditor.php

@@ -53 +53 @@
 
         $this->assertObjectHasProperty( 'error', $ret );
-        $this->assertEquals( 'Images cannot be scaled to a size larger than the original.', $ret->error );
+        $this->assertSame( 'Images cannot be scaled to a size larger than the original.', $ret->error );
     }
 

trunk/tests/phpunit/tests/ajax/wpAjaxInlineSave.php

@@ -111 +111 @@
         $this->assertSame( 'draft', $post->post_status );
 
-        $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+        $this->assertSame( '0000-00-00 00:00:00', $post->post_date_gmt );
 
         // Set up a request.
@@ -143 +143 @@
         $post_date = sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $_POST['aa'], $_POST['mm'], $_POST['jj'], $_POST['hh'], $_POST['mn'], $_POST['ss'] );
 
-        $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+        $this->assertSame( '0000-00-00 00:00:00', $post->post_date_gmt );
     }
 
@@ -168 +168 @@
         $this->assertSame( 'draft', $post->post_status );
 
-        $this->assertEquals( '0000-00-00 00:00:00', $post->post_date_gmt );
+        $this->assertSame( '0000-00-00 00:00:00', $post->post_date_gmt );
 
         // Set up a request.
@@ -198 +198 @@
         $post = get_post( $post->ID );
 
-        $this->assertEquals( '2020-09-11 19:20:11', $post->post_date_gmt );
+        $this->assertSame( '2020-09-11 19:20:11', $post->post_date_gmt );
     }
 }

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -3367 +3367 @@
         wp_default_packages_vendor( $wp_scripts );
 
-        $this->assertEquals( $package_json[ $script ], $wp_scripts->query( $script, 'registered' )->ver );
+        $this->assertSame( $package_json[ $script ], $wp_scripts->query( $script, 'registered' )->ver );
     }
 

trunk/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php

@@ -36 +36 @@
         }
 
-        $this->assertEquals(
+        $this->assertSame(
             $tag_name,
             $processor->get_tag(),
@@ -126 +126 @@
 
         $p->step();
-        $this->assertEquals( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
+        $this->assertSame( 'DIV', $p->get_tag(), 'Did not stop at initial DIV tag.' );
         $this->assertFalse( $p->is_tag_closer(), 'Did not find that initial DIV tag is an opener.' );
 
@@ -134 +134 @@
          */
         $this->assertTrue( $p->step(), 'Found no further tags when it should have found the closing DIV' );
-        $this->assertEquals( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
+        $this->assertSame( 'DIV', $p->get_tag(), "Did not skip unexpected BUTTON; stopped at {$p->get_tag()}." );
         $this->assertTrue( $p->is_tag_closer(), 'Did not find that the terminal DIV tag is a closer.' );
     }

trunk/tests/phpunit/tests/theme.php

@@ -1260 +1260 @@
         switch_theme( $old_theme->get_stylesheet() );
 
-        $this->assertEquals( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
-        $this->assertEquals( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
+        $this->assertSame( $old_root . '/test', $path1, 'The original stylesheet path is not correct' );
+        $this->assertSame( $new_root . '/test', $path2, 'The new stylesheet path is not correct' );
     }
 
@@ -1303 +1303 @@
         switch_theme( $old_theme->get_stylesheet() );
 
-        $this->assertEquals( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
-        $this->assertEquals( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
+        $this->assertSame( $old_root . '/test-parent', $path1, 'The original template path is not correct' );
+        $this->assertSame( $new_root . '/test-parent', $path2, 'The new template path is not correct' );
     }
 }