From 10111200c98ffc4c3a4d4f6ddfd8a0e2c8d26567 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 23 Jun 2021 15:59:39 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@51220 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/widgets/text-widget.php | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/phpunit/tests/widgets/text-widget.php b/tests/phpunit/tests/widgets/text-widget.php index 3e8c7b7d8c..4885876c76 100644 --- a/tests/phpunit/tests/widgets/text-widget.php +++ b/tests/phpunit/tests/widgets/text-widget.php @@ -731,7 +731,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ); $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 ); $this->assertTrue( current_user_can( 'unfiltered_html' ) ); @@ -765,7 +765,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => false, ); $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' ); // -- $instance = array( @@ -774,7 +774,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => true, ); $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.' ); // -- $instance = array( @@ -795,7 +795,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ) ); $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.' ); // -- $instance = array( @@ -816,7 +816,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'visual' => true, ) ); - $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.' ); // -- $instance = array( @@ -837,7 +837,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => true, ) ); - $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.' ); // -- $instance = array( @@ -852,7 +852,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { ) ); $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.' ); // -- $instance = array( @@ -867,7 +867,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => false, ) ); - $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.' ); // -- $instance = array( @@ -890,7 +890,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => false, ) ); - $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.' ); // -- $instance = array( @@ -906,7 +906,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'visual' => true, ) ); - $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.' ); // -- $instance = array( @@ -927,7 +927,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'filter' => true, ) ); - $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.' ); // -- $instance = array( @@ -943,7 +943,7 @@ class Test_WP_Widget_Text extends WP_UnitTestCase { 'visual' => true, ) ); - $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.' ); } /**