Changeset 58048

Timestamp:

04/26/2024 01:51:06 PM (11 days ago)

Author:

dmsnell

Message:

HTML API: Tests should use expectedIncorrectUsage phpunit annotation

Some tests in the HTML API test suite use setExpectedIncorrectUsage.
The annotation @expectedIncorrectUsage can be used to simplify the tests.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/6449
Discussed in https://core.trac.wordpress.org/ticket/61080

Fixes #61080.
Props dmsnell, jonsurrell.

Location:

trunk/tests/phpunit/tests/html-api

Files:

• wpHtmlProcessor.php (modified) (1 diff)
• wpHtmlTagProcessor-bookmark.php (modified) (2 diffs)

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

@@ -31 +31 @@
      *
      * @covers WP_HTML_Processor::__construct
+     * @expectedIncorrectUsage WP_HTML_Processor::__construct
      */
     public function test_warns_that_the_static_creator_methods_should_be_called_instead_of_the_public_constructor() {
-        $this->setExpectedIncorrectUsage( 'WP_HTML_Processor::__construct' );
-
         new WP_HTML_Processor( '<p>Light roast.</p>' );
-
-        $this->assertNotNull(
-            $this->caught_doing_it_wrong['WP_HTML_Processor::__construct'],
-            "Calling the public constructor should warn to call the static creator methods instead, but didn't."
-        );
     }
 

trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor-bookmark.php

@@ -415 +415 @@
      *
      * @covers WP_HTML_Tag_Processor::set_bookmark
+     * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_bookmark
      */
     public function test_limits_the_number_of_bookmarks() {
@@ -424 +425 @@
         }
 
-        $this->setExpectedIncorrectUsage( 'WP_HTML_Tag_Processor::set_bookmark' );
         $this->assertFalse( $processor->set_bookmark( 'final bookmark' ), "Allocated $i bookmarks, which is one above the limit" );
     }