Changeset 31372

Timestamp:

02/09/2015 12:38:11 AM (10 years ago)

Author:

pento

Message:

WPDB: Some character set tests were failing if DB_CHARSET was empty, or a non-utf8 character set.

Location:

trunk/tests/phpunit/tests

Files:

• db.php (modified) (2 diffs)
• db/charset.php (modified) (5 diffs)

trunk/tests/phpunit/tests/db.php

@@ -730 +730 @@
     function test_process_fields() {
         global $wpdb;
+
+        if ( $wpdb->charset ) {
+            $expected_charset = $wpdb->charset;
+        } else {
+            $expected_charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
+        }
+
+        if ( ! in_array( $expected_charset, array( 'utf8', 'utf8mb4', 'latin1' ) ) ) {
+            $this->markTestSkipped( "This test only works with utf8, utf8mb4 or latin1 character sets" );
+        }
+
         $data = array( 'post_content' => '¡foo foo foo!' );
         $expected = array(
@@ -735 +746 @@
                 'value' => '¡foo foo foo!',
                 'format' => '%s',
-                'charset' => $wpdb->charset,
+                'charset' => $expected_charset,
                 'ascii' => false,
             )

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

@@ -123 +123 @@
      */
     function test_strip_invalid_text( $data, $expected, $message ) {
-        if ( $data[0]['charset'] === 'koi8r' ) {
-            self::$_wpdb->query( 'SET NAMES koi8r' );
-        }
         $actual = self::$_wpdb->strip_invalid_text( $data );
         $this->assertSame( $expected, $actual, $message );
@@ -135 +132 @@
     function test_process_fields_failure() {
         global $wpdb;
+
+        $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
+        if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+            $this->markTestSkipped( 'This test requires a utf8 character set' );
+        }
+
         // \xf0\xff\xff\xff is invalid in utf8 and utf8mb4.
         $data = array( 'post_content' => "H€llo\xf0\xff\xff\xffWorld¢" );
@@ -144 +147 @@
      */
     function data_process_field_charsets() {
-        $charset = $GLOBALS['wpdb']->charset; // This is how all tables were installed
+        if ( $GLOBALS['wpdb']->charset ) {
+            $charset = $GLOBALS['wpdb']->charset;
+        } else {
+            $charset = $GLOBALS['wpdb']->get_col_charset( $GLOBALS['wpdb']->posts, 'post_content' );
+        }
+
         // 'value' and 'format' are $data, 'charset' ends up as part of $expected
 
@@ -221 +229 @@
     function test_strip_invalid_text_for_column() {
         global $wpdb;
+
+        $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
+        if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+            $this->markTestSkipped( 'This test requires a utf8 character set' );
+        }
+
         // Invalid 3-byte and 4-byte sequences
         $value = "H€llo\xe0\x80\x80World\xf0\xff\xff\xff¢";
@@ -438 +452 @@
     function test_invalid_characters_in_query() {
         global $wpdb;
+
+        $charset = $wpdb->get_col_charset( $wpdb->posts, 'post_content' );
+        if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+            $this->markTestSkipped( 'This test requires a utf8 character set' );
+        }
+
         $this->assertFalse( $wpdb->query( "INSERT INTO {$wpdb->posts} (post_content) VALUES ('foo\xf0\xff\xff\xffbar')" ) );
     }