Changeset 48939 for trunk/tests/phpunit/tests/includes/helpers.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/includes/helpers.php (modified) (7 diffs)

trunk/tests/phpunit/tests/includes/helpers.php

@@ -8 +8 @@
      * @ticket 30522
      */
-    function data_assertEqualSets() {
+    function data_assertSameSets() {
         return array(
             array(
@@ -49 +49 @@
 
     /**
-     * @dataProvider data_assertEqualSets
+     * @dataProvider data_assertSameSets
      * @ticket 30522
      */
-    function test_assertEqualSets( $expected, $actual, $exception ) {
+    function test_assertSameSets( $expected, $actual, $exception ) {
         if ( $exception ) {
             try {
-                $this->assertEqualSets( $expected, $actual );
+                $this->assertSameSets( $expected, $actual );
             } catch ( PHPUnit_Framework_ExpectationFailedException $ex ) {
                 return;
@@ -62 +62 @@
             $this->fail();
         } else {
-            $this->assertEqualSets( $expected, $actual );
+            $this->assertSameSets( $expected, $actual );
         }
     }
@@ -69 +69 @@
      * @ticket 30522
      */
-    function data_assertEqualSetsWithIndex() {
+    function data_assertSameSetsWithIndex() {
         return array(
             array(
@@ -205 +205 @@
     }
     /**
-     * @dataProvider data_assertEqualSetsWithIndex
+     * @dataProvider data_assertSameSetsWithIndex
      * @ticket 30522
      */
-    function test_assertEqualSetsWithIndex( $expected, $actual, $exception ) {
+    function test_assertSameSetsWithIndex( $expected, $actual, $exception ) {
         if ( $exception ) {
             try {
-                $this->assertEqualSetsWithIndex( $expected, $actual );
+                $this->assertSameSetsWithIndex( $expected, $actual );
             } catch ( PHPUnit_Framework_ExpectationFailedException $ex ) {
                 return;
@@ -218 +218 @@
             $this->fail();
         } else {
-            $this->assertEqualSetsWithIndex( $expected, $actual );
+            $this->assertSameSetsWithIndex( $expected, $actual );
         }
     }
@@ -313 +313 @@
 
         // Only check arguments that are explicitly asked for.
-        $this->assertEqualSets( $expected['args'], array_intersect_key( $args, $expected['args'] ) );
+        $this->assertSameSets( $expected['args'], array_intersect_key( $args, $expected['args'] ) );
     }