Changeset 48937 for trunk/tests/phpunit/tests/compat.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/tests/compat.php (modified) (10 diffs)

trunk/tests/phpunit/tests/compat.php

@@ -37 +37 @@
      */
     function test_mb_strlen( $string, $expected_character_length ) {
-        $this->assertEquals( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+        $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
     }
 
@@ -45 +45 @@
     function test_mb_strlen_via_regex( $string, $expected_character_length ) {
         _wp_can_use_pcre_u( false );
-        $this->assertEquals( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
+        $this->assertSame( $expected_character_length, _mb_strlen( $string, 'UTF-8' ) );
         _wp_can_use_pcre_u( 'reset' );
     }
@@ -53 +53 @@
      */
     function test_8bit_mb_strlen( $string, $expected_character_length, $expected_byte_length ) {
-        $this->assertEquals( $expected_byte_length, _mb_strlen( $string, '8bit' ) );
+        $this->assertSame( $expected_byte_length, _mb_strlen( $string, '8bit' ) );
     }
 
@@ -60 +60 @@
      */
     function test_mb_substr( $string, $start, $length, $expected_character_substring ) {
-        $this->assertEquals( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+        $this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
     }
 
@@ -68 +68 @@
     function test_mb_substr_via_regex( $string, $start, $length, $expected_character_substring ) {
         _wp_can_use_pcre_u( false );
-        $this->assertEquals( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
+        $this->assertSame( $expected_character_substring, _mb_substr( $string, $start, $length, 'UTF-8' ) );
         _wp_can_use_pcre_u( 'reset' );
     }
@@ -76 +76 @@
      */
     function test_8bit_mb_substr( $string, $start, $length, $expected_character_substring, $expected_byte_substring ) {
-        $this->assertEquals( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );
+        $this->assertSame( $expected_byte_substring, _mb_substr( $string, $start, $length, '8bit' ) );
     }
 
@@ -84 +84 @@
         $string_mb    = base64_decode( '5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=' );
 
-        $this->assertEquals( 'DEF', _mb_substr( $string_ascii, 3 ) );
-        $this->assertEquals( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ) );
+        $this->assertSame( 'DEF', _mb_substr( $string_ascii, 3 ) );
+        $this->assertSame( 'DEF', _mb_substr( $string_ascii, 3, 5, 'ISO-8859-1' ) );
 
         // Specific latin-1 as that is the default the core PHP test operates under.
-        $this->assertEquals( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );
-        $this->assertEquals( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );
+        $this->assertSame( 'peacrOiqng==', base64_encode( _mb_substr( $string_mb, 2, 7, 'latin-1' ) ) );
+        $this->assertSame( '6Kqe44OG44Kt44K544OI44Gn44GZ', base64_encode( _mb_substr( $string_mb, 2, 7, 'utf-8' ) ) );
 
         /* https://github.com/php/php-src/blob/php-5.6.8/ext/mbstring/tests/mb_substr_variation1.phpt */
@@ -159 +159 @@
         $iterator = 0;
         foreach ( $inputs as $input ) {
-            $this->assertEquals( $outputs[ $iterator ], _mb_substr( $input, $start, $length ) );
+            $this->assertSame( $outputs[ $iterator ], _mb_substr( $input, $start, $length ) );
             $iterator++;
         }
@@ -166 +166 @@
 
     function test_hash_hmac_simple() {
-        $this->assertEquals( '140d1cb79fa12e2a31f32d35ad0a2723', _hash_hmac( 'md5', 'simple', 'key' ) );
-        $this->assertEquals( '993003b95758e0ac2eba451a4c5877eb1bb7b92a', _hash_hmac( 'sha1', 'simple', 'key' ) );
+        $this->assertSame( '140d1cb79fa12e2a31f32d35ad0a2723', _hash_hmac( 'md5', 'simple', 'key' ) );
+        $this->assertSame( '993003b95758e0ac2eba451a4c5877eb1bb7b92a', _hash_hmac( 'sha1', 'simple', 'key' ) );
     }
 
     function test_hash_hmac_padding() {
-        $this->assertEquals( '3c1399103807cf12ec38228614416a8c', _hash_hmac( 'md5', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
-        $this->assertEquals( '4428826d20003e309d6c2a6515891370daf184ea', _hash_hmac( 'sha1', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
+        $this->assertSame( '3c1399103807cf12ec38228614416a8c', _hash_hmac( 'md5', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
+        $this->assertSame( '4428826d20003e309d6c2a6515891370daf184ea', _hash_hmac( 'sha1', 'simple', '65 character key 65 character key 65 character key 65 character k' ) );
     }
 
     function test_hash_hmac_output() {
-        $this->assertEquals( array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ), unpack( 'H32', _hash_hmac( 'md5', 'simple', 'key', true ) ) );
-        $this->assertEquals( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );
+        $this->assertSame( array( 1 => '140d1cb79fa12e2a31f32d35ad0a2723' ), unpack( 'H32', _hash_hmac( 'md5', 'simple', 'key', true ) ) );
+        $this->assertSame( array( 1 => '993003b95758e0ac2eba451a4c5877eb1bb7b92a' ), unpack( 'H40', _hash_hmac( 'sha1', 'simple', 'key', true ) ) );
     }
 
@@ -187 +187 @@
         $json = new Services_JSON();
         // Super basic test to verify Services_JSON is intact and working.
-        $this->assertEquals( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );
-        $this->assertEquals( array( 'foo' ), $json->decode( '["foo"]' ) );
+        $this->assertSame( '["foo"]', $json->encodeUnsafe( array( 'foo' ) ) );
+        $this->assertSame( array( 'foo' ), $json->decode( '["foo"]' ) );
     }