Changeset 52259

Timestamp:

11/27/2021 04:16:15 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use a simpler approach to test the output in some tests.

Instead of ignoring the output and catching it later with getActualOutput(), we can use expectOutputRegex() directly, which evaluates the output after the rest of the test code has run, if no unexpected errors were encountered.

Follow-up to [52173], [52253].

Props jrf.
See #53635, #53363.

Location:

trunk/tests/phpunit/tests

Files:

• l10n.php (modified) (3 diffs)
• widgets.php (modified) (2 diffs)

trunk/tests/phpunit/tests/l10n.php

@@ -408 +408 @@
         $this->factory()->post->create( $args );
 
-        // Effectively ignore the output until retrieving it later via `getActualOutput()`.
-        $this->expectOutputRegex( '`.`' );
-
         $expect = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do…';
+        $this->expectOutputRegex( '/' . $expect . '/' );
+
         wp_dashboard_recent_drafts();
 
-        $actual = $this->getActualOutput();
-
-        restore_previous_locale();
-
-        $this->assertMatchesRegularExpression( '/' . $expect . '/', $actual );
+        restore_previous_locale();
     }
 
@@ -437 +432 @@
         $post = $this->factory()->post->create( $args );
 
-        // Effectively ignore the output until retrieving it later via `getActualOutput()`.
-        $this->expectOutputRegex( '`.`' );
-
         $expect = 'Lorem ipsum dolor sit amet, consectetur …';
+        $this->expectOutputRegex( '/' . $expect . '/' );
+
         wp_dashboard_recent_drafts();
 
-        $actual = $this->getActualOutput();
-
-        restore_previous_locale();
-
-        $this->assertMatchesRegularExpression( '/' . $expect . '/', $actual );
+        restore_previous_locale();
     }
 
@@ -466 +456 @@
         $this->factory()->post->create( $args );
 
-        // Effectively ignore the output until retrieving it later via `getActualOutput()`.
-        $this->expectOutputRegex( '`.`' );
-
         $expect = str_repeat( 'あ', 40 ) . '…';
+        $this->expectOutputRegex( '/' . $expect . '/' );
+
         wp_dashboard_recent_drafts();
 
-        $actual = $this->getActualOutput();
-
-        restore_previous_locale();
-
-        $this->assertMatchesRegularExpression( '/' . $expect . '/', $actual );
+        restore_previous_locale();
     }
 

trunk/tests/phpunit/tests/widgets.php

@@ -612 +612 @@
         );
 
-        // Effectively ignore the output until retrieving it later via `getActualOutput()`.
-        $this->expectOutputRegex( '`.`' );
+        $this->expectOutputRegex( '/Test Title/' );
 
         $widget->display_callback(
@@ -625 +624 @@
         );
 
-        $actual = $this->getActualOutput();
-
         unregister_widget( $widget );
-
-        $this->assertStringContainsString( 'Test Title', $actual );
     }