Changeset 54090

Timestamp:

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

Author:

SergeyBiryukov

Message:

Tests: Use the factory method instead of the property.

This replaces all references to the WP_UnitTestCase_Base::$factory property with static function calls to the WP_UnitTestCase_Base::factory() method.

This is a consistency improvement for the test suite.

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

Props jrf.
See #55652.

Location:

trunk/tests/phpunit/tests

Files:

• admin/includesScreen.php (modified) (1 diff)
• admin/includesTheme.php (modified) (1 diff)
• auth.php (modified) (1 diff)
• category/walkerCategory.php (modified) (1 diff)
• comment.php (modified) (2 diffs)
• comment/checkComment.php (modified) (1 diff)
• comment/commentsOpen.php (modified) (2 diffs)
• comment/pingsOpen.php (modified) (2 diffs)
• comment/template.php (modified) (3 diffs)
• customize/nav-menus.php (modified) (1 diff)
• date/getFeedBuildDate.php (modified) (2 diffs)
• date/getTheModifiedDate.php (modified) (4 diffs)
• date/xmlrpc.php (modified) (1 diff)
• general/template.php (modified) (8 diffs)
• general/wpGetDocumentTitle.php (modified) (3 diffs)
• image/functions.php (modified) (4 diffs)
• link/getPostTypeArchiveLink.php (modified) (1 diff)
• link/getThePrivacyPolicyLink.php (modified) (1 diff)
• media/getPostGalleries.php (modified) (27 diffs)
• menu/walker-nav-menu-edit.php (modified) (1 diff)
• menu/walker-nav-menu.php (modified) (2 diffs)
• menu/wpAjaxMenuQuickSearch.php (modified) (1 diff)
• multisite/wpInstallDefaults.php (modified) (3 diffs)
• post.php (modified) (1 diff)
• post/walkerPage.php (modified) (1 diff)
• post/wpPublishPost.php (modified) (3 diffs)
• privacy/wpPrivacySendErasureFulfillmentNotification.php (modified) (2 diffs)
• privacy/wpPrivacySendRequestConfirmationNotification.php (modified) (1 diff)
• query.php (modified) (6 diffs)
• query/conditionals.php (modified) (2 diffs)
• query/noFoundRows.php (modified) (2 diffs)
• query/search.php (modified) (2 diffs)
• rest-api/rest-attachments-controller.php (modified) (46 diffs)
• rest-api/rest-categories-controller.php (modified) (39 diffs)
• rest-api/rest-comments-controller.php (modified) (52 diffs)
• rest-api/rest-pages-controller.php (modified) (29 diffs)
• rest-api/rest-post-meta-fields.php (modified) (1 diff)
• rest-api/rest-post-statuses-controller.php (modified) (3 diffs)
• rest-api/rest-post-types-controller.php (modified) (1 diff)
• rest-api/rest-posts-controller.php (modified) (80 diffs)
• rest-api/rest-schema-setup.php (modified) (6 diffs)
• rest-api/rest-tags-controller.php (modified) (45 diffs)
• rest-api/rest-taxonomies-controller.php (modified) (1 diff)
• rest-api/rest-term-meta-fields.php (modified) (1 diff)
• rest-api/rest-users-controller.php (modified) (66 diffs)
• rest-api/wpRestMenusController.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)
• term/cache.php (modified) (6 diffs)
• term/getTermBy.php (modified) (4 diffs)
• user/capabilities.php (modified) (1 diff)
• user/query.php (modified) (2 diffs)
• user/wpDropdownUsers.php (modified) (4 diffs)

trunk/tests/phpunit/tests/admin/includesScreen.php

