Changeset 48937 for trunk/tests/phpunit/tests/db/charset.php

Timestamp:

09/02/2020 12:35:36 AM (6 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/db/charset.php (modified) (13 diffs)

trunk/tests/phpunit/tests/db/charset.php

@@ -417 +417 @@
                         // Make sure PHP's multibyte conversions are working correctly.
                         $this->assertNotEquals( $utf8, $big5 );
-                        $this->assertEquals( $utf8, $conv_utf8 );
+                        $this->assertSame( $utf8, $conv_utf8 );
 
                         $fields['big5'] = array(
@@ -648 +648 @@
                 $expected = 'H€lloWorld¢';
                 $actual   = $wpdb->strip_invalid_text_for_column( $wpdb->posts, 'post_content', $value );
-                $this->assertEquals( $expected, $actual );
+                $this->assertSame( $expected, $actual );
         }
 
@@ -755 +755 @@
 
                 $charset = self::$_wpdb->get_table_charset( $table );
-                $this->assertEquals( $charset, $expected_charset );
+                $this->assertSame( $charset, $expected_charset );
 
                 $charset = self::$_wpdb->get_table_charset( strtoupper( $table ) );
-                $this->assertEquals( $charset, $expected_charset );
+                $this->assertSame( $charset, $expected_charset );
 
                 self::$_wpdb->query( $drop );
@@ -795 +795 @@
 
                 foreach ( $expected_charset as $column => $charset ) {
-                        $this->assertEquals( $charset, self::$_wpdb->get_col_charset( $table, $column ) );
-                        $this->assertEquals( $charset, self::$_wpdb->get_col_charset( strtoupper( $table ), strtoupper( $column ) ) );
+                        $this->assertSame( $charset, self::$_wpdb->get_col_charset( $table, $column ) );
+                        $this->assertSame( $charset, self::$_wpdb->get_col_charset( strtoupper( $table ), strtoupper( $column ) ) );
                 }
 
@@ -820 +820 @@
                 $columns = array_keys( $columns );
                 foreach ( $columns as $column => $charset ) {
-                        $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );
+                        $this->assertFalse( self::$_wpdb->get_col_charset( $table, $column ) );
                 }
 
@@ -846 +846 @@
                 $columns = array_keys( $columns );
                 foreach ( $columns as $column => $charset ) {
-                        $this->assertEquals( false, self::$_wpdb->get_col_charset( $table, $column ) );
+                        $this->assertFalse( self::$_wpdb->get_col_charset( $table, $column ) );
                 }
 
@@ -902 +902 @@
 
                 $return = self::$_wpdb->strip_invalid_text_from_query( $query );
-                $this->assertEquals( $expected, $return );
+                $this->assertSame( $expected, $return );
 
                 self::$_wpdb->query( $drop );
@@ -936 +936 @@
         function test_dont_strip_text_from_schema_queries( $query ) {
                 $return = self::$_wpdb->strip_invalid_text_from_query( $query );
-                $this->assertEquals( $query, $return );
+                $this->assertSame( $query, $return );
         }
 
@@ -1018 +1018 @@
 
                 $return = self::$_wpdb->check_safe_collation( $query );
-                $this->assertEquals( $expected, $return );
+                $this->assertSame( $expected, $return );
 
                 foreach ( $always_true as $true_query ) {
@@ -1033 +1033 @@
                 // TEXT column.
                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_content', str_repeat( 'A', 65536 ) );
-                $this->assertEquals( 65535, strlen( $stripped ) );
+                $this->assertSame( 65535, strlen( $stripped ) );
 
                 // VARCHAR column.
                 $stripped = $wpdb->strip_invalid_text_for_column( $wpdb->comments, 'comment_agent', str_repeat( 'A', 256 ) );
-                $this->assertEquals( 255, strlen( $stripped ) );
+                $this->assertSame( 255, strlen( $stripped ) );
         }
 
@@ -1054 +1054 @@
                 self::$_wpdb->query( "DROP TABLE $tablename" );
 
-                $this->assertEquals( $safe_query, $stripped_query );
+                $this->assertSame( $safe_query, $stripped_query );
         }
 
@@ -1076 +1076 @@
                 self::$_wpdb->charset = $charset;
 
-                $this->assertEquals( $safe_query, $stripped_query );
+                $this->assertSame( $safe_query, $stripped_query );
         }
 
@@ -1085 +1085 @@
                 self::$_wpdb->set_charset( self::$_wpdb->dbh, 'utf8', 'utf8_general_ci' );
                 $results = self::$_wpdb->get_results( "SHOW VARIABLES WHERE Variable_name='collation_connection'" );
-                $this->assertEquals( 'utf8_general_ci', $results[0]->Value );
+                $this->assertSame( 'utf8_general_ci', $results[0]->Value );
 
                 self::$_wpdb->set_charset( self::$_wpdb->dbh, 'utf8mb4', 'utf8mb4_unicode_ci' );
                 $results = self::$_wpdb->get_results( "SHOW VARIABLES WHERE Variable_name='collation_connection'" );
-                $this->assertEquals( 'utf8mb4_unicode_ci', $results[0]->Value );
+                $this->assertSame( 'utf8mb4_unicode_ci', $results[0]->Value );
 
                 self::$_wpdb->set_charset( self::$_wpdb->dbh );