Changeset 51461

Timestamp:

07/19/2021 01:29:45 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more appropriate assertions in various tests.

This replaces instances of assertFalse( stripos( ... ) ) with assertStringNotContainsString() or assertStringNotContainsStringIgnoringCase() to use native PHPUnit functionality.

Going forward, these methods introduced in PHPUnit 7.5 should be used for similar assertions:

• assertStringContainsString()
• assertStringContainsStringIgnoringCase()
• assertStringNotContainsString()
• assertStringNotContainsStringIgnoringCase()

As WordPress currently uses PHPUnit 5.7.x to run tests on PHP 5.6, polyfills for these methods are now added to the WP_UnitTestCase class for PHPUnit < 7.5.

Follow-up to [51335], [51337], [51367], [51397], [51403], [51404], [51436], [51438], [51448], [51449], [51451], [51453], [51454].

See #53363.

Location:

trunk/tests/phpunit

Files:

• includes/testcase.php (modified) (2 diffs)
• tests/rest-api/rest-categories-controller.php (modified) (3 diffs)
• tests/rest-api/rest-comments-controller.php (modified) (3 diffs)
• tests/rest-api/rest-pattern-directory-controller.php (modified) (1 diff)
• tests/rest-api/rest-posts-controller.php (modified) (2 diffs)
• tests/rest-api/rest-revisions-controller.php (modified) (1 diff)
• tests/rest-api/rest-tags-controller.php (modified) (3 diffs)
• tests/rest-api/rest-users-controller.php (modified) (3 diffs)

trunk/tests/phpunit/includes/testcase.php

@@ -391 +391 @@
 
     /**
-     * Asserts that a string haystack does not contain a needle.
+     * Asserts that a string haystack contains a needle (case-insensitive).
      *
      * This method has been backported from a more recent PHPUnit version,
@@ -402 +402 @@
      * @param string $message  Optional. Message to display when the assertion fails.
      */
+    public static function assertStringContainsStringIgnoringCase( $needle, $haystack, $message = '' ) {
+        static::assertContains( $needle, $haystack, $message, true );
+    }
+
+    /**
+     * Asserts that a string haystack does not contain a needle.
+     *
+     * This method has been backported from a more recent PHPUnit version,
+     * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+     *
+     * @since 5.9.0
+     *
+     * @param string $needle   The string to search for.
+     * @param string $haystack The string to treat as the haystack.
+     * @param string $message  Optional. Message to display when the assertion fails.
+     */
     public static function assertStringNotContainsString( $needle, $haystack, $message = '' ) {
         static::assertNotContains( $needle, $haystack, $message );
     }
+
+    /**
+     * Asserts that a string haystack does not contain a needle (case-insensitive).
+     *
+     * This method has been backported from a more recent PHPUnit version,
+     * as tests running on PHP 5.6 use PHPUnit 5.7.x.
+     *
+     * @since 5.9.0
+     *
+     * @param string $needle   The string to search for.
+     * @param string $haystack The string to treat as the haystack.
+     * @param string $message  Optional. Message to display when the assertion fails.
+     */
+    public static function assertStringNotContainsStringIgnoringCase( $needle, $haystack, $message = '' ) {
+        static::assertNotContains( $needle, $haystack, $message, true );
+    }
 }

trunk/tests/phpunit/tests/rest-api/rest-categories-controller.php

@@ -627 +627 @@
             rest_url( 'wp/v2/categories' )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
 
@@ -671 +671 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
 
         // Out of bounds.
@@ -688 +688 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-comments-controller.php

@@ -822 +822 @@
             rest_url( '/wp/v2/comments' )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
 
@@ -868 +868 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
 
         // Out of bounds.
@@ -884 +884 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php

@@ -177 +177 @@
             $search_field_values = $pattern['title'] . ' ' . $pattern['description'];
 
-            $this->assertNotFalse( stripos( $search_field_values, $search_term ) );
+            $this->assertStringContainsStringIgnoringCase( $search_term, $search_field_values );
         }
     }

trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -1532 +1532 @@
             rest_url( '/wp/v2/posts' )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
 
@@ -1574 +1574 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
 
         // Out of bounds.

trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php

@@ -483 +483 @@
             rest_url( $rest_route )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
     }

trunk/tests/phpunit/tests/rest-api/rest-tags-controller.php

@@ -591 +591 @@
             rest_url( 'wp/v2/tags' )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
 
@@ -633 +633 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
 
         // Out of bounds.
@@ -649 +649 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
     }
 

trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

@@ -322 +322 @@
             rest_url( 'wp/v2/users' )
         );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="prev"' ) );
+        $this->assertStringNotContainsString( 'rel="prev"', $headers['Link'] );
         $this->assertContains( '<' . $next_link . '>; rel="next"', $headers['Link'] );
 
@@ -364 +364 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
 
         // Out of bounds.
@@ -380 +380 @@
         );
         $this->assertContains( '<' . $prev_link . '>; rel="prev"', $headers['Link'] );
-        $this->assertFalse( stripos( $headers['Link'], 'rel="next"' ) );
+        $this->assertStringNotContainsString( 'rel="next"', $headers['Link'] );
     }