HTML API: Simplify self-closing flag tests

Author: sirreal

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

@@ -589,29 +589,20 @@ public function test_expects_closer_foreign_content_self_closing() {
 	 * @ticket 61576
 	 */
 	public function test_trailing_slash_in_unquoted_attribute_value_does_not_self_close_foreign_content() {
-		$processor = WP_HTML_Processor::create_fragment( '<math><mi disabled=abc/>text</math>' );
+		$processor = WP_HTML_Processor::create_fragment( '<math><mtext a=b/>This mtext tag is not self-closing, it has [a="b/"] attribute.' );
 
-		$this->assertTrue( $processor->next_tag( 'MI' ), 'Could not find MI tag: check test setup.' );
-		$this->assertSame(
-			'abc/',
-			$processor->get_attribute( 'disabled' ),
-			'Trailing slash in unquoted attribute value should belong to the attribute value.'
-		);
+		$this->assertTrue( $processor->next_tag( 'MTEXT' ), 'Could not find MTEXT tag: check test setup.' );
+		$this->assertSame( 'b/', $processor->get_attribute( 'a' ), 'Trailing slash in unquoted attribute value should belong to the attribute value.' );
 		$this->assertFalse(
 			$processor->has_self_closing_flag(),
 			'Trailing slash in unquoted attribute value should not be interpreted as a self-closing flag.'
 		);
-		$this->assertTrue(
-			$processor->expects_closer(),
-			'MI with a trailing slash in an unquoted attribute value should still expect a closer.'
-		);
 
-		$this->assertTrue( $processor->next_token(), 'Could not find text following MI tag: check test setup.' );
-		$this->assertSame( '#text', $processor->get_token_name(), 'Should have found the text node following the MI tag.' );
+		$this->assertTrue( $processor->next_token(), 'Could not find text following MTEXT tag: check test setup.' );
 		$this->assertSame(
-			array( 'HTML', 'BODY', 'MATH', 'MI', '#text' ),
+			array( 'HTML', 'BODY', 'MATH', 'MTEXT', '#text' ),
 			$processor->get_breadcrumbs(),
-			'Text following the MI tag should remain inside the MI element.'
+			'Text following the MTEXT tag should remain inside the MTEXT element.'
 		);
 	}
 

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

@@ -116,69 +116,7 @@ public static function data_has_self_closing_flag() {
 			'Self-closing flag after quoted attribute'   => array( '<div id="test"/>', true ),
 			'Self-closing flag after boolean attribute'  => array( '<div enabled/>', true ),
 			'Boolean attribute that looks like a self-closer' => array( '<div / >', false ),
-		);
-	}
-
-	/**
-	 * Ensures internally consumed special-element closers do not affect the opener's
-	 * self-closing flag.
-	 *
-	 * @ticket 61576
-	 *
-	 * @covers WP_HTML_Tag_Processor::has_self_closing_flag
-	 *
-	 * @dataProvider data_special_atomic_self_closing_flags
-	 *
-	 * @param string $html        Input HTML whose first tag might contain the self-closing flag `/`.
-	 * @param bool   $flag_is_set Whether the input HTML's first tag contains the self-closing flag.
-	 */
-	public function test_special_atomic_elements_report_opening_tag_self_closing_flag( string $html, bool $flag_is_set ) {
-		$processor = new WP_HTML_Tag_Processor( $html );
-
-		$this->assertTrue( $processor->next_token(), 'Expected to find complete special atomic tag.' );
-
-		if ( $flag_is_set ) {
-			$this->assertTrue( $processor->has_self_closing_flag(), 'Did not find the self-closing flag on the opening tag.' );
-		} else {
-			$this->assertFalse( $processor->has_self_closing_flag(), 'Reported the internally consumed closing tag self-closing flag on the opening tag.' );
-		}
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public static function data_special_atomic_self_closing_flags() {
-		return array(
-			'SCRIPT closer self-closing flag' => array( '<script>x</script/>', false ),
-			'STYLE closer self-closing flag'  => array( '<style>x</style/>', false ),
-			'TITLE closer self-closing flag'  => array( '<title>x</title/>', false ),
-			'TITLE opener self-closing flag'  => array( '<title/>x</title>', true ),
-		);
-	}
-
-	/**
-	 * Ensures a trailing slash in an unquoted attribute value is part of the value.
-	 *
-	 * @ticket 61576
-	 *
-	 * @covers WP_HTML_Tag_Processor::get_attribute
-	 * @covers WP_HTML_Tag_Processor::has_self_closing_flag
-	 */
-	public function test_trailing_slash_in_unquoted_attribute_value_is_not_self_closing_flag() {
-		$processor = new WP_HTML_Tag_Processor( '<mi disabled=abc/>text' );
-		$this->assertTrue( $processor->next_tag(), 'Could not find MI tag: check test setup.' );
-
-		$this->assertSame(
-			'abc/',
-			$processor->get_attribute( 'disabled' ),
-			'Trailing slash in unquoted attribute value should belong to the attribute value.'
-		);
-
-		$this->assertFalse(
-			$processor->has_self_closing_flag(),
-			'Trailing slash in unquoted attribute value should not be interpreted as a self-closing flag.'
+			'Self-closing flag on internally consumed special element closer' => array( '<title>x</title/>', false ),
 		);
 	}