improve tests

Author: adamsilverstein

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

@@ -4140,6 +4140,7 @@ public function test_get_note_with_children_link() {
 	 */
 	public function data_comment_type_provider() {
 		return array(
+			'comment type'    => array( 'comment', 5 ),
 			'annotation type' => array( 'annotation', 5 ),
 			'discussion type' => array( 'discussion', 9 ),
 			'note type'       => array( 'note', 3 ),
@@ -4172,12 +4173,13 @@ public function test_get_items_type_arg_authenticated( $comment_type, $count ) {
 
 		$request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
 		$request->set_param( 'type', $comment_type );
+		$request->set_param( 'per_page', self::$per_page );
 
 		$response = rest_get_server()->dispatch( $request );
 		$this->assertEquals( 200, $response->get_status() );
 
 		$comments = $response->get_data();
-		$this->assertCount( $count, $comments );
+		$this->assertCount( 'comment' === $comment_type ? $count + self::$total_comments: $count, $comments );
 	}
 
 	/**
@@ -4212,8 +4214,10 @@ public function test_get_items_type_arg_unauthenticated( $comment_type, $count )
 		$request->set_param( 'per_page', self::$per_page );
 
 		$response = rest_get_server()->dispatch( $request );
-		$this->assertEquals( 401, $response->get_status() );
-		$this->assertErrorResponse( 'rest_forbidden_param', $response, 401 );
+		$this->assertEquals( 'comment' === $comment_type ? 200 : 401, $response->get_status() );
+		if ( 'comment' !== $comment_type ) {
+			$this->assertErrorResponse( 'rest_forbidden_param', $response, 401 );
+		}
 	}
 
 	/**
@@ -4244,6 +4248,9 @@ public function test_get_individual_comment_type_unauthenticated( $comment_type,
 		$request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%d', $comment_id ) );
 		$response = rest_get_server()->dispatch( $request );
 
-		$this->assertEquals( 401, $response->get_status() );
+		$this->assertEquals( 'comment' === $comment_type ? 200 : 401, $response->get_status() );
+		if ( 'comment' !== $comment_type ) {
+			$this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
+		}
 	}
 }