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

trunk/tests/phpunit/includes/abstract-testcase.php

@@ -686 +686 @@
 
     /**
+     * Asserts that the contents of two un-keyed, single arrays are the same, without accounting for the order of elements.
+     *
+     * @since 5.6.0
+     *
+     * @param array $expected Expected array.
+     * @param array $actual   Array to check.
+     */
+    public function assertSameSets( $expected, $actual ) {
+        sort( $expected );
+        sort( $actual );
+        $this->assertSame( $expected, $actual );
+    }
+
+    /**
      * Asserts that the contents of two un-keyed, single arrays are equal, without accounting for the order of elements.
      *
@@ -697 +711 @@
         sort( $actual );
         $this->assertEquals( $expected, $actual );
+    }
+
+    /**
+     * Asserts that the contents of two keyed, single arrays are the same, without accounting for the order of elements.
+     *
+     * @since 5.6.0
+     *
+     * @param array $expected Expected array.
+     * @param array $actual   Array to check.
+     */
+    public function assertSameSetsWithIndex( $expected, $actual ) {
+        ksort( $expected );
+        ksort( $actual );
+        $this->assertSame( $expected, $actual );
     }