Changeset 51220

Timestamp:

06/23/2021 03:59:39 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertEquals() with assertSameSets() in text widget tests.

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

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

Follow-up to [40631], [41132], [48939], [51137].

See #52482, #52625.

File:

• trunk/tests/phpunit/tests/widgets/text-widget.php (modified) (12 diffs)

trunk/tests/phpunit/tests/widgets/text-widget.php

@@ -732 +732 @@
         $result   = $widget->update( $instance, array() );
         $this->assertSame( $expected, $result );
-        $this->assertTrue( ! empty( $expected['filter'] ), 'Expected filter prop to be truthy, to handle case where 4.8 is downgraded to 4.7.' );
+        $this->assertNotEmpty( $expected['filter'], 'Expected filter prop to be truthy, to handle case where 4.8 is downgraded to 4.7.' );
 
         add_filter( 'map_meta_cap', array( $this, 'grant_unfiltered_html_cap' ), 10, 2 );
@@ -766 +766 @@
         );
         $result   = $widget->update( $instance, array() );
-        $this->assertSame( $instance, $result, 'Updating a widget without visual prop and explicit filter=false leaves visual prop absent' );
+        $this->assertSameSets( $instance, $result, 'Updating a widget without visual prop and explicit filter=false leaves visual prop absent' );
 
         // --
@@ -775 +775 @@
         );
         $result   = $widget->update( $instance, array() );
-        $this->assertSame( $instance, $result, 'Updating a widget without visual prop and explicit filter=true leaves legacy prop absent.' );
+        $this->assertSameSets( $instance, $result, 'Updating a widget without visual prop and explicit filter=true leaves legacy prop absent.' );
 
         // --
@@ -796 +796 @@
         );
         $result       = $widget->update( $instance, $old_instance );
-        $this->assertSame( $expected, $result, 'Updating a pre-existing widget with visual mode forces filter to be true.' );
+        $this->assertSameSets( $expected, $result, 'Updating a pre-existing widget with visual mode forces filter to be true.' );
 
         // --
@@ -817 +817 @@
             )
         );
-        $this->assertSame( $expected, $result, 'Updating a pre-existing visual widget retains visual mode when updated.' );
+        $this->assertSameSets( $expected, $result, 'Updating a pre-existing visual widget retains visual mode when updated.' );
 
         // --
@@ -838 +838 @@
             )
         );
-        $this->assertSame( $expected, $result, 'Updating a pre-existing visual widget retains visual=true and supplies missing filter=true.' );
+        $this->assertSameSets( $expected, $result, 'Updating a pre-existing visual widget retains visual=true and supplies missing filter=true.' );
 
         // --
@@ -853 +853 @@
         );
         $result   = $widget->update( $instance, array() );
-        $this->assertEquals( $expected, $result, 'Updating a widget with explicit visual=true and absent filter prop causes filter to be set to true.' );
+        $this->assertSameSets( $expected, $result, 'Updating a widget with explicit visual=true and absent filter prop causes filter to be set to true.' );
 
         // --
@@ -868 +868 @@
             )
         );
-        $this->assertEquals( $expected, $result, 'Updating a widget in legacy mode results in filter=false as if checkbox not checked.' );
+        $this->assertSameSets( $expected, $result, 'Updating a widget in legacy mode results in filter=false as if checkbox not checked.' );
 
         // --
@@ -891 +891 @@
             )
         );
-        $this->assertSame( $expected, $result, 'Updating a widget that previously had legacy form results in filter allowed to be false.' );
+        $this->assertSameSets( $expected, $result, 'Updating a widget that previously had legacy form results in filter allowed to be false.' );
 
         // --
@@ -907 +907 @@
             )
         );
-        $this->assertSame( $expected, $result, 'Updating a widget that had \'content\' as its filter value persists non-legacy mode. This only existed in WP 4.8.0.' );
+        $this->assertSameSets( $expected, $result, 'Updating a widget that had \'content\' as its filter value persists non-legacy mode. This only existed in WP 4.8.0.' );
 
         // --
@@ -928 +928 @@
             )
         );
-        $this->assertEquals( $expected, $result, 'Updating a pre-existing widget with the filter=content prop in WP 4.8.0 upgrades to filter=true&visual=true.' );
+        $this->assertSameSets( $expected, $result, 'Updating a pre-existing widget with the filter=content prop in WP 4.8.0 upgrades to filter=true&visual=true.' );
 
         // --
@@ -944 +944 @@
             )
         );
-        $this->assertSame( $expected, $result, 'Updating a widget with filter=content (from WP 4.8.0) upgrades to filter=true&visual=true.' );
+        $this->assertSameSets( $expected, $result, 'Updating a widget with filter=content (from WP 4.8.0) upgrades to filter=true&visual=true.' );
     }