Changeset 54402

Timestamp:

10/07/2022 01:02:07 AM (2 years ago)

Author:

desrosj

Message:

Tests: Replace some occurrences of assertEquals() with assertSame().

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

Props costdev, desrosj.
See #55654.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesUser.php (modified) (1 diff)
• ajax/CustomizeManager.php (modified) (1 diff)
• block-template-utils.php (modified) (1 diff)
• blocks/wpBlockType.php (modified) (1 diff)
• comment/getCommentsPagesCount.php (modified) (1 diff)
• comment/query.php (modified) (1 diff)
• customize/manager.php (modified) (1 diff)
• customize/selective-refresh-ajax.php (modified) (8 diffs)
• formatting/mapDeep.php (modified) (1 diff)
• functions.php (modified) (6 diffs)
• import/import.php (modified) (4 diffs)
• import/parser.php (modified) (5 diffs)
• import/postmeta.php (modified) (1 diff)
• media.php (modified) (1 diff)
• multisite/network.php (modified) (3 diffs)
• multisite/site.php (modified) (3 diffs)
• option/networkOption.php (modified) (3 diffs)
• post/getPages.php (modified) (2 diffs)
• post/meta.php (modified) (1 diff)
• post/wpInsertPost.php (modified) (2 diffs)
• query/date.php (modified) (1 diff)
• rest-api/rest-block-renderer-controller.php (modified) (1 diff)
• rest-api/rest-global-styles-controller.php (modified) (2 diffs)
• rest-api/rest-post-meta-fields.php (modified) (1 diff)
• rest-api/rest-site-health-controller.php (modified) (1 diff)
• rest-api/rest-themes-controller.php (modified) (1 diff)
• rest-api/wpRestTemplatesController.php (modified) (1 diff)
• style-engine/wpStyleEngineCssRulesStore.php (modified) (3 diffs)
• term.php (modified) (5 diffs)
• term/getTerms.php (modified) (3 diffs)
• term/taxQuery.php (modified) (3 diffs)
• theme/wpThemeJson.php (modified) (2 diffs)
• theme/wpThemeJsonResolver.php (modified) (2 diffs)
• user.php (modified) (1 diff)
• user/countUserPosts.php (modified) (5 diffs)
• user/countUsers.php (modified) (5 diffs)
• user/query.php (modified) (3 diffs)
• widgets.php (modified) (4 diffs)
• widgets/wpWidgetMedia.php (modified) (1 diff)
• xmlrpc/wp/newPost.php (modified) (1 diff)

trunk/tests/phpunit/tests/admin/includesUser.php

@@ -18 +18 @@
         if ( $error_code ) {
             $this->assertWPError( $error );
-            $this->assertEquals( $error_code, $error->get_error_code() );
+            $this->assertSame( $error_code, $error->get_error_code() );
         } else {
             $this->assertNotWPError( $error );

trunk/tests/phpunit/tests/ajax/CustomizeManager.php

@@ -133 +133 @@
         }
         $this->assertNotEmpty( $e );
-        $this->assertEquals( -1, $e->getMessage() );
+        $this->assertSame( '-1', $e->getMessage() );
 
         // Not called setup_theme.

trunk/tests/phpunit/tests/block-template-utils.php

@@ -209 +209 @@
      */
     function test_remove_theme_attribute_in_block_template_content( $template_content, $expected ) {
-        $this->assertEquals( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );
+        $this->assertSame( $expected, _remove_theme_attribute_in_block_template_content( $template_content ) );
     }
 

trunk/tests/phpunit/tests/blocks/wpBlockType.php

@@ -241 +241 @@
         $prepared_attributes = $block_type->prepare_attributes_for_render( $attributes );
 
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'correct'            => 'include',

trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php

@@ -175 +175 @@
         $wp_query->max_num_comment_pages = 7;
 
-        $this->assertEquals( 7, get_comment_pages_count() );
-        $this->assertEquals( 7, get_comment_pages_count( null, null, null ) );
-        $this->assertEquals( 0, get_comment_pages_count( array(), null, null ) );
+        $this->assertSame( 7, get_comment_pages_count() );
+        $this->assertSame( 7, get_comment_pages_count( null, null, null ) );
+        $this->assertSame( 0, get_comment_pages_count( array(), null, null ) );
 
         $wp_query->max_num_comment_pages = $org_max_num_comment_pages;

