Changeset 62207 for trunk/tests/phpunit/tests/unicode/wpCheckInvalidUtf8.php

Timestamp:

04/04/2026 11:17:45 PM (5 months ago)

Author:

SergeyBiryukov

Message:

Tests: Adjust Unicode tests for consistency.

Includes:

• Adding missing @covers tags.
• Correcting test class names as per the naming conventions.
• Moving wp_check_invalid_utf8() tests to their own file, separate from wp_scrub_utf8().

Follow-up to [60630], [60793], [61000].

See #64225.

File:

• trunk/tests/phpunit/tests/unicode/wpCheckInvalidUtf8.php (copied) (copied from trunk/tests/phpunit/tests/unicode/wpScrubUtf8.php ) (3 diffs)

trunk/tests/phpunit/tests/unicode/wpCheckInvalidUtf8.php

@@ -1 +1 @@
 <?php
+
 /**
  * Unit tests covering WordPress’ UTF-8 handling.
@@ -5 +6 @@
  * @package WordPress
  * @group unicode
+ *
+ * @covers ::wp_check_invalid_utf8
  */
+class Tests_Unicode_WpCheckInvalidUtf8 extends WP_UnitTestCase {
 
-class Tests_WpScrubUtf8 extends WP_UnitTestCase {
         /**
          * Verifies that WordPress can properly detect valid and invalid UTF-8.
@@ -41 +44 @@
                                 $scrubbed,
                                 wp_check_invalid_utf8( $bytes, true ),
-                                'Failed to properly scrub the invalid spans of UTF-8 from the input string.'
-                        );
-                }
-        }
-
-        /**
-         * Verifies that WordPress can properly detect valid UTF-8 while replacing invalid byte sequences.
-         *
-         * @ticket 63837
-         *
-         * @dataProvider data_utf8_test_data
-         *
-         * @param string      $bytes    Bytes as a PHP string.
-         * @param string|null $scrubbed Expected checked value, if string isn’t valid UTF-8.
-         */
-        public function test_properly_scrubs_utf8( string $bytes, ?string $scrubbed = null ) {
-                if ( null === $scrubbed ) {
-                        $this->assertSame(
-                                $bytes,
-                                wp_scrub_utf8( $bytes ),
-                                'Should have returned the unchanged string for valid UTF-8 input.'
-                        );
-                } else {
-                        $this->assertSame(
-                                bin2hex( $scrubbed ),
-                                bin2hex( wp_scrub_utf8( $bytes ) ),
-                                'Failed to properly scrub the invalid spans of UTF-8 from the input string.'
-                        );
-                }
-        }
-
-        /**
-         * Verifies that WordPress’ fallback code can properly detect valid UTF-8
-         * while replacing invalid byte sequences.
-         *
-         * @ticket 63837
-         *
-         * @dataProvider data_utf8_test_data
-         *
-         * @param string      $bytes    Bytes as a PHP string.
-         * @param string|null $scrubbed Expected checked value, if string isn’t valid UTF-8.
-         */
-        public function test_fallback_properly_checks_utf8( string $bytes, ?string $scrubbed = null ) {
-                if ( null === $scrubbed ) {
-                        $this->assertSame(
-                                $bytes,
-                                _wp_scrub_utf8_fallback( $bytes ),
-                                'Should have returned the unchanged string for valid UTF-8 input.'
-                        );
-                } else {
-                        $this->assertSame(
-                                bin2hex( $scrubbed ),
-                                bin2hex( _wp_scrub_utf8_fallback( $bytes ) ),
                                 'Failed to properly scrub the invalid spans of UTF-8 from the input string.'
                         );