Changeset 51565 for trunk/tests/phpunit/tests/post/template.php

Timestamp:

08/06/2021 09:52:06 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Replace assertRegExp() with assertMatchesRegularExpression().

The assertRegExp() and assertNotRegExp() methods were hard deprecated in PHPUnit 9.1 and the functionality will be removed in PHPUnit 10.0.

The assertMatchesRegularExpression() and assertDoesNotMatchRegularExpression() methods were introduced as a replacement in PHPUnit 9.1.

These new PHPUnit methods are polyfilled by the PHPUnit Polyfills and switching to them will future-proof the tests some more.

References:

• ​https://github.com/sebastianbergmann/phpunit/blob/9.1.5/ChangeLog-9.1.md#910---2020-04-03
• ​https://github.com/sebastianbergmann/phpunit/issues/4085
• ​https://github.com/sebastianbergmann/phpunit/issues/4088

Follow-up to [51559-51564].

Props jrf.
See #46149.

File:

• trunk/tests/phpunit/tests/post/template.php (modified) (4 diffs)

trunk/tests/phpunit/tests/post/template.php

@@ -341 +341 @@
         );
 
-        $this->assertRegExp( '/<select[^>]+class=\'bar\'/', $found );
+        $this->assertMatchesRegularExpression( '/<select[^>]+class=\'bar\'/', $found );
     }
 
@@ -420 +420 @@
 
         // After falling back, the 'before' argument should be set and output as '<ul>'.
-        $this->assertRegExp( '/<div class="menu"><ul>/', $menu );
+        $this->assertMatchesRegularExpression( '/<div class="menu"><ul>/', $menu );
 
         // After falling back, the 'after' argument should be set and output as '</ul>'.
-        $this->assertRegExp( '/<\/ul><\/div>/', $menu );
+        $this->assertMatchesRegularExpression( '/<\/ul><\/div>/', $menu );
 
         // After falling back, the markup should include whitespace around <li>'s.
-        $this->assertRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
+        $this->assertMatchesRegularExpression( '/\s<li.*>|<\/li>\s/U', $menu );
         $this->assertNotRegExp( '/><li.*>|<\/li></U', $menu );
 
@@ -438 +438 @@
 
         // After falling back, the empty 'container' argument should still return a container element.
-        $this->assertRegExp( '/<div class="menu">/', $menu );
+        $this->assertMatchesRegularExpression( '/<div class="menu">/', $menu );
 
         // No menus + wp_nav_menu() falls back to wp_page_menu(), this time without white-space.
@@ -450 +450 @@
         // After falling back, the markup should not include whitespace around <li>'s.
         $this->assertNotRegExp( '/\s<li.*>|<\/li>\s/U', $menu );
-        $this->assertRegExp( '/><li.*>|<\/li></U', $menu );
+        $this->assertMatchesRegularExpression( '/><li.*>|<\/li></U', $menu );
 
     }