Changeset 48937 for trunk/tests/phpunit/includes/abstract-testcase.php

Timestamp:

09/02/2020 12:35:36 AM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: First pass at using assertSame() instead of assertEquals() in most of the unit tests.

This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using assertSame() should generally be preferred to assertEquals() where appropriate, to make the tests more reliable.

Props johnbillion, jrf, SergeyBiryukov.
See #38266.

File:

• trunk/tests/phpunit/includes/abstract-testcase.php (modified) (1 diff)

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

@@ -661 +661 @@
 
     /**
-     * Asserts that two values are equal, with EOL differences discarded.
-     *
-     * @since 5.4.0
+     * Asserts that two values have the same type and value, with EOL differences discarded.
+     *
+     * @since 5.6.0
      *
      * @param string $expected The expected value.
      * @param string $actual   The actual value.
      */
+    public function assertSameIgnoreEOL( $expected, $actual ) {
+        $this->assertSame( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );
+    }
+
+    /**
+     * Asserts that two values are equal, with EOL differences discarded.
+     *
+     * @since 5.4.0
+     * @since 5.6.0 Turned into an alias for `::assertSameIgnoreEOL()`.
+     *
+     * @param string $expected The expected value.
+     * @param string $actual   The actual value.
+     */
     public function assertEqualsIgnoreEOL( $expected, $actual ) {
-        $this->assertEquals( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );
+        $this->assertSameIgnoreEOL( $expected, $actual );
     }