Changeset 51196

Timestamp:

06/22/2021 04:34:29 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Use more appropriate assertions in a few tests.

Follow-up to [34804], [41376], [50959], [51124].

See #52625.

Location:

trunk/tests/phpunit/tests

Files:

• customize/custom-css-setting.php (modified) (1 diff)
• post/revisions.php (modified) (3 diffs)
• theme/wpThemeJsonResolver.php (modified) (1 diff)
• user/query.php (modified) (1 diff)

trunk/tests/phpunit/tests/customize/custom-css-setting.php

@@ -381 +381 @@
         $unclosed_comment = $basic_css . '</style>';
         $result           = $this->setting->validate( $unclosed_comment );
-        $this->assertTrue( array_key_exists( 'illegal_markup', $result->errors ) );
+        $this->assertArrayHasKey( 'illegal_markup', $result->errors );
     }
 }

trunk/tests/phpunit/tests/post/revisions.php

@@ -624 +624 @@
             }
         );
+
         $this->assertSame( $generic, wp_revisions_to_keep( $post ) );
 
@@ -634 +635 @@
             }
         );
+
         $this->assertSame( $expected, wp_revisions_to_keep( $post ) );
     }
@@ -643 +645 @@
      */
     public function test_wp_save_post_revision_error() {
-        $post     = self::factory()->post->create_and_get(
+        $post = self::factory()->post->create_and_get(
             array(
                 'ID' => PHP_INT_MAX,
             )
         );
+
         $revision = _wp_put_post_revision( $post );
-        $this->assertTrue( is_wp_error( $revision ) );
+
+        $this->assertWPError( $revision );
     }
 }

trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php

@@ -158 +158 @@
         $fse = WP_Theme_JSON_Resolver::theme_has_support();
 
-        $this->assertSame( false, $default );
-        $this->assertSame( true, $fse );
+        $this->assertFalse( $default );
+        $this->assertTrue( $fse );
     }
 

trunk/tests/phpunit/tests/user/query.php

@@ -1297 +1297 @@
 
         foreach ( $query_vars as $query_var ) {
-            $this->assertTrue( array_key_exists( $query_var, $q->query_vars ), "$query_var does not exist." );
+            $this->assertArrayHasKey( $query_var, $q->query_vars, "$query_var does not exist." );
         }