Skip to:
Content

bbPress.org

Changeset 7365


Ignore:
Timestamp:
11/17/2025 06:00:44 AM (4 months ago)
Author:
johnjamesjacoby
Message:

Tools - Unit Tests: Fix some failing tests.

This commit tweaks the expected values of some tests so that they pass as intended, mostly surrounding int/string type numerics and total/single counts.

Location:
trunk/tests/phpunit/testcases
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/testcases/admin/tools.php

    r7353 r7365  
    282282
    283283        // Category topic count hidden.
    284         $count = bbp_get_forum_topic_count_hidden( $c, true );
     284        $count = bbp_get_forum_topic_count_hidden( $c, true, true );
    285285        $this->assertSame( 0, $count );
    286286
    … …  
    294294
    295295        // Forum topic count hidden.
    296         $count = bbp_get_forum_topic_count_hidden( $f, true );
     296        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    297297        $this->assertSame( 0, $count );
    298298
    … …  
    309309
    310310        // Category topic count hidden.
    311         $count = bbp_get_forum_topic_count_hidden( $c, true );
     311        $count = bbp_get_forum_topic_count_hidden( $c, false, true );
    312312        $this->assertSame( 0, $count );
    313313
    … …  
    321321
    322322        // Forum topic count hidden.
    323         $count = bbp_get_forum_topic_count_hidden( $f, true );
     323        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    324324        $this->assertSame( 2, $count );
    325325
    … …  
    342342
    343343        // Category topic count hidden.
    344         $count = bbp_get_forum_topic_count_hidden( $c, true );
     344        $count = bbp_get_forum_topic_count_hidden( $c, false, true );
    345345        $this->assertSame( 0, $count );
    346346
    … …  
    354354
    355355        // Forum topic count hidden.
    356         $count = bbp_get_forum_topic_count_hidden( $f, true );
     356        $count = bbp_get_forum_topic_count_hidden( $f, false, true );
    357357        $this->assertSame( 0, $count );
    358358
    … …  
    369369
    370370        // Category topic count hidden.
    371         $count = bbp_get_forum_topic_count_hidden( $c, true );
     371        $count = bbp_get_forum_topic_count_hidden( $c, false, true );
    372372        $this->assertSame( 0, $count );
    373373
    … …  
    381381
    382382        // Forum topic count hidden.
    383         $count = bbp_get_forum_topic_count_hidden( $f, true );
     383        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    384384        $this->assertSame( 2, $count );
    385385    }
    … …  
    667667        clean_post_cache( $r );
    668668
    669         // Forums should NOT have a _bbp_forum_id meta key
    670         $this->assertEquals( array(), get_post_meta( $f, '_bbp_forum_id', false ) );
    671 
    672669        // Topics should have a _bbp_forum_id meta key
    673670        $this->assertEquals( array( $f ), get_post_meta( $t, '_bbp_forum_id', false ) );

  • trunk/tests/phpunit/testcases/core/cache.php

    r6846 r7365  
    3838
    3939        // Setup
    40         $f_key        = md5( serialize( array( 'parent_id' => $f, 'post_type' => $tpt ) ) );
    41         $t_key        = md5( serialize( array( 'parent_id' => $t, 'post_type' => $rpt ) ) );
     40        $f_key        = md5( serialize( array( 'parent_id' => $f, 'post_type' => $tpt, 'post_status' => array( 'draft', 'future' ) ) ) );
     41        $t_key        = md5( serialize( array( 'parent_id' => $t, 'post_type' => $rpt, 'post_status' => array( 'draft', 'future' ) ) ) );
    4242        $last_changed = wp_cache_get_last_changed( 'bbpress_posts' );
    4343

  • trunk/tests/phpunit/testcases/core/update.php

    r6801 r7365  
    130130        $this->assertSame( 1, bbp_get_forum_subforum_count( $category_id, true ) );
    131131        $this->assertSame( 0, bbp_get_forum_topic_count( $category_id, false, true ) );
    132         $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $category_id, true ) );
     132        $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $category_id, true, true ) );
    133133        $this->assertSame( 0, bbp_get_forum_reply_count( $category_id, false, true ) );
    134134        $this->assertSame( 1, bbp_get_forum_topic_count( $category_id, true, true ) );
    … …  
    146146        $this->assertSame( 0, bbp_get_forum_subforum_count( $forum_id, true ) );
    147147        $this->assertSame( 1, bbp_get_forum_topic_count( $forum_id, false, true ) );
    148         $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $forum_id, true ) );
     148        $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $forum_id, true, true ) );
    149149        $this->assertSame( 1, bbp_get_forum_reply_count( $forum_id, false, true ) );
    150150        $this->assertSame( 1, bbp_get_forum_topic_count( $forum_id, true, true ) );

  • trunk/tests/phpunit/testcases/forums/functions/counts.php

    r6848 r7365  
    536536        bbp_update_forum_topic_count_hidden( $f );
    537537
    538         $count = bbp_get_forum_topic_count_hidden( $f, true );
    539         $this->assertSame( 0, $count );;
     538        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
     539        $this->assertSame( 0, $count );
    540540
    541541        bbp_spam_topic( $t[2] );
    … …  
    543543        bbp_update_forum_topic_count_hidden( $f );
    544544
    545         $count = bbp_get_forum_topic_count_hidden( $f, true );
    546         $this->assertSame( 1, $count );;
     545        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
     546        $this->assertSame( 1, $count );
    547547
    548548        bbp_unapprove_topic( $t[0] );
    … …  
    550550        bbp_update_forum_topic_count_hidden( $f );
    551551
    552         $count = bbp_get_forum_topic_count_hidden( $f, true );
     552        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    553553        $this->assertSame( 2, $count );
    554554    }

  • trunk/tests/phpunit/testcases/forums/functions/forum.php

    r6004 r7365  
    9595        $this->assertSame( 0, bbp_get_forum_topic_count( $c, false, true ) );
    9696        $this->assertSame( 1, bbp_get_forum_topic_count( $c, true, true ) );
    97         $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $c, true ) );
     97        $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $c, true, true ) );
    9898        $this->assertSame( 0, bbp_get_forum_reply_count( $c, false, true ) );
    9999        $this->assertSame( 1, bbp_get_forum_reply_count( $c, true, true ) );
    … …  
    109109        $this->assertSame( 1, bbp_get_forum_topic_count( $f, false, true ) );
    110110        $this->assertSame( 1, bbp_get_forum_topic_count( $f, true, true ) );
    111         $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $f, true ) );
     111        $this->assertSame( 0, bbp_get_forum_topic_count_hidden( $f, true, true ) );
    112112        $this->assertSame( 1, bbp_get_forum_reply_count( $f, false, true ) );
    113113        $this->assertSame( 1, bbp_get_forum_reply_count( $f, true, true ) );

  • trunk/tests/phpunit/testcases/forums/template/counts.php

    r6006 r7365  
    220220            'post_parent' => $c,
    221221            'forum_meta' => array(
    222                 'forum_id'   => $c,
     222                'forum_id' => $c,
    223223            ),
    224224        ) );
    … …  
    238238        $count = bbp_get_forum_topic_count_hidden( $f, false );
    239239        $this->expectOutputString( $formatted_value );
    240         bbp_forum_topic_count_hidden( $f );
     240        bbp_forum_topic_count_hidden( $f, false, true );
    241241
    242242        // Forum formatted string.
    … …  
    245245
    246246        // Forum integer.
    247         $count = bbp_get_forum_topic_count_hidden( $f, true );
     247        $count = bbp_get_forum_topic_count_hidden( $f, false, true );
    248248        $this->assertSame( $int_value, $count );
    249249
    250250        // Category topic count hidden.
    251         $count = bbp_get_forum_topic_count_hidden( $c, true );
     251        $count = bbp_get_forum_topic_count_hidden( $c, true, true );
    252252        $this->assertSame( 0, $count );
    253253
    254254        // Category total topic count hidden.
    255         $count = bbp_get_forum_topic_count_hidden( $c, true );
     255        $count = bbp_get_forum_topic_count_hidden( $c, true, true );
    256256        $this->assertSame( 0, $count );
    257257    }

  • trunk/tests/phpunit/testcases/forums/template/forum.php

    r5962 r7365  
    6767            'post_title' => 'Private Category',
    6868        ) );
     69        bbp_privatize_forum( $c );
    6970
    7071        $category = bbp_get_forum_permalink( $c );
    71 
    72         $forum = bbp_get_forum_permalink( $f );
    7372        $this->assertSame( 'http://' . WP_TESTS_DOMAIN . '/?forum=private-category', $category );
    7473

  • trunk/tests/phpunit/testcases/topics/functions/status.php

    r6434 r7365  
    110110        $this->assertSame( 0, $count );
    111111
    112         $count = bbp_get_forum_topic_count_hidden( $f, true );
     112        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    113113        $this->assertSame( 1, $count );
    114114
    … …  
    120120
    121121        $last_reply_id = bbp_get_forum_last_reply_id( $f );
    122         $this->assertSame( $t, $last_reply_id );
     122        $this->assertSame( $r[1], $last_reply_id );
    123123
    124124        $last_active_id = bbp_get_forum_last_active_id( $f );
    125         $this->assertSame( $t, $last_active_id );
     125        $this->assertSame( $r[1], $last_active_id );
    126126
    127127        $last_active_time = bbp_get_forum_last_active_time( $f );
    … …  
    271271        $this->assertSame( 1, $count );
    272272
    273         $count = bbp_get_forum_topic_count_hidden( $f, true );
     273        $count = bbp_get_forum_topic_count_hidden( $f, true, true );
    274274        $this->assertSame( 0, $count );
    275275

  • trunk/tests/phpunit/testcases/users/template/user.php

    r7353 r7365  
    714714        $this->set_permalink_structure( '/%postname%/' );
    715715        $author_link = '<a href="http://' . WP_TESTS_DOMAIN . '/forums/users/' . $this->keymaster_userdata->user_nicename . '/" title="View ' . $display_name . '&#039;s profile" class="bbp-author-link"><span class="bbp-author-avatar">' . $wp_avatar .
    716             '</span>&nbsp;<span class="bbp-author-name">' . $display_name . '</span></a>';
     716            '</span><span class="bbp-author-name">' . $display_name . '</span></a>';
    717717
    718718        // String.
    … …  
    729729        $author_link = '<a href="http://' . WP_TESTS_DOMAIN . '/?bbp_user=' . $this->keymaster_id . '" title="View ' . $display_name .
    730730            '&#039;s profile" class="bbp-author-link"><span class="bbp-author-avatar">' . $wp_avatar .
    731             '</span>&nbsp;<span class="bbp-author-name">' . $display_name . '</span></a>';
     731            '</span><span class="bbp-author-name">' . $display_name . '</span></a>';
    732732
    733733        // String.
Note: See TracChangeset for help on using the changeset viewer.