Changeset 48939 for trunk/tests/phpunit/tests/customize/manager.php

Timestamp:

09/04/2020 07:01:00 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Introduce assertSameSets() and assertSameSetsWithIndex(), and use them where appropriate.

This ensures that not only the array values being compared are equal, but also that their type is the same.

These new methods replace most of the existing instances of assertEqualSets() and assertEqualSetsWithIndex().

Going forward, stricter type checking by using assertSameSets() or assertSameSetsWithIndex() should generally be preferred, to make the tests more reliable.

Follow-up to [48937].

See #38266.

File:

• trunk/tests/phpunit/tests/customize/manager.php (modified) (6 diffs)

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

@@ -675 +675 @@
             'page_for_posts',
         );
-        $this->assertEqualSets( $expected_setting_ids, array_keys( $changeset_values ) );
+        $this->assertSameSets( $expected_setting_ids, array_keys( $changeset_values ) );
 
         foreach ( array( 'widget_text[2]', 'widget_meta[3]' ) as $setting_id ) {
@@ -743 +743 @@
         $changeset_data = $wp_customize->changeset_data();
         // Auto-drafts should not get re-created and amended with each import.
-        $this->assertEqualSets( array_values( $posts_by_name ), $changeset_data['nav_menus_created_posts']['value'] );
+        $this->assertSameSets( array_values( $posts_by_name ), $changeset_data['nav_menus_created_posts']['value'] );
 
         // Test that saving non-starter content on top of the changeset clears the starter_content flag.
@@ -871 +871 @@
             'nested_array_theme_mod',
         );
-        $this->assertEqualSets( $expected_setting_ids, array_keys( $changeset_values ) );
+        $this->assertSameSets( $expected_setting_ids, array_keys( $changeset_values ) );
 
         $this->assertSame( $existing_published_home_page_id, $changeset_values['array_option']['home_page_id'] );
@@ -1612 +1612 @@
             $this->assertSame( $save_counts[ $setting_id ] + 1, did_action( sprintf( 'customize_save_%s', $setting_id ) ), $setting_id );
         }
-        $this->assertEqualSets( array( 'blogname', 'blogdescription', 'background_color', 'scratchpad' ), array_keys( $this->filtered_setting_current_user_ids ) );
+        $this->assertSameSets( array( 'blogname', 'blogdescription', 'background_color', 'scratchpad' ), array_keys( $this->filtered_setting_current_user_ids ) );
         $this->assertSame( $other_admin_user_id, $this->filtered_setting_current_user_ids['blogname'] );
         $this->assertSame( 0, $this->filtered_setting_current_user_ids['blogdescription'] );
@@ -2222 +2222 @@
         add_filter( 'customize_allowed_urls', array( $this, 'filter_customize_allowed_urls' ) );
         $allowed = $wp_customize->get_allowed_urls();
-        $this->assertEqualSets( $allowed, array( 'http://headless.example.com/', home_url( '/', 'http' ) ) );
+        $this->assertSameSets( $allowed, array( 'http://headless.example.com/', home_url( '/', 'http' ) ) );
     }
 
@@ -3090 +3090 @@
         $this->assertNotEmpty( $data );
 
-        $this->assertEqualSets( array( 'theme', 'url', 'browser', 'panels', 'sections', 'nonce', 'autofocus', 'documentTitleTmpl', 'previewableDevices', 'changeset', 'timeouts', 'dateFormat', 'timeFormat', 'initialClientTimestamp', 'initialServerDate', 'initialServerTimestamp', 'l10n' ), array_keys( $data ) );
+        $this->assertSameSets( array( 'theme', 'url', 'browser', 'panels', 'sections', 'nonce', 'autofocus', 'documentTitleTmpl', 'previewableDevices', 'changeset', 'timeouts', 'dateFormat', 'timeFormat', 'initialClientTimestamp', 'initialServerDate', 'initialServerTimestamp', 'l10n' ), array_keys( $data ) );
         $this->assertSame( $autofocus, $data['autofocus'] );
         $this->assertArrayHasKey( 'save', $data['nonce'] );
         $this->assertArrayHasKey( 'preview', $data['nonce'] );
 
-        $this->assertEqualSets(
+        $this->assertSameSets(
             array(
                 'branching',