trunk/tests/phpunit/tests/comment/query.php

@@ -4022 +4022 @@
         );
 
-        $this->assertEquals( 3, $q->found_comments );
+        $this->assertSame( 3, $q->found_comments );
         $this->assertEquals( 2, $q->max_num_pages );
     }

trunk/tests/phpunit/tests/customize/manager.php

@@ -2534 +2534 @@
         $this->assertSame( $default_value, $setting->post_value( $default_value ) );
 
-        $post_value = '42';
-        $this->manager->set_post_value( 'numeric', $post_value );
-        $this->assertEquals( $post_value, $this->manager->post_value( $setting, $default_value ) );
-        $this->assertEquals( $post_value, $setting->post_value( $default_value ) );
+        $post_value = 42;
+        $this->manager->set_post_value( 'numeric', (string) $post_value );
+        $this->assertSame( $post_value, $this->manager->post_value( $setting, $default_value ) );
+        $this->assertSame( $post_value, $setting->post_value( $default_value ) );
     }
 

trunk/tests/phpunit/tests/customize/selective-refresh-ajax.php

@@ -189 +189 @@
         );
 
-        $count_customize_render_partials_before = has_action( 'customize_render_partials_before' );
-        $count_customize_render_partials_after  = has_action( 'customize_render_partials_after' );
         ob_start();
         try {
@@ -201 +199 @@
             $this->assertSame( '', $e->getMessage() );
         }
-        $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );
-        $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_before' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_after' ) );
         $output = json_decode( ob_get_clean(), true );
         $this->assertSame( array( false ), $output['data']['contents']['foo'] );
@@ -327 +325 @@
         );
 
-        $count_customize_render_partials_before = has_action( 'customize_render_partials_before' );
-        $count_customize_render_partials_after  = has_action( 'customize_render_partials_after' );
         ob_start();
         try {
@@ -339 +335 @@
             $this->assertSame( '', $e->getMessage() );
         }
-        $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );
-        $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_before' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_after' ) );
         $output = json_decode( ob_get_clean(), true );
         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );
@@ -436 +432 @@
         );
 
-        $count_customize_render_partials_before = has_action( 'customize_render_partials_before' );
-        $count_customize_render_partials_after  = has_action( 'customize_render_partials_after' );
         ob_start();
         try {
@@ -448 +442 @@
             $this->assertSame( '', $e->getMessage() );
         }
-        $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );
-        $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_before' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_after' ) );
         $output = json_decode( ob_get_clean(), true );
         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_dynamic_blogname'] );
@@ -488 +482 @@
         );
 
-        $count_customize_render_partials_before = has_action( 'customize_render_partials_before' );
-        $count_customize_render_partials_after  = has_action( 'customize_render_partials_after' );
         ob_start();
         try {
@@ -500 +492 @@
             $this->assertSame( '', $e->getMessage() );
         }
