Changeset 56969

Timestamp:

10/18/2023 10:39:19 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Remove some unnecessary function_exists() checks for compat functions.

Each of these functions already has a separate test for availability.

If any of them are unavailable, then the test should fail rather than be skipped.

Follow-up to [52038], [52039], [52040].

Props johnbillion.
See #59647.

Location:

trunk/tests/phpunit/tests/compat

Files:

• arrayKeyFirst.php (modified) (1 diff)
• arrayKeyLast.php (modified) (1 diff)
• strContains.php (modified) (1 diff)
• strEndsWith.php (modified) (1 diff)
• strStartsWith.php (modified) (1 diff)

trunk/tests/phpunit/tests/compat/arrayKeyFirst.php

@@ -25 +25 @@
          */
         public function test_array_key_first( $expected, $arr ) {
-                if ( ! function_exists( 'array_key_first' ) ) {
-                        $this->markTestSkipped( 'array_key_first() is not available.' );
-                } else {
-                        $this->assertSame(
-                                $expected,
-                                array_key_first( $arr )
-                        );
-                }
+                $this->assertSame( $expected, array_key_first( $arr ) );
         }
 

trunk/tests/phpunit/tests/compat/arrayKeyLast.php

@@ -26 +26 @@
          */
         public function test_array_key_last( $expected, $arr ) {
-                if ( ! function_exists( 'array_key_last' ) ) {
-                        $this->markTestSkipped( 'array_key_last() is not available.' );
-                } else {
-                        $this->assertSame( $expected, array_key_last( $arr ) );
-                }
+                $this->assertSame( $expected, array_key_last( $arr ) );
         }
 

trunk/tests/phpunit/tests/compat/strContains.php

@@ -27 +27 @@
          */
         public function test_str_contains( $expected, $haystack, $needle ) {
-                if ( ! function_exists( 'str_contains' ) ) {
-                        $this->markTestSkipped( 'str_contains() is not available.' );
-                } else {
-                        $this->assertSame(
-                                $expected,
-                                str_contains( $haystack, $needle )
-                        );
-                }
+                $this->assertSame( $expected, str_contains( $haystack, $needle ) );
         }
 

trunk/tests/phpunit/tests/compat/strEndsWith.php

@@ -27 +27 @@
          */
         public function test_str_ends_with( $expected, $haystack, $needle ) {
-                if ( ! function_exists( 'str_ends_with' ) ) {
-                        $this->markTestSkipped( 'str_ends_with() is not available.' );
-                } else {
-                        $this->assertSame(
-                                $expected,
-                                str_ends_with( $haystack, $needle )
-                        );
-                }
+                $this->assertSame( $expected, str_ends_with( $haystack, $needle ) );
         }
 

trunk/tests/phpunit/tests/compat/strStartsWith.php

@@ -27 +27 @@
          */
         public function test_str_starts_with( $expected, $haystack, $needle ) {
-                if ( ! function_exists( 'str_starts_with' ) ) {
-                        $this->markTestSkipped( 'str_starts_with() is not available.' );
-                } else {
-                        $this->assertSame(
-                                $expected,
-                                str_starts_with( $haystack, $needle )
-                        );
-                }
+                $this->assertSame( $expected, str_starts_with( $haystack, $needle ) );
         }