Changeset 54088

Timestamp:

09/06/2022 10:03:10 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correctly use the factory method.

This replaces all non-static calls to the WP_UnitTestCase_Base::factory() method with static function calls, since the method is declared as static.

This is a consistency improvement for the test suite.

Follow up to [35225], [35242], [49603], [54087].

Props jrf.
See #55652.

Location:

trunk/tests/phpunit/tests

Files:

• adminbar.php (modified) (1 diff)
• ajax/CustomizeManager.php (modified) (5 diffs)
• ajax/CustomizeMenus.php (modified) (2 diffs)
• auth.php (modified) (2 diffs)
• blocks/context.php (modified) (1 diff)
• blocks/editor.php (modified) (1 diff)
• comment/checkComment.php (modified) (2 diffs)
• customize/control.php (modified) (4 diffs)
• customize/custom-css-setting.php (modified) (4 diffs)
• customize/manager.php (modified) (15 diffs)
• customize/nav-menus.php (modified) (6 diffs)
• customize/setting.php (modified) (5 diffs)
• feed/rss2.php (modified) (4 diffs)
• formatting/excerptRemoveBlocks.php (modified) (1 diff)
• formatting/wpTargetedLinkRel.php (modified) (1 diff)
• general/template.php (modified) (4 diffs)
• l10n.php (modified) (11 diffs)
• l10n/getUserLocale.php (modified) (3 diffs)
• l10n/wpLocaleSwitcher.php (modified) (3 diffs)
• multisite/network.php (modified) (1 diff)
• multisite/site.php (modified) (1 diff)
• oembed/WpEmbed.php (modified) (8 diffs)
• oembed/controller.php (modified) (6 diffs)
• oembed/headers.php (modified) (1 diff)
• post.php (modified) (3 diffs)
• post/isPostPubliclyViewable.php (modified) (1 diff)
• post/nav-menu.php (modified) (1 diff)
• post/wpInsertPost.php (modified) (5 diffs)
• rest-api/rest-posts-controller.php (modified) (1 diff)
• rest-api/wpRestBlockPatternCategoriesController.php (modified) (1 diff)
• rest-api/wpRestBlockPatternsController.php (modified) (1 diff)
• term/isTermPubliclyViewable.php (modified) (1 diff)
• term/termCounts.php (modified) (3 diffs)
• theme.php (modified) (1 diff)
• user.php (modified) (2 diffs)
• widgets/wpWidgetCustomHtml.php (modified) (3 diffs)
• widgets/wpWidgetMedia.php (modified) (2 diffs)
• widgets/wpWidgetText.php (modified) (3 diffs)

trunk/tests/phpunit/tests/adminbar.php

@@ -657 +657 @@
         wp_set_current_user( self::$admin_id );
 
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'   => 'customize_changeset',

trunk/tests/phpunit/tests/ajax/CustomizeManager.php

@@ -308 +308 @@
         $uuid = wp_generate_uuid4();
 
