Changeset 51404 for trunk/tests/phpunit/tests/rest-api/rest-users-controller.php

Timestamp:

07/12/2021 10:35:44 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more appropriate assertions in various tests.

This replaces instances of assertTrue( in_array( ... ) ) with assertContains() to use native PHPUnit functionality.

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

Props hellofromTonya, jrf, SergeyBiryukov.
Fixes #53123. See #53363.

File:

• trunk/tests/phpunit/tests/rest-api/rest-users-controller.php (modified) (5 diffs)

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

@@ -278 +278 @@
                 $user_ids = wp_list_pluck( $users, 'id' );
 
-                $this->assertTrue( in_array( self::$editor, $user_ids, true ) );
-                $this->assertTrue( in_array( self::$authors['r_true_p_true'], $user_ids, true ) );
-                $this->assertTrue( in_array( self::$authors['r_true_p_false'], $user_ids, true ) );
+                $this->assertContains( self::$editor, $user_ids );
+                $this->assertContains( self::$authors['r_true_p_true'], $user_ids );
+                $this->assertContains( self::$authors['r_true_p_false'], $user_ids );
                 $this->assertCount( 3, $user_ids );
         }
@@ -290 +290 @@
                 $user_ids = wp_list_pluck( $users, 'id' );
 
-                $this->assertFalse( in_array( self::$authors['r_false_p_true'], $user_ids, true ) );
-                $this->assertFalse( in_array( self::$authors['r_false_p_false'], $user_ids, true ) );
+                $this->assertNotContains( self::$authors['r_false_p_true'], $user_ids );
+                $this->assertNotContains( self::$authors['r_false_p_false'], $user_ids );
         }
 
@@ -300 +300 @@
                 $user_ids = wp_list_pluck( $users, 'id' );
 
-                $this->assertFalse( in_array( self::$draft_editor, $user_ids, true ) );
-                $this->assertFalse( in_array( self::$user, $user_ids, true ) );
+                $this->assertNotContains( self::$draft_editor, $user_ids );
+                $this->assertNotContains( self::$user, $user_ids );
         }
 
@@ -634 +634 @@
                 $data     = $response->get_data();
                 $ids      = wp_list_pluck( $data, 'id' );
-                $this->assertTrue( in_array( $id1, $ids, true ) );
-                $this->assertTrue( in_array( $id2, $ids, true ) );
+                $this->assertContains( $id1, $ids );
+                $this->assertContains( $id2, $ids );
 
                 $request->set_param( 'exclude', array( $id2 ) );
@@ -641 +641 @@
                 $data     = $response->get_data();
                 $ids      = wp_list_pluck( $data, 'id' );
-                $this->assertTrue( in_array( $id1, $ids, true ) );
-                $this->assertFalse( in_array( $id2, $ids, true ) );
+                $this->assertContains( $id1, $ids );
+                $this->assertNotContains( $id2, $ids );
 
                 // Invalid 'exclude' should error.