mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-11 20:30:23 +00:00
Tests: First pass at using assertSame() instead of assertEquals() in most of the unit tests.
This ensures that not only the return values match the expected results, but also that their type is the same. Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable. Props johnbillion, jrf, SergeyBiryukov. See #38266. git-svn-id: https://develop.svn.wordpress.org/trunk@48937 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -5,13 +5,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
public function test_wp_count_comments() {
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $count->approved );
|
||||
$this->assertEquals( 0, $count->moderated );
|
||||
$this->assertEquals( 0, $count->spam );
|
||||
$this->assertEquals( 0, $count->trash );
|
||||
$this->assertEquals( 0, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 0, $count->total_comments );
|
||||
$this->assertEquals( 0, $count->all );
|
||||
$this->assertSame( 0, $count->approved );
|
||||
$this->assertSame( 0, $count->moderated );
|
||||
$this->assertSame( 0, $count->spam );
|
||||
$this->assertSame( 0, $count->trash );
|
||||
$this->assertSame( 0, $count->{'post-trashed'} );
|
||||
$this->assertSame( 0, $count->total_comments );
|
||||
$this->assertSame( 0, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_approved() {
|
||||
@@ -23,13 +23,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 1, $count->approved );
|
||||
$this->assertEquals( 0, $count->moderated );
|
||||
$this->assertEquals( 0, $count->spam );
|
||||
$this->assertEquals( 0, $count->trash );
|
||||
$this->assertEquals( 0, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count->total_comments );
|
||||
$this->assertEquals( 1, $count->all );
|
||||
$this->assertSame( 1, $count->approved );
|
||||
$this->assertSame( 0, $count->moderated );
|
||||
$this->assertSame( 0, $count->spam );
|
||||
$this->assertSame( 0, $count->trash );
|
||||
$this->assertSame( 0, $count->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count->total_comments );
|
||||
$this->assertSame( 1, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_awaiting() {
|
||||
@@ -41,13 +41,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $count->approved );
|
||||
$this->assertEquals( 1, $count->moderated );
|
||||
$this->assertEquals( 0, $count->spam );
|
||||
$this->assertEquals( 0, $count->trash );
|
||||
$this->assertEquals( 0, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count->total_comments );
|
||||
$this->assertEquals( 1, $count->all );
|
||||
$this->assertSame( 0, $count->approved );
|
||||
$this->assertSame( 1, $count->moderated );
|
||||
$this->assertSame( 0, $count->spam );
|
||||
$this->assertSame( 0, $count->trash );
|
||||
$this->assertSame( 0, $count->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count->total_comments );
|
||||
$this->assertSame( 1, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_spam() {
|
||||
@@ -59,13 +59,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $count->approved );
|
||||
$this->assertEquals( 0, $count->moderated );
|
||||
$this->assertEquals( 1, $count->spam );
|
||||
$this->assertEquals( 0, $count->trash );
|
||||
$this->assertEquals( 0, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count->total_comments );
|
||||
$this->assertEquals( 0, $count->all );
|
||||
$this->assertSame( 0, $count->approved );
|
||||
$this->assertSame( 0, $count->moderated );
|
||||
$this->assertSame( 1, $count->spam );
|
||||
$this->assertSame( 0, $count->trash );
|
||||
$this->assertSame( 0, $count->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count->total_comments );
|
||||
$this->assertSame( 0, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_trash() {
|
||||
@@ -77,13 +77,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $count->approved );
|
||||
$this->assertEquals( 0, $count->moderated );
|
||||
$this->assertEquals( 0, $count->spam );
|
||||
$this->assertEquals( 1, $count->trash );
|
||||
$this->assertEquals( 0, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 0, $count->total_comments );
|
||||
$this->assertEquals( 0, $count->all );
|
||||
$this->assertSame( 0, $count->approved );
|
||||
$this->assertSame( 0, $count->moderated );
|
||||
$this->assertSame( 0, $count->spam );
|
||||
$this->assertSame( 1, $count->trash );
|
||||
$this->assertSame( 0, $count->{'post-trashed'} );
|
||||
$this->assertSame( 0, $count->total_comments );
|
||||
$this->assertSame( 0, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_post_trashed() {
|
||||
@@ -95,13 +95,13 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $count->approved );
|
||||
$this->assertEquals( 0, $count->moderated );
|
||||
$this->assertEquals( 0, $count->spam );
|
||||
$this->assertEquals( 0, $count->trash );
|
||||
$this->assertEquals( 1, $count->{'post-trashed'} );
|
||||
$this->assertEquals( 0, $count->total_comments );
|
||||
$this->assertEquals( 0, $count->all );
|
||||
$this->assertSame( 0, $count->approved );
|
||||
$this->assertSame( 0, $count->moderated );
|
||||
$this->assertSame( 0, $count->spam );
|
||||
$this->assertSame( 0, $count->trash );
|
||||
$this->assertSame( 1, $count->{'post-trashed'} );
|
||||
$this->assertSame( 0, $count->total_comments );
|
||||
$this->assertSame( 0, $count->all );
|
||||
}
|
||||
|
||||
public function test_wp_count_comments_cache() {
|
||||
@@ -119,88 +119,88 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
|
||||
|
||||
$count1 = wp_count_comments( $post_id );
|
||||
|
||||
$this->assertEquals( 1, $count1->approved );
|
||||
$this->assertEquals( 0, $count1->moderated );
|
||||
$this->assertEquals( 0, $count1->spam );
|
||||
$this->assertEquals( 0, $count1->trash );
|
||||
$this->assertEquals( 0, $count1->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count1->total_comments );
|
||||
$this->assertEquals( 1, $count1->all );
|
||||
$this->assertSame( 1, $count1->approved );
|
||||
$this->assertSame( 0, $count1->moderated );
|
||||
$this->assertSame( 0, $count1->spam );
|
||||
$this->assertSame( 0, $count1->trash );
|
||||
$this->assertSame( 0, $count1->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count1->total_comments );
|
||||
$this->assertSame( 1, $count1->all );
|
||||
|
||||
$all_count1 = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 1, $all_count1->approved );
|
||||
$this->assertEquals( 0, $all_count1->moderated );
|
||||
$this->assertEquals( 0, $all_count1->spam );
|
||||
$this->assertEquals( 0, $all_count1->trash );
|
||||
$this->assertEquals( 0, $all_count1->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $all_count1->total_comments );
|
||||
$this->assertEquals( 1, $all_count1->all );
|
||||
$this->assertSame( 1, $all_count1->approved );
|
||||
$this->assertSame( 0, $all_count1->moderated );
|
||||
$this->assertSame( 0, $all_count1->spam );
|
||||
$this->assertSame( 0, $all_count1->trash );
|
||||
$this->assertSame( 0, $all_count1->{'post-trashed'} );
|
||||
$this->assertSame( 1, $all_count1->total_comments );
|
||||
$this->assertSame( 1, $all_count1->all );
|
||||
|
||||
wp_spam_comment( $comment_id );
|
||||
|
||||
$count2 = wp_count_comments( $post_id );
|
||||
|
||||
$this->assertEquals( 0, $count2->approved );
|
||||
$this->assertEquals( 0, $count2->moderated );
|
||||
$this->assertEquals( 1, $count2->spam );
|
||||
$this->assertEquals( 0, $count2->trash );
|
||||
$this->assertEquals( 0, $count2->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count2->total_comments );
|
||||
$this->assertEquals( 0, $count2->all );
|
||||
$this->assertSame( 0, $count2->approved );
|
||||
$this->assertSame( 0, $count2->moderated );
|
||||
$this->assertSame( 1, $count2->spam );
|
||||
$this->assertSame( 0, $count2->trash );
|
||||
$this->assertSame( 0, $count2->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count2->total_comments );
|
||||
$this->assertSame( 0, $count2->all );
|
||||
|
||||
$all_count2 = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $all_count2->approved );
|
||||
$this->assertEquals( 0, $all_count2->moderated );
|
||||
$this->assertEquals( 1, $all_count2->spam );
|
||||
$this->assertEquals( 0, $all_count2->trash );
|
||||
$this->assertEquals( 0, $all_count2->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $all_count2->total_comments );
|
||||
$this->assertEquals( 0, $all_count2->all );
|
||||
$this->assertSame( 0, $all_count2->approved );
|
||||
$this->assertSame( 0, $all_count2->moderated );
|
||||
$this->assertSame( 1, $all_count2->spam );
|
||||
$this->assertSame( 0, $all_count2->trash );
|
||||
$this->assertSame( 0, $all_count2->{'post-trashed'} );
|
||||
$this->assertSame( 1, $all_count2->total_comments );
|
||||
$this->assertSame( 0, $all_count2->all );
|
||||
|
||||
wp_trash_comment( $comment_id );
|
||||
|
||||
$count3 = wp_count_comments( $post_id );
|
||||
|
||||
$this->assertEquals( 0, $count3->approved );
|
||||
$this->assertEquals( 0, $count3->moderated );
|
||||
$this->assertEquals( 0, $count3->spam );
|
||||
$this->assertEquals( 1, $count3->trash );
|
||||
$this->assertEquals( 0, $count3->{'post-trashed'} );
|
||||
$this->assertEquals( 0, $count3->total_comments );
|
||||
$this->assertEquals( 0, $count3->all );
|
||||
$this->assertSame( 0, $count3->approved );
|
||||
$this->assertSame( 0, $count3->moderated );
|
||||
$this->assertSame( 0, $count3->spam );
|
||||
$this->assertSame( 1, $count3->trash );
|
||||
$this->assertSame( 0, $count3->{'post-trashed'} );
|
||||
$this->assertSame( 0, $count3->total_comments );
|
||||
$this->assertSame( 0, $count3->all );
|
||||
|
||||
$all_count3 = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $all_count3->approved );
|
||||
$this->assertEquals( 0, $all_count3->moderated );
|
||||
$this->assertEquals( 0, $all_count3->spam );
|
||||
$this->assertEquals( 1, $all_count3->trash );
|
||||
$this->assertEquals( 0, $all_count3->{'post-trashed'} );
|
||||
$this->assertEquals( 0, $all_count3->total_comments );
|
||||
$this->assertEquals( 0, $all_count3->all );
|
||||
$this->assertSame( 0, $all_count3->approved );
|
||||
$this->assertSame( 0, $all_count3->moderated );
|
||||
$this->assertSame( 0, $all_count3->spam );
|
||||
$this->assertSame( 1, $all_count3->trash );
|
||||
$this->assertSame( 0, $all_count3->{'post-trashed'} );
|
||||
$this->assertSame( 0, $all_count3->total_comments );
|
||||
$this->assertSame( 0, $all_count3->all );
|
||||
|
||||
wp_untrash_comment( $comment_id );
|
||||
|
||||
$count4 = wp_count_comments( $post_id );
|
||||
|
||||
$this->assertEquals( 0, $count4->approved );
|
||||
$this->assertEquals( 0, $count4->moderated );
|
||||
$this->assertEquals( 1, $count4->spam );
|
||||
$this->assertEquals( 0, $count4->trash );
|
||||
$this->assertEquals( 0, $count4->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $count4->total_comments );
|
||||
$this->assertEquals( 0, $count4->all );
|
||||
$this->assertSame( 0, $count4->approved );
|
||||
$this->assertSame( 0, $count4->moderated );
|
||||
$this->assertSame( 1, $count4->spam );
|
||||
$this->assertSame( 0, $count4->trash );
|
||||
$this->assertSame( 0, $count4->{'post-trashed'} );
|
||||
$this->assertSame( 1, $count4->total_comments );
|
||||
$this->assertSame( 0, $count4->all );
|
||||
|
||||
$all_count4 = wp_count_comments();
|
||||
|
||||
$this->assertEquals( 0, $all_count4->approved );
|
||||
$this->assertEquals( 0, $all_count4->moderated );
|
||||
$this->assertEquals( 1, $all_count4->spam );
|
||||
$this->assertEquals( 0, $all_count4->trash );
|
||||
$this->assertEquals( 0, $all_count4->{'post-trashed'} );
|
||||
$this->assertEquals( 1, $all_count4->total_comments );
|
||||
$this->assertEquals( 0, $all_count4->all );
|
||||
$this->assertSame( 0, $all_count4->approved );
|
||||
$this->assertSame( 0, $all_count4->moderated );
|
||||
$this->assertSame( 1, $all_count4->spam );
|
||||
$this->assertSame( 0, $all_count4->trash );
|
||||
$this->assertSame( 0, $all_count4->{'post-trashed'} );
|
||||
$this->assertSame( 1, $all_count4->total_comments );
|
||||
$this->assertSame( 0, $all_count4->all );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user