@@ -496 +496 @@
 
         if ( 'post.php' === $hook ) {
-            $post_id      = $this->factory->post->create(
+            $post_id      = self::factory()->post->create(
                 array(
                     'post_type' => 'type_shows_in_rest',

trunk/tests/phpunit/tests/admin/includesTheme.php

@@ -231 +231 @@
      */
     public function test_get_theme_featured_list_api() {
-        wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+        wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
         $featured_list_api = get_theme_feature_list( true );
         $this->assertNonEmptyMultidimensionalArray( $featured_list_api );

trunk/tests/phpunit/tests/auth.php

@@ -408 +408 @@
             'user_pass'  => 'password',
         );
-        $this->factory->user->create( $user_args );
+        self::factory()->user->create( $user_args );
 
         $this->assertInstanceOf( 'WP_User', wp_authenticate( $user_args['user_email'], $user_args['user_pass'] ) );

trunk/tests/phpunit/tests/category/walkerCategory.php

@@ -31 +31 @@
     public function test_start_el_with_empty_attributes( $value, $expected ) {
         $output   = '';
-        $category = $this->factory->category->create_and_get();
+        $category = self::factory()->category->create_and_get();
         $link     = get_term_link( $category );
 

trunk/tests/phpunit/tests/comment.php

@@ -721 +721 @@
          * Set up a comment for testing.
          */
-        $post = $this->factory->post->create(
+        $post = self::factory()->post->create(
             array(
                 'post_author' => self::$user_id,
@@ -727 +727 @@
         );
 
-        $comment = $this->factory->comment->create(
+        $comment = self::factory()->comment->create(
             array(
                 'comment_post_ID' => $post,

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

@@ -147 +147 @@
 
         // Make sure comment author has an approved comment.
-        $this->factory->comment->create(
+        self::factory()->comment->create(
             array(
                 'user_id'              => $subscriber_id,

trunk/tests/phpunit/tests/comment/commentsOpen.php

@@ -18 +18 @@
      */
     public function test_post_exist_status_open() {
-        $post = $this->factory->post->create_and_get();
+        $post = self::factory()->post->create_and_get();
         $this->assertTrue( comments_open( $post ) );
     }
@@ -26 +26 @@
      */
     public function test_post_exist_status_closed() {
-        $post                 = $this->factory->post->create_and_get();
+        $post                 = self::factory()->post->create_and_get();
         $post->comment_status = 'closed';
 

trunk/tests/phpunit/tests/comment/pingsOpen.php

@@ -18 +18 @@
      */
     public function test_post_exist_status_open() {
-        $post = $this->factory->post->create_and_get();
+        $post = self::factory()->post->create_and_get();
         $this->assertTrue( pings_open( $post ) );
     }
@@ -26 +26 @@
      */
     public function test_post_exist_status_closed() {
-        $post              = $this->factory->post->create_and_get();
+        $post              = self::factory()->post->create_and_get();
         $post->ping_status = 'closed';
 

trunk/tests/phpunit/tests/comment/template.php

@@ -59 +59 @@
     public function test_get_comments_number_text_with_post_id() {
         $post_id = self::$post_id;
-        $this->factory->comment->create_post_comments( $post_id, 6 );
+        self::factory()->comment->create_post_comments( $post_id, 6 );
 
         $comments_number_text = get_comments_number_text( false, false, false, $post_id );
@@ -85 +85 @@
         $this->assertSame( __( 'No Comments' ), get_comments_number_text() );
 
-        $this->factory->comment->create_post_comments( $post_id, 1 );
+        self::factory()->comment->create_post_comments( $post_id, 1 );
         $this->go_to( $permalink );
 
         $this->assertSame( __( '1 Comment' ), get_comments_number_text() );
 
-        $this->factory->comment->create_post_comments( $post_id, 1 );
+        self::factory()->comment->create_post_comments( $post_id, 1 );
         $this->go_to( $permalink );
 
@@ -107 +107 @@
         $permalink = get_permalink( $post_id );
 
-        $this->factory->comment->create_post_comments( $post_id, $number );
+        self::factory()->comment->create_post_comments( $post_id, $number );
         $this->go_to( $permalink );
 

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

@@ -418 +418 @@
         );
 
-        $term_id = $this->factory->term->create(
+        $term_id = self::factory()->term->create(
             array(
                 'taxonomy' => 'wptests_tax',

trunk/tests/phpunit/tests/date/getFeedBuildDate.php

@@ -56 +56 @@
         $this->assertFalse( get_feed_build_date( DATE_RFC3339 ), 'False when unable to determine valid time' );
 
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_date' => $datetime->format( 'Y-m-d H:i:s' ),
@@ -69 +69 @@
         );
 
-        $post_id_broken = $this->factory->post->create();
+        $post_id_broken = self::factory()->post->create();
         $post_broken    = get_post( $post_id_broken );
 

trunk/tests/phpunit/tests/date/getTheModifiedDate.php

@@ -21 +21 @@
             'post_date_gmt' => '2016-01-21 15:34:36',
         );
-        $post_id  = $this->factory->post->create( $details );
+        $post_id  = self::factory()->post->create( $details );
         $format   = 'Y-m-d';
         $expected = '2016-01-21';
@@ -40 +40 @@
             'post_date_gmt' => '2016-01-21 15:34:36',
         );
-        $post_id = $this->factory->post->create( $details );
+        $post_id = self::factory()->post->create( $details );
         $post    = get_post( $post_id );
 
@@ -112 +112 @@
             'post_date_gmt' => '2016-01-21 15:34:36',
         );
-        $post_id  = $this->factory->post->create( $details );
+        $post_id  = self::factory()->post->create( $details );
         $format   = 'G';
         $expected = 1453390476;
@@ -131 +131 @@
             'post_date_gmt' => '2016-01-21 15:34:36',
         );
-        $post_id = $this->factory->post->create( $details );
+        $post_id = self::factory()->post->create( $details );
         $post    = get_post( $post_id );
 

trunk/tests/phpunit/tests/date/xmlrpc.php

@@ -222 +222 @@
 
         $this->make_user_by_role( 'administrator' );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         $comment_data = array(

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

@@ -105 +105 @@
      */
     public function test_has_site_icon_returns_true_when_called_for_other_site_with_site_icon_set() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
         $this->set_site_icon();
@@ -120 +120 @@
      */
     public function test_has_site_icon_returns_false_when_called_for_other_site_without_site_icon_set() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
 
         $this->assertFalse( has_site_icon( $blog_id ) );
@@ -299 +299 @@
      */
     public function test_has_custom_logo_returns_true_when_called_for_other_site_with_custom_logo_set() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
         $this->set_custom_logo();
@@ -314 +314 @@
      */
     public function test_has_custom_logo_returns_false_when_called_for_other_site_without_custom_logo_set() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
 
         $this->assertFalse( has_custom_logo( $blog_id ) );
@@ -344 +344 @@
      */
     public function test_get_custom_logo_returns_logo_when_called_for_other_site_with_custom_logo_set() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
 
@@ -467 +467 @@
      */
     public function test_get_site_icon_url_preserves_switched_state() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
 
@@ -487 +487 @@
      */
     public function test_has_custom_logo_preserves_switched_state() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
 
@@ -507 +507 @@
      */
     public function test_get_custom_logo_preserves_switched_state() {
-        $blog_id = $this->factory->blog->create();
+        $blog_id = self::factory()->blog->create();
         switch_to_blog( $blog_id );
 

trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php

@@ -102 +102 @@
         update_option(
             'page_on_front',
-            $this->factory->post->create(
+            self::factory()->post->create(
                 array(
                     'post_title' => 'front-page',
@@ -129 +129 @@
 
     public function test_home_title() {
-        $blog_page_id = $this->factory->post->create(
+        $blog_page_id = self::factory()->post->create(
             array(
                 'post_title' => 'blog-page',
@@ -206 +206 @@
         );
 
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_type' => 'cpt',

trunk/tests/phpunit/tests/image/functions.php

@@ -659 +659 @@
         }
 
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $test_file,
             0,
@@ -736 +736 @@
         }
 
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $test_file,
             0,
@@ -809 +809 @@
         }
 
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $test_file,
             0,
@@ -883 +883 @@
         }
 
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $pdf_path,
             0,

trunk/tests/phpunit/tests/link/getPostTypeArchiveLink.php

@@ -20 +20 @@
      */
     public function test_get_post_archive_link_with_post_archive_on_a_blog_page() {
-        $page_for_posts = $this->factory->post->create(
+        $page_for_posts = self::factory()->post->create(
             array(
                 'post_title' => 'blog-page',

trunk/tests/phpunit/tests/link/getThePrivacyPolicyLink.php

@@ -116 +116 @@
      */
     public function test_function_should_return_empty_string_when_privacy_page_title_empty() {
-        $nameless_page_id = $this->factory->post->create(
+        $nameless_page_id = self::factory()->post->create(
             array(
                 'post_type'  => 'page',

trunk/tests/phpunit/tests/media/getPostGalleries.php

@@ -29 +29 @@
      */
     public function test_returns_empty_array_with_post_with_no_gallery() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '<p>A post with no gallery</p>',
@@ -50 +50 @@
      */
     public function test_returns_only_galleries( $content, $needle ) {
-        $image_id = $this->factory->attachment->create_object(
+        $image_id = self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -67 +67 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $content,
@@ -125 +125 @@
     public function test_returns_no_srcs_with_shortcode_in_post_with_no_attached_images() {
         // Set up an unattached image.
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -134 +134 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '[gallery]',
@@ -174 +174 @@
     public function test_returns_no_srcs_with_block_in_post_with_no_attached_images() {
         // Set up an unattached image.
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -183 +183 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '<!-- wp:gallery -->',
@@ -232 +232 @@
     public function test_returns_no_srcs_with_block_v2_in_post_with_no_attached_images() {
         // Set up an unattached image.
-        $image_id = $this->factory->attachment->create_object(
+        $image_id = self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -261 +261 @@
 BLOB;
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $blob,
@@ -310 +310 @@
      */
     public function test_returns_html_with_shortcode_gallery() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => 'I have no gallery',
@@ -316 +316 @@
         );
 
-        $post_id_two = $this->factory->post->create(
+        $post_id_two = self::factory()->post->create(
             array(
                 'post_content' => "[gallery id='$post_id']",
@@ -322 +322 @@
         );
 
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -364 +364 @@
      */
     public function test_returns_html_with_block_gallery() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => 'I have no gallery.',
@@ -371 +371 @@
 
         // Set up an unattached image.
-        $image_id = $this->factory->attachment->create(
+        $image_id = self::factory()->attachment->create(
             array(
                 'file'           => 'test.jpg',
@@ -388 +388 @@
 BLOB;
 
-        $post_id_two = $this->factory->post->create(
+        $post_id_two = self::factory()->post->create(
             array(
                 'post_content' => $blob,
@@ -427 +427 @@
      */
     public function test_returns_html_with_block_gallery_v2() {
-        $image_id = $this->factory->attachment->create_object(
+        $image_id = self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -456 +456 @@
 BLOB;
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $blob,
@@ -496 +496 @@
      */
     public function test_respects_post_id_with_shortcode_gallery() {
-        $global_post_id = $this->factory->post->create(
+        $global_post_id = self::factory()->post->create(
             array(
                 'post_content' => 'Global Post',
             )
         );
-        $post_id        = $this->factory->post->create(
+        $post_id        = self::factory()->post->create(
             array(
                 'post_content' => '[gallery]',
             )
         );
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -578 +578 @@
         $ids_joined = join( ',', $ids );
 
-        $global_post_id = $this->factory->post->create(
+        $global_post_id = self::factory()->post->create(
             array(
                 'post_content' => 'Global Post',
@@ -589 +589 @@
 BLOB;
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $blob,
             )
         );
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -658 +658 @@
         $metadata       = array_merge( array( 'file' => 'image1.jpg' ), self::IMG_META );
         $url            = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . 'image1.jpg';
-        $global_post_id = $this->factory->post->create(
+        $global_post_id = self::factory()->post->create(
             array(
                 'post_content' => 'Global Post',
@@ -684 +684 @@
 BLOB;
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $blob,
             )
         );
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -743 +743 @@
      */
     public function test_respects_shortcode_id_attribute() {
-        $post_id     = $this->factory->post->create(
+        $post_id     = self::factory()->post->create(
             array(
                 'post_content' => 'No gallery defined',
             )
         );
-        $post_id_two = $this->factory->post->create(
+        $post_id_two = self::factory()->post->create(
             array(
                 'post_content' => "[gallery id='$post_id']",
             )
         );
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -951 +951 @@
     public function test_returns_srcs_from_html_with_block_with_no_json_blob() {
         // Set up an unattached image.
-        $image_id = $this->factory->attachment->create_object(
+        $image_id = self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -973 +973 @@
 BLOB;
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => $blob,
@@ -1023 +1023 @@
      */
     public function test_returns_srcs_with_nested_block_gallery() {
-        $post_id  = $this->factory->post->create(
+        $post_id  = self::factory()->post->create(
             array(
                 'post_content' => 'I have no gallery.',
             )
         );
-        $image_id = $this->factory->attachment->create_object(
+        $image_id = self::factory()->attachment->create_object(
             array(
                 'file'           => 'test.jpg',
@@ -1046 +1046 @@
 BLOB;
 
-        $post_id_two = $this->factory->post->create( array( 'post_content' => $blob ) );
+        $post_id_two = self::factory()->post->create( array( 'post_content' => $blob ) );
 
         $galleries = get_post_galleries( $post_id_two, false );

trunk/tests/phpunit/tests/menu/walker-nav-menu-edit.php

@@ -41 +41 @@
         $expected = '';
 
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         $item = array(

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

@@ -50 +50 @@
     public function test_noopener_no_referrer_for_target_blank() {
         $actual     = '';
-        $post_id    = $this->factory->post->create();
+        $post_id    = self::factory()->post->create();
         $post_title = get_the_title( $post_id );
 
@@ -81 +81 @@
     public function test_start_el_with_empty_attributes( $value, $expected ) {
         $output     = '';
-        $post_id    = $this->factory->post->create();
+        $post_id    = self::factory()->post->create();
         $post_title = get_the_title( $post_id );
 

trunk/tests/phpunit/tests/menu/wpAjaxMenuQuickSearch.php

@@ -105 +105 @@
         register_taxonomy( 'wptests_tax', 'post' );
 
-        $this->factory->term->create(
+        self::factory()->term->create(
             array(
                 'taxonomy' => 'wptests_tax',

trunk/tests/phpunit/tests/multisite/wpInstallDefaults.php

@@ -14 +14 @@
          */
         public function test_option_should_not_be_empty_by_default() {
-            $blog_id = $this->factory->blog->create();
+            $blog_id = self::factory()->blog->create();
 
             switch_to_blog( $blog_id );
@@ -40 +40 @@
             update_site_option( 'first_comment', '' );
 
-            $blog_id = $this->factory->blog->create();
+            $blog_id = self::factory()->blog->create();
 
             switch_to_blog( $blog_id );
@@ -66 +66 @@
             update_site_option( 'first_comment', 'Some comment content' );
 
-            $blog_id = $this->factory->blog->create();
+            $blog_id = self::factory()->blog->create();
 
             switch_to_blog( $blog_id );

trunk/tests/phpunit/tests/post.php

@@ -455 +455 @@
         add_filter( 'pre_wp_unique_post_slug', array( $this, 'filter_pre_wp_unique_post_slug' ), 10, 6 );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'title'       => 'An example',

trunk/tests/phpunit/tests/post/walkerPage.php

@@ -29 +29 @@
     public function test_start_el_with_empty_attributes( $value, $expected ) {
         $output = '';
-        $page   = $this->factory->post->create_and_get( array( 'post_type' => 'page' ) );
+        $page   = self::factory()->post->create_and_get( array( 'post_type' => 'page' ) );
         $link   = get_permalink( $page );
 

trunk/tests/phpunit/tests/post/wpPublishPost.php

@@ -143 +143 @@
     public function test_wp_publish_post_respects_current_categories() {
         $post_id     = self::$auto_draft_id;
-        $category_id = $this->factory->term->create( array( 'taxonomy' => 'category' ) );
+        $category_id = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
         wp_set_post_categories( $post_id, $category_id );
         wp_publish_post( $post_id );
@@ -184 +184 @@
     public function test_wp_publish_post_adds_default_category_when_tagged() {
         $post_id = self::$auto_draft_id;
-        $tag_id  = $this->factory->term->create( array( 'taxonomy' => 'post_tag' ) );
+        $tag_id  = self::factory()->term->create( array( 'taxonomy' => 'post_tag' ) );
         wp_set_post_tags( $post_id, array( $tag_id ) );
         wp_publish_post( $post_id );
@@ -219 +219 @@
 
         $post_id = self::$auto_draft_id;
-        $term_id = $this->factory->term->create( array( 'taxonomy' => 'tax_51292' ) );
+        $term_id = self::factory()->term->create( array( 'taxonomy' => 'tax_51292' ) );
         wp_set_object_terms( $post_id, array( $term_id ), 'tax_51292' );
         wp_publish_post( $post_id );

trunk/tests/phpunit/tests/privacy/wpPrivacySendErasureFulfillmentNotification.php

@@ -132 +132 @@
      */
     public function test_should_send_email_with_privacy_policy() {
-        $privacy_policy = $this->factory->post->create(
+        $privacy_policy = self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -308 +308 @@
      */
     public function test_should_not_send_email_when_not_user_request() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_type' => 'post', // Should be 'user_request'.

trunk/tests/phpunit/tests/privacy/wpPrivacySendRequestConfirmationNotification.php

@@ -56 +56 @@
      */
     public function test_function_should_not_send_email_when_not_a_wp_user_request() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_type' => 'post',

trunk/tests/phpunit/tests/query.php

@@ -645 +645 @@
         register_taxonomy( 'tax2', 'post' );
 
-        $term1   = $this->factory->term->create(
+        $term1   = self::factory()->term->create(
             array(
                 'taxonomy' => 'tax1',
@@ -651 +651 @@
             )
         );
-        $term2   = $this->factory->term->create(
+        $term2   = self::factory()->term->create(
             array(
                 'taxonomy' => 'tax2',
@@ -657 +657 @@
             )
         );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
         wp_set_object_terms( $post_id, 'term1', 'tax1' );
         wp_set_object_terms( $post_id, 'term2', 'tax2' );
@@ -675 +675 @@
         register_taxonomy( 'tax2', 'post' );
 
-        $term1   = $this->factory->term->create(
+        $term1   = self::factory()->term->create(
             array(
                 'taxonomy' => 'tax1',
@@ -681 +681 @@
             )
         );
-        $term2   = $this->factory->term->create(
+        $term2   = self::factory()->term->create(
             array(
                 'taxonomy' => 'tax2',
@@ -687 +687 @@
             )
         );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
         wp_set_object_terms( $post_id, 'term1', 'tax1' );
         wp_set_object_terms( $post_id, 'term2', 'tax2' );

trunk/tests/phpunit/tests/query/conditionals.php

@@ -979 +979 @@
         $this->set_permalink_structure( '/%postname%/' );
 
-        $attachment_id = $this->factory->post->create(
+        $attachment_id = self::factory()->post->create(
             array(
                 'post_type' => 'attachment',
@@ -985 +985 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title' => get_post( $attachment_id )->post_title,

trunk/tests/phpunit/tests/query/noFoundRows.php

@@ -74 +74 @@
      */
     public function test_no_found_rows_default_with_nopaging_true() {
-        $p = $this->factory->post->create();
+        $p = self::factory()->post->create();
 
         $q = new WP_Query(
@@ -91 +91 @@
      */
     public function test_no_found_rows_default_with_postsperpage_minus1() {
-        $p = $this->factory->post->create();
+        $p = self::factory()->post->create();
 
         $q = new WP_Query(

trunk/tests/phpunit/tests/query/search.php

@@ -267 +267 @@
      */
     public function test_s_zero() {
-        $p1 = $this->factory->post->create(
+        $p1 = self::factory()->post->create(
             array(
                 'post_status'  => 'publish',
@@ -276 +276 @@
         );
 
-        $p2 = $this->factory->post->create(
+        $p2 = self::factory()->post->create(
             array(
                 'post_status'  => 'publish',

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

@@ -186 +186 @@
         $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
         // Single.
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -247 +247 @@
 
     public function test_registered_get_item_params() {
-        $id1      = $this->factory->attachment->create_object(
+        $id1      = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -267 +267 @@
      */
     public function test_allow_header_sent_on_options_request() {
-        $id1      = $this->factory->attachment->create_object(
+        $id1      = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -295 +295 @@
     public function test_get_items() {
         wp_set_current_user( 0 );
-        $id1            = $this->factory->attachment->create_object(
-            $this->test_file,
-            0,
-            array(
-                'post_mime_type' => 'image/jpeg',
-                'post_excerpt'   => 'A sample caption',
-            )
-        );
-        $draft_post     = $this->factory->post->create( array( 'post_status' => 'draft' ) );
-        $id2            = $this->factory->attachment->create_object(
+        $id1            = self::factory()->attachment->create_object(
+            $this->test_file,
+            0,
+            array(
+                'post_mime_type' => 'image/jpeg',
+                'post_excerpt'   => 'A sample caption',
+            )
+        );
+        $draft_post     = self::factory()->post->create( array( 'post_status' => 'draft' ) );
+        $id2            = self::factory()->attachment->create_object(
             $this->test_file,
             $draft_post,
@@ -312 +312 @@
             )
         );
-        $published_post = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3            = $this->factory->attachment->create_object(
+        $published_post = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3            = self::factory()->attachment->create_object(
             $this->test_file,
             $published_post,
@@ -335 +335 @@
     public function test_get_items_logged_in_editor() {
         wp_set_current_user( self::$editor_id );
-        $id1            = $this->factory->attachment->create_object(
-            $this->test_file,
-            0,
-            array(
-                'post_mime_type' => 'image/jpeg',
-                'post_excerpt'   => 'A sample caption',
-            )
-        );
-        $draft_post     = $this->factory->post->create( array( 'post_status' => 'draft' ) );
-        $id2            = $this->factory->attachment->create_object(
+        $id1            = self::factory()->attachment->create_object(
+            $this->test_file,
+            0,
+            array(
+                'post_mime_type' => 'image/jpeg',
+                'post_excerpt'   => 'A sample caption',
+            )
+        );
+        $draft_post     = self::factory()->post->create( array( 'post_status' => 'draft' ) );
+        $id2            = self::factory()->attachment->create_object(
             $this->test_file,
             $draft_post,
@@ -352 +352 @@
             )
         );
-        $published_post = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3            = $this->factory->attachment->create_object(
+        $published_post = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3            = self::factory()->attachment->create_object(
             $this->test_file,
             $published_post,
@@ -373 +373 @@
 
     public function test_get_items_media_type() {
-        $id1      = $this->factory->attachment->create_object(
+        $id1      = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -396 +396 @@
 
     public function test_get_items_mime_type() {
-        $id1      = $this->factory->attachment->create_object(
+        $id1      = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -419 +419 @@
 
     public function test_get_items_parent() {
-        $post_id        = $this->factory->post->create( array( 'post_title' => 'Test Post' ) );
-        $attachment_id  = $this->factory->attachment->create_object(
+        $post_id        = self::factory()->post->create( array( 'post_title' => 'Test Post' ) );
+        $attachment_id  = self::factory()->attachment->create_object(
             $this->test_file,
             $post_id,
@@ -428 +428 @@
             )
         );
-        $attachment_id2 = $this->factory->attachment->create_object(
+        $attachment_id2 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -464 +464 @@
     public function test_get_items_invalid_status_param_is_error_response() {
         wp_set_current_user( self::$editor_id );
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -482 +482 @@
         // Logged out users can't make the request.
         wp_set_current_user( 0 );
-        $attachment_id1 = $this->factory->attachment->create_object(
+        $attachment_id1 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -506 +506 @@
         // Logged out users can't make the request.
         wp_set_current_user( 0 );
-        $attachment_id1 = $this->factory->attachment->create_object(
+        $attachment_id1 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -515 +515 @@
             )
         );
-        $attachment_id2 = $this->factory->attachment->create_object(
+        $attachment_id2 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -551 +551 @@
 
     public function test_get_items_valid_date() {
-        $id1     = $this->factory->attachment->create_object(
+        $id1     = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -560 +560 @@
             )
         );
-        $id2     = $this->factory->attachment->create_object(
+        $id2     = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -569 +569 @@
             )
         );
-        $id3     = $this->factory->attachment->create_object(
+        $id3     = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -602 +602 @@
      */
     public function test_get_items_valid_modified_date() {
-        $id1 = $this->factory->attachment->create_object(
+        $id1 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -611 +611 @@
             )
         );
-        $id2 = $this->factory->attachment->create_object(
+        $id2 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -620 +620 @@
             )
         );
-        $id3 = $this->factory->attachment->create_object(
+        $id3 = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -662 +662 @@
      */
     public function test_get_items_with_empty_page_runs_count_query_after() {
-        $this->factory->attachment->create_object(
+        self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -684 +684 @@
 
     public function test_get_item() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -704 +704 @@
      */
     public function test_get_item_sizes() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -735 +735 @@
      */
     public function test_get_item_sizes_with_no_url() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -762 +762 @@
     public function test_get_item_private_post_not_authenticated() {
         wp_set_current_user( 0 );
-        $draft_post = $this->factory->post->create( array( 'post_status' => 'draft' ) );
-        $id1        = $this->factory->attachment->create_object(
+        $draft_post = self::factory()->post->create( array( 'post_status' => 'draft' ) );
+        $id1        = self::factory()->attachment->create_object(
             $this->test_file,
             $draft_post,
@@ -777 +777 @@
 
     public function test_get_item_inherit_status_with_invalid_parent() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             REST_TESTS_IMPOSSIBLY_HIGH_NUMBER,
@@ -794 +794 @@
 
     public function test_get_item_auto_status_with_invalid_parent_not_authenticated_returns_error() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             REST_TESTS_IMPOSSIBLY_HIGH_NUMBER,
@@ -964 +964 @@
 
     public function test_create_item_invalid_edit_permissions() {
-        $post_id = $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
+        $post_id = self::factory()->post->create( array( 'post_author' => self::$editor_id ) );
         wp_set_current_user( self::$author_id );
         $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
@@ -973 +973 @@
 
     public function test_create_item_invalid_upload_permissions() {
-        $post_id = $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
+        $post_id = self::factory()->post->create( array( 'post_author' => self::$editor_id ) );
         wp_set_current_user( self::$uploader_id );
         $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
@@ -982 +982 @@
 
     public function test_create_item_invalid_post_type() {
-        $attachment_id = $this->factory->post->create(
+        $attachment_id = self::factory()->post->create(
             array(
                 'post_type'   => 'attachment',
@@ -1047 +1047 @@
     public function test_update_item() {
         wp_set_current_user( self::$editor_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1076 +1076 @@
     public function test_update_item_parent() {
         wp_set_current_user( self::$editor_id );
-        $original_parent = $this->factory->post->create( array() );
-        $attachment_id   = $this->factory->attachment->create_object(
+        $original_parent = self::factory()->post->create( array() );
+        $attachment_id   = self::factory()->attachment->create_object(
             $this->test_file,
             $original_parent,
@@ -1090 +1090 @@
         $this->assertSame( $original_parent, $attachment->post_parent );
 
-        $new_parent = $this->factory->post->create( array() );
+        $new_parent = self::factory()->post->create( array() );
         $request    = new WP_REST_Request( 'POST', '/wp/v2/media/' . $attachment_id );
         $request->set_param( 'post', $new_parent );
@@ -1101 +1101 @@
     public function test_update_item_invalid_permissions() {
         wp_set_current_user( self::$author_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1117 +1117 @@
 
     public function test_update_item_invalid_post_type() {
-        $attachment_id = $this->factory->post->create(
+        $attachment_id = self::factory()->post->create(
             array(
                 'post_type'   => 'attachment',
@@ -1125 +1125 @@
         );
         wp_set_current_user( self::$editor_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1449 +1449 @@
     public function test_delete_item() {
         wp_set_current_user( self::$editor_id );
-        $attachment_id    = $this->factory->attachment->create_object(
+        $attachment_id    = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1465 +1465 @@
     public function test_delete_item_no_trash() {
         wp_set_current_user( self::$editor_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1490 +1490 @@
     public function test_delete_item_invalid_delete_permissions() {
         wp_set_current_user( self::$author_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1505 +1505 @@
 
     public function test_prepare_item() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1524 +1524 @@
 
     public function test_prepare_item_limit_fields() {
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1615 +1615 @@
         $this->assertSame( $schema, $data['schema']['properties']['my_custom_int'] );
 
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1652 +1652 @@
 
         wp_set_current_user( self::$editor_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,
@@ -1678 +1678 @@
 
     public function test_search_item_by_filename() {
-        $id1 = $this->factory->attachment->create_object(
-            $this->test_file,
-            0,
-            array(
-                'post_mime_type' => 'image/jpeg',
-            )
-        );
-        $id2 = $this->factory->attachment->create_object(
+        $id1 = self::factory()->attachment->create_object(
+            $this->test_file,
+            0,
+            array(
+                'post_mime_type' => 'image/jpeg',
+            )
+        );
+        $id2 = self::factory()->attachment->create_object(
             $this->test_file2,
             0,
@@ -1936 +1936 @@
 
         wp_set_current_user( self::$editor_id );
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $this->test_file,
             0,

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

@@ -122 +122 @@
         $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
         // Single.
-        $category1 = $this->factory->category->create( array( 'name' => 'Season 5' ) );
+        $category1 = self::factory()->category->create( array( 'name' => 'Season 5' ) );
         $request   = new WP_REST_Request( 'OPTIONS', '/wp/v2/categories/' . $category1 );
         $response  = rest_get_server()->dispatch( $request );
@@ -173 +173 @@
 
     public function test_get_items_hide_empty_arg() {
-        $post_id   = $this->factory->post->create();
-        $category1 = $this->factory->category->create( array( 'name' => 'Season 5' ) );
-        $category2 = $this->factory->category->create( array( 'name' => 'The Be Sharps' ) );
+        $post_id   = self::factory()->post->create();
+        $category1 = self::factory()->category->create( array( 'name' => 'Season 5' ) );
+        $category2 = self::factory()->category->create( array( 'name' => 'The Be Sharps' ) );
 
         $total_categories = self::$total_categories + 2;
@@ -198 +198 @@
 
     public function test_get_items_parent_zero_arg() {
-        $parent1 = $this->factory->category->create( array( 'name' => 'Homer' ) );
-        $parent2 = $this->factory->category->create( array( 'name' => 'Marge' ) );
-        $this->factory->category->create(
+        $parent1 = self::factory()->category->create( array( 'name' => 'Homer' ) );
+        $parent2 = self::factory()->category->create( array( 'name' => 'Marge' ) );
+        self::factory()->category->create(
             array(
                 'name'   => 'Bart',
@@ -206 +206 @@
             )
         );
-        $this->factory->category->create(
+        self::factory()->category->create(
             array(
                 'name'   => 'Lisa',
@@ -230 +230 @@
 
     public function test_get_items_parent_zero_arg_string() {
-        $parent1 = $this->factory->category->create( array( 'name' => 'Homer' ) );
-        $parent2 = $this->factory->category->create( array( 'name' => 'Marge' ) );
-        $this->factory->category->create(
+        $parent1 = self::factory()->category->create( array( 'name' => 'Homer' ) );
+        $parent2 = self::factory()->category->create( array( 'name' => 'Marge' ) );
+        self::factory()->category->create(
             array(
                 'name'   => 'Bart',
@@ -238 +238 @@
             )
         );
-        $this->factory->category->create(
+        self::factory()->category->create(
             array(
                 'name'   => 'Lisa',
@@ -262 +262 @@
 
     public function test_get_items_by_parent_non_found() {
-        $parent1 = $this->factory->category->create( array( 'name' => 'Homer' ) );
+        $parent1 = self::factory()->category->create( array( 'name' => 'Homer' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
@@ -285 +285 @@
 
     public function test_get_items_include_query() {
-        $id1 = $this->factory->category->create();
-        $id2 = $this->factory->category->create();
+        $id1 = self::factory()->category->create();
+        $id2 = self::factory()->category->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
@@ -306 +306 @@
 
     public function test_get_items_exclude_query() {
-        $id1 = $this->factory->category->create();
-        $id2 = $this->factory->category->create();
+        $id1 = self::factory()->category->create();
+        $id2 = self::factory()->category->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
@@ -326 +326 @@
 
     public function test_get_items_orderby_args() {
-        $this->factory->category->create( array( 'name' => 'Apple' ) );
-        $this->factory->category->create( array( 'name' => 'Banana' ) );
+        self::factory()->category->create( array( 'name' => 'Apple' ) );
+        self::factory()->category->create( array( 'name' => 'Banana' ) );
 
         /*
@@ -357 +357 @@
 
     public function test_get_items_orderby_id() {
-        $this->factory->category->create( array( 'name' => 'Cantaloupe' ) );
-        $this->factory->category->create( array( 'name' => 'Apple' ) );
-        $this->factory->category->create( array( 'name' => 'Banana' ) );
+        self::factory()->category->create( array( 'name' => 'Cantaloupe' ) );
+        self::factory()->category->create( array( 'name' => 'Apple' ) );
+        self::factory()->category->create( array( 'name' => 'Banana' ) );
 
         // Defaults to 'orderby' => 'name', 'order' => 'asc'.
@@ -393 +393 @@
 
     public function test_get_items_orderby_slugs() {
-        $this->factory->category->create( array( 'name' => 'Burrito' ) );
-        $this->factory->category->create( array( 'name' => 'Taco' ) );
-        $this->factory->category->create( array( 'name' => 'Chalupa' ) );
+        self::factory()->category->create( array( 'name' => 'Burrito' ) );
+        self::factory()->category->create( array( 'name' => 'Taco' ) );
+        self::factory()->category->create( array( 'name' => 'Chalupa' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
@@ -409 +409 @@
 
     protected function post_with_categories() {
-        $post_id   = $this->factory->post->create();
-        $category1 = $this->factory->category->create(
+        $post_id   = self::factory()->post->create();
+        $category1 = self::factory()->category->create(
             array(
                 'name'        => 'DC',
@@ -416 +416 @@
             )
         );
-        $category2 = $this->factory->category->create(
+        $category2 = self::factory()->category->create(
             array(
                 'name'        => 'Marvel',
@@ -422 +422 @@
             )
         );
-        $category3 = $this->factory->category->create(
+        $category3 = self::factory()->category->create(
             array(
                 'name'        => 'Image',
@@ -494 +494 @@
         $controller = new WP_REST_Terms_Controller( 'batman' );
         $controller->register_routes();
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -500 +500 @@
             )
         );
-        $term2 = $this->factory->term->create(
+        $term2 = self::factory()->term->create(
             array(
                 'name'     => 'Mask',
@@ -506 +506 @@
             )
         );
-        $this->factory->term->create(
+        self::factory()->term->create(
             array(
                 'name'     => 'Car',
@@ -512 +512 @@
             )
         );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
         wp_set_object_terms( $post_id, array( $term1, $term2 ), 'batman' );
 
@@ -526 +526 @@
 
     public function test_get_items_search_args() {
-        $this->factory->category->create( array( 'name' => 'Apple' ) );
-        $this->factory->category->create( array( 'name' => 'Banana' ) );
+        self::factory()->category->create( array( 'name' => 'Apple' ) );
+        self::factory()->category->create( array( 'name' => 'Banana' ) );
 
         /*
@@ -550 +550 @@
 
     public function test_get_items_slug_arg() {
-        $this->factory->category->create( array( 'name' => 'Apple' ) );
-        $this->factory->category->create( array( 'name' => 'Banana' ) );
+        self::factory()->category->create( array( 'name' => 'Apple' ) );
+        self::factory()->category->create( array( 'name' => 'Banana' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/categories' );
@@ -563 +563 @@
 
     public function test_get_terms_parent_arg() {
-        $category1 = $this->factory->category->create( array( 'name' => 'Parent' ) );
-        $this->factory->category->create(
+        $category1 = self::factory()->category->create( array( 'name' => 'Parent' ) );
+        self::factory()->category->create(
             array(
                 'name'   => 'Child',
@@ -588 +588 @@
     public function test_get_terms_private_taxonomy() {
         register_taxonomy( 'robin', 'post', array( 'public' => false ) );
-        $this->factory->term->create(
+        self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -594 +594 @@
             )
         );
-        $this->factory->term->create(
+        self::factory()->term->create(
             array(
                 'name'     => 'Mask',
@@ -633 +633 @@
 
         // 3rd page.
-        $this->factory->category->create();
+        self::factory()->category->create();
         $total_categories++;
         $total_pages++;
@@ -776 +776 @@
     public function test_get_term_private_taxonomy() {
         register_taxonomy( 'robin', 'post', array( 'public' => false ) );
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -790 +790 @@
     public function test_get_item_incorrect_taxonomy() {
         register_taxonomy( 'robin', 'post' );
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -825 +825 @@
         wp_set_current_user( self::$administrator );
 
-        $existing_id = $this->factory->category->create( array( 'name' => 'Existing' ) );
+        $existing_id = self::factory()->category->create( array( 'name' => 'Existing' ) );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories' );
@@ -891 +891 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create(), 'category' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
@@ -923 +923 @@
         );
 
-        $term = get_term_by( 'id', $this->factory->category->create( $orig_args ), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create( $orig_args ), 'category' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
@@ -969 +969 @@
         wp_set_current_user( self::$subscriber );
 
-        $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create(), 'category' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
@@ -980 +980 @@
         wp_set_current_user( self::$administrator );
 
-        $parent = get_term_by( 'id', $this->factory->category->create(), 'category' );
-        $term   = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $parent = get_term_by( 'id', self::factory()->category->create(), 'category' );
+        $term   = get_term_by( 'id', self::factory()->category->create(), 'category' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
@@ -995 +995 @@
         wp_set_current_user( self::$administrator );
 
-        $old_parent_term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $old_parent_term = get_term_by( 'id', self::factory()->category->create(), 'category' );
         $new_parent_id   = 0;
 
         $term = get_term_by(
             'id',
-            $this->factory->category->create(
+            self::factory()->category->create(
                 array(
                     'parent' => $old_parent_term->term_id,
@@ -1022 +1022 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create(), 'category' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/categories/' . $term->term_id );
@@ -1033 +1033 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
 
         $request = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . $term->term_id );
@@ -1047 +1047 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
+        $term = get_term_by( 'id', self::factory()->category->create( array( 'name' => 'Deleted Category' ) ), 'category' );
 
         $request  = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . $term->term_id );
@@ -1077 +1077 @@
         wp_set_current_user( self::$subscriber );
 
-        $term     = get_term_by( 'id', $this->factory->category->create(), 'category' );
+        $term     = get_term_by( 'id', self::factory()->category->create(), 'category' );
         $request  = new WP_REST_Request( 'DELETE', '/wp/v2/categories/' . $term->term_id );
         $response = rest_get_server()->dispatch( $request );
@@ -1109 +1109 @@
 
     public function test_prepare_taxonomy_term_child() {
-        $child = $this->factory->category->create(
+        $child = self::factory()->category->create(
             array(
                 'parent' => 1,
@@ -1171 +1171 @@
         $this->assertSame( $schema, $data['schema']['properties']['my_custom_int'] );
 
-        $category_id = $this->factory->category->create();
+        $category_id = self::factory()->category->create();
         $request     = new WP_REST_Request( 'GET', '/wp/v2/categories/' . $category_id );
 

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

@@ -238 +238 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -262 +262 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -285 +285 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -303 +303 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -322 +322 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -341 +341 @@
         );
 
-        $private_comment = $this->factory->comment->create( $args );
+        $private_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -360 +360 @@
         );
 
-        $private_comment = $this->factory->comment->create( $args );
+        $private_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -374 +374 @@
         wp_set_current_user( 0 );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -395 +395 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -425 +425 @@
         wp_set_current_user( self::$admin_id );
 
-        $this->factory->comment->create_post_comments( 0, 2 );
+        self::factory()->comment->create_post_comments( 0, 2 );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -454 +454 @@
 
     public function test_get_items_for_post() {
-        $second_post_id = $this->factory->post->create();
-        $this->factory->comment->create_post_comments( $second_post_id, 2 );
+        $second_post_id = self::factory()->post->create();
+        self::factory()->comment->create_post_comments( $second_post_id, 2 );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -479 +479 @@
         );
 
-        $id1 = $this->factory->comment->create( $args );
-        $id2 = $this->factory->comment->create( $args );
+        $id1 = self::factory()->comment->create( $args );
+        $id2 = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -519 +519 @@
         );
 
-        $id1 = $this->factory->comment->create( $args );
-        $id2 = $this->factory->comment->create( $args );
+        $id1 = self::factory()->comment->create( $args );
+        $id2 = self::factory()->comment->create( $args );
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -575 +575 @@
         );
 
-        $id = $this->factory->comment->create( $args );
+        $id = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -599 +599 @@
         wp_set_current_user( 0 );
 
-        $post_id = $this->factory->post->create( array( 'post_status' => 'private' ) );
+        $post_id = self::factory()->post->create( array( 'post_status' => 'private' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/comments' );
@@ -617 +617 @@
         );
 
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         $args['user_id'] = self::$subscriber_id;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         unset( $args['user_id'] );
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
 
         // Limit to comment author.
@@ -660 +660 @@
         );
 
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         $args['user_id'] = self::$subscriber_id;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         unset( $args['user_id'] );
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
 
         $total_comments = self::$total_comments + 3;
@@ -710 +710 @@
             'comment_post_ID'  => self::$post_id,
         );
-        $parent_id              = $this->factory->comment->create( $args );
-        $parent_id2             = $this->factory->comment->create( $args );
+        $parent_id              = self::factory()->comment->create( $args );
+        $parent_id2             = self::factory()->comment->create( $args );
         $args['comment_parent'] = $parent_id;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         $args['comment_parent'] = $parent_id2;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
 
         $total_comments = self::$total_comments + 4;
@@ -746 +746 @@
             'comment_post_ID'  => self::$post_id,
         );
-        $parent_id              = $this->factory->comment->create( $args );
-        $parent_id2             = $this->factory->comment->create( $args );
+        $parent_id              = self::factory()->comment->create( $args );
+        $parent_id2             = self::factory()->comment->create( $args );
         $args['comment_parent'] = $parent_id;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
         $args['comment_parent'] = $parent_id2;
-        $this->factory->comment->create( $args );
+        self::factory()->comment->create( $args );
 
         $total_comments = self::$total_comments + 4;
@@ -787 +787 @@
         );
 
-        $id = $this->factory->comment->create( $args );
+        $id = self::factory()->comment->create( $args );
 
         $total_comments = self::$total_comments + 1;
@@ -826 +826 @@
 
         // 3rd page.
-        $this->factory->comment->create(
+        self::factory()->comment->create(
             array(
                 'comment_post_ID' => self::$post_id,
@@ -896 +896 @@
 
     public function test_get_comments_valid_date() {
-        $comment1 = $this->factory->comment->create(
+        $comment1 = self::factory()->comment->create(
             array(
                 'comment_date'    => '2016-01-15T00:00:00Z',
@@ -902 +902 @@
             )
         );
-        $comment2 = $this->factory->comment->create(
+        $comment2 = self::factory()->comment->create(
             array(
                 'comment_date'    => '2016-01-16T00:00:00Z',
@@ -908 +908 @@
             )
         );
-        $comment3 = $this->factory->comment->create(
+        $comment3 = self::factory()->comment->create(
             array(
                 'comment_date'    => '2016-01-17T00:00:00Z',
@@ -1004 +1004 @@
         wp_set_current_user( 0 );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -1019 +1019 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -1048 +1048 @@
 
     public function test_get_comment_with_children_link() {
-        $comment_id_1 = $this->factory->comment->create(
+        $comment_id_1 = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -1056 +1056 @@
         );
 
-        $child_comment = $this->factory->comment->create(
+        $child_comment = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -1072 +1072 @@
 
     public function test_get_comment_without_children_link() {
-        $comment_id_1 = $this->factory->comment->create(
+        $comment_id_1 = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -1094 +1094 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request  = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%s', $password_comment ) );
@@ -1112 +1112 @@
         );
 
-        $password_comment = $this->factory->comment->create( $args );
+        $password_comment = self::factory()->comment->create( $args );
 
         $request = new WP_REST_Request( 'GET', sprintf( '/wp/v2/comments/%s', $password_comment ) );
@@ -1491 +1491 @@
 
     public function test_create_item_assign_different_user() {
-        $subscriber_id = $this->factory->user->create(
+        $subscriber_id = self::factory()->user->create(
             array(
                 'role'       => 'subscriber',
@@ -1522 +1522 @@
 
     public function test_create_comment_without_type() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -1560 +1560 @@
      */
     public function test_create_comment_with_invalid_type() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -1584 +1584 @@
 
     public function test_create_comment_invalid_email() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -1607 +1607 @@
 
     public function test_create_item_current_user() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'         => 'subscriber',
@@ -1729 +1729 @@
 
     public function test_create_comment_with_status_IP_and_user_agent() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -2007 +2007 @@
         wp_set_current_user( self::$subscriber_id );
 
-        $this->factory->comment->create(
+        self::factory()->comment->create(
             array(
                 'comment_post_ID'      => self::$post_id,
@@ -2032 +2032 @@
 
     public function test_create_comment_closed() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'comment_status' => 'closed',
@@ -2304 +2304 @@
 
     public function test_update_item() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -2348 +2348 @@
         update_option( 'timezone_string', $params['timezone_string'] );
 
-        $comment_id = $this->factory->comment->create();
+        $comment_id = self::factory()->comment->create();
 
         $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/comments/%d', $comment_id ) );
@@ -2375 +2375 @@
 
     public function test_update_item_no_content() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$admin_id );
@@ -2413 +2413 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 0,
@@ -2440 +2440 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 0,
@@ -2721 +2721 @@
 
     public function test_update_comment_private_post_invalid_permission() {
-        $private_comment_id = $this->factory->comment->create(
+        $private_comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -2746 +2746 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id_1 = $this->factory->comment->create(
+        $comment_id_1 = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -2754 +2754 @@
         );
 
-        $child_comment = $this->factory->comment->create(
+        $child_comment = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -3048 +3048 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -3068 +3068 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -3089 +3089 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -3124 +3124 @@
         wp_set_current_user( self::$admin_id );
 
-        $comment_id_1 = $this->factory->comment->create(
+        $comment_id_1 = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,
@@ -3132 +3132 @@
         );
 
-        $child_comment = $this->factory->comment->create(
+        $child_comment = self::factory()->comment->create(
             array(
                 'comment_approved' => 1,

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

@@ -52 +52 @@
         $this->assertSame( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
         // Single.
-        $page_id  = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $page_id  = self::factory()->post->create( array( 'post_type' => 'page' ) );
         $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/pages/' . $page_id );
         $response = rest_get_server()->dispatch( $request );
@@ -95 +95 @@
 
     public function test_get_items() {
-        $id1      = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $id2      = $this->factory->post->create(
+        $id1      = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $id2      = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
@@ -115 +115 @@
 
     public function test_get_items_parent_query() {
-        $id1 = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $id2 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -149 +149 @@
 
     public function test_get_items_parents_query() {
-        $id1 = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $id2 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -162 +162 @@
             )
         );
-        $id3 = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $id4 = $this->factory->post->create(
+        $id3 = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $id4 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -191 +191 @@
 
     public function test_get_items_parent_exclude_query() {
-        $id1 = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $this->factory->post->create(
+        $id1 = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -225 +225 @@
 
     public function test_get_items_menu_order_query() {
-        $id1 = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $id2 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -238 +238 @@
             )
         );
-        $id3 = $this->factory->post->create(
+        $id3 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -245 +245 @@
             )
         );
-        $id4 = $this->factory->post->create(
+        $id4 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -303 +303 @@
         // Private query vars inaccessible to unauthorized users.
         wp_set_current_user( 0 );
-        $page_id  = $this->factory->post->create(
-            array(
-                'post_status' => 'publish',
-                'post_type'   => 'page',
-            )
-        );
-        $draft_id = $this->factory->post->create(
+        $page_id  = self::factory()->post->create(
+            array(
+                'post_status' => 'publish',
+                'post_type'   => 'page',
+            )
+        );
+        $draft_id = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
@@ -337 +337 @@
 
     public function test_get_items_valid_date() {
-        $post1   = $this->factory->post->create(
+        $post1   = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-15T00:00:00Z',
@@ -343 +343 @@
             )
         );
-        $post2   = $this->factory->post->create(
+        $post2   = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-16T00:00:00Z',
@@ -349 +349 @@
             )
         );
-        $post3   = $this->factory->post->create(
+        $post3   = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-17T00:00:00Z',
@@ -379 +379 @@
      */
     public function test_get_items_valid_modified_date() {
-        $post1 = $this->factory->post->create(
+        $post1 = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-01 00:00:00',
@@ -385 +385 @@
             )
         );
-        $post2 = $this->factory->post->create(
+        $post2 = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-02 00:00:00',
@@ -391 +391 @@
             )
         );
-        $post3 = $this->factory->post->create(
+        $post3 = self::factory()->post->create(
             array(
                 'post_date' => '2016-01-03 00:00:00',
@@ -417 +417 @@
 
     public function test_get_item_invalid_post_type() {
-        $post_id  = $this->factory->post->create();
+        $post_id  = self::factory()->post->create();
         $request  = new WP_REST_Request( 'GET', '/wp/v2/pages/' . $post_id );
         $response = rest_get_server()->dispatch( $request );
@@ -449 +449 @@
 
     public function test_create_page_with_parent() {
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'type' => 'page',
@@ -499 +499 @@
 
     public function test_delete_item() {
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'  => 'page',
@@ -526 +526 @@
     public function test_prepare_item_limit_fields() {
         wp_set_current_user( self::$editor_id );
-        $page_id  = $this->factory->post->create(
+        $page_id  = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -548 +548 @@
 
     public function test_get_pages_params() {
-        $this->factory->post->create_many(
+        self::factory()->post->create_many(
             8,
             array(
@@ -579 +579 @@
     public function test_update_page_menu_order() {
 
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type' => 'page',
@@ -602 +602 @@
     public function test_update_page_menu_order_to_zero() {
 
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'  => 'page',
@@ -625 +625 @@
 
     public function test_update_page_parent_non_zero() {
-        $page_id1 = $this->factory->post->create(
-            array(
-                'post_type' => 'page',
-            )
-        );
-        $page_id2 = $this->factory->post->create(
+        $page_id1 = self::factory()->post->create(
+            array(
+                'post_type' => 'page',
+            )
+        );
+        $page_id2 = self::factory()->post->create(
             array(
                 'post_type' => 'page',
@@ -648 +648 @@
 
     public function test_update_page_parent_zero() {
-        $page_id1 = $this->factory->post->create(
-            array(
-                'post_type' => 'page',
-            )
-        );
-        $page_id2 = $this->factory->post->create(
+        $page_id1 = self::factory()->post->create(
+            array(
+                'post_type' => 'page',
+            )
+        );
+        $page_id2 = self::factory()->post->create(
             array(
                 'post_type'   => 'page',
@@ -672 +672 @@
 
     public function test_get_page_with_password() {
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'     => 'page',
@@ -690 +690 @@
 
     public function test_get_page_with_password_using_password() {
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'     => 'page',
@@ -712 +712 @@
 
     public function test_get_page_with_password_using_incorrect_password() {
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'     => 'page',
@@ -728 +728 @@
 
     public function test_get_page_with_password_without_permission() {
-        $page_id  = $this->factory->post->create(
+        $page_id  = self::factory()->post->create(
             array(
                 'post_type'     => 'page',

trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php

@@ -254 +254 @@
     protected function grant_write_permission() {
         // Ensure we have write permission.
-        $user = $this->factory->user->create(
+        $user = self::factory()->user->create(
             array(
                 'role' => 'editor',

trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php

@@ -44 +44 @@
 
     public function test_get_items_logged_in() {
-        $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'author' ) );
         wp_set_current_user( $user_id );
 
@@ -73 +73 @@
 
     public function test_get_item() {
-        $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'author' ) );
         wp_set_current_user( $user_id );
         $request = new WP_REST_Request( 'GET', '/wp/v2/statuses/publish' );
@@ -95 +95 @@
 
     public function test_get_item_invalid_internal() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
         wp_set_current_user( $user_id );
 

trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php

@@ -95 +95 @@
 
     public function test_get_item_edit_context() {
-        $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
+        $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
         wp_set_current_user( $editor_id );
         $request = new WP_REST_Request( 'GET', '/wp/v2/types/post' );

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

@@ -274 +274 @@
 
     public function test_get_items_author_query() {
-        $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
-        $this->factory->post->create( array( 'post_author' => self::$author_id ) );
+        self::factory()->post->create( array( 'post_author' => self::$editor_id ) );
+        self::factory()->post->create( array( 'post_author' => self::$author_id ) );
 
         $total_posts = self::$total_posts + 2;
@@ -306 +306 @@
 
     public function test_get_items_author_exclude_query() {
-        $this->factory->post->create( array( 'post_author' => self::$editor_id ) );
-        $this->factory->post->create( array( 'post_author' => self::$author_id ) );
+        self::factory()->post->create( array( 'post_author' => self::$editor_id ) );
+        self::factory()->post->create( array( 'post_author' => self::$author_id ) );
 
         $total_posts = self::$total_posts + 2;
@@ -348 +348 @@
 
     public function test_get_items_include_query() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -354 +354 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -387 +387 @@
 
     public function test_get_items_orderby_author_query() {
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -393 +393 @@
             )
         );
-        $id3 = $this->factory->post->create(
+        $id3 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -399 +399 @@
             )
         );
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -422 +422 @@
 
     public function test_get_items_orderby_modified_query() {
-        $id1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id1 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $this->update_post_modified( $id1, '2016-04-20 4:26:20' );
@@ -446 +446 @@
 
     public function test_get_items_orderby_parent_query() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -452 +452 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -458 +458 @@
             )
         );
-        $id3 = $this->factory->post->create(
+        $id3 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -484 +484 @@
 
     public function test_get_items_exclude_query() {
-        $id1 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id1 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -514 +514 @@
 
     public function test_get_items_search_query() {
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Search Result',
@@ -536 +536 @@
 
     public function test_get_items_slug_query() {
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple',
@@ -542 +542 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Banana',
@@ -559 +559 @@
 
     public function test_get_items_multiple_slugs_array_query() {
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple',
@@ -565 +565 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Banana',
@@ -571 +571 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Peach',
@@ -593 +593 @@
 
     public function test_get_items_multiple_slugs_string_query() {
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple',
@@ -599 +599 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Banana',
@@ -605 +605 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Peach',
@@ -629 +629 @@
         wp_set_current_user( 0 );
 
-        $this->factory->post->create( array( 'post_status' => 'draft' ) );
+        self::factory()->post->create( array( 'post_status' => 'draft' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -655 +655 @@
         wp_set_current_user( self::$editor_id );
 
-        $this->factory->post->create( array( 'post_status' => 'draft' ) );
-        $this->factory->post->create( array( 'post_status' => 'private' ) );
-        $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        self::factory()->post->create( array( 'post_status' => 'draft' ) );
+        self::factory()->post->create( array( 'post_status' => 'private' ) );
+        self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -678 +678 @@
         wp_set_current_user( self::$editor_id );
 
-        $this->factory->post->create( array( 'post_status' => 'draft' ) );
-        $this->factory->post->create( array( 'post_status' => 'pending' ) );
-        $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        self::factory()->post->create( array( 'post_status' => 'draft' ) );
+        self::factory()->post->create( array( 'post_status' => 'pending' ) );
+        self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -710 +710 @@
      */
     public function test_get_items_multiple_statuses_custom_role_one_invalid_query() {
-        $private_post_id = $this->factory->post->create( array( 'post_status' => 'private' ) );
+        $private_post_id = self::factory()->post->create( array( 'post_status' => 'private' ) );
 
         wp_set_current_user( self::$private_reader_id );
@@ -731 +731 @@
 
     public function test_get_items_status_without_permissions() {
-        $draft_id = $this->factory->post->create(
+        $draft_id = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
@@ -751 +751 @@
 
     public function test_get_items_order_and_orderby() {
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple Pie',
@@ -757 +757 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple Sauce',
@@ -763 +763 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple Cobbler',
@@ -769 +769 @@
             )
         );
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'  => 'Apple Coffee Cake',
@@ -806 +806 @@
 
     public function test_get_items_with_orderby_include_without_include_param() {
-        $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -817 +817 @@
 
     public function test_get_items_with_orderby_id() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -823 +823 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -829 +829 @@
             )
         );
-        $id3 = $this->factory->post->create(
+        $id3 = self::factory()->post->create(
             array(
                 'post_status' => 'publish',
@@ -851 +851 @@
 
     public function test_get_items_with_orderby_slug() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_title'  => 'ABC',
@@ -858 +858 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_title'  => 'XYZ',
@@ -882 +882 @@
         $slugs = array( 'burrito', 'taco', 'chalupa' );
         foreach ( $slugs as $slug ) {
-            $this->factory->post->create(
+            self::factory()->post->create(
                 array(
                     'post_title'  => $slug,
@@ -904 +904 @@
 
     public function test_get_items_with_orderby_relevance() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_title'   => 'Title is more relevant',
@@ -911 +911 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_title'   => 'Title is',
@@ -932 +932 @@
 
     public function test_get_items_with_orderby_relevance_two_terms() {
-        $id1 = $this->factory->post->create(
+        $id1 = self::factory()->post->create(
             array(
                 'post_title'   => 'Title is more relevant',
@@ -939 +939 @@
             )
         );
-        $id2 = $this->factory->post->create(
+        $id2 = self::factory()->post->create(
             array(
                 'post_title'   => 'Title is',
@@ -1006 +1006 @@
     public function test_get_items_tags_exclude_query() {
         $id1 = self::$post_id;
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id4 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id4 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
         $tag = wp_insert_term( 'My Tag', 'post_tag' );
 
@@ -1029 +1029 @@
     public function test_get_items_tags_and_categories_query() {
         $id1      = self::$post_id;
-        $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
         $tag      = wp_insert_term( 'My Tag', 'post_tag' );
         $category = wp_insert_term( 'My Category', 'category' );
@@ -1054 +1054 @@
     public function test_get_items_tags_or_categories_query() {
         $id1      = self::$post_id;
-        $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
         $tag      = wp_insert_term( 'My Tag', 'post_tag' );
         $category = wp_insert_term( 'My Category', 'category' );
@@ -1076 +1076 @@
     public function test_get_items_tags_and_categories_exclude_query() {
         $id1      = self::$post_id;
-        $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
         $tag      = wp_insert_term( 'My Tag', 'post_tag' );
         $category = wp_insert_term( 'My Category', 'category' );
@@ -1103 +1103 @@
     public function test_get_items_tags_or_categories_exclude_query() {
         $id1      = end( self::$post_ids );
-        $id2      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id4      = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id4      = self::factory()->post->create( array( 'post_status' => 'publish' ) );
         $tag      = wp_insert_term( 'My Tag', 'post_tag' );
         $category = wp_insert_term( 'My Category', 'category' );
@@ -1367 +1367 @@
     public function test_get_items_sticky() {
         $id1 = self::$post_id;
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         update_option( 'sticky_posts', array( $id2 ) );
@@ -1388 +1388 @@
     public function test_get_items_sticky_with_include() {
         $id1 = self::$post_id;
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         update_option( 'sticky_posts', array( $id2 ) );
@@ -1456 +1456 @@
     public function test_get_items_not_sticky() {
         $id1 = end( self::$post_ids );
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $total_posts = self::$total_posts + 1;
@@ -1478 +1478 @@
     public function test_get_items_not_sticky_with_exclude() {
         $id1 = end( self::$post_ids );
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $total_posts = self::$total_posts + 2;
@@ -1504 +1504 @@
     public function test_get_items_not_sticky_with_exclude_no_sticky_posts() {
         $id1 = self::$post_id;
-        $id2 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
-        $id3 = $this->factory->post->create( array( 'post_status' => 'publish' ) );
+        $id2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+        $id3 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
         $total_posts = self::$total_posts + 2;
@@ -1575 +1575 @@
         $parent_ids       = array( $parent_id1, $parent_id2 );
         $attachment_ids   = array();
-        $attachment_ids[] = $this->factory->attachment->create_object(
+        $attachment_ids[] = self::factory()->attachment->create_object(
             DIR_TESTDATA . '/images/canola.jpg',
             $parent_id1,
@@ -1584 +1584 @@
         );
 
-        $attachment_ids[] = $this->factory->attachment->create_object(
+        $attachment_ids[] = self::factory()->attachment->create_object(
             DIR_TESTDATA . '/images/canola.jpg',
             $parent_id2,
@@ -1629 +1629 @@
 
         // 3rd page.
-        $this->factory->post->create();
+        self::factory()->post->create();
         $total_posts++;
         $total_pages++;
@@ -1708 +1708 @@
 
     public function test_get_items_status_draft_permissions() {
-        $draft_id = $this->factory->post->create( array( 'post_status' => 'draft' ) );
+        $draft_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
 
         // Drafts status query var inaccessible to unauthorized users.
@@ -1738 +1738 @@
      */
     public function test_get_items_status_private_permissions() {
-        $private_post_id = $this->factory->post->create( array( 'post_status' => 'private' ) );
+        $private_post_id = self::factory()->post->create( array( 'post_status' => 'private' ) );
 
         wp_set_current_user( 0 );
@@ -1793 +1793 @@
 
     public function test_get_items_valid_date() {
-        $post1 = $this->factory->post->create( array( 'post_date' => '2016-01-15T00:00:00Z' ) );
-        $post2 = $this->factory->post->create( array( 'post_date' => '2016-01-16T00:00:00Z' ) );
-        $post3 = $this->factory->post->create( array( 'post_date' => '2016-01-17T00:00:00Z' ) );
+        $post1 = self::factory()->post->create( array( 'post_date' => '2016-01-15T00:00:00Z' ) );
+        $post2 = self::factory()->post->create( array( 'post_date' => '2016-01-16T00:00:00Z' ) );
+        $post3 = self::factory()->post->create( array( 'post_date' => '2016-01-17T00:00:00Z' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/posts' );
@@ -1821 +1821 @@
      */
     public function test_get_items_valid_modified_date() {
-        $post1 = $this->factory->post->create( array( 'post_date' => '2016-01-01 00:00:00' ) );
-        $post2 = $this->factory->post->create( array( 'post_date' => '2016-01-02 00:00:00' ) );
-        $post3 = $this->factory->post->create( array( 'post_date' => '2016-01-03 00:00:00' ) );
+        $post1 = self::factory()->post->create( array( 'post_date' => '2016-01-01 00:00:00' ) );
+        $post2 = self::factory()->post->create( array( 'post_date' => '2016-01-02 00:00:00' ) );
+        $post3 = self::factory()->post->create( array( 'post_date' => '2016-01-03 00:00:00' ) );
         $this->update_post_modified( $post1, '2016-01-15 00:00:00' );
         $this->update_post_modified( $post2, '2016-01-16 00:00:00' );
@@ -1941 +1941 @@
 
     public function test_get_post_draft_status_not_authenticated() {
-        $draft_id = $this->factory->post->create(
+        $draft_id = self::factory()->post->create(
             array(
                 'post_status' => 'draft',
@@ -1957 +1957 @@
     public function test_get_post_draft_edit_context() {
         $post_content = 'Hello World!';
-        $this->factory->post->create(
+        self::factory()->post->create(
             array(
                 'post_title'    => 'Hola',
@@ -1966 +1966 @@
             )
         );
-        $draft_id = $this->factory->post->create(
+        $draft_id = self::factory()->post->create(
             array(
                 'post_status'  => 'draft',
@@ -2032 +2032 @@
 
     public function test_get_post_with_password() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_password' => '$inthebananastand',
@@ -2051 +2051 @@
 
     public function test_get_post_with_password_using_password() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_password' => '$inthebananastand',
@@ -2075 +2075 @@
 
     public function test_get_post_with_password_using_incorrect_password() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_password' => '$inthebananastand',
@@ -2091 +2091 @@
 
     public function test_get_post_with_password_without_permission() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_password' => '$inthebananastand',
@@ -2115 +2115 @@
      */
     public function test_get_post_should_not_have_block_version_when_context_view() {
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '<!-- wp:core/separator -->',
@@ -2135 +2135 @@
         wp_set_current_user( self::$editor_id );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '<!-- wp:core/separator -->',
@@ -2156 +2156 @@
         wp_set_current_user( self::$editor_id );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_content' => '<hr />',
@@ -2784 +2784 @@
 
         $file          = DIR_TESTDATA . '/images/canola.jpg';
-        $attachment_id = $this->factory->attachment->create_object(
+        $attachment_id = self::factory()->attachment->create_object(
             $file,
             0,
@@ -3188 +3188 @@
     public function test_rest_update_post_with_empty_date() {
         // Create a new test post.
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_current_user( self::$editor_id );
@@ -3437 +3437 @@
         update_option( 'timezone_string', $params['timezone_string'] );
 
-        $post_id = $this->factory->post->create( array( 'post_status' => $status ) );
+        $post_id = self::factory()->post->create( array( 'post_status' => $status ) );
 
         $request = new WP_REST_Request( 'PUT', sprintf( '/wp/v2/posts/%d', $post_id ) );
@@ -3502 +3502 @@
         // Need to set dates using wpdb directly because `wp_update_post` and
         // `wp_insert_post` have additional validation on dates.
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
         $wpdb->update(
             $wpdb->posts,
@@ -4172 +4172 @@
 
     public function test_delete_item() {
-        $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
+        $post_id = self::factory()->post->create( array( 'post_title' => 'Deleted post' ) );
 
         wp_set_current_user( self::$editor_id );
@@ -4187 +4187 @@
 
     public function test_delete_item_skip_trash() {
-        $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
+        $post_id = self::factory()->post->create( array( 'post_title' => 'Deleted post' ) );
 
         wp_set_current_user( self::$editor_id );
@@ -4202 +4202 @@
 
     public function test_delete_item_already_trashed() {
-        $post_id = $this->factory->post->create( array( 'post_title' => 'Deleted post' ) );
+        $post_id = self::factory()->post->create( array( 'post_title' => 'Deleted post' ) );
 
         wp_set_current_user( self::$editor_id );
@@ -4223 +4223 @@
 
     public function test_delete_post_invalid_post_type() {
-        $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
         wp_set_current_user( self::$editor_id );
@@ -4466 +4466 @@
         wp_set_current_user( 1 );
 
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/posts/' . $post_id );
@@ -4511 +4511 @@
             )
         );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         // 'my_custom_int' should appear because ?_fields= isn't set.
@@ -4932 +4932 @@
         wp_set_current_user( self::$editor_id );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title'  => 'Permalink Template',
@@ -4956 +4956 @@
         wp_set_current_user( self::$editor_id );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_title'  => 'Permalink Template',

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -206 +206 @@
         // is not desirable.
 
-        $administrator_id = $this->factory->user->create(
+        $administrator_id = self::factory()->user->create(
             array(
                 'role'          => 'administrator',
@@ -216 +216 @@
         wp_set_current_user( $administrator_id );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_name'    => 'restapi-client-fixture-post',
@@ -244 +244 @@
         );
 
-        $page_id = $this->factory->post->create(
+        $page_id = self::factory()->post->create(
             array(
                 'post_type'     => 'page',
@@ -274 +274 @@
         );
 
-        $tag_id = $this->factory->tag->create(
+        $tag_id = self::factory()->tag->create(
             array(
                 'name'        => 'REST API Client Fixture: Tag',
@@ -282 +282 @@
         );
 
-        $media_id = $this->factory->attachment->create_object(
+        $media_id = self::factory()->attachment->create_object(
             get_temp_dir() . 'canola.jpg',
             0,
@@ -296 +296 @@
         );
 
-        $comment_id = $this->factory->comment->create(
+        $comment_id = self::factory()->comment->create(
             array(
                 'comment_approved'     => 1,

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

@@ -140 +140 @@
         $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
         // Single.
-        $tag1     = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
+        $tag1     = self::factory()->tag->create( array( 'name' => 'Season 5' ) );
         $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags/' . $tag1 );
         $response = rest_get_server()->dispatch( $request );
@@ -175 +175 @@
 
     public function test_get_items() {
-        $this->factory->tag->create();
+        self::factory()->tag->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -193 +193 @@
 
     public function test_get_items_hide_empty_arg() {
-        $post_id = $this->factory->post->create();
-        $tag1    = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
-        $tag2    = $this->factory->tag->create( array( 'name' => 'The Be Sharps' ) );
+        $post_id = self::factory()->post->create();
+        $tag1    = self::factory()->tag->create( array( 'name' => 'Season 5' ) );
+        $tag2    = self::factory()->tag->create( array( 'name' => 'The Be Sharps' ) );
 
         wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
@@ -214 +214 @@
 
     public function test_get_items_include_query() {
-        $id1 = $this->factory->tag->create();
-        $id2 = $this->factory->tag->create();
+        $id1 = self::factory()->tag->create();
+        $id2 = self::factory()->tag->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -240 +240 @@
 
     public function test_get_items_exclude_query() {
-        $id1 = $this->factory->tag->create();
-        $id2 = $this->factory->tag->create();
+        $id1 = self::factory()->tag->create();
+        $id2 = self::factory()->tag->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -289 +289 @@
 
     public function test_get_items_orderby_args() {
-        $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-        $tag2 = $this->factory->tag->create( array( 'name' => 'Zucchini' ) );
+        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
+        $tag2 = self::factory()->tag->create( array( 'name' => 'Zucchini' ) );
 
         /*
@@ -325 +325 @@
 
     public function test_get_items_orderby_id() {
-        $tag0 = $this->factory->tag->create( array( 'name' => 'Cantaloupe' ) );
-        $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-        $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+        $tag0 = self::factory()->tag->create( array( 'name' => 'Cantaloupe' ) );
+        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
+        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
 
         // Defaults to 'orderby' => 'name', 'order' => 'asc'.
@@ -361 +361 @@
 
     public function test_get_items_orderby_slugs() {
-        $this->factory->tag->create( array( 'name' => 'Burrito' ) );
-        $this->factory->tag->create( array( 'name' => 'Taco' ) );
-        $this->factory->tag->create( array( 'name' => 'Chalupa' ) );
+        self::factory()->tag->create( array( 'name' => 'Burrito' ) );
+        self::factory()->tag->create( array( 'name' => 'Taco' ) );
+        self::factory()->tag->create( array( 'name' => 'Chalupa' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -377 +377 @@
 
     public function test_get_items_post_args() {
-        $post_id = $this->factory->post->create();
-        $tag1    = $this->factory->tag->create( array( 'name' => 'DC' ) );
-        $tag2    = $this->factory->tag->create( array( 'name' => 'Marvel' ) );
-        $this->factory->tag->create( array( 'name' => 'Dark Horse' ) );
+        $post_id = self::factory()->post->create();
+        $tag1    = self::factory()->tag->create( array( 'name' => 'DC' ) );
+        $tag2    = self::factory()->tag->create( array( 'name' => 'Marvel' ) );
+        self::factory()->tag->create( array( 'name' => 'Dark Horse' ) );
 
         wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
@@ -401 +401 @@
 
     public function test_get_terms_post_args_paging() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_object_terms( $post_id, self::$tag_ids, 'post_tag' );
@@ -438 +438 @@
 
     public function test_get_items_post_empty() {
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -453 +453 @@
         $controller = new WP_REST_Terms_Controller( 'batman' );
         $controller->register_routes();
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -459 +459 @@
             )
         );
-        $term2 = $this->factory->term->create(
+        $term2 = self::factory()->term->create(
             array(
                 'name'     => 'Mask',
@@ -465 +465 @@
             )
         );
-        $this->factory->term->create(
+        self::factory()->term->create(
             array(
                 'name'     => 'Car',
@@ -471 +471 @@
             )
         );
-        $post_id = $this->factory->post->create();
+        $post_id = self::factory()->post->create();
 
         wp_set_object_terms( $post_id, array( $term1, $term2 ), 'batman' );
@@ -486 +486 @@
 
     public function test_get_items_search_args() {
-        $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-        $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
+        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
 
         /*
@@ -510 +510 @@
 
     public function test_get_items_slug_arg() {
-        $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
-        $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
+        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
+        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -523 +523 @@
 
     public function test_get_items_slug_array_arg() {
-        $id1 = $this->factory->tag->create( array( 'name' => 'Taco' ) );
-        $id2 = $this->factory->tag->create( array( 'name' => 'Enchilada' ) );
-        $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
-        $this->factory->tag->create( array( 'name' => 'Pizza' ) );
+        $id1 = self::factory()->tag->create( array( 'name' => 'Taco' ) );
+        $id2 = self::factory()->tag->create( array( 'name' => 'Enchilada' ) );
+        $id3 = self::factory()->tag->create( array( 'name' => 'Burrito' ) );
+        self::factory()->tag->create( array( 'name' => 'Pizza' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -546 +546 @@
 
     public function test_get_items_slug_csv_arg() {
-        $id1 = $this->factory->tag->create( array( 'name' => 'Taco' ) );
-        $id2 = $this->factory->tag->create( array( 'name' => 'Enchilada' ) );
-        $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
-        $this->factory->tag->create( array( 'name' => 'Pizza' ) );
+        $id1 = self::factory()->tag->create( array( 'name' => 'Taco' ) );
+        $id2 = self::factory()->tag->create( array( 'name' => 'Enchilada' ) );
+        $id3 = self::factory()->tag->create( array( 'name' => 'Burrito' ) );
+        self::factory()->tag->create( array( 'name' => 'Pizza' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
@@ -563 +563 @@
     public function test_get_terms_private_taxonomy() {
         register_taxonomy( 'robin', 'post', array( 'public' => false ) );
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -569 +569 @@
             )
         );
-        $term2 = $this->factory->term->create(
+        $term2 = self::factory()->term->create(
             array(
                 'name'     => 'Mask',
@@ -601 +601 @@
 
         // 3rd page.
-        $this->factory->tag->create();
+        self::factory()->tag->create();
         $total_tags++;
         $total_pages++;
@@ -666 +666 @@
 
     public function test_get_item() {
-        $id = $this->factory->tag->create();
+        $id = self::factory()->tag->create();
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
@@ -677 +677 @@
      */
     public function test_get_item_meta() {
-        $id = $this->factory->tag->create();
+        $id = self::factory()->tag->create();
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
@@ -699 +699 @@
      */
     public function test_get_item_meta_registered_for_different_taxonomy() {
-        $id = $this->factory->tag->create();
+        $id = self::factory()->tag->create();
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
@@ -717 +717 @@
 
     public function test_get_item_invalid_permission_for_context() {
-        $id = $this->factory->tag->create();
+        $id = self::factory()->tag->create();
 
         wp_set_current_user( 0 );
@@ -729 +729 @@
     public function test_get_term_private_taxonomy() {
         register_taxonomy( 'robin', 'post', array( 'public' => false ) );
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -743 +743 @@
     public function test_get_item_incorrect_taxonomy() {
         register_taxonomy( 'robin', 'post' );
-        $term1 = $this->factory->term->create(
+        $term1 = self::factory()->term->create(
             array(
                 'name'     => 'Cape',
@@ -834 +834 @@
         wp_set_current_user( self::$administrator );
 
-        $existing_tag_id = $this->factory->tag->create( array( 'name' => 'My Not So Awesome Term' ) );
+        $existing_tag_id = self::factory()->tag->create( array( 'name' => 'My Not So Awesome Term' ) );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
@@ -859 +859 @@
         );
 
-        $term = get_term_by( 'id', $this->factory->tag->create( $orig_args ), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create( $orig_args ), 'post_tag' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
@@ -887 +887 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
 
         $request  = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
@@ -915 +915 @@
         wp_set_current_user( self::$subscriber );
 
-        $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
@@ -929 +929 @@
         wp_set_current_user( self::$subscriber );
 
-        $term = $this->factory->tag->create_and_get();
+        $term = self::factory()->tag->create_and_get();
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
@@ -956 +956 @@
         wp_set_current_user( self::$administrator );
 
-        $term = $this->factory->tag->create_and_get();
+        $term = self::factory()->tag->create_and_get();
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
@@ -978 +978 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
 
         $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
@@ -1105 +1105 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
 
         $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
@@ -1119 +1119 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
 
         $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
@@ -1141 +1141 @@
         wp_set_current_user( self::$subscriber );
 
-        $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
 
         $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
@@ -1154 +1154 @@
         wp_set_current_user( self::$subscriber );
 
-        $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
 
         $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
@@ -1182 +1182 @@
         wp_set_current_user( self::$administrator );
 
-        $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
 
         $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
@@ -1202 +1202 @@
 
     public function test_prepare_item() {
-        $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $term->term_id );
@@ -1215 +1215 @@
         $endpoint = new WP_REST_Terms_Controller( 'post_tag' );
         $request->set_param( '_fields', 'id,name' );
-        $term     = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
+        $term     = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
         $response = $endpoint->prepare_item_for_response( $term, $request );
         $this->assertSame(
@@ -1277 +1277 @@
         $this->assertSame( $schema, $data['schema']['properties']['my_custom_int'] );
 
-        $tag_id = $this->factory->tag->create();
+        $tag_id = self::factory()->tag->create();
 
         $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $tag_id );
@@ -1307 +1307 @@
         wp_set_current_user( self::$administrator );
 
-        $tag_id = $this->factory->tag->create();
+        $tag_id = self::factory()->tag->create();
 
         // Check for error on update.
@@ -1331 +1331 @@
         global $wpdb;
 
-        $tags = $this->factory->tag->create_many( 2 );
-        $p    = $this->factory->post->create();
+        $tags = self::factory()->tag->create_many( 2 );
+        $p    = self::factory()->post->create();
         wp_set_object_terms( $p, $tags[0], 'post_tag' );
 

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

@@ -113 +113 @@
 
     public function test_get_item_edit_context() {
-        $editor_id = $this->factory->user->create( array( 'role' => 'editor' ) );
+        $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
         wp_set_current_user( $editor_id );
         $request = new WP_REST_Request( 'GET', '/wp/v2/taxonomies/category' );

trunk/tests/phpunit/tests/rest-api/rest-term-meta-fields.php

@@ -201 +201 @@
     protected function grant_write_permission() {
         // Ensure we have write permission.
-        $user = $this->factory->user->create(
+        $user = self::factory()->user->create(
             array(
                 'role' => 'editor',

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

@@ -341 +341 @@
 
         // 3rd page.
-        $this->factory->user->create();
+        self::factory()->user->create();
         $total_users++;
         $total_pages++;
@@ -433 +433 @@
         wp_set_current_user( self::$user );
 
-        $low_id  = $this->factory->user->create( array( 'display_name' => 'AAAAA' ) );
-        $mid_id  = $this->factory->user->create( array( 'display_name' => 'NNNNN' ) );
-        $high_id = $this->factory->user->create( array( 'display_name' => 'ZZZZ' ) );
+        $low_id  = self::factory()->user->create( array( 'display_name' => 'AAAAA' ) );
+        $mid_id  = self::factory()->user->create( array( 'display_name' => 'NNNNN' ) );
+        $high_id = self::factory()->user->create( array( 'display_name' => 'ZZZZ' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -457 +457 @@
         wp_set_current_user( self::$user );
 
-        $low_id  = $this->factory->user->create( array( 'user_url' => 'http://a.com' ) );
-        $high_id = $this->factory->user->create( array( 'user_url' => 'http://b.com' ) );
+        $low_id  = self::factory()->user->create( array( 'user_url' => 'http://a.com' ) );
+        $high_id = self::factory()->user->create( array( 'user_url' => 'http://b.com' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -482 +482 @@
         wp_set_current_user( self::$user );
 
-        $high_id = $this->factory->user->create( array( 'user_nicename' => 'blogin' ) );
-        $low_id  = $this->factory->user->create( array( 'user_nicename' => 'alogin' ) );
+        $high_id = self::factory()->user->create( array( 'user_nicename' => 'blogin' ) );
+        $low_id  = self::factory()->user->create( array( 'user_nicename' => 'alogin' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -507 +507 @@
         wp_set_current_user( self::$user );
 
-        $this->factory->user->create( array( 'user_nicename' => 'burrito' ) );
-        $this->factory->user->create( array( 'user_nicename' => 'taco' ) );
-        $this->factory->user->create( array( 'user_nicename' => 'chalupa' ) );
+        self::factory()->user->create( array( 'user_nicename' => 'burrito' ) );
+        self::factory()->user->create( array( 'user_nicename' => 'taco' ) );
+        self::factory()->user->create( array( 'user_nicename' => 'chalupa' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -525 +525 @@
         wp_set_current_user( self::$user );
 
-        $high_id = $this->factory->user->create( array( 'user_email' => 'bemail@gmail.com' ) );
-        $low_id  = $this->factory->user->create( array( 'user_email' => 'aemail@gmail.com' ) );
+        $high_id = self::factory()->user->create( array( 'user_email' => 'bemail@gmail.com' ) );
+        $low_id  = self::factory()->user->create( array( 'user_email' => 'aemail@gmail.com' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -605 +605 @@
         wp_set_current_user( self::$user );
 
-        $id1 = $this->factory->user->create();
-        $id2 = $this->factory->user->create();
+        $id1 = self::factory()->user->create();
+        $id2 = self::factory()->user->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -641 +641 @@
         wp_set_current_user( self::$user );
 
-        $id1 = $this->factory->user->create();
-        $id2 = $this->factory->user->create();
+        $id1 = self::factory()->user->create();
+        $id2 = self::factory()->user->create();
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -673 +673 @@
         $this->assertCount( 0, $response->get_data() );
 
-        $yolo_id = $this->factory->user->create( array( 'display_name' => 'yololololo' ) );
+        $yolo_id = self::factory()->user->create( array( 'display_name' => 'yololololo' ) );
 
         $request = new WP_REST_Request( 'GET', '/wp/v2/users' );
@@ -680 +680 @@
         $this->assertCount( 1, $response->get_data() );
         // Default to wildcard search.
-        $adam_id = $this->factory->user->create(
+        $adam_id = self::factory()->user->create(
             array(
                 'role'          => 'author',
@@ -698 +698 @@
         wp_set_current_user( self::$user );
 
-        $this->factory->user->create(
+        self::factory()->user->create(
             array(
                 'display_name' => 'foo',
@@ -704 +704 @@
             )
         );
-        $id2 = $this->factory->user->create(
+        $id2 = self::factory()->user->create(
             array(
                 'display_name' => 'Moo',
@@ -722 +722 @@
         wp_set_current_user( self::$user );
 
-        $id1 = $this->factory->user->create(
+        $id1 = self::factory()->user->create(
             array(
                 'display_name' => 'Taco',
@@ -728 +728 @@
             )
         );
-        $id2 = $this->factory->user->create(
+        $id2 = self::factory()->user->create(
             array(
                 'display_name' => 'Enchilada',
@@ -734 +734 @@
             )
         );
-        $id3 = $this->factory->user->create(
+        $id3 = self::factory()->user->create(
             array(
                 'display_name' => 'Burrito',
@@ -740 +740 @@
             )
         );
-        $this->factory->user->create(
+        self::factory()->user->create(
             array(
                 'display_name' => 'Hon Pizza',
@@ -768 +768 @@
         wp_set_current_user( self::$user );
 
-        $id1 = $this->factory->user->create(
+        $id1 = self::factory()->user->create(
             array(
                 'display_name' => 'Taco',
@@ -774 +774 @@
             )
         );
-        $id2 = $this->factory->user->create(
+        $id2 = self::factory()->user->create(
             array(
                 'display_name' => 'Enchilada',
@@ -780 +780 @@
             )
         );
-        $id3 = $this->factory->user->create(
+        $id3 = self::factory()->user->create(
             array(
                 'display_name' => 'Burrito',
@@ -786 +786 @@
             )
         );
-        $this->factory->user->create(
+        self::factory()->user->create(
             array(
                 'display_name' => 'Hon Pizza',
@@ -963 +963 @@
 
     public function test_get_item() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
 
         wp_set_current_user( self::$user );
@@ -1030 +1030 @@
         $this->allow_user_to_manage_multisite();
 
-        $lolz = $this->factory->user->create(
+        $lolz = self::factory()->user->create(
             array(
                 'display_name' => 'lolz',
@@ -1115 +1115 @@
 
     public function test_get_item_published_author_post() {
-        $author_id = $this->factory->user->create(
+        $author_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -1121 +1121 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_author' => $author_id,
@@ -1135 +1135 @@
 
     public function test_get_item_published_author_pages() {
-        $author_id = $this->factory->user->create(
+        $author_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -1147 +1147 @@
         $this->assertSame( 401, $response->get_status() );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_author' => $author_id,
@@ -1159 +1159 @@
 
     public function test_get_user_with_edit_context() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
 
         $this->allow_user_to_manage_multisite();
@@ -1170 +1170 @@
 
     public function test_get_item_published_author_wrong_context() {
-        $author_id = $this->factory->user->create(
+        $author_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -1176 +1176 @@
         );
 
-        $post_id = $this->factory->post->create(
+        $post_id = self::factory()->post->create(
             array(
                 'post_author' => $author_id,
@@ -1555 +1555 @@
 
     public function test_update_item() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'user_email' => 'test@example.com',
@@ -1621 +1621 @@
 
     public function test_update_item_existing_email() {
-        $user1 = $this->factory->user->create(
+        $user1 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1627 +1627 @@
             )
         );
-        $user2 = $this->factory->user->create(
+        $user2 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user2',
@@ -1685 +1685 @@
 
     public function test_update_item_invalid_locale() {
-        $user1 = $this->factory->user->create(
+        $user1 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1704 +1704 @@
 
     public function test_update_item_en_US_locale() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1728 +1728 @@
      */
     public function test_update_item_empty_locale() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1752 +1752 @@
 
     public function test_update_item_username_attempt() {
-        $user1 = $this->factory->user->create(
+        $user1 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1758 +1758 @@
             )
         );
-        $user2 = $this->factory->user->create(
+        $user2 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user2',
@@ -1777 +1777 @@
 
     public function test_update_item_existing_nicename() {
-        $user1 = $this->factory->user->create(
+        $user1 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user',
@@ -1783 +1783 @@
             )
         );
-        $user2 = $this->factory->user->create(
+        $user2 = self::factory()->user->create(
             array(
                 'user_login' => 'test_json_user2',
@@ -1802 +1802 @@
 
     public function test_json_update_user() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'user_email' => 'testjson2@example.com',
@@ -1847 +1847 @@
 
     public function test_update_user_role() {
-        $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
         wp_set_current_user( self::$user );
@@ -1868 +1868 @@
 
     public function test_update_user_multiple_roles() {
-        $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
         wp_set_current_user( self::$user );
@@ -1914 +1914 @@
      */
     public function test_update_user_role_invalid_privilege_deescalation() {
-        $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
         wp_set_current_user( $user_id );
@@ -1943 +1943 @@
      */
     public function test_update_user_role_privilege_deescalation_multisite() {
-        $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
         wp_set_current_user( $user_id );
@@ -1957 +1957 @@
         $this->assertNotEquals( 'administrator', $new_data['roles'][0] );
 
-        $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+        $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
         wp_set_current_user( $user_id );
@@ -2047 +2047 @@
      */
     public function test_update_item_only_roles_as_editor() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2065 +2065 @@
      */
     public function test_update_item_only_roles_as_site_administrator() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2086 +2086 @@
      */
     public function test_update_item_including_roles_and_other_params() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2342 +2342 @@
 
     public function test_delete_item() {
-        $user_id = $this->factory->user->create( array( 'display_name' => 'Deleted User' ) );
+        $user_id = self::factory()->user->create( array( 'display_name' => 'Deleted User' ) );
 
         $this->allow_user_to_manage_multisite();
@@ -2367 +2367 @@
 
     public function test_delete_item_no_trash() {
-        $user_id = $this->factory->user->create( array( 'display_name' => 'Deleted User' ) );
+        $user_id = self::factory()->user->create( array( 'display_name' => 'Deleted User' ) );
 
         $this->allow_user_to_manage_multisite();
@@ -2397 +2397 @@
 
     public function test_delete_current_item() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'         => 'administrator',
@@ -2426 +2426 @@
 
     public function test_delete_current_item_no_trash() {
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role'         => 'administrator',
@@ -2459 +2459 @@
 
     public function test_delete_user_without_permission() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
 
         $this->allow_user_to_manage_multisite();
@@ -2497 +2497 @@
 
         // Test with a new user, to avoid any complications.
-        $user_id     = $this->factory->user->create();
-        $reassign_id = $this->factory->user->create();
-        $test_post   = $this->factory->post->create(
+        $user_id     = self::factory()->user->create();
+        $reassign_id = self::factory()->user->create();
+        $test_post   = self::factory()->post->create(
             array(
                 'post_author' => $user_id,
@@ -2531 +2531 @@
 
     public function test_delete_user_invalid_reassign_id() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
 
         $this->allow_user_to_manage_multisite();
@@ -2552 +2552 @@
 
     public function test_delete_user_invalid_reassign_passed_as_string() {
-        $user_id = $this->factory->user->create();
+        $user_id = self::factory()->user->create();
 
         $this->allow_user_to_manage_multisite();
@@ -2567 +2567 @@
 
     public function test_delete_user_reassign_passed_as_boolean_false_trashes_post() {
-        $user_id = $this->factory->user->create();
-
-        $this->allow_user_to_manage_multisite();
-
-        wp_set_current_user( self::$user );
-
-        $test_post = $this->factory->post->create(
+        $user_id = self::factory()->user->create();
+
+        $this->allow_user_to_manage_multisite();
+
+        wp_set_current_user( self::$user );
+
+        $test_post = self::factory()->post->create(
             array(
                 'post_author' => $user_id,
@@ -2595 +2595 @@
 
     public function test_delete_user_reassign_passed_as_string_false_trashes_post() {
-        $user_id = $this->factory->user->create();
-
-        $this->allow_user_to_manage_multisite();
-
-        wp_set_current_user( self::$user );
-
-        $test_post = $this->factory->post->create(
+        $user_id = self::factory()->user->create();
+
+        $this->allow_user_to_manage_multisite();
+
+        wp_set_current_user( self::$user );
+
+        $test_post = self::factory()->post->create(
             array(
                 'post_author' => $user_id,
@@ -2623 +2623 @@
 
     public function test_delete_user_reassign_passed_as_empty_string_trashes_post() {
-        $user_id = $this->factory->user->create();
-
-        $this->allow_user_to_manage_multisite();
-
-        wp_set_current_user( self::$user );
-
-        $test_post = $this->factory->post->create(
+        $user_id = self::factory()->user->create();
+
+        $this->allow_user_to_manage_multisite();
+
+        wp_set_current_user( self::$user );
+
+        $test_post = self::factory()->post->create(
             array(
                 'post_author' => $user_id,
@@ -2651 +2651 @@
 
     public function test_delete_user_reassign_passed_as_0_reassigns_author() {
-        $user_id = $this->factory->user->create();
-
-        $this->allow_user_to_manage_multisite();
-
-        wp_set_current_user( self::$user );
-
-        $test_post = $this->factory->post->create(
+        $user_id = self::factory()->user->create();
+
+        $this->allow_user_to_manage_multisite();
+
+        wp_set_current_user( self::$user );
+
+        $test_post = self::factory()->post->create(
             array(
                 'post_author' => $user_id,
@@ -2832 +2832 @@
     public function test_get_item_from_different_site_as_site_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2852 +2852 @@
     public function test_get_item_from_different_site_as_network_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2872 +2872 @@
     public function test_update_item_from_different_site_as_site_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2894 +2894 @@
     public function test_update_item_from_different_site_as_network_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2916 +2916 @@
     public function test_delete_item_from_different_site_as_site_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',
@@ -2938 +2938 @@
     public function test_delete_item_from_different_site_as_network_administrator() {
         switch_to_blog( self::$site );
-        $user_id = $this->factory->user->create(
+        $user_id = self::factory()->user->create(
             array(
                 'role' => 'author',

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

@@ -86 +86 @@
         );
 
-        $this->menu_id = $this->factory->term->create( $orig_args );
+        $this->menu_id = self::factory()->term->create( $orig_args );
 
         register_meta(
@@ -134 +134 @@
         $this->assertSame( array( 'v1' => true ), $data['endpoints'][0]['allow_batch'] );
         // Single.
-        $tag1     = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
+        $tag1     = self::factory()->tag->create( array( 'name' => 'Season 5' ) );
         $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/menus/' . $tag1 );
         $response = rest_get_server()->dispatch( $request );

trunk/tests/phpunit/tests/taxonomy.php

@@ -682 +682 @@
             )
         );
-        $t = $this->factory->term->create_and_get(
-            array(
-                'taxonomy' => 'wptests_tax',
-            )
-        );
-
-        $p = $this->factory->post->create();
+        $t = self::factory()->term->create_and_get(
+            array(
+                'taxonomy' => 'wptests_tax',
+            )
+        );
+
+        $p = self::factory()->post->create();
         wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
 

trunk/tests/phpunit/tests/term/cache.php

@@ -245 +245 @@
         global $wpdb;
 
-        $term_id = $this->factory->term->create(
+        $term_id = self::factory()->term->create(
             array(
                 'slug'     => 'burrito',
@@ -276 +276 @@
         global $wpdb;
 
-        $term_id = $this->factory->term->create(
+        $term_id = self::factory()->term->create(
             array(
                 'slug'     => 'burrito',
@@ -314 +314 @@
         global $wpdb;
 
-        $term_id = $this->factory->term->