Changeset 59364 for trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php

Timestamp:

11/06/2024 07:22:22 PM (2 years ago)

Author:

westonruter

Message:

HTML API: Improve private method name used by WP_HTML_Processor::next_token().

This renames the private _next_token method to next_visitable_token. It also removes irrelevant assertions from the unit test.

Follow-up to [59285].

Props dmsnell, jonsurrell, westonruter.
See #62269.

File:

• trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (4 diffs)

trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php

@@ -926 +926 @@
                                         ''         => 1,
                                 ),
-                                'expected_xpaths'       => array(
-                                        0 => '/*[1][self::HTML]',
-                                        1 => '/*[1][self::HTML]/*[1][self::HEAD]',
-                                        2 => '/*[1][self::HTML]/*[1][self::HEAD]/*[1][self::META]',
-                                        3 => '/*[1][self::HTML]/*[1][self::HEAD]/*[2][self::TITLE]',
-                                        4 => '/*[1][self::HTML]/*[2][self::BODY]',
-                                        5 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::H1]',
-                                        6 => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::IMG]',
-                                        7 => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::P]',
-                                        8 => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::FOOTER]',
-                                ),
                         ),
 
@@ -973 +962 @@
                                         ''      => 1,
                                 ),
-                                'expected_xpaths'       => array(
-                                        0  => '/*[1][self::HTML]',
-                                        1  => '/*[1][self::HTML]/*[1][self::HEAD]',
-                                        2  => '/*[1][self::HTML]/*[2][self::BODY]',
-                                        3  => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::H1]',
-                                        4  => '/*[1][self::HTML]/*[2][self::BODY]/*[2][self::P]',
-                                        5  => '/*[1][self::HTML]/*[2][self::BODY]/*[3][self::P]',
-                                        6  => '/*[1][self::HTML]/*[2][self::BODY]/*[4][self::P]',
-                                        7  => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::UL]',
-                                        8  => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::UL]/*[1][self::LI]',
-                                        9  => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::UL]/*[2][self::LI]',
-                                        10 => '/*[1][self::HTML]/*[2][self::BODY]/*[5][self::UL]/*[3][self::LI]',
-                                ),
                         ),
 
@@ -1022 +998 @@
                                         ''        => 1,
                                 ),
-                                'expected_xpaths'       => array(
-                                        0 => '/*[1][self::HTML]',
-                                        1 => '/*[1][self::HTML]/*[1][self::HEAD]',
-                                        2 => '/*[1][self::HTML]/*[2][self::BODY]',
-                                        3 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]',
-                                        4 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]',
-                                        5 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]/*[1][self::EM]',
-                                        6 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]/*[1][self::EM]/*[1][self::STRIKE]',
-                                        7 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]/*[1][self::EM]/*[1][self::STRIKE]/*[1][self::I]',
-                                        8 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]/*[1][self::EM]/*[1][self::STRIKE]/*[1][self::I]/*[1][self::B]',
-                                        9 => '/*[1][self::HTML]/*[2][self::BODY]/*[1][self::P]/*[1][self::STRONG]/*[1][self::EM]/*[1][self::STRIKE]/*[1][self::I]/*[1][self::B]/*[1][self::U]',
-                                ),
                         ),
                 );
@@ -1041 +1005 @@
          * Ensures that subclasses to WP_HTML_Processor can do bookkeeping by extending the next_token() method.
          *
-         * @ticket ?
+         * @ticket 62269
          * @dataProvider data_html_processor_with_extended_next_token
          */
-        public function test_ensure_next_token_method_extensibility( $html, $expected_token_counts, $expected_xpaths ) {
-                require_once DIR_TESTDATA . '/html-api/html-xpath-generating-processor.php';
-
-                $processor     = HTML_XPath_Generating_Processor::create_full_parser( $html );
-                $actual_xpaths = array();
+        public function test_ensure_next_token_method_extensibility( $html, $expected_token_counts ) {
+                require_once DIR_TESTDATA . '/html-api/token-counting-html-processor.php';
+
+                $processor = Token_Counting_HTML_Processor::create_full_parser( $html );
                 while ( $processor->next_tag() ) {
-                        if ( ! $processor->is_tag_closer() ) {
-                                $processor->set_attribute( 'xpath', $processor->get_xpath() );
-                                $actual_xpaths[] = $processor->get_xpath();
-                        }
+                        continue;
                 }
 
                 $this->assertEquals( $expected_token_counts, $processor->token_seen_count, 'Snapshot: ' . var_export( $processor->token_seen_count, true ) );
-                $this->assertEquals( $expected_xpaths, $actual_xpaths, 'Snapshot: ' . var_export( $actual_xpaths, true ) );
         }
 }