Changeset 61409

Timestamp:

12/26/2025 11:51:28 AM (5 months ago)

Author:

jonsurrell

Message:

Tests: Update fonts tests to use semantic HTML comparison.

This aims to make the tests more robust.

Follow-up to [60295], [61391], [61392].

Props jonsurrell.
See #64225.

Location:

trunk/tests/phpunit/tests/fonts/font-face

Files:

• wpFontFace/generateAndPrint.php (modified) (1 diff)
• wpPrintFontFaces.php (modified) (3 diffs)
• wpPrintFontFacesFromStyleVariations.php (modified) (1 diff)

trunk/tests/phpunit/tests/fonts/font-face/wpFontFace/generateAndPrint.php

@@ -35 +35 @@
         $expected_output = sprintf( $style_element, $expected );
 
-        $this->expectOutputString( $expected_output );
-        $font_face->generate_and_print( $fonts );
+        $output = get_echo( array( $font_face, 'generate_and_print' ), array( $fonts ) );
+        $this->assertEqualHTML( $expected_output, $output );
     }
 }

trunk/tests/phpunit/tests/fonts/font-face/wpPrintFontFaces.php

@@ -38 +38 @@
         $expected_output = $this->get_expected_styles_output( $expected );
 
-        $this->expectOutputString( $expected_output );
-        wp_print_font_faces( $fonts );
+        $output = get_echo( 'wp_print_font_faces', array( $fonts ) );
+        $this->assertEqualHTML( $expected_output, $output );
     }
 
@@ -61 +61 @@
 
 CSS;
-        $this->expectOutputString( $expected_output );
 
-        wp_print_font_faces( $fonts );
+        $output = get_echo( 'wp_print_font_faces', array( $fonts ) );
+        $this->assertEqualHTML( $expected_output, $output );
     }
 
@@ -72 +72 @@
         $expected_output = $this->get_expected_styles_output( $expected );
 
-        $this->expectOutputString( $expected_output );
-        wp_print_font_faces();
+        $output = get_echo( 'wp_print_font_faces' );
+        $this->assertEqualHTML( $expected_output, $output );
     }
 

trunk/tests/phpunit/tests/fonts/font-face/wpPrintFontFacesFromStyleVariations.php

@@ -44 +44 @@
         $expected_output = $this->get_expected_styles_output( $expected );
 
-        $this->expectOutputString( $expected_output );
-        wp_print_font_faces_from_style_variations();
+        $output = get_echo( 'wp_print_font_faces_from_style_variations' );
+        $this->assertEqualHTML( $expected_output, $output );
     }