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 WordPress#6449
Discussed in https://core.trac.wordpress.org/ticket/61080

Fixes #61080.
Props dmsnell, jonsurrell.


git-svn-id: https://develop.svn.wordpress.org/trunk@58048 602fd350-edb4-49c9-b593-d223f7449a82

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

@@ -30,16 +30,10 @@ class Tests_HtmlApi_WpHtmlProcessor extends WP_UnitTestCase {
 	 * @ticket 58517
 	 *
 	 * @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."
-		);
 	}
 
 	/**

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

@@ -414,6 +414,7 @@ public function test_updates_bookmark_for_deletions_before_both_sides() {
 	 * @ticket 56299
 	 *
 	 * @covers WP_HTML_Tag_Processor::set_bookmark
+	 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_bookmark
 	 */
 	public function test_limits_the_number_of_bookmarks() {
 		$processor = new WP_HTML_Tag_Processor( '<ul><li>One</li><li>Two</li><li>Three</li></ul>' );
@@ -423,7 +424,6 @@ public function test_limits_the_number_of_bookmarks() {
 			$this->assertTrue( $processor->set_bookmark( "bookmark $i" ), "Could not allocate the bookmark #$i" );
 		}
 
-		$this->setExpectedIncorrectUsage( 'WP_HTML_Tag_Processor::set_bookmark' );
 		$this->assertFalse( $processor->set_bookmark( 'final bookmark' ), "Allocated $i bookmarks, which is one above the limit" );
 	}