-        $post_id      = $this->factory()->post->create(
+        $post_id      = self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -347 +347 @@
     public function test_success_save_post_date() {
         $uuid         = wp_generate_uuid4();
-        $post_id      = $this->factory()->post->create(
+        $post_id      = self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -447 +447 @@
         $uuid = wp_generate_uuid4();
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -615 +615 @@
         $this->assertSame( 'no_auto_draft_to_delete', $this->_last_response_parsed['data'] );
 
-        $other_user_id = $this->factory()->user->create();
+        $other_user_id = self::factory()->user->create();
 
         // Create auto-drafts.
         $user_auto_draft_ids = array();
         for ( $i = 0; $i < 3; $i++ ) {
-            $user_auto_draft_ids[] = $this->factory()->post->create(
+            $user_auto_draft_ids[] = self::factory()->post->create(
                 array(
                     'post_name'    => wp_generate_uuid4(),
@@ -632 +632 @@
         $other_user_auto_draft_ids = array();
         for ( $i = 0; $i < 3; $i++ ) {
-            $other_user_auto_draft_ids[] = $this->factory()->post->create(
+            $other_user_auto_draft_ids[] = self::factory()->post->create(
                 array(
                     'post_name'    => wp_generate_uuid4(),

trunk/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -707 +707 @@
 
         // Bad nonce.
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'subscriber' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
         $_POST                = wp_slash(
             array(
@@ -720 +720 @@
 
         // Missing params.
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $_POST                = wp_slash(
             array(

trunk/tests/phpunit/tests/auth.php

@@ -422 +422 @@
             'user_pass'  => 'password',
         );
-        $this->factory()->user->create( $user_args );
+        self::factory()->user->create( $user_args );
 
         $_POST['log'] = $user_args['user_email'];
@@ -437 +437 @@
      */
     public function test_application_password_authentication() {
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'user_login' => 'http_auth_login',

trunk/tests/phpunit/tests/blocks/context.php

@@ -37 +37 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
     }

trunk/tests/phpunit/tests/blocks/editor.php

@@ -29 +29 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
 
         global $wp_rest_server;

trunk/tests/phpunit/tests/comment/checkComment.php

@@ -139 +139 @@
      */
     public function test_should_return_true_when_comment_previously_approved_is_enabled_and_user_has_previously_approved_comments_with_different_email() {
-        $subscriber_id = $this->factory()->user->create(
+        $subscriber_id = self::factory()->user->create(
             array(
                 'role'  => 'subscriber',
@@ -171 +171 @@
      */
     public function test_should_return_false_when_comment_previously_approved_is_enabled_and_user_does_not_have_a_previously_approved_comment_with_any_email() {
-        $subscriber_id = $this->factory()->user->create(
+        $subscriber_id = self::factory()->user->create(
             array(
                 'role'  => 'subscriber',

trunk/tests/phpunit/tests/customize/control.php

@@ -27 +27 @@
     public function set_up() {
         parent::set_up();
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
         $GLOBALS['wp_customize'] = new WP_Customize_Manager();
@@ -139 +139 @@
 
         // Ensure that auto-draft pages are included if they are among the nav_menus_created_posts.
-        $auto_draft_page_id = $this->factory()->post->create(
+        $auto_draft_page_id = self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -146 +146 @@
             )
         );
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -153 +153 @@
             )
         );
-        $auto_draft_post_id = $this->factory()->post->create(
+        $auto_draft_post_id = self::factory()->post->create(
             array(
                 'post_type'   => 'post',

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

@@ -121 +121 @@
 
         $original_css      = 'body { color: black; }';
-        $post_id           = $this->factory()->post->create(
+        $post_id           = self::factory()->post->create(
             array(
                 'post_title'   => $this->setting->stylesheet,
@@ -131 +131 @@
         );
         $twentyten_css     = 'body { color: red; }';
-        $twentyten_post_id = $this->factory()->post->create(
+        $twentyten_post_id = self::factory()->post->create(
             array(
                 'post_title'   => 'twentyten',
@@ -274 +274 @@
         $this->assertSame( '/*default*//*filtered*/', $this->setting->value() );
 
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'   => $this->setting->stylesheet,
@@ -311 +311 @@
     public function test_update_filter() {
         $original_css = 'body { color:red; }';
-        $post_id      = $this->factory()->post->create(
+        $post_id      = self::factory()->post->create(
             array(
                 'post_title'   => $this->setting->stylesheet,

trunk/tests/phpunit/tests/customize/manager.php

@@ -163 +163 @@
     public function test_constructor_deferred_changeset_uuid() {
         wp_set_current_user( self::$admin_user_id );
-        $other_admin_user_id = $this->factory()->user->create( array( 'role' => 'admin' ) );
+        $other_admin_user_id = self::factory()->user->create( array( 'role' => 'admin' ) );
 
         $data = array(
@@ -172 +172 @@
 
         $uuid1 = wp_generate_uuid4();
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'     => 'customize_changeset',
@@ -188 +188 @@
          */
         $uuid2   = wp_generate_uuid4();
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_type'     => 'customize_changeset',
@@ -425 +425 @@
     public function test_find_changeset_post_id() {
         $uuid    = wp_generate_uuid4();
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -455 +455 @@
         $uuid         = wp_generate_uuid4();
         $wp_customize = new WP_Customize_Manager( array( 'changeset_uuid' => $uuid ) );
-        $post_id      = $this->factory()->post->create(
+        $post_id      = self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -483 +483 @@
             'blogdescription' => array( 'value' => 'Greet the world' ),
         );
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_name'    => $uuid,
@@ -566 +566 @@
             )
         );
-        $existing_published_home_page_id   = $this->factory()->post->create(
+        $existing_published_home_page_id   = self::factory()->post->create(
             array(
                 'post_name'   => 'home',
@@ -573 +573 @@
             )
         );
-        $existing_auto_draft_about_page_id = $this->factory()->post->create(
+        $existing_auto_draft_about_page_id = self::factory()->post->create(
             array(
                 'post_name'   => 'about',
@@ -821 +821 @@
         wp_set_current_user( self::$admin_user_id );
 
-        $existing_published_home_page_id = $this->factory()->post->create(
+        $existing_published_home_page_id = self::factory()->post->create(
             array(
                 'post_name'   => 'home',
@@ -1879 +1879 @@
             array(
                 'autosave' => true,
-                'user_id'  => $this->factory()->user->create( array( 'role' => 'administrator' ) ),
+                'user_id'  => self::factory()->user->create( array( 'role' => 'administrator' ) ),
             )
         );
@@ -2032 +2032 @@
         $new_sidebar_1 = array_reverse( $new_sidebars_widgets['sidebar-1'] );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_type'    => 'customize_changeset',
@@ -2336 +2336 @@
             ),
         );
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'    => 'customize_changeset',
@@ -2831 +2831 @@
         $this->assertFalse( $this->manager->has_published_pages() );
 
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -2839 +2839 @@
         $this->assertFalse( $this->manager->has_published_pages() );
 
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -2865 +2865 @@
         $setting    = $this->manager->get_setting( $setting_id );
         $this->assertInstanceOf( 'WP_Customize_Filter_Setting', $setting );
-        $auto_draft_page = $this->factory()->post->create(
+        $auto_draft_page = self::factory()->post->create(
             array(
                 'post_type'   => 'page',

trunk/tests/phpunit/tests/customize/nav-menus.php

@@ -852 +852 @@
     public function test_sanitize_nav_menus_created_posts() {
         $menus                 = new WP_Customize_Nav_Menus( $this->wp_customize );
-        $contributor_user_id   = $this->factory()->user->create( array( 'role' => 'contributor' ) );
-        $author_user_id        = $this->factory()->user->create( array( 'role' => 'author' ) );
-        $administrator_user_id = $this->factory()->user->create( array( 'role' => 'administrator' ) );
-
-        $contributor_post_id   = $this->factory()->post->create(
+        $contributor_user_id   = self::factory()->user->create( array( 'role' => 'contributor' ) );
+        $author_user_id        = self::factory()->user->create( array( 'role' => 'author' ) );
+        $administrator_user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+
+        $contributor_post_id   = self::factory()->post->create(
             array(
                 'post_status' => 'auto-draft',
@@ -864 +864 @@
             )
         );
-        $author_post_id        = $this->factory()->post->create(
+        $author_post_id        = self::factory()->post->create(
             array(
                 'post_status' => 'auto-draft',
@@ -872 +872 @@
             )
         );
-        $administrator_post_id = $this->factory()->post->create(
+        $administrator_post_id = self::factory()->post->create(
             array(
                 'post_status' => 'auto-draft',
@@ -881 +881 @@
         );
 
-        $draft_post_id = $this->factory()->post->create(
+        $draft_post_id = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
@@ -889 +889 @@
         );
 
-        $private_post_id = $this->factory()->post->create(
+        $private_post_id = self::factory()->post->create(
             array(
                 'post_status' => 'private',
@@ -991 +991 @@
         $trashed_post_id = $r->ID;
 
-        $pre_published_post_id = $this->factory()->post->create( array( 'post_status' => 'publish' ) );
+        $pre_published_post_id = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $setting_id = 'nav_menus_created_posts';

trunk/tests/phpunit/tests/customize/setting.php

@@ -138 +138 @@
      */
     public function test_preview_standard_types_non_multidimensional() {
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
 
@@ -217 +217 @@
      */
     public function test_preview_standard_types_multidimensional() {
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $_POST['customized'] = wp_slash( wp_json_encode( $this->post_data_overrides ) );
 
@@ -363 +363 @@
      */
     public function test_preview_custom_type() {
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $type                = 'custom_type';
         $post_data_overrides = array(
@@ -552 +552 @@
      */
     public function test_is_current_blog_previewed() {
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $type       = 'option';
         $name       = 'blogname';
@@ -744 +744 @@
      */
     public function test_multidimensional_value_when_previewed() {
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         WP_Customize_Setting::reset_aggregated_multidimensionals();
 

trunk/tests/phpunit/tests/feed/rss2.php

@@ -523 +523 @@
 
         // Create a post dated last week.
-        $post_id = $this->factory()->post->create( array( 'post_date' => $last_week ) );
+        $post_id = self::factory()->post->create( array( 'post_date' => $last_week ) );
 
         // Create a comment dated yesterday.
-        $this->factory()->comment->create(
+        self::factory()->comment->create(
             array(
                 'comment_post_ID' => $post_id,
@@ -562 +562 @@
 
         // Create a post dated last week.
-        $post_id = $this->factory()->post->create( array( 'post_date' => $last_week ) );
+        $post_id = self::factory()->post->create( array( 'post_date' => $last_week ) );
 
         // Create a comment dated yesterday.
-        $this->factory()->comment->create(
+        self::factory()->comment->create(
             array(
                 'comment_post_ID' => $post_id,
@@ -602 +602 @@
 
         // Create a post dated last week.
-        $post_id = $this->factory()->post->create( array( 'post_date' => $last_week ) );
+        $post_id = self::factory()->post->create( array( 'post_date' => $last_week ) );
 
         // Create a comment dated yesterday.
-        $this->factory()->comment->create(
+        self::factory()->comment->create(
             array(
                 'comment_post_ID' => $post_id,
@@ -613 +613 @@
 
         // Create a post dated today.
-        $this->factory()->post->create( array( 'post_date' => $today ) );
+        self::factory()->post->create( array( 'post_date' => $today ) );
 
         // The Last-Modified header should have the date from today's post when it is the latest update.

trunk/tests/phpunit/tests/formatting/excerptRemoveBlocks.php

@@ -61 +61 @@
     public function set_up() {
         parent::set_up();
-        self::$post_id = $this->factory()->post->create(
+        self::$post_id = self::factory()->post->create(
             array(
                 'post_excerpt' => '', // Empty excerpt, so it has to be generated.

trunk/tests/phpunit/tests/formatting/wpTargetedLinkRel.php

@@ -90 +90 @@
         $expected = '<p>Links: <a href="/" target="_blank" rel="noopener">No rel</a></p>';
 
-        $post = $this->factory()->post->create_and_get(
+        $post = self::factory()->post->create_and_get(
             array(
                 'post_content' => $content,

trunk/tests/phpunit/tests/general/template.php

@@ -181 +181 @@
     public function test_customize_preview_wp_site_icon_empty() {
         global $wp_customize;
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
         require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
@@ -199 +199 @@
     public function test_customize_preview_wp_site_icon_dirty() {
         global $wp_customize;
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
         require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
@@ -599 +599 @@
      */
     public function test_get_the_archive_title_is_correct_for_author_queries() {
-        $user_with_posts    = $this->factory()->user->create_and_get(
+        $user_with_posts    = self::factory()->user->create_and_get(
             array(
                 'role' => 'author',
             )
         );
-        $user_with_no_posts = $this->factory()->user->create_and_get(
+        $user_with_no_posts = self::factory()->user->create_and_get(
             array(
                 'role' => 'author',
@@ -610 +610 @@
         );
 
-        $this->factory()->post->create(
+        self::factory()->post->create(
             array(
                 'post_author' => $user_with_posts->ID,

trunk/tests/phpunit/tests/l10n.php

@@ -310 +310 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
 
@@ -336 +336 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
 
@@ -362 +362 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
 
@@ -388 +388 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
 
@@ -414 +414 @@
         );
 
-        $post = $this->factory()->post->create_and_get( $args );
+        $post = self::factory()->post->create_and_get( $args );
         setup_postdata( $post );
 
@@ -442 +442 @@
         );
 
-        $this->factory()->post->create( $args );
+        self::factory()->post->create( $args );
 
         $expect = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do…';
@@ -468 +468 @@
         );
 
-        $post = $this->factory()->post->create( $args );
+        $post = self::factory()->post->create( $args );
 
         $expect = 'Lorem ipsum dolor sit amet, consectetur …';
@@ -494 +494 @@
         );
 
-        $this->factory()->post->create( $args );
+        self::factory()->post->create( $args );
 
         $expect = str_repeat( 'あ', 40 ) . '…';
@@ -515 +515 @@
             'comment_content' => $this->long_text,
         );
-        $comment_id      = $this->factory()->comment->create( $args );
+        $comment_id      = self::factory()->comment->create( $args );
         $expect          = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut…';
         $comment_excerpt = get_comment_excerpt( $comment_id );
@@ -535 +535 @@
             'comment_content' => $this->long_text,
         );
-        $comment_id      = $this->factory()->comment->create( $args );
+        $comment_id      = self::factory()->comment->create( $args );
         $expect          = 'Lorem ipsum dolor sit amet, consectetur …';
         $comment_excerpt = get_comment_excerpt( $comment_id );
@@ -555 +555 @@
             'comment_content' => str_repeat( 'あ', 200 ),
         );
-        $comment_id      = $this->factory()->comment->create( $args );
+        $comment_id      = self::factory()->comment->create( $args );
         $expect          = str_repeat( 'あ', 40 ) . '…';
         $comment_excerpt = get_comment_excerpt( $comment_id );

trunk/tests/phpunit/tests/l10n/getUserLocale.php

@@ -13 +13 @@
         parent::set_up();
 
-        $this->user_id = $this->factory()->user->create(
+        $this->user_id = self::factory()->user->create(
             array(
                 'role'   => 'administrator',
@@ -83 +83 @@
 
     public function test_user_id_argument_with_id() {
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'locale' => 'es_ES',
@@ -100 +100 @@
 
     public function test_user_id_argument_with_wp_user_object() {
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'locale' => 'es_ES',

trunk/tests/phpunit/tests/l10n/wpLocaleSwitcher.php

@@ -327 +327 @@
         $site_locale = get_locale();
 
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'   => 'administrator',
@@ -379 +379 @@
         $site_locale = get_locale();
 
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'   => 'administrator',
@@ -431 +431 @@
         $site_locale = get_locale();
 
-        $user_id = $this->factory()->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'   => 'administrator',

trunk/tests/phpunit/tests/multisite/network.php

@@ -562 +562 @@
             $this->assertNull( get_network( $new_network_id ) );
 
-            $new_network = $this->factory()->network->create_and_get();
+            $new_network = self::factory()->network->create_and_get();
 
             // Double-check we got the ID of the new network correct.

trunk/tests/phpunit/tests/multisite/site.php

@@ -2460 +2460 @@
             $this->assertNull( get_site( $new_site_id ) );
 
-            $new_site = $this->factory()->blog->create_and_get();
+            $new_site = self::factory()->blog->create_and_get();
 
             // Double-check we got the ID of the new site correct.

trunk/tests/phpunit/tests/oembed/WpEmbed.php

@@ -29 +29 @@
 
     public function test_maybe_run_ajax_cache_should_return_nothing_if_there_is_no_message() {
-        $GLOBALS['post'] = $this->factory()->post->create_and_get(
+        $GLOBALS['post'] = self::factory()->post->create_and_get(
             array(
                 'post_title' => 'Hello World',
@@ -42 +42 @@
 
     public function test_maybe_run_ajax_cache_should_return_javascript() {
-        $GLOBALS['post'] = $this->factory()->post->create_and_get(
+        $GLOBALS['post'] = self::factory()->post->create_and_get(
             array(
                 'post_title' => 'Hello World',
@@ -135 +135 @@
 
     public function test_delete_oembed_caches() {
-        $post_id = $this->factory()->post->create();
+        $post_id = self::factory()->post->create();
 
         add_post_meta( $post_id, '_oembed_foo', 'bar' );
@@ -148 +148 @@
 
     public function test_cache_oembed_invalid_post_type() {
-        $post_id = $this->factory()->post->create( array( 'post_type' => 'nav_menu_item' ) );
+        $post_id = self::factory()->post->create( array( 'post_type' => 'nav_menu_item' ) );
 
         $this->wp_embed->cache_oembed( $post_id );
@@ -155 +155 @@
 
     public function test_cache_oembed_empty_content() {
-        $post_id = $this->factory()->post->create( array( 'post_content' => '' ) );
+        $post_id = self::factory()->post->create( array( 'post_content' => '' ) );
 
         $this->wp_embed->cache_oembed( $post_id );
@@ -168 +168 @@
         $cachekey_time = '_oembed_time_' . $key_suffix;
 
-        $post_id = $this->factory()->post->create( array( 'post_content' => 'https://example.com/' ) );
+        $post_id = self::factory()->post->create( array( 'post_content' => 'https://example.com/' ) );
 
         add_filter( 'pre_oembed_result', array( $this, '_pre_oembed_result_callback' ) );
@@ -182 +182 @@
         global $post;
 
-        $post       = $this->factory()->post->create_and_get();
+        $post       = self::factory()->post->create_and_get();
         $url        = 'https://example.com/';
         $expected   = '<b>Embedded content</b>';
@@ -209 +209 @@
         global $post;
 
-        $post          = $this->factory()->post->create_and_get();
+        $post          = self::factory()->post->create_and_get();
         $url           = 'https://example.com/';
         $expected      = '<a href="' . esc_url( $url ) . '">' . esc_html( $url ) . '</a>';

trunk/tests/phpunit/tests/oembed/controller.php

@@ -291 +291 @@
 
     public function test_request_invalid_format() {
-        $post_id = $this->factory()->post->create();
+        $post_id = self::factory()->post->create();
 
         $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
@@ -462 +462 @@
 
     public function test_rest_pre_serve_request() {
-        $user = $this->factory()->user->create_and_get(
+        $user = self::factory()->user->create_and_get(
             array(
                 'display_name' => 'John Doe',
             )
         );
-        $post = $this->factory()->post->create_and_get(
+        $post = self::factory()->post->create_and_get(
             array(
                 'post_author' => $user->ID,
@@ -486 +486 @@
 
     public function test_rest_pre_serve_request_wrong_format() {
-        $post = $this->factory()->post->create_and_get();
+        $post = self::factory()->post->create_and_get();
 
         $request = new WP_REST_Request( 'GET', '/oembed/1.0/embed' );
@@ -498 +498 @@
 
     public function test_rest_pre_serve_request_wrong_method() {
-        $post = $this->factory()->post->create_and_get();
+        $post = self::factory()->post->create_and_get();
 
         $request = new WP_REST_Request( 'HEAD', '/oembed/1.0/embed' );
@@ -514 +514 @@
         $this->assertSame( home_url() . '/index.php?rest_route=/oembed/1.0/embed', get_oembed_endpoint_url( '', 'xml' ) );
 
-        $post_id     = $this->factory()->post->create();
+        $post_id     = self::factory()->post->create();
         $url         = get_permalink( $post_id );
         $url_encoded = urlencode( $url );
@@ -528 +528 @@
         $this->assertSame( home_url() . '/wp-json/oembed/1.0/embed', get_oembed_endpoint_url( '', 'xml' ) );
 
-        $post_id     = $this->factory()->post->create();
+        $post_id     = self::factory()->post->create();
         $url         = get_permalink( $post_id );
         $url_encoded = urlencode( $url );

trunk/tests/phpunit/tests/oembed/headers.php

@@ -14 +14 @@
      */
     public function test_rest_pre_serve_request_headers() {
-        $post = $this->factory()->post->create_and_get(
+        $post = self::factory()->post->create_and_get(
             array(
                 'post_title' => 'Hello World',

trunk/tests/phpunit/tests/post.php

@@ -727 +727 @@
     public function test_use_block_editor_for_post() {
         $this->assertFalse( use_block_editor_for_post( -1 ) );
-        $bogus_post_id = $this->factory()->post->create(
+        $bogus_post_id = self::factory()->post->create(
             array(
                 'post_type' => 'bogus',
@@ -740 +740 @@
             )
         );
-        $restless_post_id = $this->factory()->post->create(
+        $restless_post_id = self::factory()->post->create(
             array(
                 'post_type' => 'restless',
@@ -747 +747 @@
         $this->assertFalse( use_block_editor_for_post( $restless_post_id ) );
 
-        $generic_post_id = $this->factory()->post->create();
+        $generic_post_id = self::factory()->post->create();
 
         add_filter( 'use_block_editor_for_post', '__return_false' );

trunk/tests/phpunit/tests/post/isPostPubliclyViewable.php

@@ -55 +55 @@
         }
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_type'   => $post_type,

trunk/tests/phpunit/tests/post/nav-menu.php

@@ -746 +746 @@
      */
     public function test_wp_delete_customize_changeset_dependent_auto_drafts() {
-        $auto_draft_post_id = $this->factory()->post->create(
+        $auto_draft_post_id = self::factory()->post->create(
             array(
                 'post_status' => 'auto-draft',
             )
         );
-        $draft_post_id      = $this->factory()->post->create(
+        $draft_post_id      = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
             )
         );
-        $private_post_id    = $this->factory()->post->create(
+        $private_post_id    = self::factory()->post->create(
             array(
                 'post_status' => 'private',

trunk/tests/phpunit/tests/post/wpInsertPost.php

@@ -1426 +1426 @@
         wp_set_current_user( self::$user_ids['contributor'] );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title'   => 'Jefferson claim: nice to have Washington on your side.',
@@ -1465 +1465 @@
         wp_set_current_user( self::$user_ids['administrator'] );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title'   => 'What is the Conner Project?',
@@ -1506 +1506 @@
         wp_set_current_user( self::$user_ids['administrator'] );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title'   => 'Everything is legal in New Jersey',
@@ -1543 +1543 @@
         $now = new DateTimeImmutable( 'now', new DateTimeZone( 'UTC' ) );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_date_gmt' => $now->modify( '-1 year' )->format( 'Y-m-d H:i:s' ),
@@ -1552 +1552 @@
         $this->assertSame( 'publish', get_post_status( $post_id ) );
 
-        $post_id = $this->factory()->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_date_gmt' => $now->modify( '+50 years' )->format( 'Y-m-d H:i:s' ),

trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php

@@ -5257 +5257 @@
     public function test_draft_post_does_not_have_the_same_slug_as_existing_post() {
         wp_set_current_user( self::$editor_id );
-        $this->factory()->post->create( array( 'post_name' => 'sample-slug' ) );
+        self::factory()->post->create( array( 'post_name' => 'sample-slug' ) );
 
         $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', self::$post_id ) );

trunk/tests/phpunit/tests/rest-api/wpRestBlockPatternCategoriesController.php

@@ -137 +137 @@
     public function test_get_items_forbidden() {
         // Set current user without `edit_posts` capability.
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'subscriber' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 
         $request  = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );

trunk/tests/phpunit/tests/rest-api/wpRestBlockPatternsController.php

@@ -163 +163 @@
     public function test_get_items_forbidden() {
         // Set current user without `edit_posts` capability.
-        wp_set_current_user( $this->factory()->user->create( array( 'role' => 'subscriber' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 
         $request  = new WP_REST_Request( 'GET', static::REQUEST_ROUTE );

trunk/tests/phpunit/tests/term/isTermPubliclyViewable.php

@@ -26 +26 @@
      */
     public function test_is_term_publicly_viewable( $taxonomy, $expected ) {
-        $term_id = $this->factory()->term->create(
+        $term_id = self::factory()->term->create(
             array(
                 'taxonomy' => $taxonomy,

trunk/tests/phpunit/tests/term/termCounts.php

@@ -91 +91 @@
         $term_count = get_term( get_option( 'default_category' ) )->count;
         // Do not use shared fixture for this test as it relies on a new post.
-        $post_id = $this->factory()->post->create( array( 'post_status' => $post_status ) );
+        $post_id = self::factory()->post->create( array( 'post_status' => $post_status ) );
 
         $expected = $term_count + $change;
@@ -245 +245 @@
         add_filter( 'update_post_term_count_statuses', array( $this, 'add_custom_status_to_counted_statuses' ) );
 
-        $post_id = $this->factory()->post->create( array( 'post_status' => $post_status ) );
+        $post_id = self::factory()->post->create( array( 'post_status' => $post_status ) );
         wp_add_object_terms( $post_id, self::$attachment_term, 'wp_test_tax_counts' );
         $attachment_id = self::factory()->attachment->create_object(
@@ -297 +297 @@
         $term_count = get_term( self::$attachment_term )->count;
         // Do not use shared fixture for this test as it relies on a new post.
-        $post_id = $this->factory()->post->create( array( 'post_status' => $post_status ) );
+        $post_id = self::factory()->post->create( array( 'post_status' => $post_status ) );
         wp_add_object_terms( $post_id, self::$attachment_term, 'wp_test_tax_counts' );
         $attachment_id = self::factory()->attachment->create_object(

trunk/tests/phpunit/tests/theme.php

@@ -367 +367 @@
      */
     public function test_wp_keep_alive_customize_changeset_dependent_auto_drafts() {
-        $nav_created_post_ids = $this->factory()->post->create_many(
+        $nav_created_post_ids = self::factory()->post->create_many(
             2,
             array(

trunk/tests/phpunit/tests/user.php

@@ -1697 +1697 @@
         $was_confirmation_email_sent = false;
 
-        $user = $this->factory()->user->create_and_get(
+        $user = self::factory()->user->create_and_get(
             array(
                 'user_email' => 'before@example.com',
@@ -1734 +1734 @@
         $was_confirmation_email_sent = false;
 
-        $user = $this->factory()->user->create_and_get(
+        $user = self::factory()->user->create_and_get(
             array(
                 'user_email' => 'before@example.com',

trunk/tests/phpunit/tests/widgets/wpWidgetCustomHtml.php

@@ -173 +173 @@
 
         wp_set_current_user(
-            $this->factory()->user->create(
+            self::factory()->user->create(
                 array(
                     'role' => 'administrator',
@@ -242 +242 @@
      */
     public function test_enqueue_admin_scripts_when_logged_in_and_syntax_highlighting_on() {
-        $user = $this->factory()->user->create();
+        $user = self::factory()->user->create();
         wp_set_current_user( $user );
         wp_get_current_user()->syntax_highlighting = 'true';
@@ -263 +263 @@
      */
     public function test_enqueue_admin_scripts_when_logged_in_and_syntax_highlighting_off() {
-        $user = $this->factory()->user->create();
+        $user = self::factory()->user->create();
         wp_set_current_user( $user );
         update_user_meta( $user, 'syntax_highlighting', 'false' );

trunk/tests/phpunit/tests/widgets/wpWidgetMedia.php

@@ -117 +117 @@
         global $wp_customize;
         wp_set_current_user(
-            $this->factory()->user->create(
+            self::factory()->user->create(
                 array(
                     'role' => 'administrator',
@@ -160 +160 @@
         $this->assertFalse( $widget->is_attachment_with_mime_type( -123, 'image' ) );
 
-        $post_id = $this->factory()->post->create();
+        $post_id = self::factory()->post->create();
         $this->assertFalse( $widget->is_attachment_with_mime_type( $post_id, 'image' ) );
         $this->assertFalse( $widget->is_attachment_with_mime_type( $attachment_id, 'video' ) );

trunk/tests/phpunit/tests/widgets/wpWidgetText.php

@@ -82 +82 @@
         global $wp_customize;
         wp_set_current_user(
-            $this->factory()->user->create(
+            self::factory()->user->create(
                 array(
                     'role' => 'administrator',
@@ -316 +316 @@
     public function test_widget_shortcodes() {
         global $post;
-        $post_id = $this->factory()->post->create();
+        $post_id = self::factory()->post->create();
         $post    = get_post( $post_id );
 
@@ -717 +717 @@
 
         wp_set_current_user(
-            $this->factory()->user->create(
+            self::factory()->user->create(
                 array(
                     'role' => 'administrator',