Changeset 58183

Timestamp:

05/22/2024 03:39:51 PM (5 weeks ago)

Author:

SergeyBiryukov

Message:

Tests: Use assertSame() in navigation fallback 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 [56052].

See #60705.

Location:

trunk/tests/phpunit/tests/editor

Files:

• classic-to-block-menu-converter.php (modified) (3 diffs)
• navigation-fallback.php (modified) (9 diffs)

trunk/tests/phpunit/tests/editor/classic-to-block-menu-converter.php

@@ -32 +32 @@
         $this->assertTrue( is_wp_error( $result ), 'Should be a WP_Error instance' );
 
-        $this->assertEquals( 'invalid_menu', $result->get_error_code(), 'Error code should indicate invalidity of menu argument.' );
-
-        $this->assertEquals( 'The menu provided is not a valid menu.', $result->get_error_message(), 'Error message should communicate invalidity of menu argument.' );
+        $this->assertSame( 'invalid_menu', $result->get_error_code(), 'Error code should indicate invalidity of menu argument.' );
+
+        $this->assertSame( 'The menu provided is not a valid menu.', $result->get_error_message(), 'Error message should communicate invalidity of menu argument.' );
     }
 
@@ -105 +105 @@
         $nested_block = $parsed_blocks[1]['innerBlocks'][0];
 
-        $this->assertEquals( 'core/navigation-link', $first_block['blockName'], 'First block name should be "core/navigation-link"' );
-
-        $this->assertEquals( 'Classic Menu Item 1', $first_block['attrs']['label'], 'First block label should match.' );
-
-        $this->assertEquals( '/classic-menu-item-1', $first_block['attrs']['url'], 'First block URL should match.' );
+        $this->assertSame( 'core/navigation-link', $first_block['blockName'], 'First block name should be "core/navigation-link"' );
+
+        $this->assertSame( 'Classic Menu Item 1', $first_block['attrs']['label'], 'First block label should match.' );
+
+        $this->assertSame( '/classic-menu-item-1', $first_block['attrs']['url'], 'First block URL should match.' );
 
         // Assert parent of nested menu item is a submenu block.
-        $this->assertEquals( 'core/navigation-submenu', $second_block['blockName'], 'Second block name should be "core/navigation-submenu"' );
-
-        $this->assertEquals( 'Classic Menu Item 2', $second_block['attrs']['label'], 'Second block label should match.' );
-
-        $this->assertEquals( '/classic-menu-item-2', $second_block['attrs']['url'], 'Second block URL should match.' );
-
-        $this->assertEquals( 'core/navigation-link', $nested_block['blockName'], 'Nested block name should be "core/navigation-link"' );
-
-        $this->assertEquals( 'Nested Menu Item 1', $nested_block['attrs']['label'], 'Nested block label should match.' );
-
-        $this->assertEquals( '/nested-menu-item-1', $nested_block['attrs']['url'], 'Nested block URL should match.' );
+        $this->assertSame( 'core/navigation-submenu', $second_block['blockName'], 'Second block name should be "core/navigation-submenu"' );
+
+        $this->assertSame( 'Classic Menu Item 2', $second_block['attrs']['label'], 'Second block label should match.' );
+
+        $this->assertSame( '/classic-menu-item-2', $second_block['attrs']['url'], 'Second block URL should match.' );
+
+        $this->assertSame( 'core/navigation-link', $nested_block['blockName'], 'Nested block name should be "core/navigation-link"' );
+
+        $this->assertSame( 'Nested Menu Item 1', $nested_block['attrs']['label'], 'Nested block label should match.' );
+
+        $this->assertSame( '/nested-menu-item-1', $nested_block['attrs']['url'], 'Nested block URL should match.' );
 
         wp_delete_nav_menu( $menu_id );
@@ -195 +195 @@
             $this->assertCount( 1, $parsed_blocks, 'Should only be one block in the array.' );
 
-            $this->assertEquals( 'core/navigation-link', $parsed_blocks[0]['blockName'], 'First block name should be "core/navigation-link"' );
-
-            $this->assertEquals( 'Classic Menu Item 1', $parsed_blocks[0]['attrs']['label'], 'First block label should match.' );
-
-            $this->assertEquals( '/classic-menu-item-1', $parsed_blocks[0]['attrs']['url'], 'First block URL should match.' );
+            $this->assertSame( 'core/navigation-link', $parsed_blocks[0]['blockName'], 'First block name should be "core/navigation-link"' );
+
+            $this->assertSame( 'Classic Menu Item 1', $parsed_blocks[0]['attrs']['label'], 'First block label should match.' );
+
+            $this->assertSame( '/classic-menu-item-1', $parsed_blocks[0]['attrs']['url'], 'First block URL should match.' );
 
             wp_delete_nav_menu( $menu_id );

