Changeset 51438

Timestamp:

07/15/2021 02:44:22 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more appropriate assertions in various tests.

This replaces instances of assertTrue( is_numeric( ... ) ) with assertIsNumeric() to use native PHPUnit functionality.

Follow-up to [51335], [51337], [51367], [51397], [51403], [51404], [51436].

See #53363.

Location:

trunk/tests/phpunit/tests

Files:

• ajax/DeleteComment.php (modified) (2 diffs)
• customize/manager.php (modified) (1 diff)
• functions.php (modified) (1 diff)
• post.php (modified) (4 diffs)
• taxonomy.php (modified) (1 diff)
• term.php (modified) (1 diff)
• theme/getThemeStarterContent.php (modified) (1 diff)
• user.php (modified) (1 diff)
• user/wpDeleteUser.php (modified) (2 diffs)

trunk/tests/phpunit/tests/ajax/DeleteComment.php

@@ -206 +206 @@
         } catch ( WPAjaxDieStopException $e ) {
             $this->assertSame( 10, strlen( $e->getMessage() ) );
-            $this->assertTrue( is_numeric( $e->getMessage() ) );
+            $this->assertIsNumeric( $e->getMessage() );
         } catch ( Exception $e ) {
             $this->fail( 'Unexpected exception type: ' . get_class( $e ) );
@@ -256 +256 @@
         } catch ( WPAjaxDieStopException $e ) {
             $this->assertSame( 10, strlen( $e->getMessage() ) );
-            $this->assertTrue( is_numeric( $e->getMessage() ) );
+            $this->assertIsNumeric( $e->getMessage() );
         } catch ( Exception $e ) {
             $this->fail( 'Unexpected exception type: ' . get_class( $e ) );

trunk/tests/phpunit/tests/customize/manager.php

@@ -1215 +1215 @@
         wp_set_current_user( self::$admin_user_id );
         $this->assertSame( 'publish', get_post_meta( $post_id, '_wp_trash_meta_status', true ) );
-        $this->assertTrue( is_numeric( get_post_meta( $post_id, '_wp_trash_meta_time', true ) ) );
+        $this->assertIsNumeric( get_post_meta( $post_id, '_wp_trash_meta_time', true ) );
 
         foreach ( array_keys( $expected_actions ) as $action_name ) {

trunk/tests/phpunit/tests/functions.php

@@ -1199 +1199 @@
             $id = wp_unique_id();
             $this->assertIsString( $id );
-            $this->assertTrue( is_numeric( $id ) );
+            $this->assertIsNumeric( $id );
             $ids[] = $id;
         }

trunk/tests/phpunit/tests/post.php

@@ -80 +80 @@
             // Insert a post and make sure the ID is OK.
             $id = wp_insert_post( $post );
-            $this->assertTrue( is_numeric( $id ) );
+            $this->assertIsNumeric( $id );
             $this->assertTrue( $id > 0 );
 
@@ -136 +136 @@
         $this->post_ids[] = $id;
         // dmp( _get_cron_array() );
-        $this->assertTrue( is_numeric( $id ) );
+        $this->assertIsNumeric( $id );
         $this->assertTrue( $id > 0 );
 
@@ -259 +259 @@
         $this->post_ids[] = $id;
         // dmp( _get_cron_array() );
-        $this->assertTrue( is_numeric( $id ) );
+        $this->assertIsNumeric( $id );
         $this->assertTrue( $id > 0 );
 
@@ -380 +380 @@
         $this->post_ids[] = $id;
         // dmp( _get_cron_array() );
-        $this->assertTrue( is_numeric( $id ) );
+        $this->assertIsNumeric( $id );
         $this->assertTrue( $id > 0 );
 

trunk/tests/phpunit/tests/taxonomy.php

@@ -421 +421 @@
             'cat_name' => 'test1',
         );
-        $this->assertTrue( is_numeric( wp_insert_category( $cat, true ) ) );
+        $this->assertIsNumeric( wp_insert_category( $cat, true ) );
     }
 

trunk/tests/phpunit/tests/term.php

@@ -154 +154 @@
 
         $t = wp_insert_category( array( 'cat_name' => $term ) );
-        $this->assertTrue( is_numeric( $t ) );
+        $this->assertIsNumeric( $t );
         $this->assertNotWPError( $t );
         $this->assertTrue( $t > 0 );

trunk/tests/phpunit/tests/theme/getThemeStarterContent.php

@@ -160 +160 @@
         foreach ( $hydrated_starter_content['posts'] as $key => $post ) {
             $this->assertIsString( $key );
-            $this->assertFalse( is_numeric( $key ) );
+            $this->assertIsNotNumeric( $key );
             $this->assertIsArray( $post );
             $this->assertArrayHasKey( 'post_type', $post );

trunk/tests/phpunit/tests/user.php

@@ -483 +483 @@
         // Insert a post and make sure the ID is OK.
         $post_id = wp_insert_post( $post );
-        $this->assertTrue( is_numeric( $post_id ) );
+        $this->assertIsNumeric( $post_id );
 
         setup_postdata( get_post( $post_id ) );

trunk/tests/phpunit/tests/user/wpDeleteUser.php

@@ -68 +68 @@
         // Insert a post and make sure the ID is OK.
         $post_id = wp_insert_post( $post );
-        $this->assertTrue( is_numeric( $post_id ) );
+        $this->assertIsNumeric( $post_id );
         $this->assertTrue( $post_id > 0 );
 
@@ -84 +84 @@
         // Insert a post and make sure the ID is OK.
         $nav_id = wp_insert_post( $post );
-        $this->assertTrue( is_numeric( $nav_id ) );
+        $this->assertIsNumeric( $nav_id );
         $this->assertTrue( $nav_id > 0 );