Tests: Use assertInstanceOf() instead of assertTrue() in some tests.

SergeyBiryukov · SergeyBiryukov · commit fe9ab38075a6 · 2021-05-18T21:04:31.000Z
See #52625. git-svn-id: https://develop.svn.wordpress.org/trunk@50926 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php b/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
@@ -110,7 +110,7 @@ public function test_get_translations_for_domain_does_not_return_null_if_overrid
 		remove_filter( 'override_load_textdomain', '__return_true' );
 		remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
 
-		$this->assertTrue( $translations instanceof NOOP_Translations );
+		$this->assertInstanceOf( 'NOOP_Translations', $translations );
 	}
 
 	/**
diff --git a/tests/phpunit/tests/term/cache.php b/tests/phpunit/tests/term/cache.php
@@ -433,7 +433,7 @@ public function test_get_term_by_does_not_prime_term_meta_cache() {
 
 		$term = get_term_by( 'name', 'Burrito', 'post_tag' );
 		$num_queries++;
-		$this->assertTrue( $term instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $term );
 		$this->assertSame( $term_id, $term->term_id );
 		$this->assertSame( $num_queries, $wpdb->num_queries );
 
diff --git a/tests/phpunit/tests/term/getTerm.php b/tests/phpunit/tests/term/getTerm.php
@@ -135,7 +135,7 @@ public function test_numeric_properties_should_be_cast_to_ints() {
 
 		$found = get_term( $term_data );
 
-		$this->assertTrue( $found instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $found );
 		$this->assertInternalType( 'int', $found->term_id );
 		$this->assertInternalType( 'int', $found->term_taxonomy_id );
 		$this->assertInternalType( 'int', $found->parent );
diff --git a/tests/phpunit/tests/term/getTermBy.php b/tests/phpunit/tests/term/getTermBy.php
@@ -125,7 +125,7 @@ public function test_should_prime_term_cache() {
 		$found       = get_term_by( 'slug', 'foo', 'wptests_tax' );
 		$num_queries++;
 
-		$this->assertTrue( $found instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $found );
 		$this->assertSame( $t, $found->term_id );
 		$this->assertSame( $num_queries, $wpdb->num_queries );
 
@@ -151,7 +151,7 @@ public function test_should_unslash_name() {
 
 		$found = get_term_by( 'name', $term_name_slashed, 'wptests_tax' );
 
-		$this->assertTrue( $found instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $found );
 		$this->assertSame( $t, $found->term_id );
 		$this->assertSame( $term_name, $found->name );
 	}
@@ -171,7 +171,7 @@ public function test_should_sanitize_slug() {
 		// Whitespace should get replaced by a '-'.
 		$found1 = get_term_by( 'slug', 'foo foo', 'wptests_tax' );
 
-		$this->assertTrue( $found1 instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $found1 );
 		$this->assertSame( $t1, $found1->term_id );
 
 		$t2 = self::factory()->term->create(
@@ -184,7 +184,7 @@ public function test_should_sanitize_slug() {
 		// Slug should get urlencoded.
 		$found2 = get_term_by( 'slug', '仪表盘', 'wptests_tax' );
 
-		$this->assertTrue( $found2 instanceof WP_Term );
+		$this->assertInstanceOf( 'WP_Term', $found2 );
 		$this->assertSame( $t2, $found2->term_id );
 	}
 
diff --git a/tests/phpunit/tests/user/updateUserCaches.php b/tests/phpunit/tests/user/updateUserCaches.php
@@ -64,7 +64,7 @@ public function test_should_store_raw_data_in_users_bucket_when_passed_a_wp_user
 		update_user_caches( $user_object );
 
 		$cached = wp_cache_get( $u, 'users' );
-		$this->assertFalse( $cached instanceof WP_User );
+		$this->assertNotInstanceOf( 'WP_User', $cached );
 		$this->assertEquals( $raw_userdata, $cached );
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function test_get_translations_for_domain_does_not_return_null_if_overrid`
`110`	`110`	`remove_filter( 'override_load_textdomain', '__return_true' );`
`111`	`111`	`remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );`
`112`	`112`
`113`		`- $this->assertTrue( $translations instanceof NOOP_Translations );`
	`113`	`+ $this->assertInstanceOf( 'NOOP_Translations', $translations );`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public function test_should_store_raw_data_in_users_bucket_when_passed_a_wp_user`
`64`	`64`	`update_user_caches( $user_object );`
`65`	`65`
`66`	`66`	`$cached = wp_cache_get( $u, 'users' );`
`67`		`- $this->assertFalse( $cached instanceof WP_User );`
	`67`	`+ $this->assertNotInstanceOf( 'WP_User', $cached );`
`68`	`68`	`$this->assertEquals( $raw_userdata, $cached );`
`69`	`69`	`}`
`70`	`70`	`}`