WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
09/06/2022 10:09:49 PM (3 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.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r53909 r54090  
    140140        $this->assertSameSets( array( 'view', 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
    141141        // Single.
    142         $tag1     = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
     142        $tag1     = self::factory()->tag->create( array( 'name' => 'Season 5' ) );
    143143        $request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/tags/' . $tag1 );
    144144        $response = rest_get_server()->dispatch( $request );
    … …  
    175175
    176176    public function test_get_items() {
    177         $this->factory->tag->create();
     177        self::factory()->tag->create();
    178178
    179179        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    193193
    194194    public function test_get_items_hide_empty_arg() {
    195         $post_id = $this->factory->post->create();
    196         $tag1    = $this->factory->tag->create( array( 'name' => 'Season 5' ) );
    197         $tag2    = $this->factory->tag->create( array( 'name' => 'The Be Sharps' ) );
     195        $post_id = self::factory()->post->create();
     196        $tag1    = self::factory()->tag->create( array( 'name' => 'Season 5' ) );
     197        $tag2    = self::factory()->tag->create( array( 'name' => 'The Be Sharps' ) );
    198198
    199199        wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
    … …  
    214214
    215215    public function test_get_items_include_query() {
    216         $id1 = $this->factory->tag->create();
    217         $id2 = $this->factory->tag->create();
     216        $id1 = self::factory()->tag->create();
     217        $id2 = self::factory()->tag->create();
    218218
    219219        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    240240
    241241    public function test_get_items_exclude_query() {
    242         $id1 = $this->factory->tag->create();
    243         $id2 = $this->factory->tag->create();
     242        $id1 = self::factory()->tag->create();
     243        $id2 = self::factory()->tag->create();
    244244
    245245        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    289289
    290290    public function test_get_items_orderby_args() {
    291         $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
    292         $tag2 = $this->factory->tag->create( array( 'name' => 'Zucchini' ) );
     291        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
     292        $tag2 = self::factory()->tag->create( array( 'name' => 'Zucchini' ) );
    293293
    294294        /*
    … …  
    325325
    326326    public function test_get_items_orderby_id() {
    327         $tag0 = $this->factory->tag->create( array( 'name' => 'Cantaloupe' ) );
    328         $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
    329         $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
     327        $tag0 = self::factory()->tag->create( array( 'name' => 'Cantaloupe' ) );
     328        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
     329        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
    330330
    331331        // Defaults to 'orderby' => 'name', 'order' => 'asc'.
    … …  
    361361
    362362    public function test_get_items_orderby_slugs() {
    363         $this->factory->tag->create( array( 'name' => 'Burrito' ) );
    364         $this->factory->tag->create( array( 'name' => 'Taco' ) );
    365         $this->factory->tag->create( array( 'name' => 'Chalupa' ) );
     363        self::factory()->tag->create( array( 'name' => 'Burrito' ) );
     364        self::factory()->tag->create( array( 'name' => 'Taco' ) );
     365        self::factory()->tag->create( array( 'name' => 'Chalupa' ) );
    366366
    367367        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    377377
    378378    public function test_get_items_post_args() {
    379         $post_id = $this->factory->post->create();
    380         $tag1    = $this->factory->tag->create( array( 'name' => 'DC' ) );
    381         $tag2    = $this->factory->tag->create( array( 'name' => 'Marvel' ) );
    382         $this->factory->tag->create( array( 'name' => 'Dark Horse' ) );
     379        $post_id = self::factory()->post->create();
     380        $tag1    = self::factory()->tag->create( array( 'name' => 'DC' ) );
     381        $tag2    = self::factory()->tag->create( array( 'name' => 'Marvel' ) );
     382        self::factory()->tag->create( array( 'name' => 'Dark Horse' ) );
    383383
    384384        wp_set_object_terms( $post_id, array( $tag1, $tag2 ), 'post_tag' );
    … …  
    401401
    402402    public function test_get_terms_post_args_paging() {
    403         $post_id = $this->factory->post->create();
     403        $post_id = self::factory()->post->create();
    404404
    405405        wp_set_object_terms( $post_id, self::$tag_ids, 'post_tag' );
    … …  
    438438
    439439    public function test_get_items_post_empty() {
    440         $post_id = $this->factory->post->create();
     440        $post_id = self::factory()->post->create();
    441441
    442442        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    453453        $controller = new WP_REST_Terms_Controller( 'batman' );
    454454        $controller->register_routes();
    455         $term1 = $this->factory->term->create(
     455        $term1 = self::factory()->term->create(
    456456            array(
    457457                'name'     => 'Cape',
    … …  
    459459            )
    460460        );
    461         $term2 = $this->factory->term->create(
     461        $term2 = self::factory()->term->create(
    462462            array(
    463463                'name'     => 'Mask',
    … …  
    465465            )
    466466        );
    467         $this->factory->term->create(
     467        self::factory()->term->create(
    468468            array(
    469469                'name'     => 'Car',
    … …  
    471471            )
    472472        );
    473         $post_id = $this->factory->post->create();
     473        $post_id = self::factory()->post->create();
    474474
    475475        wp_set_object_terms( $post_id, array( $term1, $term2 ), 'batman' );
    … …  
    486486
    487487    public function test_get_items_search_args() {
    488         $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
    489         $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
     488        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
     489        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
    490490
    491491        /*
    … …  
    510510
    511511    public function test_get_items_slug_arg() {
    512         $tag1 = $this->factory->tag->create( array( 'name' => 'Apple' ) );
    513         $tag2 = $this->factory->tag->create( array( 'name' => 'Banana' ) );
     512        $tag1 = self::factory()->tag->create( array( 'name' => 'Apple' ) );
     513        $tag2 = self::factory()->tag->create( array( 'name' => 'Banana' ) );
    514514
    515515        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    523523
    524524    public function test_get_items_slug_array_arg() {
    525         $id1 = $this->factory->tag->create( array( 'name' => 'Taco' ) );
    526         $id2 = $this->factory->tag->create( array( 'name' => 'Enchilada' ) );
    527         $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
    528         $this->factory->tag->create( array( 'name' => 'Pizza' ) );
     525        $id1 = self::factory()->tag->create( array( 'name' => 'Taco' ) );
     526        $id2 = self::factory()->tag->create( array( 'name' => 'Enchilada' ) );
     527        $id3 = self::factory()->tag->create( array( 'name' => 'Burrito' ) );
     528        self::factory()->tag->create( array( 'name' => 'Pizza' ) );
    529529
    530530        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    546546
    547547    public function test_get_items_slug_csv_arg() {
    548         $id1 = $this->factory->tag->create( array( 'name' => 'Taco' ) );
    549         $id2 = $this->factory->tag->create( array( 'name' => 'Enchilada' ) );
    550         $id3 = $this->factory->tag->create( array( 'name' => 'Burrito' ) );
    551         $this->factory->tag->create( array( 'name' => 'Pizza' ) );
     548        $id1 = self::factory()->tag->create( array( 'name' => 'Taco' ) );
     549        $id2 = self::factory()->tag->create( array( 'name' => 'Enchilada' ) );
     550        $id3 = self::factory()->tag->create( array( 'name' => 'Burrito' ) );
     551        self::factory()->tag->create( array( 'name' => 'Pizza' ) );
    552552
    553553        $request = new WP_REST_Request( 'GET', '/wp/v2/tags' );
    … …  
    563563    public function test_get_terms_private_taxonomy() {
    564564        register_taxonomy( 'robin', 'post', array( 'public' => false ) );
    565         $term1 = $this->factory->term->create(
     565        $term1 = self::factory()->term->create(
    566566            array(
    567567                'name'     => 'Cape',
    … …  
    569569            )
    570570        );
    571         $term2 = $this->factory->term->create(
     571        $term2 = self::factory()->term->create(
    572572            array(
    573573                'name'     => 'Mask',
    … …  
    601601
    602602        // 3rd page.
    603         $this->factory->tag->create();
     603        self::factory()->tag->create();
    604604        $total_tags++;
    605605        $total_pages++;
    … …  
    666666
    667667    public function test_get_item() {
    668         $id = $this->factory->tag->create();
     668        $id = self::factory()->tag->create();
    669669
    670670        $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
    … …  
    677677     */
    678678    public function test_get_item_meta() {
    679         $id = $this->factory->tag->create();
     679        $id = self::factory()->tag->create();
    680680
    681681        $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
    … …  
    699699     */
    700700    public function test_get_item_meta_registered_for_different_taxonomy() {
    701         $id = $this->factory->tag->create();
     701        $id = self::factory()->tag->create();
    702702
    703703        $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $id );
    … …  
    717717
    718718    public function test_get_item_invalid_permission_for_context() {
    719         $id = $this->factory->tag->create();
     719        $id = self::factory()->tag->create();
    720720
    721721        wp_set_current_user( 0 );
    … …  
    729729    public function test_get_term_private_taxonomy() {
    730730        register_taxonomy( 'robin', 'post', array( 'public' => false ) );
    731         $term1 = $this->factory->term->create(
     731        $term1 = self::factory()->term->create(
    732732            array(
    733733                'name'     => 'Cape',
    … …  
    743743    public function test_get_item_incorrect_taxonomy() {
    744744        register_taxonomy( 'robin', 'post' );
    745         $term1 = $this->factory->term->create(
     745        $term1 = self::factory()->term->create(
    746746            array(
    747747                'name'     => 'Cape',
    … …  
    834834        wp_set_current_user( self::$administrator );
    835835
    836         $existing_tag_id = $this->factory->tag->create( array( 'name' => 'My Not So Awesome Term' ) );
     836        $existing_tag_id = self::factory()->tag->create( array( 'name' => 'My Not So Awesome Term' ) );
    837837
    838838        $request = new WP_REST_Request( 'POST', '/wp/v2/tags' );
    … …  
    859859        );
    860860
    861         $term = get_term_by( 'id', $this->factory->tag->create( $orig_args ), 'post_tag' );
     861        $term = get_term_by( 'id', self::factory()->tag->create( $orig_args ), 'post_tag' );
    862862
    863863        $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
    … …  
    887887        wp_set_current_user( self::$administrator );
    888888
    889         $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     889        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    890890
    891891        $request  = new WP_REST_Request( 'PUT', '/wp/v2/tags/' . $term->term_id );
    … …  
    915915        wp_set_current_user( self::$subscriber );
    916916
    917         $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     917        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    918918
    919919        $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
    … …  
    929929        wp_set_current_user( self::$subscriber );
    930930
    931         $term = $this->factory->tag->create_and_get();
     931        $term = self::factory()->tag->create_and_get();
    932932
    933933        $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
    … …  
    956956        wp_set_current_user( self::$administrator );
    957957
    958         $term = $this->factory->tag->create_and_get();
     958        $term = self::factory()->tag->create_and_get();
    959959
    960960        $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
    … …  
    978978        wp_set_current_user( self::$administrator );
    979979
    980         $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     980        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    981981
    982982        $request = new WP_REST_Request( 'POST', '/wp/v2/tags/' . $term->term_id );
    … …  
    11051105        wp_set_current_user( self::$administrator );
    11061106
    1107         $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
     1107        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
    11081108
    11091109        $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
    … …  
    11191119        wp_set_current_user( self::$administrator );
    11201120
    1121         $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
     1121        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
    11221122
    11231123        $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
    … …  
    11411141        wp_set_current_user( self::$subscriber );
    11421142
    1143         $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     1143        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    11441144
    11451145        $request  = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
    … …  
    11541154        wp_set_current_user( self::$subscriber );
    11551155
    1156         $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
     1156        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
    11571157
    11581158        $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
    … …  
    11821182        wp_set_current_user( self::$administrator );
    11831183
    1184         $term = get_term_by( 'id', $this->factory->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
     1184        $term = get_term_by( 'id', self::factory()->tag->create( array( 'name' => 'Deleted Tag' ) ), 'post_tag' );
    11851185
    11861186        $request = new WP_REST_Request( 'DELETE', '/wp/v2/tags/' . $term->term_id );
    … …  
    12021202
    12031203    public function test_prepare_item() {
    1204         $term = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     1204        $term = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    12051205
    12061206        $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $term->term_id );
    … …  
    12151215        $endpoint = new WP_REST_Terms_Controller( 'post_tag' );
    12161216        $request->set_param( '_fields', 'id,name' );
    1217         $term     = get_term_by( 'id', $this->factory->tag->create(), 'post_tag' );
     1217        $term     = get_term_by( 'id', self::factory()->tag->create(), 'post_tag' );
    12181218        $response = $endpoint->prepare_item_for_response( $term, $request );
    12191219        $this->assertSame(
    … …  
    12771277        $this->assertSame( $schema, $data['schema']['properties']['my_custom_int'] );
    12781278
    1279         $tag_id = $this->factory->tag->create();
     1279        $tag_id = self::factory()->tag->create();
    12801280
    12811281        $request  = new WP_REST_Request( 'GET', '/wp/v2/tags/' . $tag_id );
    … …  
    13071307        wp_set_current_user( self::$administrator );
    13081308
    1309         $tag_id = $this->factory->tag->create();
     1309        $tag_id = self::factory()->tag->create();
    13101310
    13111311        // Check for error on update.
    … …  
    13311331        global $wpdb;
    13321332
    1333         $tags = $this->factory->tag->create_many( 2 );
    1334         $p    = $this->factory->post->create();
     1333        $tags = self::factory()->tag->create_many( 2 );
     1334        $p    = self::factory()->post->create();
    13351335        wp_set_object_terms( $p, $tags[0], 'post_tag' );
    13361336
Note: See TracChangeset for help on using the changeset viewer.