-        $this->assertEquals( $count_customize_render_partials_before + 1, has_action( 'customize_render_partials_before' ) );
-        $this->assertEquals( $count_customize_render_partials_after + 1, has_action( 'customize_render_partials_after' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_before' ) );
+        $this->assertTrue( has_action( 'customize_render_partials_after' ) );
         $output = json_decode( ob_get_clean(), true );
         $this->assertSame( array( get_bloginfo( 'name', 'display' ) ), $output['data']['contents']['test_blogname'] );

trunk/tests/phpunit/tests/formatting/mapDeep.php

@@ -50 +50 @@
 
     public function test_map_deep_should_map_each_object_element_of_an_array() {
-        $this->assertEquals(
+        $this->assertEqualSets(
             array(
                 'var0' => 'ababa',

trunk/tests/phpunit/tests/functions.php

@@ -2057 +2057 @@
      */
     public function test_wp_get_default_extension_for_mime_type() {
-        $this->assertEquals( 'jpg', wp_get_default_extension_for_mime_type( 'image/jpeg' ), 'jpg not returned as default extension for "image/jpeg"' );
+        $this->assertSame( 'jpg', wp_get_default_extension_for_mime_type( 'image/jpeg' ), 'jpg not returned as default extension for "image/jpeg"' );
         $this->assertNotEquals( 'jpeg', wp_get_default_extension_for_mime_type( 'image/jpeg' ), 'jpeg should not be returned as default extension for "image/jpeg"' );
-        $this->assertEquals( 'png', wp_get_default_extension_for_mime_type( 'image/png' ), 'png not returned as default extension for "image/png"' );
+        $this->assertSame( 'png', wp_get_default_extension_for_mime_type( 'image/png' ), 'png not returned as default extension for "image/png"' );
         $this->assertFalse( wp_get_default_extension_for_mime_type( 'wibble/wobble' ), 'false not returned for unrecognized mime type' );
         $this->assertFalse( wp_get_default_extension_for_mime_type( '' ), 'false not returned when empty string as mime type supplied' );
@@ -2073 +2073 @@
     function test_wp_filesize_with_nonexistent_file() {
         $file = 'nonexistent/file.jpg';
-        $this->assertEquals( 0, wp_filesize( $file ) );
+        $this->assertSame( 0, wp_filesize( $file ) );
     }
 
@@ -2083 +2083 @@
         $file = DIR_TESTDATA . '/images/test-image-upside-down.jpg';
 
-        $this->assertEquals( filesize( $file ), wp_filesize( $file ) );
+        $this->assertSame( filesize( $file ), wp_filesize( $file ) );
 
         $filter = function() {
@@ -2091 +2091 @@
         add_filter( 'wp_filesize', $filter );
 
-        $this->assertEquals( 999, wp_filesize( $file ) );
+        $this->assertSame( 999, wp_filesize( $file ) );
 
         $pre_filter = function() {
@@ -2099 +2099 @@
         add_filter( 'pre_wp_filesize', $pre_filter );
 
-        $this->assertEquals( 111, wp_filesize( $file ) );
+        $this->assertSame( 111, wp_filesize( $file ) );
     }
 
@@ -2185 +2185 @@
             'version'  => 1,
         );
-        $this->assertEquals( $theme_json, $expected_theme_json );
+        $this->assertSameSetsWithIndex( $theme_json, $expected_theme_json );
     }
 

trunk/tests/phpunit/tests/import/import.php

@@ -63 +63 @@
 
         // Check that terms were imported correctly.
-        $this->assertEquals( 30, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
-        $this->assertEquals( 3, wp_count_terms( array( 'taxonomy' => 'post_tag' ) ) );
+        $this->assertSame( '30', wp_count_terms( array( 'taxonomy' => 'category' ) ) );
+        $this->assertSame( '3', wp_count_terms( array( 'taxonomy' => 'post_tag' ) ) );
         $foo = get_term_by( 'slug', 'foo', 'category' );
         $this->assertSame( 0, $foo->parent );
@@ -73 +73 @@
         // Check that posts/pages were imported correctly.
         $post_count = wp_count_posts( 'post' );
-        $this->assertEquals( 5, $post_count->publish );
-        $this->assertEquals( 1, $post_count->private );
+        $this->assertSame( '5', $post_count->publish );
+        $this->assertSame( '1', $post_count->private );
         $page_count = wp_count_posts( 'page' );
-        $this->assertEquals( 4, $page_count->publish );
-        $this->assertEquals( 1, $page_count->draft );
+        $this->assertSame( '4', $page_count->publish );
+        $this->assertSame( '1', $page_count->draft );
         $comment_count = wp_count_comments();
         $this->assertSame( 1, $comment_count->total_comments );
@@ -231 +231 @@
         $this->assertSame( 'author@example.org', $author->user_email );
 
-        $this->assertEquals( 30, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
-        $this->assertEquals( 3, wp_count_terms( array( 'taxonomy' => 'post_tag' ) ) );
+        $this->assertSame( '30', wp_count_terms( array( 'taxonomy' => 'category' ) ) );
+        $this->assertSame( '3', wp_count_terms( array( 'taxonomy' => 'post_tag' ) ) );
         $foo = get_term_by( 'slug', 'foo', 'category' );
         $this->assertSame( 0, $foo->parent );
@@ -240 +240 @@
 
         $post_count = wp_count_posts( 'post' );
-        $this->assertEquals( 5, $post_count->publish );
-        $this->assertEquals( 1, $post_count->private );
+        $this->assertSame( '5', $post_count->publish );
+        $this->assertSame( '1', $post_count->private );
         $page_count = wp_count_posts( 'page' );
-        $this->assertEquals( 4, $page_count->publish );
-        $this->assertEquals( 1, $page_count->draft );
+        $this->assertSame( '4', $page_count->publish );
+        $this->assertSame( '1', $page_count->draft );
         $comment_count = wp_count_comments();
         $this->assertSame( 1, $comment_count->total_comments );

trunk/tests/phpunit/tests/import/parser.php

@@ -75 +75 @@
             $this->assertIsArray( $result, $message );
             $this->assertSame( 'http://localhost/', $result['base_url'], $message );
-            $this->assertEquals(
+            $this->assertEqualSetsWithIndex(
                 array(
                     'author_id'           => 2,
@@ -87 +87 @@
                 $message
             );
-            $this->assertEquals(
+            $this->assertEqualSetsWithIndex(
                 array(
                     'term_id'              => 3,
@@ -98 +98 @@
                 $message
             );
-            $this->assertEquals(
+            $this->assertEqualSetsWithIndex(
                 array(
                     'term_id'         => 22,
@@ -108 +108 @@
                 $message
             );
-            $this->assertEquals(
+            $this->assertEqualSetsWithIndex(
                 array(
                     'term_id'          => 40,
@@ -124 +124 @@
             $this->assertCount( 19, $result['posts'][0], $message );
             $this->assertCount( 18, $result['posts'][1], $message );
-            $this->assertEquals(
+            $this->assertEqualSetsWithIndex(
                 array(
                     array(

trunk/tests/phpunit/tests/import/postmeta.php

@@ -77 +77 @@
         $expected[]  = $classy;
 
-        $this->assertEquals( $expected, get_post_meta( 150, 'test', true ) );
+        $this->assertEqualSets( $expected, get_post_meta( 150, 'test', true ) );
     }
 

trunk/tests/phpunit/tests/media.php

@@ -502 +502 @@
 
         $images = get_attached_media( 'image', $post_id );
-        $this->assertEquals( $images, array( $attachment_id => get_post( $attachment_id ) ) );
+        $this->assertEqualSets( $images, array( $attachment_id => get_post( $attachment_id ) ) );
     }
 

trunk/tests/phpunit/tests/multisite/network.php

@@ -172 +172 @@
             wp_update_network_counts();
 
-            $this->assertEquals( $site_count_start, $actual );
+            $this->assertSame( $site_count_start, $actual );
         }
 
@@ -192 +192 @@
             wp_update_network_counts();
 
-            $this->assertEquals( $site_count_start + 1, $actual );
+            $this->assertSame( $site_count_start + 1, $actual );
         }
 
@@ -203 +203 @@
             $site_count = get_blog_count( self::$different_network_id );
 
-            $this->assertEquals( count( self::$different_site_ids ), $site_count );
-        }
-
-
+            $this->assertSame( count( self::$different_site_ids ), $site_count );
+        }
 
         public function test_active_network_plugins() {

trunk/tests/phpunit/tests/multisite/site.php

@@ -1556 +1556 @@
             $site3  = get_site( $site_id );
 
-            $this->assertEquals( 1, $site1->public );
-            $this->assertEquals( 0, $site2->public );
-            $this->assertEquals( 1, $site3->public );
+            $this->assertSame( '1', $site1->public );
+            $this->assertSame( '0', $site2->public );
+            $this->assertSame( '1', $site3->public );
         }
 
@@ -2434 +2434 @@
             wpmu_create_blog( 'testsite1.example.org', '/new-blog/', 'New Blog', get_current_user_id(), $meta, 1 );
 
-            $this->assertEquals( $expected_meta, $this->wp_initialize_site_meta );
+            $this->assertSameSetsWithIndex( $expected_meta, $this->wp_initialize_site_meta );
 
             $this->wp_initialize_site_meta = array();
@@ -2535 +2535 @@
                     array(
                         'public' => 0,
+                        'foo'    => 'bar',
                         'WPLANG' => 'en_US',
-                        'foo'    => 'bar',
                     ),
                 ),

trunk/tests/phpunit/tests/option/networkOption.php

@@ -177 +177 @@
 
         // Check they exists.
-        $this->assertEquals( $funky_meta, get_network_option( $network_id, $option ) );
+        $this->assertEqualSets( $funky_meta, get_network_option( $network_id, $option ) );
     }
 
@@ -191 +191 @@
         add_metadata( 'site', $network_id, $option, 'tuesday', true );
         add_metadata( 'site', $network_id, $option, 'wednesday', true );
-        $this->assertEquals( 'monday', get_network_option( $network_id, $option, true ) );
+        $this->assertSame( 'monday', get_network_option( $network_id, $option, true ) );
     }
 
@@ -280 +280 @@
 
         add_metadata( 'site', $network_id, $option, $array_w_object, true );
-        $this->assertEquals( $array_w_object, get_network_option( $network_id, $option ) );
+        $this->assertEqualSets( $array_w_object, get_network_option( $network_id, $option ) );
     }
 

trunk/tests/phpunit/tests/post/getPages.php

@@ -425 +425 @@
         );
         // Confirm the defaults.
-        $this->assertEquals( $pages, $pages_default_args );
+        $this->assertEqualSets( $pages, $pages_default_args );
 
         /*
@@ -469 +469 @@
         );
 
-        $this->assertEquals( $pages, $default_args );
+        $this->assertEqualSets( $pages, $default_args );
 
         /*

trunk/tests/phpunit/tests/post/meta.php

@@ -249 +249 @@
 
         // Check it exists.
-        $this->assertEquals( $funky_meta, get_post_meta( self::$post_id, 'test_funky_post_meta', true ) );
+        $this->assertEqualSets( $funky_meta, get_post_meta( self::$post_id, 'test_funky_post_meta', true ) );
 
     }

trunk/tests/phpunit/tests/post/wpInsertPost.php

@@ -901 +901 @@
         $assigned_terms = wp_get_object_terms( array( $post_id ), array( 'category' ), array() );
         $this->assertCount( 1, $assigned_terms );
-        $this->assertEquals( $term_id, $assigned_terms[0]->term_id );
+        $this->assertSame( $term_id, $assigned_terms[0]->term_id );
 
         // Update the post with no changes.
@@ -910 +910 @@
         $assigned_terms = wp_get_object_terms( array( $post_id ), array( 'category' ), array() );
         $this->assertCount( 1, $assigned_terms );
-        $this->assertEquals( $term_id, $assigned_terms[0]->term_id );
+        $this->assertSame( $term_id, $assigned_terms[0]->term_id );
 
         // Remove the term from the post.

trunk/tests/phpunit/tests/query/date.php

@@ -299 +299 @@
         );
 
-        $this->assertEquals( $expected, $posts );
+        $this->assertEqualSets( $expected, $posts );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-block-renderer-controller.php

@@ -422 +422 @@
 
         $this->assertSame( $expected_attributes, json_decode( $data['rendered'], true ) );
-        $this->assertEquals(
+        $this->assertEqualSetsWithIndex(
             json_decode( $block_type->render( $attributes ), true ),
             json_decode( $data['rendered'], true )

trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php

@@ -372 +372 @@
         $links    = $response->get_links();
 
-        $this->assertEquals(
+        $this->assertEqualSets(
             array(
                 'id'       => self::$global_styles_id,
@@ -410 +410 @@
         $response = rest_get_server()->dispatch( $request );
         $data     = $response->get_data();
-        $this->assertEquals( 'My new global styles title', $data['title']['raw'] );
+        $this->assertSame( 'My new global styles title', $data['title']['raw'] );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php

@@ -2798 +2798 @@
 
         $this->assertSame( 200, $response->get_status() );
-        $this->assertEquals( array( 0 ), $response->get_data()['meta']['multi_boolean'] );
+        $this->assertSameSetsWithIndex( array( false ), $response->get_data()['meta']['multi_boolean'] );
 
         $this->assertFalse( get_metadata_by_mid( 'post', $mid1 ) );

trunk/tests/phpunit/tests/rest-api/rest-site-health-controller.php

@@ -117 +117 @@
 
         $route = current( $route );
-        $this->assertEquals(
+        $this->assertSame(
             array( WP_REST_Server::READABLE => true ),
             $route['methods']
         );
 
-        $this->assertEquals(
+        $this->assertSame(
             'test_page_cache',
             $route['callback'][1]

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

@@ -629 +629 @@
         $this->assertArrayHasKey( 'theme_supports', $result[0] );
         $this->assertArrayHasKey( 'editor-font-sizes', $result[0]['theme_supports'] );
-        $this->assertEquals( array( $tiny ), $result[0]['theme_supports']['editor-font-sizes'] );
+        $this->assertEqualSetsWithIndex( array( $tiny ), $result[0]['theme_supports']['editor-font-sizes'] );
     }
 

trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php

@@ -344 +344 @@
     public function test_sanitize_template_id( $input_id, $sanitized_id ) {
         $endpoint = new WP_REST_Templates_Controller( 'wp_template' );
-        $this->assertEquals(
+        $this->assertSame(
             $sanitized_id,
             $endpoint->_sanitize_template_id( $input_id )

trunk/tests/phpunit/tests/style-engine/wpStyleEngineCssRulesStore.php

@@ -89 +89 @@
         $quesadilla_store = WP_Style_Engine_CSS_Rules_Store::get_store( 'quesadilla' );
 
-        $this->assertEquals(
+        $this->assertSame(
             array(
                 'burrito'    => $burrito_store,
@@ -109 +109 @@
         $tzatziki_store = WP_Style_Engine_CSS_Rules_Store::get_store( 'tzatziki' );
 
-        $this->assertEquals(
+        $this->assertSame(
             array(
                 'dolmades' => $dolmades_store,
@@ -120 +120 @@
         WP_Style_Engine_CSS_Rules_Store::remove_all_stores();
 
-        $this->assertEquals(
+        $this->assertSame(
             array(),
             WP_Style_Engine_CSS_Rules_Store::get_stores(),

trunk/tests/phpunit/tests/term.php

@@ -76 +76 @@
         );
         // There are 5 posts, all Uncategorized.
-        $this->assertEquals( 1, $count );
+        $this->assertSame( '1', $count );
     }
 
@@ -87 +87 @@
         // Counts all terms (1 default category, 5 tags).
         $count = wp_count_terms();
-        $this->assertEquals( 6, $count );
+        $this->assertSame( '6', $count );
 
         // Counts only tags (5), with both current and legacy signature.
@@ -93 +93 @@
         $count        = wp_count_terms( array( 'taxonomy' => 'post_tag' ) );
         $legacy_count = wp_count_terms( 'post_tag' );
-        $this->assertEquals( 5, $count );
-        $this->assertEquals( $count, $legacy_count );
+        $this->assertSame( '5', $count );
+        $this->assertSame( $count, $legacy_count );
     }
 
@@ -160 +160 @@
         $this->assertNotWPError( $t );
         $this->assertGreaterThan( 0, $t );
-        $this->assertEquals( $initial_count + 1, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
+        $this->assertSame( (string) ( $initial_count + 1 ), wp_count_terms( array( 'taxonomy' => 'category' ) ) );
 
         // Make sure the term exists.
@@ -170 +170 @@
         $this->assertNull( term_exists( $term ) );
         $this->assertNull( term_exists( $t ) );
-        $this->assertEquals( $initial_count, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
+        $this->assertSame( $initial_count, wp_count_terms( array( 'taxonomy' => 'category' ) ) );
     }
 

trunk/tests/phpunit/tests/term/getTerms.php

@@ -256 +256 @@
             )
         );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 $term_id1 => 0,
@@ -289 +289 @@
             )
         );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 $term_id1 => 'WOO!',
@@ -304 +304 @@
             )
         );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 $term_id1 => 'woo',

trunk/tests/phpunit/tests/term/taxQuery.php

@@ -60 +60 @@
         );
 
-        $this->assertEquals( $expected, $tq->queries[0] );
+        $this->assertSameSetsWithIndex( $expected, $tq->queries[0] );
     }
 
@@ -83 +83 @@
         );
 
-        $this->assertEquals( $expected, $tq->queries[0] );
+        $this->assertSameSetsWithIndex( $expected, $tq->queries[0] );
     }
 
@@ -263 +263 @@
         $tq->transform_query( $tq->queries[0], 'term_taxonomy_id' );
 
-        $this->assertEquals( $tt_ids, $tq->queries[0]['terms'] );
+        $this->assertEqualSets( $tt_ids, $tq->queries[0]['terms'] );
         $this->assertSame( 'term_taxonomy_id', $tq->queries[0]['field'] );
     }

trunk/tests/phpunit/tests/theme/wpThemeJson.php

@@ -677 +677 @@
             $theme_json->get_stylesheet( array( 'presets' ) )
         );
+
         $this->assertSame(
             'body{--wp--preset--color--grey: grey;--wp--preset--color--dark-grey: grey;--wp--preset--color--light-grey: grey;--wp--preset--color--white-2-black: grey;--wp--custom--white-2-black: value;}',
@@ -3353 +3354 @@
         );
 
-        $this->assertEquals(
+        $this->assertSame(
             'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1rem; }body { --wp--style--block-gap: 1rem; }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: 1rem;margin-block-end: 0;}body .is-layout-flex{gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}.wp-block-post-content{color: gray;}.wp-block-social-links.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flex{gap: 0;}.wp-block-buttons.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flex{gap: 0;}',
             $theme_json->get_stylesheet()

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -367 +367 @@
         }
         $query_count = count( $this->queries ) - $query_count;
-        $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
+        $this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
 
         $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme );
@@ -382 +382 @@
         }
         $query_count = count( $this->queries ) - $query_count;
-        $this->assertEquals( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
+        $this->assertSame( 0, $query_count, 'Unexpected SQL queries detected for the wp_global_style post type' );
         remove_filter( 'query', array( $this, 'filter_db_query' ) );
     }

trunk/tests/phpunit/tests/user.php

@@ -561 +561 @@
         wp_set_current_user( self::$author_id );
         $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', false );
-        $this->assertEquals( 1, $counts[ self::$author_id ] );
-        $this->assertEquals( 1, $counts[ $user_id_b ] );
+        $this->assertSame( '1', $counts[ self::$author_id ] );
+        $this->assertSame( '1', $counts[ $user_id_b ] );
 
         $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', true );
-        $this->assertEquals( 1, $counts[ self::$author_id ] );
-        $this->assertEquals( 1, $counts[ $user_id_b ] );
+        $this->assertSame( '1', $counts[ self::$author_id ] );
+        $this->assertSame( '1', $counts[ $user_id_b ] );
 
         wp_set_current_user( $user_id_b );
         $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', false );
-        $this->assertEquals( 1, $counts[ self::$author_id ] );
-        $this->assertEquals( 2, $counts[ $user_id_b ] );
+        $this->assertSame( '1', $counts[ self::$author_id ] );
+        $this->assertSame( '2', $counts[ $user_id_b ] );
 
         $counts = count_many_users_posts( array( self::$author_id, $user_id_b ), 'post', true );
-        $this->assertEquals( 1, $counts[ self::$author_id ] );
-        $this->assertEquals( 1, $counts[ $user_id_b ] );
+        $this->assertSame( '1', $counts[ self::$author_id ] );
+        $this->assertSame( '1', $counts[ $user_id_b ] );
     }
 

trunk/tests/phpunit/tests/user/countUserPosts.php

@@ -60 +60 @@
 
     public function test_count_user_posts_post_type_should_default_to_post() {
-        $this->assertEquals( 4, count_user_posts( self::$user_id ) );
+        $this->assertSame( '4', count_user_posts( self::$user_id ) );
     }
 
@@ -67 +67 @@
      */
     public function test_count_user_posts_post_type_post() {
-        $this->assertEquals( 4, count_user_posts( self::$user_id, 'post' ) );
+        $this->assertSame( '4', count_user_posts( self::$user_id, 'post' ) );
     }
 
@@ -74 +74 @@
      */
     public function test_count_user_posts_post_type_cpt() {
-        $this->assertEquals( 3, count_user_posts( self::$user_id, 'wptests_pt' ) );
+        $this->assertSame( '3', count_user_posts( self::$user_id, 'wptests_pt' ) );
     }
 
@@ -81 +81 @@
      */
     public function test_count_user_posts_with_multiple_post_types() {
-        $this->assertEquals( 7, count_user_posts( self::$user_id, array( 'wptests_pt', 'post' ) ) );
+        $this->assertSame( '7', count_user_posts( self::$user_id, array( 'wptests_pt', 'post' ) ) );
     }
 
@@ -88 +88 @@
      */
     public function test_count_user_posts_should_ignore_non_existent_post_types() {
-        $this->assertEquals( 4, count_user_posts( self::$user_id, array( 'foo', 'post' ) ) );
+        $this->assertSame( '4', count_user_posts( self::$user_id, array( 'foo', 'post' ) ) );
     }
 }

trunk/tests/phpunit/tests/user/countUsers.php

@@ -54 +54 @@
 
         $this->assertSame( 8, $count['total_users'] );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'administrator' => 2,
@@ -134 +134 @@
 
         $this->assertSame( 8, $count['total_users'] );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'administrator' => 2,
@@ -152 +152 @@
 
         $this->assertSame( 2, $count['total_users'] );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'administrator' => 1,
@@ -167 +167 @@
 
         $this->assertSame( 2, $count['total_users'] );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'administrator' => 1,
@@ -240 +240 @@
 
         $this->assertSame( 3, $count['total_users'] );
-        $this->assertEquals(
+        $this->assertSameSetsWithIndex(
             array(
                 'administrator' => 2,

trunk/tests/phpunit/tests/user/query.php

@@ -53 +53 @@
         $users = new WP_User_Query();
 
-        $this->assertEquals( '', $users->get( 'fields' ) );
+        $this->assertNull( $users->get( 'fields' ) );
         if ( isset( $users->query_vars['fields'] ) ) {
             $this->assertSame( '', $users->query_vars['fields'] );
@@ -583 +583 @@
         $query->prepare_query( array( 'fields' => 'all' ) );
         $this->assertEmpty( $query->query_limit );
-        $this->assertEquals( '', $query->query_limit );
+        $this->assertNull( $query->query_limit );
         $_query_vars = $query->query_vars;
 
@@ -1686 +1686 @@
 
         // Must include user that has the same string in display_name.
-        $this->assertEquals( array( $new_user1 ), $ids );
+        $this->assertSameSetsWithIndex( array( (string) $new_user1 ), $ids );
     }
 

trunk/tests/phpunit/tests/widgets.php

@@ -1275 +1275 @@
 
         $expected_sidebars = array(
+            'wp_inactive_widgets' => array(),
             'primary'             => 1,
-            'wp_inactive_widgets' => array(),
-        );
-        $this->assertEquals( $expected_sidebars, $new_next_theme_sidebars );
+        );
+        $this->assertSameSetsWithIndex( $expected_sidebars, $new_next_theme_sidebars );
     }
 
@@ -1296 +1296 @@
         $new_next_theme_sidebars = wp_map_sidebars_widgets( $prev_theme_sidebars );
 
-        $this->assertEquals( $prev_theme_sidebars, $new_next_theme_sidebars );
+        $this->assertSameSetsWithIndex( $prev_theme_sidebars, $new_next_theme_sidebars );
     }
 
@@ -1319 +1319 @@
             'wp_inactive_widgets' => array(),
         );
-        $this->assertEquals( $expected_sidebars, $new_next_theme_sidebars );
+        $this->assertSameSetsWithIndex( $expected_sidebars, $new_next_theme_sidebars );
     }
 
@@ -1363 +1363 @@
             'wp_inactive_widgets' => array(),
         );
-        $this->assertEquals( $expected_sidebars, $new_next_theme_sidebars );
+        $this->assertSameSetsWithIndex( $expected_sidebars, $new_next_theme_sidebars );
     }
 }

trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php

@@ -344 +344 @@
         $widget->widget( $args, $instance );
         $this->assertCount( 3, $this->widget_instance_filter_args );
-        $this->assertEquals( $instance, $this->widget_instance_filter_args[0] );
+        $this->assertSameSetsWithIndex( $instance, $this->widget_instance_filter_args[0] );
         $this->assertSame( $args, $this->widget_instance_filter_args[1] );
         $this->assertSame( $widget, $this->widget_instance_filter_args[2] );

trunk/tests/phpunit/tests/xmlrpc/wp/newPost.php

@@ -239 +239 @@
         $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'editor', 'editor', $post ) );
         $this->assertNotIXRError( $result );
-        $this->assertEquals( '', get_post_format( $result ) );
+        $this->assertFalse( get_post_format( $result ) );
     }