Changeset 51404 for trunk/tests/phpunit/tests/rest-api/rest-comments-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-comments-controller.php (modified) (10 diffs)

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

@@ -248 +248 @@
 
                 $collection_data = $response->get_data();
-                $this->assertTrue( in_array( $password_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertContains( $password_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -271 +271 @@
 
                 $collection_data = $response->get_data();
-                $this->assertFalse( in_array( $password_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertNotContains( $password_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -311 +311 @@
 
                 $collection_data = $response->get_data();
-                $this->assertFalse( in_array( $password_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertNotContains( $password_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -330 +330 @@
 
                 $collection_data = $response->get_data();
-                $this->assertTrue( in_array( $password_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertContains( $password_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -349 +349 @@
 
                 $collection_data = $response->get_data();
-                $this->assertFalse( in_array( $private_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertNotContains( $private_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -368 +368 @@
 
                 $collection_data = $response->get_data();
-                $this->assertTrue( in_array( $private_comment, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertContains( $private_comment, wp_list_pluck( $collection_data, 'id' ) );
         }
 
@@ -387 +387 @@
 
                 $collection_data = $response->get_data();
-                $this->assertFalse( in_array( $comment_id, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertNotContains( $comment_id, wp_list_pluck( $collection_data, 'id' ) );
 
                 wp_delete_comment( $comment_id );
@@ -408 +408 @@
 
                 $collection_data = $response->get_data();
-                $this->assertTrue( in_array( $comment_id, wp_list_pluck( $collection_data, 'id' ), true ) );
+                $this->assertContains( $comment_id, wp_list_pluck( $collection_data, 'id' ) );
 
                 wp_delete_comment( $comment_id );
@@ -526 +526 @@
                 $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 ) );
@@ -533 +533 @@
                 $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.