Changeset 53790 for trunk/tests/phpunit/tests/media.php

Timestamp:

07/28/2022 10:37:00 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Simplify some assertions in Tests_Media.

A number of assertions are checking for the number of times a hard-coded substring existed in a larger $haystack.

These assertions were using preg_match_all() to do so, but without actually using a regex.

In these cases, it is more performant (and simpler) to use the PHP native substr_count() function, which will yield the same result, without the overhead of regex parsing.

Reference: ​PHP Manual: substr_count()

Follow-up to [711/tests], [38838], [42694], [53558].

Props jrf.
See #55652.

File:

• trunk/tests/phpunit/tests/media.php (modified) (5 diffs)

trunk/tests/phpunit/tests/media.php

@@ -158 +158 @@
         );
 
-        $this->assertSame( 2, preg_match_all( '/wp-caption/', $result, $_r ) );
-        $this->assertSame( 1, preg_match_all( '/alignnone/', $result, $_r ) );
-        $this->assertSame( 1, preg_match_all( '/' . self::CAPTION . '/', $result, $_r ) );
+        $this->assertSame( 2, substr_count( $result, 'wp-caption' ) );
+        $this->assertSame( 1, substr_count( $result, 'alignnone' ) );
+        $this->assertSame( 1, substr_count( $result, self::CAPTION ) );
 
         if ( current_theme_supports( 'html5', 'caption' ) ) {
-            $this->assertSame( 1, preg_match_all( '/width: 20/', $result, $_r ) );
+            $this->assertSame( 1, substr_count( $result, 'width: 20' ) );
         } else {
-            $this->assertSame( 1, preg_match_all( '/width: 30/', $result, $_r ) );
+            $this->assertSame( 1, substr_count( $result, 'width: 30' ) );
         }
     }
@@ -178 +178 @@
             )
         );
-        $this->assertSame( 1, preg_match_all( '/wp-caption &myAlignment/', $result, $_r ) );
-        $this->assertSame( 1, preg_match_all( '/id="myId"/', $result, $_r ) );
-        $this->assertSame( 1, preg_match_all( '/' . self::CAPTION . '/', $result, $_r ) );
+        $this->assertSame( 1, substr_count( $result, 'wp-caption &myAlignment' ) );
+        $this->assertSame( 1, substr_count( $result, 'id="myId"' ) );
+        $this->assertSame( 1, substr_count( $result, self::CAPTION ) );
     }
 
@@ -191 +191 @@
             )
         );
-        $this->assertSame( 1, preg_match_all( '/wp-caption alignnone some-class another-class/', $result, $_r ) );
+        $this->assertSame( 1, substr_count( $result, 'wp-caption alignnone some-class another-class' ) );
 
     }
 
     public function test_new_img_caption_shortcode_with_html_caption() {
-        $result   = img_caption_shortcode(
+        $result = img_caption_shortcode(
             array(
                 'width'   => 20,
@@ -202 +202 @@
             )
         );
-        $our_preg = preg_quote( self::HTML_CONTENT );
-
-        $this->assertSame( 1, preg_match_all( "~{$our_preg}~", $result, $_r ) );
+
+        $this->assertSame( 1, substr_count( $result, self::HTML_CONTENT ) );
     }
 
@@ -257 +256 @@
         );
 
-        $this->assertSame( 1, preg_match_all( '/aria-describedby="caption-myId"/', $result, $_r ) );
+        $this->assertSame( 1, substr_count( $result, 'aria-describedby="caption-myId"' ) );
     }