trunk/tests/phpunit/tests/editor/navigation-fallback.php

@@ -46 +46 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'wp_navigation', $data->post_type, 'Fallback menu type should be `wp_navigation`' );
-
-        $this->assertEquals( 'Navigation', $data->post_title, 'Fallback menu title should be the default fallback title' );
-
-        $this->assertEquals( 'navigation', $data->post_name, 'Fallback menu slug (post_name) should be the default slug' );
-
-        $this->assertEquals( '<!-- wp:page-list /-->', $data->post_content );
+        $this->assertSame( 'wp_navigation', $data->post_type, 'Fallback menu type should be `wp_navigation`' );
+
+        $this->assertSame( 'Navigation', $data->post_title, 'Fallback menu title should be the default fallback title' );
+
+        $this->assertSame( 'navigation', $data->post_name, 'Fallback menu slug (post_name) should be the default slug' );
+
+        $this->assertSame( '<!-- wp:page-list /-->', $data->post_content );
 
         $navs_in_db = $this->get_navigations_in_database();
@@ -93 +93 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertNotEquals( '<!-- wp:page-list /-->', $data->post_content, 'Navigation Menu should not contain a Page List block.' );
+        $this->assertNotSame( '<!-- wp:page-list /-->', $data->post_content, 'Navigation Menu should not contain a Page List block.' );
 
         $this->assertEmpty( $data->post_content, 'Menu should be empty.' );
@@ -114 +114 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'Navigation', $data->post_title, 'Fallback menu title should be the default title' );
+        $this->assertSame( 'Navigation', $data->post_title, 'Fallback menu title should be the default title' );
 
         $navs_in_db = $this->get_navigations_in_database();
@@ -147 +147 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( $most_recently_published_nav->post_title, $data->post_title, 'Fallback menu title should be the same as the most recently created menu.' );
-
-        $this->assertEquals( $most_recently_published_nav->post_name, $data->post_name, 'Post name should be the same as the most recently created menu.' );
-
-        $this->assertEquals( $most_recently_published_nav->post_content, $data->post_content, 'Post content should be the same as the most recently created menu.' );
+        $this->assertSame( $most_recently_published_nav->post_title, $data->post_title, 'Fallback menu title should be the same as the most recently created menu.' );
+
+        $this->assertSame( $most_recently_published_nav->post_name, $data->post_name, 'Post name should be the same as the most recently created menu.' );
+
+        $this->assertSame( $most_recently_published_nav->post_content, $data->post_content, 'Post content should be the same as the most recently created menu.' );
 
         // Check that no new Navigation menu was created.
@@ -180 +180 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should be the same as the classic menu.' );
+        $this->assertSame( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should be the same as the classic menu.' );
 
         // Assert that the fallback contains a navigation-link block.
@@ -234 +234 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'Classic Menu in Primary Location', $data->post_title, 'Fallback menu title should match the menu in the "primary" location.' );
+        $this->assertSame( 'Classic Menu in Primary Location', $data->post_title, 'Fallback menu title should match the menu in the "primary" location.' );
     }
 
@@ -272 +272 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'Primary', $data->post_title, 'Fallback menu title should match the menu with the slug "primary".' );
+        $this->assertSame( 'Primary', $data->post_title, 'Fallback menu title should match the menu with the slug "primary".' );
     }
 
@@ -310 +310 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( 'Most Recent Classic Menu', $data->post_title, 'Fallback menu title should match the menu that was created most recently.' );
+        $this->assertSame( 'Most Recent Classic Menu', $data->post_title, 'Fallback menu title should match the menu that was created most recently.' );
     }
 
@@ -342 +342 @@
         $this->assertInstanceOf( 'WP_Post', $data, 'Response should be of the correct type.' );
 
-        $this->assertEquals( $existing_navigation_menu->post_title, $data->post_title, 'Fallback menu title should be the same as the existing Navigation menu.' );
-
-        $this->assertNotEquals( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should not be the same as the Classic Menu.' );
+        $this->assertSame( $existing_navigation_menu->post_title, $data->post_title, 'Fallback menu title should be the same as the existing Navigation menu.' );
+
+        $this->assertNotSame( 'Existing Classic Menu', $data->post_title, 'Fallback menu title should not be the same as the Classic Menu.' );
 
         // Check that only a single Navigation fallback was created.