mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-06-28 22:30:04 +00:00
Tests: Use more appropriate assertions in various tests.
This replaces instances of `assertSame( [number], count( ... ) )` with `assertCount()` to use native PHPUnit functionality. Follow-up to [51335], [51337]. See #53363. git-svn-id: https://develop.svn.wordpress.org/trunk@51367 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -1291,7 +1291,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
self::factory()->comment->create_post_comments( $post_id, $limit );
|
||||
|
||||
$comments = get_comments( array( 'post_id' => $post_id ) );
|
||||
$this->assertSame( $limit, count( $comments ) );
|
||||
$this->assertCount( $limit, $comments );
|
||||
foreach ( $comments as $comment ) {
|
||||
$this->assertEquals( $post_id, $comment->comment_post_ID );
|
||||
}
|
||||
@@ -1300,7 +1300,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
self::factory()->comment->create_post_comments( $post_id2, $limit );
|
||||
|
||||
$comments = get_comments( array( 'post_id' => $post_id2 ) );
|
||||
$this->assertSame( $limit, count( $comments ) );
|
||||
$this->assertCount( $limit, $comments );
|
||||
foreach ( $comments as $comment ) {
|
||||
$this->assertEquals( $post_id2, $comment->comment_post_ID );
|
||||
}
|
||||
@@ -1309,7 +1309,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );
|
||||
|
||||
$comments = get_comments( array( 'post_id' => $post_id3 ) );
|
||||
$this->assertSame( $limit, count( $comments ) );
|
||||
$this->assertCount( $limit, $comments );
|
||||
foreach ( $comments as $comment ) {
|
||||
$this->assertEquals( $post_id3, $comment->comment_post_ID );
|
||||
}
|
||||
@@ -1320,7 +1320,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'status' => 'hold',
|
||||
)
|
||||
);
|
||||
$this->assertSame( $limit, count( $comments ) );
|
||||
$this->assertCount( $limit, $comments );
|
||||
foreach ( $comments as $comment ) {
|
||||
$this->assertEquals( $post_id3, $comment->comment_post_ID );
|
||||
}
|
||||
@@ -1331,11 +1331,11 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'status' => 'approve',
|
||||
)
|
||||
);
|
||||
$this->assertSame( 0, count( $comments ) );
|
||||
$this->assertCount( 0, $comments );
|
||||
|
||||
self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );
|
||||
$comments = get_comments( array( 'post_id' => $post_id3 ) );
|
||||
$this->assertSame( $limit * 2, count( $comments ) );
|
||||
$this->assertCount( $limit * 2, $comments );
|
||||
foreach ( $comments as $comment ) {
|
||||
$this->assertEquals( $post_id3, $comment->comment_post_ID );
|
||||
}
|
||||
@@ -1362,7 +1362,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'orderby' => array( 'key' ),
|
||||
)
|
||||
);
|
||||
$this->assertSame( 2, count( $comments ) );
|
||||
$this->assertCount( 2, $comments );
|
||||
$this->assertEquals( $comment_id2, $comments[0]->comment_ID );
|
||||
$this->assertEquals( $comment_id, $comments[1]->comment_ID );
|
||||
|
||||
@@ -1372,7 +1372,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'orderby' => array( 'meta_value' ),
|
||||
)
|
||||
);
|
||||
$this->assertSame( 2, count( $comments ) );
|
||||
$this->assertCount( 2, $comments );
|
||||
$this->assertEquals( $comment_id2, $comments[0]->comment_ID );
|
||||
$this->assertEquals( $comment_id, $comments[1]->comment_ID );
|
||||
|
||||
@@ -1383,7 +1383,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'order' => 'ASC',
|
||||
)
|
||||
);
|
||||
$this->assertSame( 2, count( $comments ) );
|
||||
$this->assertCount( 2, $comments );
|
||||
$this->assertEquals( $comment_id, $comments[0]->comment_ID );
|
||||
$this->assertEquals( $comment_id2, $comments[1]->comment_ID );
|
||||
|
||||
@@ -1394,7 +1394,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'order' => 'ASC',
|
||||
)
|
||||
);
|
||||
$this->assertSame( 2, count( $comments ) );
|
||||
$this->assertCount( 2, $comments );
|
||||
$this->assertEquals( $comment_id, $comments[0]->comment_ID );
|
||||
$this->assertEquals( $comment_id2, $comments[1]->comment_ID );
|
||||
|
||||
@@ -1422,7 +1422,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'orderby' => array( 'key' ),
|
||||
)
|
||||
);
|
||||
$this->assertSame( 1, count( $comments ) );
|
||||
$this->assertCount( 1, $comments );
|
||||
|
||||
$comments = get_comments(
|
||||
array(
|
||||
@@ -1430,7 +1430,7 @@ class Tests_Comment_Query extends WP_UnitTestCase {
|
||||
'orderby' => array( 'meta_value' ),
|
||||
)
|
||||
);
|
||||
$this->assertSame( 1, count( $comments ) );
|
||||
$this->assertCount( 1, $comments );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user