Skip to:
Content

BuddyPress.org

Changeset 11737


Ignore:
Timestamp:
11/03/2017 07:44:10 PM (7 years ago)
Author:
boonebgorges
Message:

Use static factory method throughout PHPUnit tests.

See #7620.

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

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/testcases/activity/actions.php

    r11256 r11737  
    1616        ) );
    1717
    18         $post_id = $this->factory->post->create( array(
     18        $post_id = self::factory()->post->create( array(
    1919            'post_status' => 'publish',
    2020            'post_type'   => 'foo',
     
    4040        ) );
    4141
    42         $post_id = $this->factory->post->create( array(
     42        $post_id = self::factory()->post->create( array(
    4343            'post_status' => 'publish',
    4444            'post_type'   => 'foo',
     
    5858     */
    5959    public function test_bp_activity_catch_transition_post_type_status_publish_existing_post() {
    60         $u = $this->factory->user->create();
     60        $u = self::factory()->user->create();
    6161
    6262        $labels = array(
     
    8585
    8686        // Create the initial post.
    87         $p = $this->factory->post->create( array(
     87        $p = self::factory()->post->create( array(
    8888            'post_author' => $u,
    8989            'post_type'   => 'foo',
     
    119119        ) );
    120120
    121         $post_id = $this->factory->post->create( array(
     121        $post_id = self::factory()->post->create( array(
    122122            'post_status' => 'publish',
    123123            'post_type'   => 'foo',
     
    151151        ) );
    152152
    153         $post_id = $this->factory->post->create( array(
     153        $post_id = self::factory()->post->create( array(
    154154            'post_status' => 'publish',
    155155            'post_type'   => 'foo',
  • trunk/tests/phpunit/testcases/activity/cache.php

    r11076 r11737  
    1010     */
    1111    public function test_bp_activity_update_meta_cache() {
    12         $a1 = $this->factory->activity->create();
    13         $a2 = $this->factory->activity->create();
     12        $a1 = self::factory()->activity->create();
     13        $a2 = self::factory()->activity->create();
    1414
    1515        // Set up some data
     
    5959     */
    6060    public function test_bp_activity_clear_cache_for_activity() {
    61         $u = $this->factory->user->create();
    62 
    63         $a = $this->factory->activity->create( array(
     61        $u = self::factory()->user->create();
     62
     63        $a = self::factory()->activity->create( array(
    6464            'component'     => buddypress()->activity->id,
    6565            'type'          => 'activity_update',
     
    9292        global $wpdb;
    9393
    94         $u = $this->factory->user->create();
    95         $a = $this->factory->activity->create( array(
     94        $u = self::factory()->user->create();
     95        $a = self::factory()->activity->create( array(
    9696            'component'     => buddypress()->activity->id,
    9797            'type'          => 'activity_update',
     
    123123        global $wpdb;
    124124
    125         $u = $this->factory->user->create();
    126         $a = $this->factory->activity->create( array(
     125        $u = self::factory()->user->create();
     126        $a = self::factory()->activity->create( array(
    127127            'component'     => buddypress()->activity->id,
    128128            'type'          => 'activity_update',
     
    162162        global $wpdb;
    163163
    164         $u = $this->factory->user->create();
    165         $a1 = $this->factory->activity->create( array(
     164        $u = self::factory()->user->create();
     165        $a1 = self::factory()->activity->create( array(
    166166            'component'     => buddypress()->activity->id,
    167167            'type'          => 'activity_update',
     
    179179
    180180        // Bust the cache.
    181         $a2 = $this->factory->activity->create( array(
     181        $a2 = self::factory()->activity->create( array(
    182182            'component'     => buddypress()->activity->id,
    183183            'type'          => 'activity_update',
     
    204204        global $wpdb;
    205205
    206         $u = $this->factory->user->create();
    207         $a = $this->factory->activity->create( array(
     206        $u = self::factory()->user->create();
     207        $a = self::factory()->activity->create( array(
    208208            'component'     => buddypress()->activity->id,
    209209            'type'          => 'activity_update',
     
    221221
    222222        // Bust the cache.
    223         $this->factory->activity->create( array(
     223        self::factory()->activity->create( array(
    224224            'id'            => $a,
    225225            'component'     => buddypress()->activity->id,
     
    244244        global $wpdb;
    245245
    246         $u = $this->factory->user->create();
    247         $a = $this->factory->activity->create( array(
     246        $u = self::factory()->user->create();
     247        $a = self::factory()->activity->create( array(
    248248            'component'     => buddypress()->activity->id,
    249249            'type'          => 'activity_update',
     
    281281        global $wpdb;
    282282
    283         $activities = $this->factory->activity->create_many( 2 );
     283        $activities = self::factory()->activity->create_many( 2 );
    284284        bp_activity_add_meta( $activities[0], 'foo', 'bar' );
    285285
     
    309309        global $wpdb;
    310310
    311         $activities = $this->factory->activity->create_many( 2 );
     311        $activities = self::factory()->activity->create_many( 2 );
    312312        bp_activity_add_meta( $activities[0], 'foo', 'bar' );
    313313        bp_activity_add_meta( $activities[1], 'foo', 'baz' );
     
    338338        global $wpdb;
    339339
    340         $activities = $this->factory->activity->create_many( 2 );
     340        $activities = self::factory()->activity->create_many( 2 );
    341341        bp_activity_add_meta( $activities[0], 'foo', 'bar' );
    342342        bp_activity_add_meta( $activities[1], 'foo', 'bar' );
  • trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

    r11312 r11737  
    1010    public function test_check_exists_by_content() {
    1111        $content  = 'A classy girl who know how to enjoy the freedom of a cup of coffee';
    12         $activity = $this->factory->activity->create( array(
     12        $activity = self::factory()->activity->create( array(
    1313            'content' => $content,
    1414            'type'    => 'activity_update',
     
    2323     */
    2424    public function test_delete_activity_item_comments() {
    25         $parent_activity = $this->factory->activity->create( array(
     25        $parent_activity = self::factory()->activity->create( array(
    2626            'type' => 'activity_update',
    2727        ) );
    2828
    29         $comments = $this->factory->activity->create_many( 3, array(
     29        $comments = self::factory()->activity->create_many( 3, array(
    3030            'item_id' => $parent_activity,
    3131            'type'    => 'activity_comment',
     
    4444     */
    4545    public function test_delete_activity_meta_entries() {
    46         $activity = $this->factory->activity->create( array(
     46        $activity = self::factory()->activity->create( array(
    4747            'type' => 'activity_update',
    4848        ) );
     
    6161     */
    6262    public function test_get_with_fields_parameter_by_id() {
    63         $a = $this->factory->activity->create_many( 3, array(
     63        $a = self::factory()->activity->create_many( 3, array(
    6464            'type' => 'activity_update',
    6565        ) );
     
    7575     */
    7676    public function test_hide_all_for_user() {
    77         $activity = $this->factory->activity->create( array(
     77        $activity = self::factory()->activity->create( array(
    7878            'type' => 'activity_update',
    7979        ) );
     
    9393     */
    9494    public function test_get_with_meta_query() {
    95         $a1 = $this->factory->activity->create();
    96         $a2 = $this->factory->activity->create();
     95        $a1 = self::factory()->activity->create();
     96        $a2 = self::factory()->activity->create();
    9797        bp_activity_update_meta( $a1, 'foo', 'bar' );
    9898
     
    114114    public function test_get_with_meta_query_two_clauses_with_or_relation() {
    115115        $now = time();
    116         $a1 = $this->factory->activity->create( array(
     116        $a1 = self::factory()->activity->create( array(
    117117            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    118118        ) );
    119         $a2 = $this->factory->activity->create( array(
     119        $a2 = self::factory()->activity->create( array(
    120120            'recorded_time' => date( 'Y-m-d H:i:s', $now - 60 ),
    121121        ) );
    122         $a3 = $this->factory->activity->create( array(
     122        $a3 = self::factory()->activity->create( array(
    123123            'recorded_time' => date( 'Y-m-d H:i:s', $now - 120 ),
    124124        ) );
     
    157157        }
    158158
    159         $a1 = $this->factory->activity->create();
    160         $a2 = $this->factory->activity->create( array(
     159        $a1 = self::factory()->activity->create();
     160        $a2 = self::factory()->activity->create( array(
    161161            'recorded_time' => '2001-01-01 12:00'
    162162        ) );
    163         $a3 = $this->factory->activity->create( array(
     163        $a3 = self::factory()->activity->create( array(
    164164            'recorded_time' => '2005-01-01 12:00'
    165165        ) );
     
    188188        }
    189189
    190         $a1 = $this->factory->activity->create();
    191         $a2 = $this->factory->activity->create( array(
     190        $a1 = self::factory()->activity->create();
     191        $a2 = self::factory()->activity->create( array(
    192192            'recorded_time' => '2001-01-01 12:00'
    193193        ) );
    194         $a3 = $this->factory->activity->create( array(
     194        $a3 = self::factory()->activity->create( array(
    195195            'recorded_time' => '2005-01-01 12:00'
    196196        ) );
     
    221221        }
    222222
    223         $a1 = $this->factory->activity->create();
    224         $a2 = $this->factory->activity->create( array(
     223        $a1 = self::factory()->activity->create();
     224        $a2 = self::factory()->activity->create( array(
    225225            'recorded_time' => '2001-01-01 12:00'
    226226        ) );
    227         $a3 = $this->factory->activity->create( array(
     227        $a3 = self::factory()->activity->create( array(
    228228            'recorded_time' => '2005-01-01 12:00'
    229229        ) );
     
    242242     */
    243243    public function test_get_with_search_terms() {
    244         $a1 = $this->factory->activity->create( array(
     244        $a1 = self::factory()->activity->create( array(
    245245            'content' => 'Boone is a cool guy',
    246246        ) );
    247         $a2 = $this->factory->activity->create( array(
     247        $a2 = self::factory()->activity->create( array(
    248248            'content' => 'No he isn\'t',
    249249        ) );
     
    260260     */
    261261    public function test_get_with_display_comments_threaded() {
    262         $u = $this->factory->user->create();
     262        $u = self::factory()->user->create();
    263263
    264264        $now = time();
    265         $a1 = $this->factory->activity->create( array(
     265        $a1 = self::factory()->activity->create( array(
    266266            'user_id' => $u,
    267267            'content' => 'Life Rules',
    268268            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    269269        ) );
    270         $a2 = $this->factory->activity->create( array(
     270        $a2 = self::factory()->activity->create( array(
    271271            'user_id' => $u,
    272272            'content' => 'Life Drools',
     
    303303    public function test_get_with_display_comments_stream() {
    304304        $now = time();
    305         $a1 = $this->factory->activity->create( array(
     305        $a1 = self::factory()->activity->create( array(
    306306            'content' => 'Life Rules',
    307307            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    308308        ) );
    309         $a2 = $this->factory->activity->create( array(
     309        $a2 = self::factory()->activity->create( array(
    310310            'content' => 'Life Drools',
    311311            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    336336    public function test_get_with_display_comments_false() {
    337337        $now = time();
    338         $a1 = $this->factory->activity->create( array(
     338        $a1 = self::factory()->activity->create( array(
    339339            'content' => 'Life Rules',
    340340            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    341341        ) );
    342         $a2 = $this->factory->activity->create( array(
     342        $a2 = self::factory()->activity->create( array(
    343343            'content' => 'Life Drools',
    344344            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    362362    public function test_get_with_offset() {
    363363        $now = time();
    364         $a1 = $this->factory->activity->create( array(
     364        $a1 = self::factory()->activity->create( array(
    365365            'content' => 'Life Rules',
    366366            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    367367        ) );
    368         $a2 = $this->factory->activity->create( array(
     368        $a2 = self::factory()->activity->create( array(
    369369            'content' => 'Life Drools',
    370370            'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
    371371        ) );
    372         $a3 = $this->factory->activity->create( array(
     372        $a3 = self::factory()->activity->create( array(
    373373            'content' => 'Life Drools',
    374374            'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ),
     
    389389    public function test_get_with_since() {
    390390        $now = time();
    391         $a1 = $this->factory->activity->create( array(
     391        $a1 = self::factory()->activity->create( array(
    392392            'content' => 'Life Rules',
    393393            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    394394        ) );
    395         $a2 = $this->factory->activity->create( array(
     395        $a2 = self::factory()->activity->create( array(
    396396            'content' => 'Life Drools',
    397397            'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ),
    398398        ) );
    399         $a3 = $this->factory->activity->create( array(
     399        $a3 = self::factory()->activity->create( array(
    400400            'content' => 'Life Drools',
    401401            'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ),
     
    416416     */
    417417    public function test_get_with_count_total() {
    418         $a1 = $this->factory->activity->create();
    419         $a2 = $this->factory->activity->create();
     418        $a1 = self::factory()->activity->create();
     419        $a2 = self::factory()->activity->create();
    420420
    421421        $activity = BP_Activity_Activity::get( array(
     
    431431     */
    432432    public function test_get_with_count_total_false() {
    433         $a1 = $this->factory->activity->create();
    434         $a2 = $this->factory->activity->create();
     433        $a1 = self::factory()->activity->create();
     434        $a2 = self::factory()->activity->create();
    435435
    436436        $activity = BP_Activity_Activity::get( array(
     
    446446     */
    447447    public function test_get_with_count_total_default_to_false() {
    448         $a1 = $this->factory->activity->create();
    449         $a2 = $this->factory->activity->create();
     448        $a1 = self::factory()->activity->create();
     449        $a2 = self::factory()->activity->create();
    450450
    451451        $activity = BP_Activity_Activity::get();
     
    458458     */
    459459    public function test_get_id_with_item_id() {
    460         $a1 = $this->factory->activity->create( array(
     460        $a1 = self::factory()->activity->create( array(
    461461            'item_id' => 523,
    462462        ) );
    463         $a2 = $this->factory->activity->create( array(
     463        $a2 = self::factory()->activity->create( array(
    464464            'item_id' => 1888,
    465465        ) );
     
    473473     */
    474474    public function test_get_id_with_secondary_item_id() {
    475         $a1 = $this->factory->activity->create( array(
     475        $a1 = self::factory()->activity->create( array(
    476476            'secondary_item_id' => 523,
    477477        ) );
    478         $a2 = $this->factory->activity->create( array(
     478        $a2 = self::factory()->activity->create( array(
    479479            'secondary_content' => 1888,
    480480        ) );
     
    488488     */
    489489    public function test_delete_with_item_id() {
    490         $a1 = $this->factory->activity->create( array(
     490        $a1 = self::factory()->activity->create( array(
    491491            'item_id' => 523,
    492492        ) );
    493         $a2 = $this->factory->activity->create( array(
     493        $a2 = self::factory()->activity->create( array(
    494494            'item_id' => 1888,
    495495        ) );
     
    505505     */
    506506    public function test_delete_with_secondary_item_id() {
    507         $a1 = $this->factory->activity->create( array(
     507        $a1 = self::factory()->activity->create( array(
    508508            'secondary_item_id' => 523,
    509509        ) );
    510         $a2 = $this->factory->activity->create( array(
     510        $a2 = self::factory()->activity->create( array(
    511511            'secondary_item_id' => 1888,
    512512        ) );
     
    527527        $now = time();
    528528
    529         $u1 = $this->factory->user->create();
    530         $u2 = $this->factory->user->create();
    531 
    532         $a1 = $this->factory->activity->create( array(
     529        $u1 = self::factory()->user->create();
     530        $u2 = self::factory()->user->create();
     531
     532        $a1 = self::factory()->activity->create( array(
    533533            'content' => 'Life Rules',
    534534            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
     
    602602    public function test_get_last_updated() {
    603603        $now = time();
    604         $a1 = $this->factory->activity->create( array(
     604        $a1 = self::factory()->activity->create( array(
    605605            'recorded_time' => date( 'Y-m-d H:i:s', $now - 500 ),
    606606        ) );
    607         $a2 = $this->factory->activity->create( array(
     607        $a2 = self::factory()->activity->create( array(
    608608            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    609609        ) );
    610         $a3 = $this->factory->activity->create( array(
     610        $a3 = self::factory()->activity->create( array(
    611611            'recorded_time' => date( 'Y-m-d H:i:s', $now - 300 ),
    612612        ) );
     
    619619     */
    620620    public function test_get_recorded_components_skip_last_activity_false() {
    621         $a1 = $this->factory->activity->create( array(
     621        $a1 = self::factory()->activity->create( array(
    622622            'component' => 'members',
    623623            'action' => 'last_activity',
    624624        ) );
    625         $a2 = $this->factory->activity->create( array(
     625        $a2 = self::factory()->activity->create( array(
    626626            'component' => 'groups',
    627627            'action' => 'created_group',
    628628        ) );
    629         $a3 = $this->factory->activity->create( array(
     629        $a3 = self::factory()->activity->create( array(
    630630            'component' => 'friends',
    631631            'action' => 'friendship_accepted',
     
    642642     */
    643643    public function test_get_recorded_components_skip_last_activity_true_filter_empty_component() {
    644         $a1 = $this->factory->activity->create( array(
     644        $a1 = self::factory()->activity->create( array(
    645645            'component' => 'members',
    646646            'action' => 'last_activity',
    647647        ) );
    648         $a2 = $this->factory->activity->create( array(
     648        $a2 = self::factory()->activity->create( array(
    649649            'component' => 'groups',
    650650            'action' => 'created_group',
    651651        ) );
    652         $a3 = $this->factory->activity->create( array(
     652        $a3 = self::factory()->activity->create( array(
    653653            'component' => 'friends',
    654654            'action' => 'friendship_accepted',
     
    665665     */
    666666    public function test_get_recorded_components_skip_last_activity_true_members_component_not_empty() {
    667         $a1 = $this->factory->activity->create( array(
     667        $a1 = self::factory()->activity->create( array(
    668668            'component' => 'members',
    669669            'action' => 'last_activity',
    670670        ) );
    671         $a2 = $this->factory->activity->create( array(
     671        $a2 = self::factory()->activity->create( array(
    672672            'component' => 'groups',
    673673            'action' => 'created_group',
    674674        ) );
    675         $a3 = $this->factory->activity->create( array(
     675        $a3 = self::factory()->activity->create( array(
    676676            'component' => 'friends',
    677677            'action' => 'friendship_accepted',
    678678        ) );
    679         $a4 = $this->factory->activity->create( array(
     679        $a4 = self::factory()->activity->create( array(
    680680            'component' => 'members',
    681681            'action' => 'foo',
     
    692692     */
    693693    public function test_get_recorded_components_skip_last_activity_true_la_in_multiple_components() {
    694         $a1 = $this->factory->activity->create( array(
     694        $a1 = self::factory()->activity->create( array(
    695695            'component' => 'members',
    696696            'action' => 'last_activity',
    697697        ) );
    698         $a2 = $this->factory->activity->create( array(
     698        $a2 = self::factory()->activity->create( array(
    699699            'component' => 'groups',
    700700            'action' => 'created_group',
    701701        ) );
    702         $a3 = $this->factory->activity->create( array(
     702        $a3 = self::factory()->activity->create( array(
    703703            'component' => 'friends',
    704704            'action' => 'friendship_accepted',
    705705        ) );
    706         $a4 = $this->factory->activity->create( array(
     706        $a4 = self::factory()->activity->create( array(
    707707            'component' => 'groups',
    708708            'action' => 'last_activity',
     
    726726
    727727        // Create the activity item with a manual activity string
    728         $a = $this->factory->activity->create( array(
     728        $a = self::factory()->activity->create( array(
    729729            'component' => 'foo',
    730730            'type' => 'bar',
     
    744744
    745745        // Create the activity item with a manual activity string
    746         $a = $this->factory->activity->create( array(
     746        $a = self::factory()->activity->create( array(
    747747            'component' => 'foo',
    748748            'type' => 'bar1',
     
    762762
    763763        // Create the activity item with a manual activity string
    764         $a = $this->factory->activity->create( array(
     764        $a = self::factory()->activity->create( array(
    765765            'component' => 'foo',
    766766            'type' => 'bar2',
     
    776776     */
    777777    public function test_nonexistent_activity_should_have_id_0_after_population() {
    778         $a = $this->factory->activity->create();
     778        $a = self::factory()->activity->create();
    779779        bp_activity_delete_by_activity_id( $a );
    780780
  • trunk/tests/phpunit/testcases/activity/filters.php

    r10960 r11737  
    1010     */
    1111    public function test_bp_activity_at_name_filter() {
    12         $u1 = $this->factory->user->create( array(
     12        $u1 = self::factory()->user->create( array(
    1313            'user_login' => 'foobarbaz',
    1414            'user_nicename' => 'foobarbaz',
    1515        ) );
    1616
    17         $u2 = $this->factory->user->create( array(
     17        $u2 = self::factory()->user->create( array(
    1818            'user_login' => 'foo2',
    1919            'user_nicename' => 'foo2',
  • trunk/tests/phpunit/testcases/activity/functions.php

    r11583 r11737  
    2828
    2929        // create an activity update
    30         $activity = $this->factory->activity->create( array(
     30        $activity = self::factory()->activity->create( array(
    3131            'type' => 'activity_update'
    3232        ) );
     
    5757
    5858        // create an activity update
    59         $this->factory->activity->create( $criteria );
    60         $this->factory->activity->create( $criteria );
    61         $this->factory->activity->create( $criteria );
    62         $this->factory->activity->create( $criteria );
     59        self::factory()->activity->create( $criteria );
     60        self::factory()->activity->create( $criteria );
     61        self::factory()->activity->create( $criteria );
     62        self::factory()->activity->create( $criteria );
    6363
    6464        // now delete the activity items
     
    8383
    8484        // create an activity update
    85         $this->factory->activity->create( $criteria );
    86         $this->factory->activity->create( $criteria );
    87         $this->factory->activity->create( $criteria );
    88         $this->factory->activity->create( $criteria );
     85        self::factory()->activity->create( $criteria );
     86        self::factory()->activity->create( $criteria );
     87        self::factory()->activity->create( $criteria );
     88        self::factory()->activity->create( $criteria );
    8989
    9090        // now delete the activity items
     
    109109
    110110        // create an activity update
    111         $this->factory->activity->create( $criteria );
    112         $this->factory->activity->create( $criteria );
    113         $this->factory->activity->create( $criteria );
    114         $this->factory->activity->create( $criteria );
     111        self::factory()->activity->create( $criteria );
     112        self::factory()->activity->create( $criteria );
     113        self::factory()->activity->create( $criteria );
     114        self::factory()->activity->create( $criteria );
    115115
    116116        // now delete the activity items
     
    130130
    131131        // create an activity update
    132         $activity = $this->factory->activity->create( array(
     132        $activity = self::factory()->activity->create( array(
    133133            'type' => 'activity_update'
    134134        ) );
     
    153153
    154154        // create an activity update
    155         $activity = $this->factory->activity->create( array(
     155        $activity = self::factory()->activity->create( array(
    156156            'type' => 'activity_update'
    157157        ) );
     
    188188
    189189        // create an activity update
    190         $parent_activity = $this->factory->activity->create( array(
     190        $parent_activity = self::factory()->activity->create( array(
    191191            'type' => 'activity_update',
    192192        ) );
    193193
    194194        // create some activity comments
    195         $comment_one = $this->factory->activity->create( array(
     195        $comment_one = self::factory()->activity->create( array(
    196196            'type'              => 'activity_comment',
    197197            'item_id'           => $parent_activity,
     
    199199        ) );
    200200
    201         $comment_two = $this->factory->activity->create( array(
     201        $comment_two = self::factory()->activity->create( array(
    202202            'type'              => 'activity_comment',
    203203            'item_id'           => $parent_activity,
     
    227227
    228228        // create an activity update
    229         $parent_activity = $this->factory->activity->create( array(
     229        $parent_activity = self::factory()->activity->create( array(
    230230            'type' => 'activity_update',
    231231        ) );
    232232
    233233        // create some activity comments
    234         $comment_one = $this->factory->activity->create( array(
     234        $comment_one = self::factory()->activity->create( array(
    235235            'type'              => 'activity_comment',
    236236            'item_id'           => $parent_activity,
     
    238238        ) );
    239239
    240         $comment_two = $this->factory->activity->create( array(
     240        $comment_two = self::factory()->activity->create( array(
    241241            'type'              => 'activity_comment',
    242242            'item_id'           => $parent_activity,
     
    271271     */
    272272    public function test_bp_activity_update_meta_with_line_breaks() {
    273         $a = $this->factory->activity->create();
     273        $a = self::factory()->activity->create();
    274274        $meta_value = 'Foo!
    275275
     
    285285     */
    286286    public function test_bp_activity_update_meta_with_0() {
    287         $a = $this->factory->activity->create();
     287        $a = self::factory()->activity->create();
    288288        $meta_value = 0;
    289289
     
    307307     */
    308308    public function test_bp_activity_update_meta_with_illegal_key_characters() {
    309         $a = $this->factory->activity->create();
     309        $a = self::factory()->activity->create();
    310310        $krazy_key = ' f!@#$%^o *(){}o?+';
    311311        bp_activity_update_meta( $a, $krazy_key, 'bar' );
     
    319319     */
    320320    public function test_bp_activity_update_meta_stripslashes() {
    321         $a = $this->factory->activity->create();
     321        $a = self::factory()->activity->create();
    322322        $value = "This string is totally slashin\'!";
    323323        bp_activity_update_meta( $a, 'foo', $value );
     
    331331     */
    332332    public function test_bp_activity_update_meta_false_value_deletes() {
    333         $a = $this->factory->activity->create();
     333        $a = self::factory()->activity->create();
    334334        bp_activity_update_meta( $a, 'foo', false );
    335335        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     
    341341     */
    342342    public function test_bp_activity_update_meta_new() {
    343         $a = $this->factory->activity->create();
     343        $a = self::factory()->activity->create();
    344344        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ), '"foo" meta should be empty for this activity item.' );
    345345        $this->assertNotEmpty( bp_activity_update_meta( $a, 'foo', 'bar' ) );
     
    352352     */
    353353    public function test_bp_activity_update_meta_existing() {
    354         $a = $this->factory->activity->create();
     354        $a = self::factory()->activity->create();
    355355        bp_activity_update_meta( $a, 'foo', 'bar' );
    356356        $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) );
     
    364364     */
    365365    public function test_bp_activity_update_meta_same_value() {
    366         $a = $this->factory->activity->create();
     366        $a = self::factory()->activity->create();
    367367        bp_activity_update_meta( $a, 'foo', 'bar' );
    368368        $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) );
     
    376376     */
    377377    public function test_bp_activity_update_meta_prev_value() {
    378         $a = $this->factory->activity->create();
     378        $a = self::factory()->activity->create();
    379379        bp_activity_add_meta( $a, 'foo', 'bar' );
    380380
     
    413413     */
    414414    public function test_bp_activity_get_meta_with_illegal_characters() {
    415         $a = $this->factory->activity->create();
     415        $a = self::factory()->activity->create();
    416416        bp_activity_update_meta( $a, 'foo', 'bar' );
    417417
     
    425425     */
    426426    public function test_bp_activity_get_meta_multiple() {
    427         $a = $this->factory->activity->create();
     427        $a = self::factory()->activity->create();
    428428        bp_activity_update_meta( $a, 'foo', 'bar' );
    429429        bp_activity_update_meta( $a, 'foo1', 'bar1' );
     
    447447     */
    448448    public function test_bp_activity_get_meta_no_results_returns_false() {
    449         $a = $this->factory->activity->create();
     449        $a = self::factory()->activity->create();
    450450
    451451        $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) );
     
    457457     */
    458458    public function test_bp_activity_get_meta_single_true() {
    459         $a = $this->factory->activity->create();
     459        $a = self::factory()->activity->create();
    460460        bp_activity_add_meta( $a, 'foo', 'bar' );
    461461        bp_activity_add_meta( $a, 'foo', 'baz' );
     
    469469     */
    470470    public function test_bp_activity_get_meta_single_false() {
    471         $a = $this->factory->activity->create();
     471        $a = self::factory()->activity->create();
    472472        bp_activity_add_meta( $a, 'foo', 'bar' );
    473473        bp_activity_add_meta( $a, 'foo', 'baz' );
     
    481481     */
    482482    public function test_bp_activity_get_meta_cache_all_on_get() {
    483         $a = $this->factory->activity->create();
     483        $a = self::factory()->activity->create();
    484484        bp_activity_add_meta( $a, 'foo', 'bar' );
    485485        bp_activity_add_meta( $a, 'foo1', 'baz' );
     
    507507     */
    508508    public function test_bp_activity_delete_meta_trim_meta_value() {
    509         $a = $this->factory->activity->create();
     509        $a = self::factory()->activity->create();
    510510        bp_activity_update_meta( $a, 'foo', 'bar' );
    511511        bp_activity_delete_meta( $a, 'foo', ' bar ' );
     
    518518     */
    519519    public function test_bp_activity_delete_meta_single() {
    520         $a = $this->factory->activity->create();
     520        $a = self::factory()->activity->create();
    521521        bp_activity_update_meta( $a, 'foo', 'bar' );
    522522        $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) );
     
    529529     */
    530530    public function test_bp_activity_delete_meta_all_for_activity() {
    531         $a = $this->factory->activity->create();
     531        $a = self::factory()->activity->create();
    532532        bp_activity_update_meta( $a, 'foo', 'bar' );
    533533        bp_activity_update_meta( $a, 'foo1', 'bar1' );
     
    542542     */
    543543    public function test_bp_activity_delete_meta_with_meta_value() {
    544         $a = $this->factory->activity->create();
     544        $a = self::factory()->activity->create();
    545545        bp_activity_update_meta( $a, 'foo', 'bar' );
    546546        $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) );
     
    555555        // With no meta key, don't delete for all items - just delete
    556556        // all for a single item
    557         $a1 = $this->factory->activity->create();
    558         $a2 = $this->factory->activity->create();
     557        $a1 = self::factory()->activity->create();
     558        $a2 = self::factory()->activity->create();
    559559        bp_activity_update_meta( $a1, 'foo', 'bar' );
    560560        bp_activity_update_meta( $a1, 'foo1', 'bar1' );
     
    575575        // With no meta key, don't delete for all items - just delete
    576576        // all for a single item
    577         $a1 = $this->factory->activity->create();
    578         $a2 = $this->factory->activity->create();
     577        $a1 = self::factory()->activity->create();
     578        $a2 = self::factory()->activity->create();
    579579        bp_activity_update_meta( $a1, 'foo', 'bar' );
    580580        bp_activity_update_meta( $a1, 'foo1', 'bar1' );
     
    610610     */
    611611    public function test_bp_activity_add_meta_existing_unique() {
    612         $a = $this->factory->activity->create();
     612        $a = self::factory()->activity->create();
    613613        bp_activity_add_meta( $a, 'foo', 'bar' );
    614614        $this->assertFalse( bp_activity_add_meta( $a, 'foo', 'baz', true ) );
     
    620620     */
    621621    public function test_bp_activity_add_meta_existing_not_unique() {
    622         $a = $this->factory->activity->create();
     622        $a = self::factory()->activity->create();
    623623        bp_activity_add_meta( $a, 'foo', 'bar' );
    624624        $this->assertNotEmpty( bp_activity_add_meta( $a, 'foo', 'baz' ) );
     
    631631        add_filter( 'bp_is_username_compatibility_mode', '__return_false' );
    632632
    633         $u = $this->factory->user->create( array(
     633        $u = self::factory()->user->create( array(
    634634            'user_login' => 'foo bar baz',
    635635            'user_nicename' => 'foo-bar-baz',
     
    647647        add_filter( 'bp_is_username_compatibility_mode', '__return_true' );
    648648
    649         $u1 = $this->factory->user->create( array(
     649        $u1 = self::factory()->user->create( array(
    650650            'user_login' => 'foo bar baz',
    651651            'user_nicename' => 'foo-bar-baz',
    652652        ) );
    653653
    654         $u2 = $this->factory->user->create( array(
     654        $u2 = self::factory()->user->create( array(
    655655            'user_login' => 'foo.bar.baz',
    656656            'user_nicename' => 'foo-bar-baz',
     
    669669        add_filter( 'bp_is_username_compatibility_mode', '__return_false' );
    670670
    671         $u = $this->factory->user->create( array(
     671        $u = self::factory()->user->create( array(
    672672            'user_login' => 'foo bar baz',
    673673            'user_nicename' => 'foo-bar-baz',
     
    686686
    687687        // all spaces are hyphens
    688         $u1 = $this->factory->user->create( array(
     688        $u1 = self::factory()->user->create( array(
    689689            'user_login' => 'foo bar baz',
    690690            'user_nicename' => 'foobarbaz',
     
    692692
    693693        // no spaces are hyphens
    694         $u2 = $this->factory->user->create( array(
     694        $u2 = self::factory()->user->create( array(
    695695            'user_login' => 'foo-bar-baz-1',
    696696            'user_nicename' => 'foobarbaz-1',
     
    698698
    699699        // some spaces are hyphens
    700         $u3 = $this->factory->user->create( array(
     700        $u3 = self::factory()->user->create( array(
    701701            'user_login' => 'foo bar-baz 2',
    702702            'user_nicename' => 'foobarbaz-2',
    703703        ) );
    704704
    705         $u4 = $this->factory->user->create( array(
     705        $u4 = self::factory()->user->create( array(
    706706            'user_login' => 'foo.bar.baz',
    707707            'user_nicename' => 'foo-bar-baz',
     
    721721     */
    722722    public function test_bp_activity_format_activity_action_activity_update() {
    723         $u = $this->factory->user->create();
    724         $a = $this->factory->activity->create( array(
     723        $u = self::factory()->user->create();
     724        $a = self::factory()->activity->create( array(
    725725            'component' => buddypress()->activity->id,
    726726            'type' => 'activity_update',
     
    740740     */
    741741    public function test_bp_activity_format_activity_action_activity_comment() {
    742         $u = $this->factory->user->create();
    743         $a = $this->factory->activity->create( array(
     742        $u = self::factory()->user->create();
     743        $a = self::factory()->activity->create( array(
    744744            'component' => buddypress()->activity->id,
    745745            'type' => 'activity_comment',
     
    773773        bp_activity_get_actions();
    774774
    775         $u = $this->factory->user->create();
    776         $p = $this->factory->post->create( array(
     775        $u = self::factory()->user->create();
     776        $p = self::factory()->post->create( array(
    777777            'post_author' => $u,
    778778            'post_type'   => 'foo',
    779779        ) );
    780780
    781         $a = $this->factory->activity->create( array(
     781        $a = self::factory()->activity->create( array(
    782782            'component'         => 'activity',
    783783            'type'              => 'new_foo',
     
    811811        }
    812812
    813         $b = $this->factory->blog->create();
    814         $u = $this->factory->user->create();
     813        $b = self::factory()->blog->create();
     814        $u = self::factory()->user->create();
    815815
    816816        switch_to_blog( $b );
     
    825825        bp_activity_get_actions();
    826826
    827         $p = $this->factory->post->create( array(
     827        $p = self::factory()->post->create( array(
    828828            'post_author' => $u,
    829829            'post_type'   => 'foo',
     
    843843        restore_current_blog();
    844844
    845         $a = $this->factory->activity->create( $activity_args );
     845        $a = self::factory()->activity->create( $activity_args );
    846846
    847847        $a_obj = new BP_Activity_Activity( $a );
     
    886886        bp_activity_get_actions();
    887887
    888         $u = $this->factory->user->create();
    889         $p = $this->factory->post->create( array(
     888        $u = self::factory()->user->create();
     889        $p = self::factory()->post->create( array(
    890890            'post_author' => $u,
    891891            'post_type'   => 'foo',
    892892        ) );
    893893
    894         $a = $this->factory->activity->create( array(
     894        $a = self::factory()->activity->create( array(
    895895            'component'         => 'activity',
    896896            'type'              => 'foo_bar',
     
    923923        }
    924924
    925         $b = $this->factory->blog->create();
    926         $u = $this->factory->user->create();
     925        $b = self::factory()->blog->create();
     926        $u = self::factory()->user->create();
    927927
    928928        switch_to_blog( $b );
     
    943943        bp_activity_get_actions();
    944944
    945         $p = $this->factory->post->create( array(
     945        $p = self::factory()->post->create( array(
    946946            'post_author' => $u,
    947947            'post_type'   => 'foo',
     
    960960        restore_current_blog();
    961961
    962         $a = $this->factory->activity->create( $activity_args );
     962        $a = self::factory()->activity->create( $activity_args );
    963963
    964964        $a_obj = new BP_Activity_Activity( $a );
     
    990990        bp_activity_get_actions();
    991991
    992         $u = $this->factory->user->create();
    993 
    994         $post_id = $this->factory->post->create( array(
     992        $u = self::factory()->user->create();
     993
     994        $post_id = self::factory()->post->create( array(
    995995            'post_author' => $u,
    996996            'post_status' => 'publish',
     
    10541054    public function test_bp_activity_format_activity_action_custom_post_type_comment() {
    10551055        if ( is_multisite() ) {
    1056             $b = $this->factory->blog->create();
     1056            $b = self::factory()->blog->create();
    10571057            switch_to_blog( $b );
    10581058            add_filter( 'comment_flood_filter', '__return_false' );
     
    10611061        }
    10621062
    1063         $u = $this->factory->user->create();
     1063        $u = self::factory()->user->create();
    10641064        $userdata = get_userdata( $u );
    10651065
     
    10841084        bp_activity_get_actions();
    10851085
    1086         $p = $this->factory->post->create( array(
     1086        $p = self::factory()->post->create( array(
    10871087            'post_author' => $u,
    10881088            'post_type'   => 'foo',
     
    11271127     */
    11281128    public function test_bp_activity_new_comment_clear_comment_caches() {
    1129         $u = $this->factory->user->create();
    1130         $a1 = $this->factory->activity->create( array(
     1129        $u = self::factory()->user->create();
     1130        $a1 = self::factory()->activity->create( array(
    11311131            'user_id' => $u,
    11321132        ) );
     
    11811181     */
    11821182    public function test_bp_activity_new_comment_clear_activity_caches() {
    1183         $u = $this->factory->user->create();
    1184         $a1 = $this->factory->activity->create( array(
     1183        $u = self::factory()->user->create();
     1184        $a1 = self::factory()->activity->create( array(
    11851185            'user_id' => $u,
    11861186        ) );
     
    12531253     */
    12541254    public function test_bp_activity_delete_comment_clear_cache() {
    1255         $u = $this->factory->user->create();
     1255        $u = self::factory()->user->create();
    12561256        // add new activity update and comment to this update
    1257         $a1 = $this->factory->activity->create( array(
     1257        $a1 = self::factory()->activity->create( array(
    12581258            'user_id' => $u,
    12591259        ) );
     
    12831283     */
    12841284    public function test_bp_activity_delete_comment_shouldnt_delete_all_comments_when_parameters_are_empty() {
    1285         $u = $this->factory->user->create();
     1285        $u = self::factory()->user->create();
    12861286
    12871287        // create an activity update
    1288         $parent_activity = $this->factory->activity->create( array(
     1288        $parent_activity = self::factory()->activity->create( array(
    12891289            'type'    => 'activity_update',
    12901290            'user_id' => $u
     
    13301330     */
    13311331    public function test_bp_activity_comment_on_deleted_activity() {
    1332         $u = $this->factory->user->create();
    1333         $a = $this->factory->activity->create();
     1332        $u = self::factory()->user->create();
     1333        $a = self::factory()->activity->create();
    13341334
    13351335        bp_activity_delete_by_activity_id( $a );
     
    13501350     */
    13511351    public function test_add_user_favorite_already_favorited() {
    1352         $u = $this->factory->user->create();
    1353         $a = $this->factory->activity->create();
     1352        $u = self::factory()->user->create();
     1353        $a = self::factory()->activity->create();
    13541354
    13551355        // bp_activity_add_user_favorite() requires a logged-in user.
     
    13711371     */
    13721372    public function test_add_user_favorite_not_yet_favorited() {
    1373         $u = $this->factory->user->create();
    1374         $a = $this->factory->activity->create();
     1373        $u = self::factory()->user->create();
     1374        $a = self::factory()->activity->create();
    13751375
    13761376        // bp_activity_add_user_favorite() requires a logged-in user.
     
    13871387     */
    13881388    public function test_remove_user_favorite_bad_activity_id() {
    1389         $u1 = $this->factory->user->create();
    1390         $u2 = $this->factory->user->create();
    1391         $a = $this->factory->activity->create();
     1389        $u1 = self::factory()->user->create();
     1390        $u2 = self::factory()->user->create();
     1391        $a = self::factory()->activity->create();
    13921392
    13931393        // bp_activity_add_user_favorite() requires a logged-in user.
     
    14261426     */
    14271427    public function test_bp_activity_post_update_success() {
    1428         $u = $this->factory->user->create();
     1428        $u = self::factory()->user->create();
    14291429
    14301430        $a = bp_activity_post_update( array(
     
    14481448        );
    14491449
    1450         $a = $this->factory->activity->create( $args );
     1450        $a = self::factory()->activity->create( $args );
    14511451
    14521452        $this->assertEquals( $a, bp_activity_get_activity_id( $args ) );
     
    14651465        );
    14661466
    1467         $a = $this->factory->activity->create( $args );
     1467        $a = self::factory()->activity->create( $args );
    14681468
    14691469        $this->assertTrue( bp_activity_delete_by_item_id( $args ) );
  • trunk/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php

    r11413 r11737  
    1010     */
    1111    public function test_depth_inside_activity_comment_loop() {
    12         $u = $this->factory->user->create();
     12        $u = self::factory()->user->create();
    1313
    1414        // create an activity update
    15         $parent_activity = $this->factory->activity->create( array(
     15        $parent_activity = self::factory()->activity->create( array(
    1616            'type'    => 'activity_update',
    1717            'user_id' => $u
     
    7777     */
    7878    public function test_depth_outside_of_activity_comment_loop() {
    79         $u = $this->factory->user->create();
     79        $u = self::factory()->user->create();
    8080
    8181        // create an activity update
    82         $parent_activity = $this->factory->activity->create( array(
     82        $parent_activity = self::factory()->activity->create( array(
    8383            'type'    => 'activity_update',
    8484            'user_id' => $u
  • trunk/tests/phpunit/testcases/activity/notifications.php

    r11256 r11737  
    1515        parent::setUp();
    1616        $this->current_user = get_current_user_id();
    17         $this->u1 = $this->factory->user->create();
    18         $this->u2 = $this->factory->user->create();
     17        $this->u1 = self::factory()->user->create();
     18        $this->u2 = self::factory()->user->create();
    1919        $this->set_current_user( $this->u1 );
    2020
     
    274274    protected function create_notifications() {
    275275        $u1_mentionname = bp_activity_get_user_mentionname( $this->u1 );
    276         $this->a1 = $this->factory->activity->create( array(
     276        $this->a1 = self::factory()->activity->create( array(
    277277            'user_id' => $this->u2,
    278278            'component' => buddypress()->activity->id,
     
    281281        ) );
    282282        $u2_mentionname = bp_activity_get_user_mentionname( $this->u2 );
    283         $this->a2 = $this->factory->activity->create( array(
     283        $this->a2 = self::factory()->activity->create( array(
    284284            'user_id' => $this->u1,
    285285            'component' => buddypress()->activity->id,
     
    296296
    297297        // Current user is $this->u1, so $this->u2 posted the mention
    298         $a = $this->factory->activity->create( array(
     298        $a = self::factory()->activity->create( array(
    299299            'user_id' => $this->u2,
    300300            'component' => buddypress()->activity->id,
     
    338338     */
    339339    public function test_bp_activity_comment_add_notification() {
    340         $a = $this->factory->activity->create( array(
     340        $a = self::factory()->activity->create( array(
    341341            'user_id' => $this->u1,
    342342            'component' => buddypress()->activity->id,
     
    352352        ) );
    353353
    354         $u3 = $this->factory->user->create();
     354        $u3 = self::factory()->user->create();
    355355
    356356        $r3 = bp_activity_new_comment( array(
     
    381381    public function test_activity_reply_notifications_for_blog_comment_to_activity_comment_sync() {
    382382        $old_user = get_current_user_id();
    383         $u1 = $this->factory->user->create();
    384         $u2 = $this->factory->user->create();
    385         $u3 = $this->factory->user->create();
     383        $u1 = self::factory()->user->create();
     384        $u2 = self::factory()->user->create();
     385        $u3 = self::factory()->user->create();
    386386
    387387        $this->set_current_user( $u1 );
     
    395395
    396396        // create the blog post
    397         $post_id = $this->factory->post->create( array(
     397        $post_id = self::factory()->post->create( array(
    398398            'post_status' => 'publish',
    399399            'post_type'   => 'post',
     
    415415        ) );
    416416        // Approve the comment
    417         $this->factory->comment->update_object( $c1, array( 'comment_approved' => 1 ) );
     417        self::factory()->comment->update_object( $c1, array( 'comment_approved' => 1 ) );
    418418
    419419        $this->set_current_user( $u3 );
     
    431431        ) );
    432432        // Approve the comment
    433         $this->factory->comment->update_object( $c2, array( 'comment_approved' => 1 ) );
     433        self::factory()->comment->update_object( $c2, array( 'comment_approved' => 1 ) );
    434434
    435435        // Get activity IDs.
  • trunk/tests/phpunit/testcases/activity/template.php

    r11091 r11737  
    1010    public function test_user_can_delete() {
    1111        $bp = buddypress();
    12         $u = $this->factory->user->create();
     12        $u = self::factory()->user->create();
    1313        $original_user = bp_loggedin_user_id();
    1414        $this->set_current_user( $u );
    1515
    16         $a = $this->factory->activity->create( array(
     16        $a = self::factory()->activity->create( array(
    1717            'type' => 'activity_update',
    1818            'user_id' => $u,
     
    2020
    2121        // User can delete his own items
    22         $activity = $this->factory->activity->get_object_by_id( $a );
     22        $activity = self::factory()->activity->get_object_by_id( $a );
    2323        $this->assertTrue( bp_activity_user_can_delete( $activity ) );
    2424
     
    2828
    2929        // Miscellaneous user can't delete
    30         $misc_user = $this->factory->user->create( array( 'role' => 'subscriber' ) );
     30        $misc_user = self::factory()->user->create( array( 'role' => 'subscriber' ) );
    3131        $this->set_current_user( $misc_user );
    3232        $this->assertFalse( bp_activity_user_can_delete( $activity ) );
     
    5252        // save the current user and override logged-in user
    5353        $old_user = get_current_user_id();
    54         $u = $this->factory->user->create();
     54        $u = self::factory()->user->create();
    5555        $this->set_current_user( $u );
    5656
    5757        // create an activity update for the user
    58         $this->factory->activity->create( array(
     58        self::factory()->activity->create( array(
    5959            'component' => buddypress()->activity->id,
    6060            'type' => 'activity_update',
     
    8181     */
    8282    public function test_bp_has_activities_favorites_action_filter() {
    83         $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
    84 
    85         $now = time();
    86 
    87         $a1 = $this->factory->activity->create( array(
     83        $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
     84
     85        $now = time();
     86
     87        $a1 = self::factory()->activity->create( array(
    8888            'type' => 'activity_update',
    8989            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    9090        ) );
    9191
    92         $a2 = $this->factory->activity->create( array(
     92        $a2 = self::factory()->activity->create( array(
    9393            'type' => 'joined_group',
    9494            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    141141     */
    142142    function test_bp_has_activities_just_me_scope_with_no_user_id() {
    143         $u1 = $this->factory->user->create();
    144         $u2 = $this->factory->user->create();
     143        $u1 = self::factory()->user->create();
     144        $u2 = self::factory()->user->create();
    145145
    146146        // save the current user and override logged-in user
     
    151151
    152152        // activity item
    153         $a1 = $this->factory->activity->create( array(
     153        $a1 = self::factory()->activity->create( array(
    154154            'user_id'   => $u1,
    155155            'component' => 'activity',
     
    160160        // misc activity items
    161161
    162         $this->factory->activity->create( array(
     162        self::factory()->activity->create( array(
    163163            'user_id'   => $u2,
    164164            'component' => 'activity',
     
    166166            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    167167        ) );
    168         $this->factory->activity->create( array(
     168        self::factory()->activity->create( array(
    169169            'user_id'   => $u2,
    170170            'component' => 'groups',
     
    197197     */
    198198    function test_bp_has_activities_mentions_scope() {
    199         $u1 = $this->factory->user->create();
    200         $u2 = $this->factory->user->create();
     199        $u1 = self::factory()->user->create();
     200        $u2 = self::factory()->user->create();
    201201
    202202        $now = time();
     
    204204        // mentioned activity item
    205205        $mention_username = '@' . bp_activity_get_user_mentionname( $u1 );
    206         $a1 = $this->factory->activity->create( array(
     206        $a1 = self::factory()->activity->create( array(
    207207            'user_id' => $u2,
    208208            'type'    => 'activity_update',
     
    212212
    213213        // misc activity items
    214         $this->factory->activity->create( array(
     214        self::factory()->activity->create( array(
    215215            'user_id'   => $u1,
    216216            'component' => 'blogs',
     
    219219            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    220220        ) );
    221         $this->factory->activity->create( array(
     221        self::factory()->activity->create( array(
    222222            'user_id'   => $u2,
    223223            'component' => 'activity',
     
    225225            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    226226        ) );
    227         $this->factory->activity->create( array(
     227        self::factory()->activity->create( array(
    228228            'user_id'   => $u2,
    229229            'component' => 'groups',
     
    254254     */
    255255    function test_bp_has_activities_friends_and_mentions_scope() {
    256         $u1 = $this->factory->user->create();
    257         $u2 = $this->factory->user->create();
    258         $u3 = $this->factory->user->create();
     256        $u1 = self::factory()->user->create();
     257        $u2 = self::factory()->user->create();
     258        $u3 = self::factory()->user->create();
    259259
    260260        // user 1 becomes friends with user 2
     
    264264
    265265        // friend status update
    266         $a1 = $this->factory->activity->create( array(
     266        $a1 = self::factory()->activity->create( array(
    267267            'user_id' => $u2,
    268268            'type' => 'activity_update',
     
    272272        // mentioned item by non-friend
    273273        $mention_username = '@' . bp_activity_get_user_mentionname( $u1 );
    274         $a2 = $this->factory->activity->create( array(
     274        $a2 = self::factory()->activity->create( array(
    275275            'user_id'   => $u3,
    276276            'component' => 'activity',
     
    281281
    282282        // misc activity items
    283         $this->factory->activity->create( array(
     283        self::factory()->activity->create( array(
    284284            'user_id'   => $u1,
    285285            'component' => 'blogs',
     
    288288            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    289289        ) );
    290         $this->factory->activity->create( array(
     290        self::factory()->activity->create( array(
    291291            'user_id'   => $u3,
    292292            'component' => 'activity',
     
    294294            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    295295        ) );
    296         $this->factory->activity->create( array(
     296        self::factory()->activity->create( array(
    297297            'user_id'   => $u3,
    298298            'component' => 'groups',
     
    323323     */
    324324    function test_bp_has_activities_groups_and_friends_scope() {
    325         $u1 = $this->factory->user->create();
    326         $u2 = $this->factory->user->create();
    327         $u3 = $this->factory->user->create();
     325        $u1 = self::factory()->user->create();
     326        $u2 = self::factory()->user->create();
     327        $u3 = self::factory()->user->create();
    328328
    329329        // user 1 becomes friends with user 2
     
    331331
    332332        // user 1 joins a group
    333         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    334         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     333        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     334        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    335335
    336336        $now = time();
    337337
    338338        // friend status update
    339         $a1 = $this->factory->activity->create( array(
     339        $a1 = self::factory()->activity->create( array(
    340340            'user_id' => $u2,
    341341            'type' => 'activity_update',
     
    344344
    345345        // group activity
    346         $a2 = $this->factory->activity->create( array(
     346        $a2 = self::factory()->activity->create( array(
    347347            'user_id'   => $u3,
    348348            'component' => 'groups',
     
    353353
    354354        // misc activity items
    355         $this->factory->activity->create( array(
     355        self::factory()->activity->create( array(
    356356            'user_id'   => $u3,
    357357            'component' => 'blogs',
     
    360360            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    361361        ) );
    362         $this->factory->activity->create( array(
     362        self::factory()->activity->create( array(
    363363            'user_id'   => $u3,
    364364            'component' => 'activity',
     
    370370        global $wpdb, $bp;
    371371        $max_group_id = $wpdb->get_var( "SELECT id FROM {$bp->groups->table_name} ORDER BY id DESC LIMIT 1" );
    372         $this->factory->activity->create( array(
     372        self::factory()->activity->create( array(
    373373            'user_id'   => $u3,
    374374            'component' => 'groups',
     
    399399     */
    400400    function test_bp_has_activities_scope_friends_no_items() {
    401         $u1 = $this->factory->user->create();
     401        $u1 = self::factory()->user->create();
    402402
    403403        $now = time();
    404404
    405405        // Create a random activity
    406         $this->factory->activity->create( array(
     406        self::factory()->activity->create( array(
    407407            'user_id' => $u1,
    408408            'type' => 'activity_update',
     
    432432     */
    433433    function test_bp_has_activities_scope_favorites_no_items() {
    434         $u1 = $this->factory->user->create();
     434        $u1 = self::factory()->user->create();
    435435
    436436        $now = time();
    437437
    438438        // Create a random activity
    439         $this->factory->activity->create( array(
     439        self::factory()->activity->create( array(
    440440            'user_id' => $u1,
    441441            'type' => 'activity_update',
     
    465465     */
    466466    function test_bp_has_activities_scope_groups_no_items() {
    467         $u1 = $this->factory->user->create();
     467        $u1 = self::factory()->user->create();
    468468
    469469        $now = time();
    470470
    471471        // Create a random activity
    472         $this->factory->activity->create( array(
     472        self::factory()->activity->create( array(
    473473            'user_id' => $u1,
    474474            'type' => 'activity_update',
     
    498498     */
    499499    function test_bp_has_activities_scope_mentions_no_items() {
    500         $u1 = $this->factory->user->create();
     500        $u1 = self::factory()->user->create();
    501501
    502502        $now = time();
    503503
    504504        // Create a random activity
    505         $this->factory->activity->create( array(
     505        self::factory()->activity->create( array(
    506506            'user_id' => $u1,
    507507            'type' => 'activity_update',
     
    530530     */
    531531    public function test_bp_has_activities_scope_friends_should_respect_id_order_when_record_dates_are_same() {
    532         $u1 = $this->factory->user->create();
    533         $u2 = $this->factory->user->create();
     532        $u1 = self::factory()->user->create();
     533        $u2 = self::factory()->user->create();
    534534
    535535        friends_add_friend( $u1, $u2, true );
    536536
    537537        // Friend's very fast status updates.
    538         $a1 = $this->factory->activity->create( array(
     538        $a1 = self::factory()->activity->create( array(
    539539            'user_id' => $u2,
    540540            'type' => 'activity_update',
    541541            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
    542542        ) );
    543         $a2 = $this->factory->activity->create( array(
     543        $a2 = self::factory()->activity->create( array(
    544544            'user_id' => $u2,
    545545            'type' => 'activity_update',
     
    569569     */
    570570    public function test_bp_has_activities_scope_groups_should_respect_id_order_when_record_dates_are_same() {
    571         $u1 = $this->factory->user->create();
    572         $u2 = $this->factory->user->create();
    573         $u3 = $this->factory->user->create();
    574 
    575         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     571        $u1 = self::factory()->user->create();
     572        $u2 = self::factory()->user->create();
     573        $u3 = self::factory()->user->create();
     574
     575        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    576576
    577577        // Two user join first user's group same time
    578         $a1 = $this->factory->activity->create( array(
     578        $a1 = self::factory()->activity->create( array(
    579579            'user_id'   => $u2,
    580580            'component' => 'groups',
     
    583583            'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ),
    584584        ) );
    585         $a2 = $this->factory->activity->create( array(
     585        $a2 = self::factory()->activity->create( array(
    586586            'user_id'   => $u3,
    587587            'component' => 'groups',
     
    613613     */
    614614    function test_bp_has_activities_with_filter_query_nested_conditions() {
    615         $u1 = $this->factory->user->create();
    616         $u2 = $this->factory->user->create();
    617         $u3 = $this->factory->user->create();
    618 
    619         $now = time();
    620 
    621         $a1 = $this->factory->activity->create( array(
     615        $u1 = self::factory()->user->create();
     616        $u2 = self::factory()->user->create();
     617        $u3 = self::factory()->user->create();
     618
     619        $now = time();
     620
     621        $a1 = self::factory()->activity->create( array(
    622622            'user_id'   => $u3,
    623623            'component' => 'blogs',
     
    626626            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    627627        ) );
    628         $a2 = $this->factory->activity->create( array(
     628        $a2 = self::factory()->activity->create( array(
    629629            'user_id'   => $u2,
    630630            'component' => 'activity',
     
    634634
    635635        // misc activity items
    636         $this->factory->activity->create( array(
     636        self::factory()->activity->create( array(
    637637            'user_id'   => $u3,
    638638            'component' => 'activity',
     
    640640            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    641641        ) );
    642         $this->factory->activity->create( array(
     642        self::factory()->activity->create( array(
    643643            'user_id'   => $u3,
    644644            'component' => 'groups',
     
    683683     */
    684684    function test_bp_has_activities_with_filter_query_compare_not_in_operator() {
    685         $u1 = $this->factory->user->create();
    686         $u2 = $this->factory->user->create();
    687         $u3 = $this->factory->user->create();
     685        $u1 = self::factory()->user->create();
     686        $u2 = self::factory()->user->create();
     687        $u3 = self::factory()->user->create();
    688688
    689689        $now = time();
    690690
    691691        // misc activity items
    692         $a1 = $this->factory->activity->create( array(
     692        $a1 = self::factory()->activity->create( array(
    693693            'user_id'   => $u3,
    694694            'component' => 'blogs',
     
    697697            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    698698        ) );
    699         $a2 = $this->factory->activity->create( array(
     699        $a2 = self::factory()->activity->create( array(
    700700            'user_id'   => $u2,
    701701            'component' => 'activity',
     
    703703            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    704704        ) );
    705         $a3 = $this->factory->activity->create( array(
     705        $a3 = self::factory()->activity->create( array(
    706706            'user_id'   => $u3,
    707707            'component' => 'activity',
     
    709709            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    710710        ) );
    711         $a4 = $this->factory->activity->create( array(
     711        $a4 = self::factory()->activity->create( array(
    712712            'user_id'   => $u3,
    713713            'component' => 'groups',
     
    741741     */
    742742    function test_bp_has_activities_with_filter_query_compare_between_operator() {
    743         $u1 = $this->factory->user->create();
     743        $u1 = self::factory()->user->create();
    744744
    745745        $now = time();
    746746
    747747        // misc activity items
    748         $a1 = $this->factory->activity->create( array(
     748        $a1 = self::factory()->activity->create( array(
    749749            'user_id'   => $u1,
    750750            'component' => 'blogs',
     
    753753            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    754754        ) );
    755         $a2 = $this->factory->activity->create( array(
     755        $a2 = self::factory()->activity->create( array(
    756756            'user_id'   => $u1,
    757757            'component' => 'activity',
     
    759759            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    760760        ) );
    761         $a3 = $this->factory->activity->create( array(
     761        $a3 = self::factory()->activity->create( array(
    762762            'user_id'   => $u1,
    763763            'component' => 'activity',
     
    765765            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    766766        ) );
    767         $a4 = $this->factory->activity->create( array(
     767        $a4 = self::factory()->activity->create( array(
    768768            'user_id'   => $u1,
    769769            'component' => 'groups',
     
    797797     */
    798798    function test_bp_has_activities_with_filter_query_compare_arithmetic_comparisons() {
    799         $u1 = $this->factory->user->create();
     799        $u1 = self::factory()->user->create();
    800800
    801801        $now = time();
    802802
    803803        // misc activity items
    804         $a1 = $this->factory->activity->create( array(
     804        $a1 = self::factory()->activity->create( array(
    805805            'user_id'   => $u1,
    806806            'component' => 'activity',
     
    809809            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    810810        ) );
    811         $a2 = $this->factory->activity->create( array(
     811        $a2 = self::factory()->activity->create( array(
    812812            'user_id'   => $u1,
    813813            'component' => 'activity',
     
    816816            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    817817        ) );
    818         $a3 = $this->factory->activity->create( array(
     818        $a3 = self::factory()->activity->create( array(
    819819            'user_id'   => $u1,
    820820            'component' => 'activity',
     
    823823            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    824824        ) );
    825         $a4 = $this->factory->activity->create( array(
     825        $a4 = self::factory()->activity->create( array(
    826826            'user_id'   => $u1,
    827827            'component' => 'activity',
     
    913913     */
    914914    function test_bp_has_activities_with_filter_query_compare_regex() {
    915         $u1 = $this->factory->user->create();
     915        $u1 = self::factory()->user->create();
    916916
    917917        $now = time();
    918918
    919919        // misc activity items
    920         $a1 = $this->factory->activity->create( array(
     920        $a1 = self::factory()->activity->create( array(
    921921            'user_id'   => $u1,
    922922            'component' => 'blogs',
     
    925925            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    926926        ) );
    927         $a2 = $this->factory->activity->create( array(
     927        $a2 = self::factory()->activity->create( array(
    928928            'user_id'   => $u1,
    929929            'component' => 'blogs',
     
    931931            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    932932        ) );
    933         $a3 = $this->factory->activity->create( array(
     933        $a3 = self::factory()->activity->create( array(
    934934            'user_id'   => $u1,
    935935            'component' => 'activity',
     
    937937            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
    938938        ) );
    939         $a4 = $this->factory->activity->create( array(
     939        $a4 = self::factory()->activity->create( array(
    940940            'user_id'   => $u1,
    941941            'component' => 'groups',
     
    10031003        $reset_current_action = $bp->current_action;
    10041004
    1005         $u1 = $this->factory->user->create();
    1006         $u2 = $this->factory->user->create();
    1007         $u3 = $this->factory->user->create();
     1005        $u1 = self::factory()->user->create();
     1006        $u2 = self::factory()->user->create();
     1007        $u3 = self::factory()->user->create();
    10081008
    10091009        $this->set_current_user( $u1 );
    10101010
    1011         $g = $this->factory->group->create( array(
     1011        $g = self::factory()->group->create( array(
    10121012            'status' => 'private',
    10131013        ) );
     
    10161016        groups_join_group( $g, $u3 );
    10171017
    1018         $a1 = $this->factory->activity->create( array(
     1018        $a1 = self::factory()->activity->create( array(
    10191019            'component' => $bp->groups->id,
    10201020            'item_id'   => $g,
     
    10241024        ) );
    10251025
    1026         $a2 = $this->factory->activity->create( array(
     1026        $a2 = self::factory()->activity->create( array(
    10271027            'component' => $bp->groups->id,
    10281028            'item_id'   => $g,
     
    10571057        $reset_current_action = $bp->current_action;
    10581058
    1059         $u1 = $this->factory->user->create();
    1060         $u2 = $this->factory->user->create();
    1061         $u3 = $this->factory->user->create();
     1059        $u1 = self::factory()->user->create();
     1060        $u2 = self::factory()->user->create();
     1061        $u3 = self::factory()->user->create();
    10621062
    10631063        $this->set_current_user( $u1 );
    10641064
    1065         $g = $this->factory->group->create( array(
     1065        $g = self::factory()->group->create( array(
    10661066            'status' => 'hidden',
    10671067        ) );
     
    10701070        groups_join_group( $g, $u3 );
    10711071
    1072         $a1 = $this->factory->activity->create( array(
     1072        $a1 = self::factory()->activity->create( array(
    10731073            'component' => $bp->groups->id,
    10741074            'item_id'   => $g,
     
    10781078        ) );
    10791079
    1080         $a2 = $this->factory->activity->create( array(
     1080        $a2 = self::factory()->activity->create( array(
    10811081            'component' => $bp->groups->id,
    10821082            'item_id'   => $g,
     
    11051105     */
    11061106    function test_bp_has_activities_with_meta_query() {
    1107         $a1 = $this->factory->activity->create();
    1108         $a2 = $this->factory->activity->create();
     1107        $a1 = self::factory()->activity->create();
     1108        $a2 = self::factory()->activity->create();
    11091109        bp_activity_update_meta( $a1, 'foo', 'bar' );
    11101110
     
    11291129    public function test_bp_has_activities_with_display_comments_false() {
    11301130        $now = time();
    1131         $a1 = $this->factory->activity->create( array(
     1131        $a1 = self::factory()->activity->create( array(
    11321132            'content' => 'Life Rules',
    11331133            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    11341134        ) );
    1135         $a2 = $this->factory->activity->create( array(
     1135        $a2 = self::factory()->activity->create( array(
    11361136            'content' => 'Life Drools',
    11371137            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    11591159    public function test_bp_has_activities_with_display_comments_0() {
    11601160        $now = time();
    1161         $a1 = $this->factory->activity->create( array(
     1161        $a1 = self::factory()->activity->create( array(
    11621162            'content' => 'Life Rules',
    11631163            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    11641164        ) );
    1165         $a2 = $this->factory->activity->create( array(
     1165        $a2 = self::factory()->activity->create( array(
    11661166            'content' => 'Life Drools',
    11671167            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    11891189    public function test_bp_has_activities_with_display_comments_0_querystring() {
    11901190        $now = time();
    1191         $a1 = $this->factory->activity->create( array(
     1191        $a1 = self::factory()->activity->create( array(
    11921192            'content' => 'Life Rules',
    11931193            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    11941194        ) );
    1195         $a2 = $this->factory->activity->create( array(
     1195        $a2 = self::factory()->activity->create( array(
    11961196            'content' => 'Life Drools',
    11971197            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    12171217    public function test_bp_has_activities_with_display_comments_none_querystring() {
    12181218        $now = time();
    1219         $a1 = $this->factory->activity->create( array(
     1219        $a1 = self::factory()->activity->create( array(
    12201220            'content' => 'Life Rules',
    12211221            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    12221222        ) );
    1223         $a2 = $this->factory->activity->create( array(
     1223        $a2 = self::factory()->activity->create( array(
    12241224            'content' => 'Life Drools',
    12251225            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    12451245    public function test_bp_has_activities_with_update_meta_cache_false() {
    12461246        $now = time();
    1247         $a1 = $this->factory->activity->create( array(
     1247        $a1 = self::factory()->activity->create( array(
    12481248            'content' => 'Life Rules',
    12491249            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    12501250        ) );
    1251         $a2 = $this->factory->activity->create( array(
     1251        $a2 = self::factory()->activity->create( array(
    12521252            'content' => 'Life Drools',
    12531253            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    12721272    public function test_bp_has_activities_with_update_meta_cache_true() {
    12731273        $now = time();
    1274         $a1 = $this->factory->activity->create( array(
     1274        $a1 = self::factory()->activity->create( array(
    12751275            'content' => 'Life Rules',
    12761276            'recorded_time' => date( 'Y-m-d H:i:s', $now ),
    12771277        ) );
    1278         $a2 = $this->factory->activity->create( array(
     1278        $a2 = self::factory()->activity->create( array(
    12791279            'content' => 'Life Drools',
    12801280            'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
     
    13001300        add_filter( 'bp_disable_blogforum_comments', '__return_false' );
    13011301
    1302         $u = $this->factory->user->create();
    1303 
    1304         $now = time();
    1305         $a1 = $this->factory->activity->create( array(
     1302        $u = self::factory()->user->create();
     1303
     1304        $now = time();
     1305        $a1 = self::factory()->activity->create( array(
    13061306            'content' => 'Life Rules',
    13071307            'component' => 'blogs',
     
    13101310            'user_id' => $u,
    13111311        ) );
    1312         $a2 = $this->factory->activity->create( array(
     1312        $a2 = self::factory()->activity->create( array(
    13131313            'content' => 'Life Drools',
    13141314            'component' => 'blogs',
     
    13271327        ) );
    13281328
    1329         $a4 = $this->factory->activity->create( array(
     1329        $a4 = self::factory()->activity->create( array(
    13301330            'content' => 'Life Rulez',
    13311331            'component' => 'activity',
     
    15131513     */
    15141514    public function test_bp_activity_has_more_items_no_count_total_false() {
    1515         $a1 = $this->factory->activity->create();
    1516         $a2 = $this->factory->activity->create();
     1515        $a1 = self::factory()->activity->create();
     1516        $a2 = self::factory()->activity->create();
    15171517
    15181518        $args = array(
     
    15311531     */
    15321532    public function test_bp_activity_has_more_items_no_count_total_true() {
    1533         $a1 = $this->factory->activity->create();
    1534         $a2 = $this->factory->activity->create();
    1535         $a3 = $this->factory->activity->create();
    1536         $a4 = $this->factory->activity->create();
     1533        $a1 = self::factory()->activity->create();
     1534        $a2 = self::factory()->activity->create();
     1535        $a3 = self::factory()->activity->create();
     1536        $a4 = self::factory()->activity->create();
    15371537
    15381538        $args = array(
     
    15521552     */
    15531553    public function test_bp_activity_has_more_items_count_total_false() {
    1554         $a1 = $this->factory->activity->create();
    1555         $a2 = $this->factory->activity->create();
    1556         $a3 = $this->factory->activity->create();
    1557         $a4 = $this->factory->activity->create();
     1554        $a1 = self::factory()->activity->create();
     1555        $a2 = self::factory()->activity->create();
     1556        $a3 = self::factory()->activity->create();
     1557        $a4 = self::factory()->activity->create();
    15581558
    15591559        $args = array(
     
    15721572     */
    15731573    public function test_bp_activity_has_more_items_count_total_true() {
    1574         $a1 = $this->factory->activity->create();
    1575         $a2 = $this->factory->activity->create();
    1576         $a3 = $this->factory->activity->create();
    1577         $a4 = $this->factory->activity->create();
     1574        $a1 = self::factory()->activity->create();
     1575        $a2 = self::factory()->activity->create();
     1576        $a3 = self::factory()->activity->create();
     1577        $a4 = self::factory()->activity->create();
    15781578
    15791579        $args = array(
     
    16001600        }
    16011601
    1602         $a1 = $this->factory->activity->create();
    1603         $a2 = $this->factory->activity->create( array(
     1602        $a1 = self::factory()->activity->create();
     1603        $a2 = self::factory()->activity->create( array(
    16041604            'recorded_time' => '2001-01-01 12:00'
    16051605        ) );
    1606         $a3 = $this->factory->activity->create( array(
     1606        $a3 = self::factory()->activity->create( array(
    16071607            'recorded_time' => '2005-01-01 12:00'
    16081608        ) );
  • trunk/tests/phpunit/testcases/admin/functions.php

    r11513 r11737  
    99        parent::setUp();
    1010        $this->old_current_user = get_current_user_id();
    11         $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
     11        $this->set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
    1212
    1313        if ( ! function_exists( 'bp_admin' ) ) {
     
    139139        $bp->foo->name = 'Foo';
    140140        $bp->active_components[ $bp->foo->id ] = 1;
    141         $new_page_ids = array( $bp->foo->id => $this->factory->post->create( array(
     141        $new_page_ids = array( $bp->foo->id => self::factory()->post->create( array(
    142142            'post_type'  => 'page',
    143143            'post_title' => $bp->foo->name,
  • trunk/tests/phpunit/testcases/blogs/activity.php

    r10868 r11737  
    3030        }
    3131
    32         $b = $this->factory->blog->create();
    33         $u = $this->factory->user->create();
    34         $a = $this->factory->activity->create( array(
     32        $b = self::factory()->blog->create();
     33        $u = self::factory()->user->create();
     34        $a = self::factory()->activity->create( array(
    3535            'component' => buddypress()->blogs->id,
    3636            'type' => 'new_blog',
     
    5555        }
    5656
    57         $u = $this->factory->user->create();
    58         $p = $this->factory->post->create( array(
     57        $u = self::factory()->user->create();
     58        $p = self::factory()->post->create( array(
    5959            'post_author' => $u,
    6060        ) );
    61         $a = $this->factory->activity->create( array(
     61        $a = self::factory()->activity->create( array(
    6262            'component' => buddypress()->blogs->id,
    6363            'type' => 'new_blog_post',
     
    8989        }
    9090
    91         $u = $this->factory->user->create();
    92         $p = $this->factory->post->create( array(
     91        $u = self::factory()->user->create();
     92        $p = self::factory()->post->create( array(
    9393            'post_author' => $u,
    9494        ) );
    95         $a = $this->factory->activity->create( array(
     95        $a = self::factory()->activity->create( array(
    9696            'component' => buddypress()->blogs->id,
    9797            'type' => 'new_blog_post',
     
    123123        }
    124124
    125         $b = $this->factory->blog->create();
    126         $u = $this->factory->user->create();
     125        $b = self::factory()->blog->create();
     126        $u = self::factory()->user->create();
    127127
    128128        switch_to_blog( $b );
    129         $p = $this->factory->post->create( array(
     129        $p = self::factory()->post->create( array(
    130130            'post_author' => $u,
    131131        ) );
     
    133133        restore_current_blog();
    134134
    135         $a = $this->factory->activity->create( array(
     135        $a = self::factory()->activity->create( array(
    136136            'component' => buddypress()->blogs->id,
    137137            'type' => 'new_blog_post',
     
    164164        }
    165165
    166         $b = $this->factory->blog->create();
    167         $u = $this->factory->user->create();
     166        $b = self::factory()->blog->create();
     167        $u = self::factory()->user->create();
    168168
    169169        switch_to_blog( $b );
    170         $p = $this->factory->post->create( array(
     170        $p = self::factory()->post->create( array(
    171171            'post_author' => $u,
    172172        ) );
    173173        $p_obj = get_post( $p );
    174         $c = $this->factory->comment->create( array(
     174        $c = self::factory()->comment->create( array(
    175175            'comment_post_ID' => $p,
    176176        ) );
     
    178178        restore_current_blog();
    179179
    180         $a = $this->factory->activity->create( array(
     180        $a = self::factory()->activity->create( array(
    181181            'component' => buddypress()->blogs->id,
    182182            'type' => 'new_blog_comment',
     
    209209        add_filter( 'bp_blogs_activity_created_blog_action', array( $this, 'created_blog_passthrough' ), 10, 2 );
    210210
    211         $b = $this->factory->blog->create();
    212         $u = $this->factory->user->create();
     211        $b = self::factory()->blog->create();
     212        $u = self::factory()->user->create();
    213213
    214214        $recorded_blog          = new BP_Blogs_Blog;
     
    217217        $recorded_blog_id       = $recorded_blog->save();
    218218
    219         $a = $this->factory->activity->create( array(
     219        $a = self::factory()->activity->create( array(
    220220            'component' => buddypress()->blogs->id,
    221221            'type' => 'new_blog',
     
    237237        add_filter( 'bp_blogs_activity_new_post_action', array( $this, 'new_post_passthrough' ), 10, 2 );
    238238
    239         $b = $this->factory->blog->create();
     239        $b = self::factory()->blog->create();
    240240
    241241        switch_to_blog( $b );
    242         $p = $this->factory->post->create();
     242        $p = self::factory()->post->create();
    243243        restore_current_blog();
    244244
    245         $u = $this->factory->user->create();
    246         $a = $this->factory->activity->create( array(
     245        $u = self::factory()->user->create();
     246        $a = self::factory()->activity->create( array(
    247247            'component' => buddypress()->blogs->id,
    248248            'type' => 'new_blog_post',
     
    265265        add_filter( 'bp_blogs_activity_new_comment_action', array( $this, 'new_comment_passthrough' ), 10, 2 );
    266266
    267         $b = $this->factory->blog->create();
     267        $b = self::factory()->blog->create();
    268268
    269269        switch_to_blog( $b );
    270         $p = $this->factory->post->create();
    271         $c = $this->factory->comment->create( array(
     270        $p = self::factory()->post->create();
     271        $c = self::factory()->comment->create( array(
    272272            'comment_post_ID' => $p,
    273273        ) );
    274274        restore_current_blog();
    275275
    276         $u = $this->factory->user->create();
    277         $a = $this->factory->activity->create( array(
     276        $u = self::factory()->user->create();
     277        $a = self::factory()->activity->create( array(
    278278            'component' => buddypress()->blogs->id,
    279279            'type' => 'new_blog_comment',
     
    296296        }
    297297
    298         $u = $this->factory->user->create();
    299         $p = $this->factory->post->create( array( 'post_author' => $u, ) );
    300         $a = $this->factory->activity->create( array(
     298        $u = self::factory()->user->create();
     299        $p = self::factory()->post->create( array( 'post_author' => $u, ) );
     300        $a = self::factory()->activity->create( array(
    301301            'component'         => buddypress()->blogs->id,
    302302            'item_id'           => 1,
     
    322322        buddypress()->activity->actions = new stdClass();
    323323
    324         $u = $this->factory->user->create();
     324        $u = self::factory()->user->create();
    325325        $p = wp_insert_post( array(
    326326            'post_author' => $u,
     
    359359        buddypress()->activity->actions = new stdClass();
    360360
    361         $u = $this->factory->user->create();
     361        $u = self::factory()->user->create();
    362362        $p = wp_insert_post( array(
    363363            'post_author' => $u,
     
    409409    public function test_bp_blogs_sync_add_from_activity_comment() {
    410410        $old_user = get_current_user_id();
    411         $u = $this->factory->user->create();
     411        $u = self::factory()->user->create();
    412412        $this->set_current_user( $u );
    413413        $userdata = get_userdata( $u );
     
    417417
    418418        // create the blog post
    419         $post_id = $this->factory->post->create( array(
     419        $post_id = self::factory()->post->create( array(
    420420            'post_status' => 'publish',
    421421            'post_type'   => 'post',
     
    457457    public function test_bp_blogs_sync_delete_from_activity_comment() {
    458458        $old_user = get_current_user_id();
    459         $u = $this->factory->user->create();
     459        $u = self::factory()->user->create();
    460460        $this->set_current_user( $u );
    461461        $userdata = get_userdata( $u );
     
    465465
    466466        // create the blog post
    467         $post_id = $this->factory->post->create( array(
     467        $post_id = self::factory()->post->create( array(
    468468            'post_status' => 'publish',
    469469            'post_type'   => 'post',
     
    505505    public function test_bp_blogs_sync_activity_edit_to_post_comment_spam_unspam_activity_comment() {
    506506        $old_user = get_current_user_id();
    507         $u = $this->factory->user->create();
     507        $u = self::factory()->user->create();
    508508        $this->set_current_user( $u );
    509509        $userdata = get_userdata( $u );
     
    513513
    514514        // create the blog post
    515         $post_id = $this->factory->post->create( array(
     515        $post_id = self::factory()->post->create( array(
    516516            'post_status' => 'publish',
    517517            'post_type'   => 'post',
     
    565565    public function test_bp_blogs_sync_activity_edit_to_post_comment_spam_activity_comment_unspam_post_comment() {
    566566        $old_user = get_current_user_id();
    567         $u = $this->factory->user->create();
     567        $u = self::factory()->user->create();
    568568        $this->set_current_user( $u );
    569569        $userdata = get_userdata( $u );
     
    573573
    574574        // create the blog post
    575         $post_id = $this->factory->post->create( array(
     575        $post_id = self::factory()->post->create( array(
    576576            'post_status' => 'publish',
    577577            'post_type'   => 'post',
     
    623623    public function test_bp_blogs_sync_activity_edit_to_post_comment_trash_comment_ham_activity() {
    624624        $old_user = get_current_user_id();
    625         $u = $this->factory->user->create();
     625        $u = self::factory()->user->create();
    626626        $this->set_current_user( $u );
    627627        $userdata = get_userdata( $u );
     
    631631
    632632        // create the blog post
    633         $post_id = $this->factory->post->create( array(
     633        $post_id = self::factory()->post->create( array(
    634634            'post_status' => 'publish',
    635635            'post_type'   => 'post',
     
    680680    public function test_spammed_activity_comment_should_not_create_post_comment() {
    681681        $old_user = get_current_user_id();
    682         $u = $this->factory->user->create();
     682        $u = self::factory()->user->create();
    683683        $this->set_current_user( $u );
    684684        $userdata = get_userdata( $u );
     
    688688
    689689        // create the blog post.
    690         $post_id = $this->factory->post->create( array(
     690        $post_id = self::factory()->post->create( array(
    691691            'post_status' => 'publish',
    692692            'post_type'   => 'post',
  • trunk/tests/phpunit/testcases/blogs/cache.php

    r9839 r11737  
    1414        }
    1515
    16         $b1 = $this->factory->blog->create();
    17         $b2 = $this->factory->blog->create();
     16        $b1 = self::factory()->blog->create();
     17        $b2 = self::factory()->blog->create();
    1818
    1919        bp_blogs_add_blogmeta( $b1, 'foo', 'bar' );
     
    9595        }
    9696
    97         $u = $this->factory->user->create();
     97        $u = self::factory()->user->create();
    9898
    9999        // Switch user so we have access to non-public blogs
     
    101101        $this->set_current_user( $u );
    102102
    103         $b1 = $this->factory->blog->create();
    104         $b2 = $this->factory->blog->create();
     103        $b1 = self::factory()->blog->create();
     104        $b2 = self::factory()->blog->create();
    105105
    106106        bp_blogs_record_blog( $b1, $u, true );
     
    189189        }
    190190
    191         $u = $this->factory->user->create();
     191        $u = self::factory()->user->create();
    192192
    193193        // Switch user so we have access to non-public blogs
     
    195195        $this->set_current_user( $u );
    196196
    197         $b1 = $this->factory->blog->create();
    198         $b2 = $this->factory->blog->create();
     197        $b1 = self::factory()->blog->create();
     198        $b2 = self::factory()->blog->create();
    199199
    200200        bp_blogs_record_blog( $b1, $u, true );
     
    264264        }
    265265
    266         $u = $this->factory->user->create();
     266        $u = self::factory()->user->create();
    267267
    268268        // need to make sure we set the 'public' flag due to how BP_Blogs_Blogs:get_all() works
    269         $b1 = $this->factory->blog->create( array(
     269        $b1 = self::factory()->blog->create( array(
    270270            'meta' => array(
    271271                'public' => 1
    272272            )
    273273        ) );
    274         $b2 = $this->factory->blog->create( array(
     274        $b2 = self::factory()->blog->create( array(
    275275            'meta' => array(
    276276                'public' => 1
     
    298298        }
    299299
    300         $u = $this->factory->user->create();
    301 
    302         $b1 = $this->factory->blog->create();
     300        $u = self::factory()->user->create();
     301
     302        $b1 = self::factory()->blog->create();
    303303        bp_blogs_record_blog( $b1, $u, true );
    304304
  • trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php

    r9980 r11737  
    1313        $old_user = get_current_user_id();
    1414
    15         $u = $this->factory->user->create();
     15        $u = self::factory()->user->create();
    1616        $this->set_current_user( $u );
    17         $b = $this->factory->blog->create( array(
     17        $b = self::factory()->blog->create( array(
    1818            'title' => 'The Foo Bar Blog',
    1919            'user_id' => $u,
     
    4040        $old_user = get_current_user_id();
    4141
    42         $u = $this->factory->user->create();
     42        $u = self::factory()->user->create();
    4343        $this->set_current_user( $u );
    44         $b = $this->factory->blog->create( array(
     44        $b = self::factory()->blog->create( array(
    4545            'title' => 'The Foo Bar Blog',
    4646            'domain' => __METHOD__,
     
    6767        $old_user = get_current_user_id();
    6868
    69         $u = $this->factory->user->create();
     69        $u = self::factory()->user->create();
    7070        $this->set_current_user( $u );
    71         $b = $this->factory->blog->create( array(
     71        $b = self::factory()->blog->create( array(
    7272            'title' => 'The Foo Bar Blog',
    7373            'user_id' => $u,
     
    9595        $old_user = get_current_user_id();
    9696
    97         $u = $this->factory->user->create();
     97        $u = self::factory()->user->create();
    9898        $this->set_current_user( $u );
    99         $b = $this->factory->blog->create( array(
     99        $b = self::factory()->blog->create( array(
    100100            'title' => 'Foo Bar Blog',
    101101            'user_id' => $u,
     
    123123        $old_user = get_current_user_id();
    124124
    125         $u = $this->factory->user->create();
     125        $u = self::factory()->user->create();
    126126        $this->set_current_user( $u );
    127127        $bs = array(
    128             'foobar' => $this->factory->blog->create( array(
     128            'foobar' => self::factory()->blog->create( array(
    129129                'title' => 'Foo Bar Blog',
    130130                'user_id' => $u,
    131131                'path' => '/path' . rand() . time() . '/',
    132132            ) ),
    133             'barfoo' => $this->factory->blog->create( array(
     133            'barfoo' => self::factory()->blog->create( array(
    134134                'title' => 'Bar foo Blog',
    135135                'user_id' => $u,
  • trunk/tests/phpunit/testcases/blogs/filters.php

    r11256 r11737  
    4646     */
    4747    public function test_bp_activity_catch_transition_post_type_status() {
    48         $post_id = $this->factory->post->create( array(
     48        $post_id = self::factory()->post->create( array(
    4949            'post_status' => 'publish',
    5050            'post_type'   => 'using_old_filter',
     
    5959     */
    6060    public function test_bp_blogs_record_comment() {
    61         $u = $this->factory->user->create();
    62         $user = $this->factory->user->get_object_by_id( $u );
     61        $u = self::factory()->user->create();
     62        $user = self::factory()->user->get_object_by_id( $u );
    6363
    64         $post_id = $this->factory->post->create( array(
     64        $post_id = self::factory()->post->create( array(
    6565            'post_status' => 'publish',
    6666            'post_type'   => 'using_old_filter',
     
    6868        ) );
    6969
    70         $comment_id = $this->factory->comment->create( array(
     70        $comment_id = self::factory()->comment->create( array(
    7171            'user_id'              => $u,
    7272            'comment_author_email' => $user->user_email,
     
    7575
    7676        // Approve the comment
    77         $this->factory->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
     77        self::factory()->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
    7878
    7979        $this->assertTrue( $this->activity_exists_for_post_type( get_current_blog_id(), $comment_id, 'new_blog_comment' ), 'Generated activity for comments about a post type registering using the bp_blogs_record_post_post_types filter should have a new_blog_comment action' );
     
    8585     */
    8686    public function test_bp_blogs_record_comment_sync_activity_comment() {
    87         $u = $this->factory->user->create();
    88         $user = $this->factory->user->get_object_by_id( $u );
     87        $u = self::factory()->user->create();
     88        $user = self::factory()->user->get_object_by_id( $u );
    8989
    9090        add_filter( 'bp_disable_blogforum_comments', '__return_false' );
    9191
    92         $post_id = $this->factory->post->create( array(
     92        $post_id = self::factory()->post->create( array(
    9393            'post_status' => 'publish',
    9494            'post_type'   => 'using_old_filter',
     
    103103        ) );
    104104
    105         $comment_id = $this->factory->comment->create( array(
     105        $comment_id = self::factory()->comment->create( array(
    106106            'user_id'              => $u,
    107107            'comment_author_email' => $user->user_email,
     
    110110
    111111        // Approve the comment
    112         $this->factory->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
     112        self::factory()->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
    113113
    114114        $this->assertTrue( $this->activity_exists_for_post_type( $parent_activity_id, '', 'activity_comment', 'stream' ), 'Generated activity for comments about a post type registering using the bp_blogs_record_post_post_types filter having sync on should have a activity_comment action' );
  • trunk/tests/phpunit/testcases/blogs/functions.php

    r10971 r11737  
    289289
    290290        // Create a regular member
    291         $u = $this->factory->user->create();
     291        $u = self::factory()->user->create();
    292292
    293293        // Create blogs
    294         $b1 = $this->factory->blog->create( array( 'user_id' => $u ) );
    295         $b2 = $this->factory->blog->create( array( 'user_id' => $u ) );
     294        $b1 = self::factory()->blog->create( array( 'user_id' => $u ) );
     295        $b2 = self::factory()->blog->create( array( 'user_id' => $u ) );
    296296
    297297        $expected = array(
     
    323323     */
    324324    public function test_transition_post_status_publish_to_publish() {
    325         $post_id = $this->factory->post->create( array(
     325        $post_id = self::factory()->post->create( array(
    326326            'post_status' => 'publish',
    327327            'post_type' => 'post',
     
    344344     */
    345345    public function test_transition_post_status_password_publish() {
    346         $post_id = $this->factory->post->create( array(
     346        $post_id = self::factory()->post->create( array(
    347347            'post_status'   => 'publish',
    348348            'post_type'     => 'post',
     
    359359     */
    360360    public function test_transition_post_status_publish_update_password() {
    361         $post_id = $this->factory->post->create( array(
     361        $post_id = self::factory()->post->create( array(
    362362            'post_status'   => 'publish',
    363363            'post_type'     => 'post',
     
    380380     */
    381381    public function test_transition_post_status_private_publish() {
    382         $post_id = $this->factory->post->create( array(
     382        $post_id = self::factory()->post->create( array(
    383383            'post_status'   => 'private',
    384384            'post_type'     => 'post',
     
    401401     */
    402402    public function test_transition_post_status_publish_private() {
    403         $post_id = $this->factory->post->create( array(
     403        $post_id = self::factory()->post->create( array(
    404404            'post_status'   => 'publish',
    405405            'post_type'     => 'post',
     
    422422     */
    423423    public function test_transition_post_status_draft_to_draft() {
    424         $post_id = $this->factory->post->create( array(
     424        $post_id = self::factory()->post->create( array(
    425425            'post_status' => 'draft',
    426426            'post_type' => 'post',
     
    442442     */
    443443    public function test_transition_post_status_draft_to_publish() {
    444         $post_id = $this->factory->post->create( array(
     444        $post_id = self::factory()->post->create( array(
    445445            'post_status' => 'draft',
    446446            'post_type' => 'post',
     
    462462     */
    463463    public function test_transition_post_status_publish_to_draft() {
    464         $post_id = $this->factory->post->create( array(
     464        $post_id = self::factory()->post->create( array(
    465465            'post_status' => 'publish',
    466466            'post_type' => 'post',
     
    482482     */
    483483    public function test_transition_post_status_wp_delete_post() {
    484         $post_id = $this->factory->post->create( array(
     484        $post_id = self::factory()->post->create( array(
    485485            'post_status' => 'publish',
    486486            'post_type' => 'post',
     
    499499     */
    500500    public function test_transition_post_status_wp_trash_post() {
    501         $post_id = $this->factory->post->create( array(
     501        $post_id = self::factory()->post->create( array(
    502502            'post_status' => 'publish',
    503503            'post_type' => 'post',
     
    519519        // save the current user and override logged-in user
    520520        $old_user = get_current_user_id();
    521         $u = $this->factory->user->create();
     521        $u = self::factory()->user->create();
    522522        $this->set_current_user( $u );
    523523        $userdata = get_userdata( $u );
    524524
    525525        // create the blog post
    526         $post_id = $this->factory->post->create( array(
     526        $post_id = self::factory()->post->create( array(
    527527            'post_status' => 'publish',
    528528            'post_type' => 'post',
     
    604604        // save the current user and override logged-in user
    605605        $old_user = get_current_user_id();
    606         $u = $this->factory->user->create();
     606        $u = self::factory()->user->create();
    607607        $this->set_current_user( $u );
    608608        $userdata = get_userdata( $u );
    609609
    610610        // create the blog post
    611         $post_id = $this->factory->post->create( array(
     611        $post_id = self::factory()->post->create( array(
    612612            'post_status' => 'publish',
    613613            'post_type' => 'post',
     
    666666    public function test_bp_blogs_post_type_remove_comment() {
    667667        $old_user = get_current_user_id();
    668         $u = $this->factory->user->create();
     668        $u = self::factory()->user->create();
    669669        $this->set_current_user( $u );
    670670        $userdata = get_userdata( $u );
    671671
    672672        // create the blog post
    673         $p = $this->factory->post->create( array(
     673        $p = self::factory()->post->create( array(
    674674            'post_status' => 'publish',
    675675            'post_type' => 'post',
     
    708708        add_filter( 'bp_blogs_is_blog_trackable', '__return_false' );
    709709
    710         $post_id = $this->factory->post->create( array(
     710        $post_id = self::factory()->post->create( array(
    711711            'post_status'   => 'publish',
    712712            'post_type'     => 'post',
     
    737737        add_filter( 'bp_is_blog_public', '__return_zero' );
    738738
    739         $post_id = $this->factory->post->create( array(
     739        $post_id = self::factory()->post->create( array(
    740740            'post_status'   => 'publish',
    741741            'post_type'     => 'post',
     
    764764        // save the current user and override logged-in user
    765765        $old_user = get_current_user_id();
    766         $u = $this->factory->user->create();
     766        $u = self::factory()->user->create();
    767767        $this->set_current_user( $u );
    768768        $userdata = get_userdata( $u );
     
    777777
    778778        // create the blog post
    779         $post_id = $this->factory->post->create( array(
     779        $post_id = self::factory()->post->create( array(
    780780            'post_status' => 'publish',
    781781            'post_type'   => 'post',
     
    828828        // Save the current user and override logged-in user
    829829        $old_user = get_current_user_id();
    830         $u = $this->factory->user->create();
     830        $u = self::factory()->user->create();
    831831        $this->set_current_user( $u );
    832832
     
    838838
    839839        // Create the blog post
    840         $post_id = $this->factory->post->create( array(
     840        $post_id = self::factory()->post->create( array(
    841841            'post_status' => 'publish',
    842842            'post_type'   => 'post',
     
    887887    public function test_bp_blogs_comment_sync_activity_comment_for_custom_post_type() {
    888888        if ( is_multisite() ) {
    889             $b = $this->factory->blog->create();
     889            $b = self::factory()->blog->create();
    890890            switch_to_blog( $b );
    891891            add_filter( 'comment_flood_filter', '__return_false' );
     
    894894        }
    895895
    896         $u = $this->factory->user->create();
     896        $u = self::factory()->user->create();
    897897        $userdata = get_userdata( $u );
    898898
     
    916916        add_filter( 'bp_disable_blogforum_comments', '__return_false' );
    917917
    918         $p = $this->factory->post->create( array(
     918        $p = self::factory()->post->create( array(
    919919            'post_author' => $u,
    920920            'post_type'   => 'foo',
     
    995995        $old_user = get_current_user_id();
    996996
    997         $u = $this->factory->user->create();
     997        $u = self::factory()->user->create();
    998998        $this->set_current_user( $u );
    999999
    10001000        // Create three sites.
    1001         $this->factory->blog->create_many( 3, array(
     1001        self::factory()->blog->create_many( 3, array(
    10021002            'user_id' => $u
    10031003        ) );
     
    10311031        $_POST['blog_public'] = 1;
    10321032
    1033         $u = $this->factory->user->create();
     1033        $u = self::factory()->user->create();
    10341034        $this->set_current_user( $u );
    10351035
    10361036        // Create three sites.
    1037         $b = $this->factory->blog->create( array(
     1037        $b = self::factory()->blog->create( array(
    10381038            'user_id' => $u
    10391039        ) );
     
    10781078        $_POST['blog_public'] = 1;
    10791079
    1080         $u = $this->factory->user->create();
     1080        $u = self::factory()->user->create();
    10811081        $this->set_current_user( $u );
    10821082
    10831083        // Create three sites.
    1084         $b = $this->factory->blog->create( array(
     1084        $b = self::factory()->blog->create( array(
    10851085            'user_id' => $u
    10861086        ) );
    10871087
    1088         $u2 = $this->factory->user->create();
     1088        $u2 = self::factory()->user->create();
    10891089        add_user_to_blog( $b, $u2, 'contributor' );
    10901090
  • trunk/tests/phpunit/testcases/core/avatars.php

    r11256 r11737  
    2626        }
    2727
    28         $u = $this->factory->user->create();
     28        $u = self::factory()->user->create();
    2929
    3030        // get BP root blog's upload directory data
     
    3232
    3333        // create new subsite
    34         $blog_id = $this->factory->blog->create( array(
     34        $blog_id = self::factory()->blog->create( array(
    3535            'user_id' => $u,
    3636            'title'   => 'Test Title',
     
    5454        $this->clean_existing_avatars();
    5555
    56         $u = $this->factory->user->create();
     56        $u = self::factory()->user->create();
    5757        $this->assertFalse( bp_get_user_has_avatar( $u ) );
    5858    }
     
    6262     */
    6363    public function test_bp_get_user_has_avatar_has_avatar_uploaded() {
    64         $u = $this->factory->user->create();
     64        $u = self::factory()->user->create();
    6565
    6666        // Fake it
     
    176176     */
    177177    public function test_bp_core_fetch_avatar_class_attribute() {
    178         $u = $this->factory->user->create();
     178        $u = self::factory()->user->create();
    179179
    180180        $hw = 100;
  • trunk/tests/phpunit/testcases/core/cache.php

    r9819 r11737  
    1111    public function test_bp_update_meta_cache_with_cache_misses() {
    1212        // Use activity just because
    13         $a1 = $this->factory->activity->create();
     13        $a1 = self::factory()->activity->create();
    1414
    1515        // Confirm that all activitymeta is deleted
  • trunk/tests/phpunit/testcases/core/caps.php

    r11256 r11737  
    1111        }
    1212
    13         $b = $this->factory->blog->create();
    14         $u = $this->factory->user->create();
     13        $b = self::factory()->blog->create();
     14        $u = self::factory()->user->create();
    1515
    1616        $this->set_current_user( $u );
     
    3333        }
    3434
    35         $b = $this->factory->blog->create();
    36         $u = $this->factory->user->create();
     35        $b = self::factory()->blog->create();
     36        $u = self::factory()->user->create();
    3737
    3838        $this->set_current_user( $u );
  • trunk/tests/phpunit/testcases/core/class-bp-attachment.php

    r11540 r11737  
    224224        $bp->displayed_user = new stdClass;
    225225
    226         $u1 = $this->factory->user->create();
     226        $u1 = self::factory()->user->create();
    227227        $bp->displayed_user->id = $u1;
    228228
     
    274274        $reset_current_group = $bp->groups->current_group;
    275275
    276         $g = $this->factory->group->create();
     276        $g = self::factory()->group->create();
    277277
    278278        $bp->groups->current_group = groups_get_group( $g );
     
    348348        $bp->displayed_user = new stdClass;
    349349
    350         $u1 = $this->factory->user->create();
     350        $u1 = self::factory()->user->create();
    351351        $bp->displayed_user->id = $u1;
    352352
  • trunk/tests/phpunit/testcases/core/class-bp-button.php

    r11117 r11737  
    1010     */
    1111    public function test_block_self_own_profile() {
    12         $u = $this->factory->user->create();
     12        $u = self::factory()->user->create();
    1313        $this->set_current_user( $u );
    1414
     
    2828     */
    2929    public function test_block_self_others_profile() {
    30         $u1 = $this->factory->user->create();
    31         $this->set_current_user( $u1 );
    32 
    33         $u2 = $this->factory->user->create();
     30        $u1 = self::factory()->user->create();
     31        $this->set_current_user( $u1 );
     32
     33        $u2 = self::factory()->user->create();
    3434        $this->go_to( bp_core_get_user_domain( $u2 ) );
    3535
     
    4848    public function test_block_self_inside_members_loop() {
    4949        $now = time();
    50         $u1 = $this->factory->user->create( array(
     50        $u1 = self::factory()->user->create( array(
    5151            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    5252        ) );
    53         $u2 = $this->factory->user->create( array(
     53        $u2 = self::factory()->user->create( array(
    5454            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    5555        ) );
     
    8888    public function test_block_self_false_inside_members_loop() {
    8989        $now = time();
    90         $u1 = $this->factory->user->create( array(
     90        $u1 = self::factory()->user->create( array(
    9191            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    9292        ) );
    93         $u2 = $this->factory->user->create( array(
     93        $u2 = self::factory()->user->create( array(
    9494            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    9595        ) );
     
    128128    public function test_block_self_inside_members_loop_on_my_profile_page() {
    129129        $now = time();
    130         $u1 = $this->factory->user->create( array(
     130        $u1 = self::factory()->user->create( array(
    131131            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    132132        ) );
    133         $u2 = $this->factory->user->create( array(
     133        $u2 = self::factory()->user->create( array(
    134134            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    135135        ) );
  • trunk/tests/phpunit/testcases/core/class-bp-core-user.php

    r9819 r11737  
    1010     */
    1111    public function test_get_users_with_exclude_querystring() {
    12         $u1 = $this->factory->user->create();
    13         $u2 = $this->factory->user->create();
    14         $u3 = $this->factory->user->create();
     12        $u1 = self::factory()->user->create();
     13        $u2 = self::factory()->user->create();
     14        $u3 = self::factory()->user->create();
    1515
    1616        $exclude_qs = $u1 . ',junkstring,' . $u3;
     
    2626     */
    2727    public function test_get_users_with_exclude_array() {
    28         $u1 = $this->factory->user->create();
    29         $u2 = $this->factory->user->create();
    30         $u3 = $this->factory->user->create();
     28        $u1 = self::factory()->user->create();
     29        $u2 = self::factory()->user->create();
     30        $u3 = self::factory()->user->create();
    3131
    3232        $exclude_array = array(
     
    4646     */
    4747    public function test_get_users_with_include_querystring() {
    48         $u1 = $this->factory->user->create( array(
     48        $u1 = self::factory()->user->create( array(
    4949            'last_activity' => gmdate( 'Y-m-d H:i:s' ),
    5050        ) );
    51         $u2 = $this->factory->user->create( array(
     51        $u2 = self::factory()->user->create( array(
    5252            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ),
    5353        ) );
    54         $u3 = $this->factory->user->create( array(
     54        $u3 = self::factory()->user->create( array(
    5555            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ),
    5656        ) );
     
    6868     */
    6969    public function test_get_users_with_include_array() {
    70         $u1 = $this->factory->user->create( array(
     70        $u1 = self::factory()->user->create( array(
    7171            'last_activity' => gmdate( 'Y-m-d H:i:s' ),
    7272        ) );
    73         $u2 = $this->factory->user->create( array(
     73        $u2 = self::factory()->user->create( array(
    7474            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ),
    7575        ) );
    76         $u3 = $this->factory->user->create( array(
     76        $u3 = self::factory()->user->create( array(
    7777            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ),
    7878        ) );
     
    100100     */
    101101    public function test_type_alphabetical() {
    102         $u1 = $this->factory->user->create( array(
     102        $u1 = self::factory()->user->create( array(
    103103            'display_name' => 'foo',
    104104        ) );
    105         $u2 = $this->factory->user->create( array(
     105        $u2 = self::factory()->user->create( array(
    106106            'display_name' => 'bar',
    107107        ) );
     
    119119     */
    120120    public function test_get_users_by_letter() {
    121         $u1 = $this->factory->user->create( array(
     121        $u1 = self::factory()->user->create( array(
    122122            'display_name' => 'foo',
    123123        ) );
    124         $u2 = $this->factory->user->create( array(
     124        $u2 = self::factory()->user->create( array(
    125125            'display_name' => 'bar',
    126126        ) );
     
    136136     */
    137137    public function test_search_users() {
    138         $u1 = $this->factory->user->create( array(
     138        $u1 = self::factory()->user->create( array(
    139139            'display_name' => 'foo',
    140140        ) );
    141         $u2 = $this->factory->user->create( array(
     141        $u2 = self::factory()->user->create( array(
    142142            'display_name' => 'bar',
    143143        ) );
     
    150150
    151151    public function test_get_specific_users() {
    152         $u1 = $this->factory->user->create();
    153         $u2 = $this->factory->user->create();
    154         $u3 = $this->factory->user->create();
     152        $u1 = self::factory()->user->create();
     153        $u2 = self::factory()->user->create();
     154        $u3 = self::factory()->user->create();
    155155
    156156        $include_array = array(
     
    170170     */
    171171    public function test_get_last_activity() {
    172         $u = $this->factory->user->create();
     172        $u = self::factory()->user->create();
    173173        $time = bp_core_current_time();
    174174
     
    186186     */
    187187    public function test_get_last_activity_store_in_cache() {
    188         $u = $this->factory->user->create();
     188        $u = self::factory()->user->create();
    189189        $time = bp_core_current_time();
    190190
     
    204204     */
    205205    public function test_get_last_activity_store_in_cache_multiple_users() {
    206         $u1 = $this->factory->user->create();
    207         $u2 = $this->factory->user->create();
     206        $u1 = self::factory()->user->create();
     207        $u2 = self::factory()->user->create();
    208208        $time = bp_core_current_time();
    209209
     
    225225     */
    226226    public function test_get_last_activity_from_cache_single_user() {
    227         $u    = $this->factory->user->create();
     227        $u    = self::factory()->user->create();
    228228        $time = bp_core_current_time();
    229229
     
    248248     */
    249249    public function test_get_last_activity_in_cache_multiple_users() {
    250         $u1 = $this->factory->user->create();
    251         $u2 = $this->factory->user->create();
     250        $u1 = self::factory()->user->create();
     251        $u2 = self::factory()->user->create();
    252252        $time = bp_core_current_time();
    253253
     
    273273     */
    274274    public function test_update_last_activity() {
    275         $u = $this->factory->user->create();
     275        $u = self::factory()->user->create();
    276276        $time = bp_core_current_time();
    277277        $time2 = '1968-12-25 01:23:45';
     
    292292     */
    293293    public function test_delete_last_activity() {
    294         $u = $this->factory->user->create();
     294        $u = self::factory()->user->create();
    295295        $time = bp_core_current_time();
    296296
  • trunk/tests/phpunit/testcases/core/class-bp-email-recipient.php

    r10792 r11737  
    1010        parent::setUp();
    1111
    12         $this->u1 = $this->factory->user->create( array(
     12        $this->u1 = self::factory()->user->create( array(
    1313            'display_name' => 'Unit Test',
    1414            'user_email'   => 'test@example.com',
  • trunk/tests/phpunit/testcases/core/class-bp-email.php

    r10761 r11737  
    1111        parent::setUp();
    1212
    13         $this->u1 = $this->factory->user->create( array(
     13        $this->u1 = self::factory()->user->create( array(
    1414            'display_name' => 'Unit Test',
    1515            'user_email'   => 'test1@example.com',
    1616        ) );
    1717
    18         $this->u2 = $this->factory->user->create( array(
     18        $this->u2 = self::factory()->user->create( array(
    1919            'display_name' => 'Unit Test2',
    2020            'user_email'   => 'test2@example.com',
  • trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php

    r10223 r11737  
    144144
    145145    public function test_extract_multiple_media_types_from_content() {
    146         $this->factory->user->create( array( 'user_login' => 'paulgibbs' ) );
     146        self::factory()->user->create( array( 'user_login' => 'paulgibbs' ) );
    147147        $media = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::LINKS | BP_Media_Extractor::MENTIONS );
    148148
     
    153153
    154154    public function test_extract_media_from_a_wp_post() {
    155         $post_id = $this->factory->post->create( array( 'post_content' => self::$richtext ) );
     155        $post_id = self::factory()->post->create( array( 'post_content' => self::$richtext ) );
    156156        $media   = self::$media_extractor->extract( get_post( $post_id ), BP_Media_Extractor::LINKS );
    157157
     
    190190
    191191    public function test_extract_mentions_from_content_with_activity_enabled() {
    192         $this->factory->user->create( array( 'user_login' => 'paulgibbs' ) );
     192        self::factory()->user->create( array( 'user_login' => 'paulgibbs' ) );
    193193        $media = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::MENTIONS );
    194194
     
    198198
    199199    public function test_extract_mentions_from_content_with_activity_disabled() {
    200         $this->factory->user->create( array( 'user_login' => 'paulgibbs' ) );
     200        self::factory()->user->create( array( 'user_login' => 'paulgibbs' ) );
    201201        $was_activity_enabled = false;
    202202
     
    304304    public function test_extract_images_from_content_with_galleries_variant_no_ids() {
    305305        // To test the [gallery] shortcode, we need to create a post and an attachment.
    306         $post_id       = $this->factory->post->create( array( 'post_content' => self::$richtext ) );
    307         $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
     306        $post_id       = self::factory()->post->create( array( 'post_content' => self::$richtext ) );
     307        $attachment_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
    308308            'post_mime_type' => 'image/jpeg',
    309309            'post_type'      => 'attachment'
     
    329329        $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/canola.jpg' );
    330330        $attachment_ids   = join( ',', $attachment_ids );
    331         $post_id          = $this->factory->post->create( array( 'post_content' => "[gallery ids='{$attachment_ids}']" ) );
     331        $post_id          = self::factory()->post->create( array( 'post_content' => "[gallery ids='{$attachment_ids}']" ) );
    332332
    333333        // Extract the gallery images.
     
    345345
    346346    public function test_extract_no_images_from_content_with_invalid_galleries_variant_no_ids() {
    347         $post_id = $this->factory->post->create( array( 'post_content' => self::$richtext ) );
     347        $post_id = self::factory()->post->create( array( 'post_content' => self::$richtext ) );
    348348        $media   = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::IMAGES, array(
    349349            'post' => get_post( $post_id ),
     
    356356
    357357    public function test_extract_no_images_from_content_with_invalid_galleries_variant_ids() {
    358         $post_id = $this->factory->post->create( array( 'post_content' => '[gallery ids="117,4529"]' ) );
     358        $post_id = self::factory()->post->create( array( 'post_content' => '[gallery ids="117,4529"]' ) );
    359359        $media   = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array(
    360360            'post' => get_post( $post_id ),
     
    372372
    373373    public function test_extract_no_images_from_content_with_featured_image() {
    374         $post_id      = $this->factory->post->create( array( 'post_content' => self::$richtext ) );
    375         $thumbnail_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
     374        $post_id      = self::factory()->post->create( array( 'post_content' => self::$richtext ) );
     375        $thumbnail_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
    376376            'post_mime_type' => 'image/jpeg',
    377377            'post_type'      => 'attachment'
     
    393393
    394394    public function test_extract_images_from_content_without_featured_image() {
    395         $post_id = $this->factory->post->create( array( 'post_content' => self::$richtext ) );
     395        $post_id = self::factory()->post->create( array( 'post_content' => self::$richtext ) );
    396396        $media   = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array(
    397397            'post' => get_post( $post_id ),
  • trunk/tests/phpunit/testcases/core/class-bp-user-query.php

    r11366 r11737  
    1010     */
    1111    public function test_bp_user_query_friends() {
    12         $u1 = $this->factory->user->create();
    13         $u2 = $this->factory->user->create();
    14         $u3 = $this->factory->user->create();
     12        $u1 = self::factory()->user->create();
     13        $u2 = self::factory()->user->create();
     14        $u3 = self::factory()->user->create();
    1515        friends_add_friend( $u1, $u2, true );
    1616
     
    2828     */
    2929    public function test_bp_user_query_friends_with_include() {
    30         $u1 = $this->factory->user->create();
    31         $u2 = $this->factory->user->create();
    32         $u3 = $this->factory->user->create();
    33         $u4 = $this->factory->user->create();
     30        $u1 = self::factory()->user->create();
     31        $u2 = self::factory()->user->create();
     32        $u3 = self::factory()->user->create();
     33        $u4 = self::factory()->user->create();
    3434        friends_add_friend( $u1, $u2, true );
    3535        friends_add_friend( $u1, $u3, true );
     
    4949
    5050    public function test_bp_user_query_friends_with_include_but_zero_friends() {
    51         $u1 = $this->factory->user->create();
    52         $u2 = $this->factory->user->create();
    53         $u3 = $this->factory->user->create();
    54         $u4 = $this->factory->user->create();
     51        $u1 = self::factory()->user->create();
     52        $u2 = self::factory()->user->create();
     53        $u3 = self::factory()->user->create();
     54        $u4 = self::factory()->user->create();
    5555
    5656        $q = new BP_User_Query( array(
     
    9494    public function test_bp_user_query_user_ids_with_invalid_user_id() {
    9595        $now = time();
    96         $u1 = $this->factory->user->create();
    97         $u2 = $this->factory->user->create();
     96        $u1 = self::factory()->user->create();
     97        $u2 = self::factory()->user->create();
    9898
    9999        // invalid user ID
     
    116116
    117117    public function test_bp_user_query_sort_by_popular() {
    118         $u1 = $this->factory->user->create();
    119         $u2 = $this->factory->user->create();
    120         $u3 = $this->factory->user->create();
    121         $u4 = $this->factory->user->create();
     118        $u1 = self::factory()->user->create();
     119        $u2 = self::factory()->user->create();
     120        $u3 = self::factory()->user->create();
     121        $u4 = self::factory()->user->create();
    122122
    123123        bp_update_user_meta( $u1, bp_get_user_meta_key( 'total_friend_count' ), '5' );
     
    142142    public function test_bp_user_query_type_online() {
    143143        $now = time();
    144         $u1 = $this->factory->user->create( array(
     144        $u1 = self::factory()->user->create( array(
    145145            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    146146        ) );
    147         $u2 = $this->factory->user->create( array(
     147        $u2 = self::factory()->user->create( array(
    148148            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*13 ),
    149149        ) );
    150         $u3 = $this->factory->user->create( array(
     150        $u3 = self::factory()->user->create( array(
    151151            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*16 ),
    152152        ) );
     
    166166    public function test_bp_user_query_type_online_five_minute_interval() {
    167167        $now = time();
    168         $u1 = $this->factory->user->create( array(
     168        $u1 = self::factory()->user->create( array(
    169169            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    170170        ) );
    171         $u2 = $this->factory->user->create( array(
     171        $u2 = self::factory()->user->create( array(
    172172            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*4 ),
    173173        ) );
    174         $u3 = $this->factory->user->create( array(
     174        $u3 = self::factory()->user->create( array(
    175175            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*6 ),
    176176        ) );
     
    190190    public function test_bp_user_query_search_with_apostrophe() {
    191191        // Apostrophe. Search_terms must escaped to mimic POST payload
    192         $user_id = $this->factory->user->create();
     192        $user_id = self::factory()->user->create();
    193193        xprofile_set_field_data( 1, $user_id, "Foo'Bar" );
    194194        $q = new BP_User_Query( array( 'search_terms' => "oo\'Ba", ) );
     
    206206
    207207        // LIKE special character: %
    208         $user_id = $this->factory->user->create();
     208        $user_id = self::factory()->user->create();
    209209        xprofile_set_field_data( 1, $user_id, "Foo%Bar" );
    210210        $q = new BP_User_Query( array( 'search_terms' => "oo%Bar", ) );
     
    223223
    224224        // LIKE special character: _
    225         $user_id = $this->factory->user->create();
     225        $user_id = self::factory()->user->create();
    226226        xprofile_set_field_data( 1, $user_id, "Foo_Bar" );
    227227        $q = new BP_User_Query( array( 'search_terms' => "oo_Bar", ) );
     
    239239
    240240        // LIKE special character: &
    241         $user_id = $this->factory->user->create();
     241        $user_id = self::factory()->user->create();
    242242        xprofile_set_field_data( 1, $user_id, "a&mpersand" );
    243243        $q = new BP_User_Query( array( 'search_terms' => "a&m", ) );
     
    257257     */
    258258    public function test_bp_user_query_search_core_fields() {
    259         $user_id = $this->factory->user->create( array(
     259        $user_id = self::factory()->user->create( array(
    260260            'user_login' => 'foo',
    261261        ) );
     
    273273
    274274    public function test_bp_user_query_search_wildcards() {
    275         $u1 = $this->factory->user->create( array(
     275        $u1 = self::factory()->user->create( array(
    276276            'user_login' => 'xfoo',
    277277        ) );
     
    279279        $q1 = new BP_User_Query( array( 'search_terms' => 'foo', 'search_wildcard' => 'left' ) );
    280280
    281         $u2 = $this->factory->user->create( array(
     281        $u2 = self::factory()->user->create( array(
    282282            'user_login' => 'foox',
    283283        ) );
     
    285285        $q2 = new BP_User_Query( array( 'search_terms' => 'foo', 'search_wildcard' => 'right' ) );
    286286
    287         $u3 = $this->factory->user->create( array(
     287        $u3 = self::factory()->user->create( array(
    288288            'user_login' => 'xfoox',
    289289        ) );
     
    313313        $existing_users = $wpdb->get_col( "SELECT ID FROM {$wpdb->users}" );
    314314
    315         $u1 = $this->factory->user->create();
    316         $u2 = $this->factory->user->create();
     315        $u1 = self::factory()->user->create();
     316        $u2 = self::factory()->user->create();
    317317
    318318        $exclude = array_merge( array( $u1 ), $existing_users );
     
    341341        add_filter( 'bp_disable_profile_sync', '__return_false' );
    342342
    343         $u1 = $this->factory->user->create();
    344         $u2 = $this->factory->user->create();
     343        $u1 = self::factory()->user->create();
     344        $u2 = self::factory()->user->create();
    345345
    346346        global $wpdb;
     
    372372     */
    373373    public function test_bp_user_query_type_alphabetical_spam_xprofileoff() {
    374         $u1 = $this->factory->user->create();
    375         $u2 = $this->factory->user->create();
     374        $u1 = self::factory()->user->create();
     375        $u2 = self::factory()->user->create();
    376376
    377377        // Make sure xprofile and profile sync are off
     
    407407     */
    408408    public function test_bp_user_query_with_user_meta_argument() {
    409         $u1 = $this->factory->user->create();
    410         $u2 = $this->factory->user->create();
     409        $u1 = self::factory()->user->create();
     410        $u2 = self::factory()->user->create();
    411411
    412412        bp_update_user_meta( $u2, 'foo', 'bar' );
     
    429429     */
    430430    public function test_bp_user_query_with_user_meta_argument_no_user() {
    431         $u1 = $this->factory->user->create();
    432         $u2 = $this->factory->user->create();
     431        $u1 = self::factory()->user->create();
     432        $u2 = self::factory()->user->create();
    433433
    434434        $q = new BP_User_Query( array(
     
    448448        bp_register_member_type( 'foo' );
    449449        bp_register_member_type( 'bar' );
    450         $users = $this->factory->user->create_many( 3 );
     450        $users = self::factory()->user->create_many( 3 );
    451451        bp_set_member_type( $users[0], 'foo' );
    452452        bp_set_member_type( $users[1], 'bar' );
     
    466466        bp_register_member_type( 'foo' );
    467467        bp_register_member_type( 'bar' );
    468         $users = $this->factory->user->create_many( 3 );
     468        $users = self::factory()->user->create_many( 3 );
    469469        bp_set_member_type( $users[0], 'foo' );
    470470        bp_set_member_type( $users[1], 'bar' );
     
    484484        bp_register_member_type( 'foo' );
    485485        bp_register_member_type( 'bar' );
    486         $users = $this->factory->user->create_many( 3 );
     486        $users = self::factory()->user->create_many( 3 );
    487487        bp_set_member_type( $users[0], 'foo' );
    488488        bp_set_member_type( $users[1], 'bar' );
     
    502502        bp_register_member_type( 'foo' );
    503503        bp_register_member_type( 'bar' );
    504         $users = $this->factory->user->create_many( 3 );
     504        $users = self::factory()->user->create_many( 3 );
    505505        bp_set_member_type( $users[0], 'foo' );
    506506        bp_set_member_type( $users[1], 'bar' );
     
    520520        bp_register_member_type( 'foo' );
    521521        bp_register_member_type( 'bar' );
    522         $users = $this->factory->user->create_many( 3 );
     522        $users = self::factory()->user->create_many( 3 );
    523523        bp_set_member_type( $users[0], 'foo' );
    524524        bp_set_member_type( $users[1], 'bar' );
     
    538538    public function test_should_return_no_results_when_no_users_match_the_specified_member_type() {
    539539        bp_register_member_type( 'foo' );
    540         $users = $this->factory->user->create_many( 3 );
     540        $users = self::factory()->user->create_many( 3 );
    541541
    542542        $q = new BP_User_Query( array(
     
    553553        bp_register_member_type( 'foo' );
    554554        bp_register_member_type( 'bar' );
    555         $users = $this->factory->user->create_many( 3 );
     555        $users = self::factory()->user->create_many( 3 );
    556556        bp_set_member_type( $users[0], 'foo' );
    557557        bp_set_member_type( $users[1], 'bar' );
     
    571571        bp_register_member_type( 'foo' );
    572572        bp_register_member_type( 'bar' );
    573         $users = $this->factory->user->create_many( 3 );
     573        $users = self::factory()->user->create_many( 3 );
    574574        bp_set_member_type( $users[0], 'foo' );
    575575        bp_set_member_type( $users[1], 'bar' );
     
    589589        bp_register_member_type( 'foo' );
    590590        bp_register_member_type( 'bar' );
    591         $users = $this->factory->user->create_many( 3 );
     591        $users = self::factory()->user->create_many( 3 );
    592592        bp_set_member_type( $users[0], 'foo' );
    593593        bp_set_member_type( $users[1], 'bar' );
     
    607607        bp_register_member_type( 'foo' );
    608608        bp_register_member_type( 'bar' );
    609         $users = $this->factory->user->create_many( 3 );
     609        $users = self::factory()->user->create_many( 3 );
    610610        bp_set_member_type( $users[0], 'foo' );
    611611        bp_set_member_type( $users[1], 'bar' );
     
    625625        bp_register_member_type( 'foo' );
    626626        bp_register_member_type( 'bar' );
    627         $users = $this->factory->user->create_many( 3 );
     627        $users = self::factory()->user->create_many( 3 );
    628628        bp_set_member_type( $users[0], 'foo' );
    629629        bp_set_member_type( $users[1], 'bar' );
     
    642642    public function test_should_return_no_results_when_no_users_match_the_specified_member_type__in() {
    643643        bp_register_member_type( 'foo' );
    644         $users = $this->factory->user->create_many( 3 );
     644        $users = self::factory()->user->create_many( 3 );
    645645
    646646        $q = new BP_User_Query( array(
     
    657657        bp_register_member_type( 'foo' );
    658658        bp_register_member_type( 'bar' );
    659         $users = $this->factory->user->create_many( 3 );
     659        $users = self::factory()->user->create_many( 3 );
    660660        bp_set_member_type( $users[0], 'foo' );
    661661        bp_set_member_type( $users[1], 'bar' );
     
    676676        bp_register_member_type( 'foo' );
    677677        bp_register_member_type( 'bar' );
    678         $users = $this->factory->user->create_many( 3 );
     678        $users = self::factory()->user->create_many( 3 );
    679679        bp_set_member_type( $users[0], 'foo' );
    680680        bp_set_member_type( $users[1], 'bar' );
     
    693693    public function test_should_return_no_results_when_all_users_match_the_specified_member_type__not_in() {
    694694        bp_register_member_type( 'foo' );
    695         $users = $this->factory->user->create_many( 3 );
     695        $users = self::factory()->user->create_many( 3 );
    696696        bp_set_member_type( $users[0], 'foo' );
    697697        bp_set_member_type( $users[1], 'foo' );
     
    710710    public function test_member_type__not_in_takes_precedence_over_member_type() {
    711711        bp_register_member_type( 'foo' );
    712         $users = $this->factory->user->create_many( 3 );
     712        $users = self::factory()->user->create_many( 3 );
    713713        bp_set_member_type( $users[0], 'foo' );
    714714        bp_set_member_type( $users[1], 'foo' );
     
    728728    public function test_member_type__not_in_takes_precedence_over_member_type__in() {
    729729        bp_register_member_type( 'foo' );
    730         $users = $this->factory->user->create_many( 3 );
     730        $users = self::factory()->user->create_many( 3 );
    731731        bp_set_member_type( $users[0], 'foo' );
    732732        bp_set_member_type( $users[1], 'foo' );
     
    748748        bp_register_member_type( 'foo' );
    749749        bp_register_member_type( 'bar' );
    750         $users = $this->factory->user->create_many( 4 );
     750        $users = self::factory()->user->create_many( 4 );
    751751        bp_set_member_type( $users[0], 'foo' );
    752752        bp_set_member_type( $users[1], 'bar' );
  • trunk/tests/phpunit/testcases/core/functions.php

    r11097 r11737  
    701701
    702702        if ( is_multisite() ) {
    703             $b = $this->factory->blog->create();
     703            $b = self::factory()->blog->create();
    704704            switch_to_blog( $b );
    705705        }
  • trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php

    r11256 r11737  
    4545        $old_page_ids = bp_core_get_directory_page_ids();
    4646
    47         $p = $this->factory->post->create( array(
     47        $p = self::factory()->post->create( array(
    4848            'post_status' => 'publish',
    4949            'post_type' => 'page',
     
    263263
    264264        // create a blog
    265         $u = $this->factory->user->create();
    266         $b1 = $this->factory->blog->create( array( 'user_id' => $u ) );
     265        $u = self::factory()->user->create();
     266        $b1 = self::factory()->blog->create( array( 'user_id' => $u ) );
    267267
    268268        // switch to blog and create some dummy posts until we reach a post ID that
    269269        // matches our BP activity page ID
    270270        switch_to_blog( $b1 );
    271         $p = $this->factory->post->create();
     271        $p = self::factory()->post->create();
    272272        while( $p <= $dir_pages->activity->id ) {
    273             $p = $this->factory->post->create();
     273            $p = self::factory()->post->create();
    274274        }
    275275
  • trunk/tests/phpunit/testcases/core/nav/backCompat.php

    r11091 r11737  
    4646     */
    4747    protected function set_up_group() {
    48         $g = $this->factory->group->create( array(
     48        $g = self::factory()->group->create( array(
    4949            'slug' => 'testgroup',
    5050        ) );
  • trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php

    r11091 r11737  
    5454
    5555    public function test_user_has_access_false_user_logged_in_my_profile() {
    56         $u = $this->factory->user->create();
     56        $u = self::factory()->user->create();
    5757        $old_current_user = get_current_user_id();
    5858        $this->set_current_user( $u );
     
    7373
    7474    public function test_user_has_access_false_user_logged_in_others_profile_default_component_accessible() {
    75         $u1 = $this->factory->user->create();
    76         $u2 = $this->factory->user->create();
     75        $u1 = self::factory()->user->create();
     76        $u2 = self::factory()->user->create();
    7777        $old_current_user = get_current_user_id();
    7878        $this->set_current_user( $u1 );
     
    108108
    109109    public function test_user_has_access_false_user_logged_in_others_profile_default_component_not_accessible() {
    110         $u1 = $this->factory->user->create();
    111         $u2 = $this->factory->user->create();
     110        $u1 = self::factory()->user->create();
     111        $u2 = self::factory()->user->create();
    112112        $old_current_user = get_current_user_id();
    113113        $this->set_current_user( $u1 );
     
    144144
    145145    public function test_user_has_access_false_user_logged_in_group() {
    146         $u = $this->factory->user->create();
    147         $g = $this->factory->group->create();
     146        $u = self::factory()->user->create();
     147        $g = self::factory()->group->create();
    148148        $old_current_user = get_current_user_id();
    149149        $this->set_current_user( $u );
     
    168168
    169169    public function test_user_has_access_false_user_logged_in_group_no_redirect_url_provided() {
    170         $u = $this->factory->user->create();
    171         $g = $this->factory->group->create();
     170        $u = self::factory()->user->create();
     171        $g = self::factory()->group->create();
    172172        $old_current_user = get_current_user_id();
    173173        $this->set_current_user( $u );
  • trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php

    r11091 r11737  
    1212        $bp_nav = buddypress()->bp_nav;
    1313
    14         $u = $this->factory->user->create();
     14        $u = self::factory()->user->create();
    1515        $old_current_user = get_current_user_id();
    1616        $this->set_current_user( $u );
     
    5252        $bp_nav = buddypress()->bp_nav;
    5353
    54         $u = $this->factory->user->create();
    55         $g = $this->factory->group->create();
     54        $u = self::factory()->user->create();
     55        $g = self::factory()->group->create();
    5656        $old_current_user = get_current_user_id();
    5757        $this->set_current_user( $u );
     
    143143        $bp_nav = buddypress()->bp_nav;
    144144
    145         $u = $this->factory->user->create();
    146         $u2 = $this->factory->user->create();
     145        $u = self::factory()->user->create();
     146        $u2 = self::factory()->user->create();
    147147        $old_current_user = get_current_user_id();
    148148        $this->set_current_user( $u2 );
     
    178178        $bp_nav = buddypress()->bp_nav;
    179179
    180         $u = $this->factory->user->create();
    181         $u2 = $this->factory->user->create();
     180        $u = self::factory()->user->create();
     181        $u2 = self::factory()->user->create();
    182182        $old_current_user = get_current_user_id();
    183183        $this->set_current_user( $u2 );
  • trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php

    r10745 r11737  
    1212        $bp_options_nav = buddypress()->bp_options_nav;
    1313
    14         $u = $this->factory->user->create();
     14        $u = self::factory()->user->create();
    1515        $old_current_user = get_current_user_id();
    1616        $this->set_current_user( $u );
  • trunk/tests/phpunit/testcases/core/nav/bpCoreRemoveSubnavItem.php

    r11091 r11737  
    7373
    7474    public function test_backcompat_remove_group_nav_items() {
    75         $g1 = $this->factory->group->create();
     75        $g1 = self::factory()->group->create();
    7676
    7777        // In group context
  • trunk/tests/phpunit/testcases/core/nav/bpGetNavMenuItems.php

    r10874 r11737  
    1010     */
    1111    public function test_top_level_link_should_point_to_displayed_user_for_loggedin_user() {
    12         $users = $this->factory->user->create_many( 2 );
     12        $users = self::factory()->user->create_many( 2 );
    1313
    1414        $this->set_current_user( $users[0] );
     
    3434     */
    3535    public function test_top_level_link_should_point_to_displayed_user_for_loggedout_user() {
    36         $user = $this->factory->user->create();
     36        $user = self::factory()->user->create();
    3737
    3838        $this->set_current_user( 0 );
  • trunk/tests/phpunit/testcases/core/template/bpUserHasAccess.php

    r9989 r11737  
    66class BP_Tests_Core_Template_BpUserHasAccess extends BP_UnitTestCase {
    77    public function test_should_return_true_for_bp_moderate_user() {
    8         $users = $this->factory->user->create_many( 2 );
     8        $users = self::factory()->user->create_many( 2 );
    99
    1010        $this->grant_bp_moderate( $users[0] );
     
    1717
    1818    public function test_should_return_false_on_anothers_profile_for_user_without_bp_moderate() {
    19         $users = $this->factory->user->create_many( 2 );
     19        $users = self::factory()->user->create_many( 2 );
    2020
    2121        $this->set_current_user( $users[0] );
     
    2727
    2828    public function test_should_return_true_on_own_profile() {
    29         $users = $this->factory->user->create_many( 2 );
     29        $users = self::factory()->user->create_many( 2 );
    3030
    3131        $this->set_current_user( $users[0] );
  • trunk/tests/phpunit/testcases/friends/activity.php

    r10748 r11737  
    1111     */
    1212    public function test_bp_friends_format_activity_action_friendship_accepted() {
    13         $u1 = $this->factory->user->create();
    14         $u2 = $this->factory->user->create();
    15 
    16         $a = $this->factory->activity->create( array(
     13        $u1 = self::factory()->user->create();
     14        $u2 = self::factory()->user->create();
     15
     16        $a = self::factory()->activity->create( array(
    1717            'component' => buddypress()->friends->id,
    1818            'type' => 'friendship_accepted',
     
    3333     */
    3434    public function test_bp_friends_format_activity_action_friendship_created() {
    35         $u1 = $this->factory->user->create();
    36         $u2 = $this->factory->user->create();
    37 
    38         $a = $this->factory->activity->create( array(
     35        $u1 = self::factory()->user->create();
     36        $u2 = self::factory()->user->create();
     37
     38        $a = self::factory()->activity->create( array(
    3939            'component' => buddypress()->friends->id,
    4040            'type' => 'friendship_created',
     
    5656        $old_user = get_current_user_id();
    5757
    58         $u1 = $this->factory->user->create();
    59         $u2 = $this->factory->user->create();
     58        $u1 = self::factory()->user->create();
     59        $u2 = self::factory()->user->create();
    6060
    6161        friends_add_friend( $u2, $u1 );
     
    7070
    7171        // Random activities
    72         $au1 = $this->factory->activity->create( array( 'user_id' => $u1 ) );
    73         $au2 = $this->factory->activity->create( array( 'user_id' => $u2 ) );
     72        $au1 = self::factory()->activity->create( array( 'user_id' => $u1 ) );
     73        $au2 = self::factory()->activity->create( array( 'user_id' => $u2 ) );
    7474
    7575        $fc_act = bp_activity_get( array(
     
    103103        $old_user = get_current_user_id();
    104104
    105         $u1 = $this->factory->user->create();
    106         $u2 = $this->factory->user->create();
     105        $u1 = self::factory()->user->create();
     106        $u2 = self::factory()->user->create();
    107107
    108108        friends_add_friend( $u2, $u1 );
     
    141141        $old_user = get_current_user_id();
    142142
    143         $u1 = $this->factory->user->create();
    144         $u2 = $this->factory->user->create();
     143        $u1 = self::factory()->user->create();
     144        $u2 = self::factory()->user->create();
    145145        $users = array( $u1, $u2 );
    146146
     
    155155        $this->set_current_user( $old_user );
    156156
    157         $users[] = $this->factory->user->create();
    158         $users[] = $this->factory->user->create();
     157        $users[] = self::factory()->user->create();
     158        $users[] = self::factory()->user->create();
    159159
    160160        foreach( $users as $u ) {
     
    192192        $old_user = get_current_user_id();
    193193
    194         $u1 = $this->factory->user->create();
    195         $u2 = $this->factory->user->create();
     194        $u1 = self::factory()->user->create();
     195        $u2 = self::factory()->user->create();
    196196
    197197        friends_add_friend( $u2, $u1 );
     
    222222    public function test_delete_user_with_no_activities() {
    223223        $old_user = get_current_user_id();
    224         $u1 = $this->factory->user->create();
     224        $u1 = self::factory()->user->create();
    225225        $this->set_current_user( $u1 );
    226226
  • trunk/tests/phpunit/testcases/friends/class-bp-friends-friendship.php

    r11122 r11737  
    66class BP_Tests_BP_Friends_Friendship_TestCases extends BP_UnitTestCase {
    77    public function test_search_friends() {
    8         $u1 = $this->factory->user->create();
    9         $u2 = $this->factory->user->create();
    10         $u3 = $this->factory->user->create();
     8        $u1 = self::factory()->user->create();
     9        $u2 = self::factory()->user->create();
     10        $u3 = self::factory()->user->create();
    1111
    1212        xprofile_set_field_data( 1, $u2, 'Cool Dude' );
     
    2626        $this->deactivate_component( 'xprofile' );
    2727
    28         $u1 = $this->factory->user->create();
    29         $u2 = $this->factory->user->create();
    30         $u3 = $this->factory->user->create();
     28        $u1 = self::factory()->user->create();
     29        $u2 = self::factory()->user->create();
     30        $u3 = self::factory()->user->create();
    3131
    3232        add_user_meta( $u2, 'nickname', 'Cool Dude' );
     
    4141
    4242    public function test_get_bulk_last_active() {
    43         $u1 = $this->factory->user->create( array(
     43        $u1 = self::factory()->user->create( array(
    4444            'last_activity' => gmdate( 'Y-m-d H:i:s' ),
    4545        ) );
    46         $u2 = $this->factory->user->create( array(
     46        $u2 = self::factory()->user->create( array(
    4747            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ),
    4848        ) );
    49         $u3 = $this->factory->user->create( array(
     49        $u3 = self::factory()->user->create( array(
    5050            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ),
    5151        ) );
     
    5757
    5858    public function test_search_users() {
    59         $u1 = $this->factory->user->create();
    60         $u2 = $this->factory->user->create();
    61         $u3 = $this->factory->user->create();
     59        $u1 = self::factory()->user->create();
     60        $u2 = self::factory()->user->create();
     61        $u3 = self::factory()->user->create();
    6262
    6363        xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' );
     
    7171
    7272    public function test_search_users_count() {
    73         $u1 = $this->factory->user->create();
    74         $u2 = $this->factory->user->create();
    75         $u3 = $this->factory->user->create();
     73        $u1 = self::factory()->user->create();
     74        $u2 = self::factory()->user->create();
     75        $u3 = self::factory()->user->create();
    7676
    7777        xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' );
     
    8888     */
    8989    public function test_check_is_friend_not_friends() {
    90         $u1 = $this->factory->user->create();
    91         $u2 = $this->factory->user->create();
     90        $u1 = self::factory()->user->create();
     91        $u2 = self::factory()->user->create();
    9292        $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
    9393    }
     
    9797     */
    9898    public function test_check_is_friend_pending() {
    99         $u1 = $this->factory->user->create();
    100         $u2 = $this->factory->user->create();
     99        $u1 = self::factory()->user->create();
     100        $u2 = self::factory()->user->create();
    101101        friends_add_friend( $u1, $u2, false );
    102102        $this->assertEquals( 'pending', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
     
    107107     */
    108108    public function test_check_is_friend_awaiting_response() {
    109         $u1 = $this->factory->user->create();
    110         $u2 = $this->factory->user->create();
     109        $u1 = self::factory()->user->create();
     110        $u2 = self::factory()->user->create();
    111111        friends_add_friend( $u1, $u2, false );
    112112        $this->assertEquals( 'awaiting_response', BP_Friends_Friendship::check_is_friend( $u2, $u1 ) );
     
    117117     */
    118118    public function test_check_is_friend_is_friend() {
    119         $u1 = $this->factory->user->create();
    120         $u2 = $this->factory->user->create();
     119        $u1 = self::factory()->user->create();
     120        $u2 = self::factory()->user->create();
    121121        friends_add_friend( $u1, $u2, true );
    122122        $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) );
     
    127127     */
    128128    public function test_save_method_should_update_existing_row() {
    129         $u1 = $this->factory->user->create();
    130         $u2 = $this->factory->user->create();
     129        $u1 = self::factory()->user->create();
     130        $u2 = self::factory()->user->create();
    131131
    132132        $friendship = new BP_Friends_Friendship();
     
    155155        global $wpdb;
    156156        $now = time();
    157         $u1 = $this->factory->user->create( array(
     157        $u1 = self::factory()->user->create( array(
    158158            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    159159        ) );
    160         $u2 = $this->factory->user->create( array(
     160        $u2 = self::factory()->user->create( array(
    161161            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    162162        ) );
  • trunk/tests/phpunit/testcases/friends/functions.php

    r11354 r11737  
    2020     */
    2121    public function test_requests_on_accept() {
    22         $u1 = $this->factory->user->create();
    23         $u2 = $this->factory->user->create();
    24         $u3 = $this->factory->user->create();
     22        $u1 = self::factory()->user->create();
     23        $u2 = self::factory()->user->create();
     24        $u3 = self::factory()->user->create();
    2525
    2626        // request friendship
     
    5555     */
    5656    public function test_requests_on_request() {
    57         $u1 = $this->factory->user->create();
    58         $u2 = $this->factory->user->create();
    59         $u3 = $this->factory->user->create();
     57        $u1 = self::factory()->user->create();
     58        $u2 = self::factory()->user->create();
     59        $u3 = self::factory()->user->create();
    6060
    6161        // request friendship
     
    8585     */
    8686    public function test_requests_on_withdraw() {
    87         $u1 = $this->factory->user->create();
    88         $u2 = $this->factory->user->create();
     87        $u1 = self::factory()->user->create();
     88        $u2 = self::factory()->user->create();
    8989
    9090        // request friendship
     
    113113     */
    114114    public function test_requests_on_reject() {
    115         $u1 = $this->factory->user->create();
    116         $u2 = $this->factory->user->create();
     115        $u1 = self::factory()->user->create();
     116        $u2 = self::factory()->user->create();
    117117
    118118        // request friendship
     
    139139     */
    140140    public function test_friends_add_friend_fail_on_self() {
    141         $u1 = $this->factory->user->create();
     141        $u1 = self::factory()->user->create();
    142142        $this->assertFalse( friends_add_friend( $u1, $u1 ) );
    143143    }
     
    147147     */
    148148    public function test_friends_add_friend_already_friends() {
    149         $u1 = $this->factory->user->create();
    150         $u2 = $this->factory->user->create();
     149        $u1 = self::factory()->user->create();
     150        $u2 = self::factory()->user->create();
    151151
    152152        friends_add_friend( $u1, $u2, true );
     
    160160    public function test_friends_check_friendship_status_in_members_loop() {
    161161        $now = time();
    162         $u1 = $this->factory->user->create( array(
     162        $u1 = self::factory()->user->create( array(
    163163            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    164164        ) );
    165         $u2 = $this->factory->user->create( array(
     165        $u2 = self::factory()->user->create( array(
    166166            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    167167        ) );
    168         $u3 = $this->factory->user->create( array(
     168        $u3 = self::factory()->user->create( array(
    169169            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
    170170        ) );
    171         $u4 = $this->factory->user->create( array(
     171        $u4 = self::factory()->user->create( array(
    172172            'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ),
    173173        ) );
    174         $u5 = $this->factory->user->create( array(
     174        $u5 = self::factory()->user->create( array(
    175175            'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ),
    176176        ) );
     
    208208    public function test_friends_check_friendship_status_not_in_members_loop() {
    209209        $now = time();
    210         $u1 = $this->factory->user->create( array(
     210        $u1 = self::factory()->user->create( array(
    211211            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    212212        ) );
    213         $u2 = $this->factory->user->create( array(
     213        $u2 = self::factory()->user->create( array(
    214214            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    215215        ) );
    216         $u3 = $this->factory->user->create( array(
     216        $u3 = self::factory()->user->create( array(
    217217            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
    218218        ) );
    219         $u4 = $this->factory->user->create( array(
     219        $u4 = self::factory()->user->create( array(
    220220            'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ),
    221221        ) );
    222         $u5 = $this->factory->user->create( array(
     222        $u5 = self::factory()->user->create( array(
    223223            'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ),
    224224        ) );
     
    251251     */
    252252    public function test_friends_add_friend_friends_friendship_requested() {
    253         $u1 = $this->factory->user->create();
    254         $u2 = $this->factory->user->create();
     253        $u1 = self::factory()->user->create();
     254        $u2 = self::factory()->user->create();
    255255
    256256        add_filter( 'friends_friendship_requested', array( $this, 'friends_friendship_filter_callback' ) );
     
    265265     */
    266266    public function test_friends_add_friend_friends_friendship_accepted() {
    267         $u1 = $this->factory->user->create();
    268         $u2 = $this->factory->user->create();
     267        $u1 = self::factory()->user->create();
     268        $u2 = self::factory()->user->create();
    269269
    270270        add_filter( 'friends_friendship_accepted', array( $this, 'friends_friendship_filter_callback' ) );
     
    286286        global $wpdb;
    287287        $now = time();
    288         $u1 = $this->factory->user->create( array(
     288        $u1 = self::factory()->user->create( array(
    289289            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    290290        ) );
    291         $u2 = $this->factory->user->create( array(
     291        $u2 = self::factory()->user->create( array(
    292292            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    293293        ) );
    294         $u3 = $this->factory->user->create( array(
     294        $u3 = self::factory()->user->create( array(
    295295            'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ),
    296296        ) );
     
    313313        global $wpdb;
    314314        $now = time();
    315         $u1 = $this->factory->user->create( array(
     315        $u1 = self::factory()->user->create( array(
    316316            'last_activity' => date( 'Y-m-d H:i:s', $now ),
    317317        ) );
    318         $u2 = $this->factory->user->create( array(
     318        $u2 = self::factory()->user->create( array(
    319319            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    320320        ) );
     
    335335
    336336    public function test_friends_get_recently_active() {
    337         $u1 = $this->factory->user->create();
    338         $u2 = $this->factory->user->create();
    339         $u3 = $this->factory->user->create();
    340         $u4 = $this->factory->user->create();
     337        $u1 = self::factory()->user->create();
     338        $u2 = self::factory()->user->create();
     339        $u3 = self::factory()->user->create();
     340        $u4 = self::factory()->user->create();
    341341
    342342        // request friendship
     
    357357
    358358    public function test_friends_get_alphabetically() {
    359         $u1 = $this->factory->user->create();
    360         $u2 = $this->factory->user->create();
    361         $u3 = $this->factory->user->create();
     359        $u1 = self::factory()->user->create();
     360        $u2 = self::factory()->user->create();
     361        $u3 = self::factory()->user->create();
    362362
    363363        // request friendship
     
    378378
    379379    public function test_friends_get_newest() {
    380         $u1 = $this->factory->user->create();
    381         $u2 = $this->factory->user->create();
    382         $u3 = $this->factory->user->create();
    383         $u4 = $this->factory->user->create();
     380        $u1 = self::factory()->user->create();
     381        $u2 = self::factory()->user->create();
     382        $u3 = self::factory()->user->create();
     383        $u4 = self::factory()->user->create();
    384384
    385385        // request friendship
  • trunk/tests/phpunit/testcases/friends/notifications.php

    r9819 r11737  
    1212        parent::setUp();
    1313        $this->current_user = get_current_user_id();
    14         $this->set_current_user( $this->factory->user->create() );
     14        $this->set_current_user( self::factory()->user->create() );
    1515
    16         $this->friend = $this->factory->user->create();
     16        $this->friend = self::factory()->user->create();
    1717        $this->filter_fired = '';
    1818    }
  • trunk/tests/phpunit/testcases/groups/activity.php

    r11557 r11737  
    1111     */
    1212    public function test_bp_groups_format_activity_action_created_group() {
    13         $u = $this->factory->user->create();
    14         $g = $this->factory->group->create();
    15         $a = $this->factory->activity->create( array(
     13        $u = self::factory()->user->create();
     14        $g = self::factory()->group->create();
     15        $a = self::factory()->activity->create( array(
    1616            'component' => buddypress()->groups->id,
    1717            'type' => 'created_group',
     
    3333     */
    3434    public function test_bp_groups_format_activity_action_joined_group() {
    35         $u = $this->factory->user->create();
    36         $g = $this->factory->group->create();
    37         $a = $this->factory->activity->create( array(
     35        $u = self::factory()->user->create();
     36        $g = self::factory()->group->create();
     37        $a = self::factory()->activity->create( array(
    3838            'component' => buddypress()->groups->id,
    3939            'type' => 'joined_group',
     
    5555     */
    5656    public function test_bp_groups_format_activity_action_group_details_updated_with_no_change() {
    57         $group = $this->factory->group->create_and_get();
     57        $group = self::factory()->group->create_and_get();
    5858        groups_edit_base_group_details( array(
    5959                'group_id'       => $group->id,
     
    7878     */
    7979    public function test_bp_groups_format_activity_action_group_details_updated_with_notify_members_false() {
    80         $group = $this->factory->group->create_and_get();
     80        $group = self::factory()->group->create_and_get();
    8181        groups_edit_base_group_details( array(
    8282            'group_id'       => $group->id,
     
    102102    public function test_bp_groups_format_activity_action_group_details_updated_with_updated_name() {
    103103        $old_user = get_current_user_id();
    104         $u = $this->factory->user->create();
    105         $this->set_current_user( $u );
    106 
    107         $group = $this->factory->group->create_and_get();
     104        $u = self::factory()->user->create();
     105        $this->set_current_user( $u );
     106
     107        $group = self::factory()->group->create_and_get();
    108108        groups_edit_base_group_details( array(
    109109            'group_id'       => $group->id,
     
    134134    public function test_bp_groups_format_activity_action_group_details_updated_with_updated_description() {
    135135        $old_user = get_current_user_id();
    136         $u = $this->factory->user->create();
    137         $this->set_current_user( $u );
    138 
    139         $group = $this->factory->group->create_and_get();
     136        $u = self::factory()->user->create();
     137        $this->set_current_user( $u );
     138
     139        $group = self::factory()->group->create_and_get();
    140140        groups_edit_base_group_details( array(
    141141            'group_id'       => $group->id,
     
    166166    public function test_bp_groups_format_activity_action_group_details_updated_with_updated_slug() {
    167167        $old_user = get_current_user_id();
    168         $u = $this->factory->user->create();
    169         $this->set_current_user( $u );
    170 
    171         $group = $this->factory->group->create_and_get();
     168        $u = self::factory()->user->create();
     169        $this->set_current_user( $u );
     170
     171        $group = self::factory()->group->create_and_get();
    172172        groups_edit_base_group_details( array(
    173173            'group_id'       => $group->id,
     
    199199    public function test_bp_groups_format_activity_action_group_details_updated_with_updated_name_and_description() {
    200200        $old_user = get_current_user_id();
    201         $u = $this->factory->user->create();
    202         $this->set_current_user( $u );
    203 
    204         $group = $this->factory->group->create_and_get();
     201        $u = self::factory()->user->create();
     202        $this->set_current_user( $u );
     203
     204        $group = self::factory()->group->create_and_get();
    205205        groups_edit_base_group_details( array(
    206206            'group_id'       => $group->id,
  • trunk/tests/phpunit/testcases/groups/avatars.php

    r9819 r11737  
    1010     */
    1111    public function test_bp_get_group_has_avatar_no_avatar_uploaded() {
    12         $g = $this->factory->group->create();
     12        $g = self::factory()->group->create();
    1313        $this->assertFalse( bp_get_group_has_avatar( $g ) );
    1414    }
     
    1818     */
    1919    public function test_bp_get_group_has_avatar_has_avatar_uploaded() {
    20         $g = $this->factory->group->create();
     20        $g = self::factory()->group->create();
    2121
    2222        // Fake it
  • trunk/tests/phpunit/testcases/groups/cache.php

    r11091 r11737  
    1010     */
    1111    public function test_bp_groups_update_meta_cache() {
    12         $g1 = $this->factory->group->create();
    13         $g2 = $this->factory->group->create();
     12        $g1 = self::factory()->group->create();
     13        $g2 = self::factory()->group->create();
    1414
    1515        $time = bp_core_current_time();
     
    7171     */
    7272    public function test_bp_groups_delete_group_cache_on_metadata_add() {
    73         $g = $this->factory->group->create();
     73        $g = self::factory()->group->create();
    7474
    7575        // Prime cache
     
    8989     */
    9090    public function test_bp_groups_delete_group_cache_on_metadata_change() {
    91         $g = $this->factory->group->create();
     91        $g = self::factory()->group->create();
    9292
    9393        // Prime cache
     
    106106     */
    107107    public function test_bp_groups_prefetch_activity_object_data_all_cached() {
    108         $g = $this->factory->group->create();
     108        $g = self::factory()->group->create();
    109109
    110110        // Prime cache
     
    130130     */
    131131    public function test_bp_groups_prefetch_activity_object_data_some_cached() {
    132         $g1 = $this->factory->group->create();
    133         $g2 = $this->factory->group->create();
     132        $g1 = self::factory()->group->create();
     133        $g2 = self::factory()->group->create();
    134134
    135135        // Prime cache
     
    160160     */
    161161    public function test_groups_get_group_admins_cache() {
    162         $u1 = $this->factory->user->create();
    163         $u2 = $this->factory->user->create();
    164         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     162        $u1 = self::factory()->user->create();
     163        $u2 = self::factory()->user->create();
     164        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    165165
    166166        // User 2 joins the group
     
    185185     */
    186186    public function test_groups_get_group_mods_cache() {
    187         $u1 = $this->factory->user->create();
    188         $u2 = $this->factory->user->create();
    189         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     187        $u1 = self::factory()->user->create();
     188        $u2 = self::factory()->user->create();
     189        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    190190
    191191        // User 2 joins the group
     
    207207     */
    208208    public function test_groups_get_group_mods_cache_on_member_save() {
    209         $u1 = $this->factory->user->create();
    210         $u2 = $this->factory->user->create();
    211         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     209        $u1 = self::factory()->user->create();
     210        $u2 = self::factory()->user->create();
     211        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    212212
    213213        // prime cache
     
    225225     */
    226226    public function test_groups_get_group_admins_cache_on_member_save() {
    227         $u1 = $this->factory->user->create();
    228         $u2 = $this->factory->user->create();
    229         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     227        $u1 = self::factory()->user->create();
     228        $u2 = self::factory()->user->create();
     229        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    230230
    231231        // prime cache
  • trunk/tests/phpunit/testcases/groups/class-bp-group-extension.php

    r11091 r11737  
    223223        $old_options_nav = buddypress()->bp_options_nav;
    224224
    225         $g = $this->factory->group->create();
     225        $g = self::factory()->group->create();
    226226        $g_obj = groups_get_group( $g );
    227227
     
    246246        $old_options_nav = buddypress()->bp_options_nav;
    247247
    248         $g = $this->factory->group->create();
     248        $g = self::factory()->group->create();
    249249        $g_obj = groups_get_group( $g );
    250250
     
    270270        $old_current_user = get_current_user_id();
    271271
    272         $g = $this->factory->group->create( array(
     272        $g = self::factory()->group->create( array(
    273273            'status' => 'private',
    274274        ) );
     
    288288
    289289        // Test as group member
    290         $u = $this->factory->user->create();
     290        $u = self::factory()->user->create();
    291291        $this->set_current_user( $u );
    292292        $this->add_user_to_group( $u, $g );
     
    314314        $old_current_user = get_current_user_id();
    315315
    316         $g = $this->factory->group->create( array(
     316        $g = self::factory()->group->create( array(
    317317            'status' => 'private',
    318318        ) );
     
    332332
    333333        // Test as group member
    334         $u = $this->factory->user->create();
     334        $u = self::factory()->user->create();
    335335        $this->set_current_user( $u );
    336336        $this->add_user_to_group( $u, $g );
     
    350350        $old_current_user = get_current_user_id();
    351351
    352         $g = $this->factory->group->create( array(
     352        $g = self::factory()->group->create( array(
    353353            'status' => 'public',
    354354        ) );
     
    376376        $this->set_current_user( 0 );
    377377
    378         $g = $this->factory->group->create( array(
     378        $g = self::factory()->group->create( array(
    379379            'status' => 'public',
    380380        ) );
     
    413413     */
    414414    public function test_user_can_visit_explicit_for_logged_in_user() {
    415         $g = $this->factory->group->create( array(
    416             'status' => 'public',
    417         ) );
    418         $g_obj = groups_get_group( $g );
    419 
    420         $u = $this->factory->user->create();
     415        $g = self::factory()->group->create( array(
     416            'status' => 'public',
     417        ) );
     418        $g_obj = groups_get_group( $g );
     419
     420        $u = self::factory()->user->create();
    421421        $old_current_user = get_current_user_id();
    422422        $this->set_current_user( $u );
     
    455455     */
    456456    public function test_user_can_visit_explicit_for_group_member() {
    457         $g = $this->factory->group->create( array(
    458             'status' => 'public',
    459         ) );
    460         $g_obj = groups_get_group( $g );
    461 
    462         $u = $this->factory->user->create();
     457        $g = self::factory()->group->create( array(
     458            'status' => 'public',
     459        ) );
     460        $g_obj = groups_get_group( $g );
     461
     462        $u = self::factory()->user->create();
    463463        $old_current_user = get_current_user_id();
    464464        $this->set_current_user( $u );
     
    499499     */
    500500    public function test_user_can_visit_explicit_for_group_mod() {
    501         $g = $this->factory->group->create( array(
    502             'status' => 'public',
    503         ) );
    504         $g_obj = groups_get_group( $g );
    505 
    506         $u = $this->factory->user->create();
     501        $g = self::factory()->group->create( array(
     502            'status' => 'public',
     503        ) );
     504        $g_obj = groups_get_group( $g );
     505
     506        $u = self::factory()->user->create();
    507507        $old_current_user = get_current_user_id();
    508508        $this->set_current_user( $u );
     
    545545     */
    546546    public function test_user_can_visit_explicit_for_group_admin() {
    547         $g = $this->factory->group->create( array(
    548             'status' => 'public',
    549         ) );
    550         $g_obj = groups_get_group( $g );
    551 
    552         $u = $this->factory->user->create();
     547        $g = self::factory()->group->create( array(
     548            'status' => 'public',
     549        ) );
     550        $g_obj = groups_get_group( $g );
     551
     552        $u = self::factory()->user->create();
    553553        $old_current_user = get_current_user_id();
    554554        $this->set_current_user( $u );
     
    591591     */
    592592    public function test_user_can_see_nav_item_implied() {
    593         $g = $this->factory->group->create( array(
     593        $g = self::factory()->group->create( array(
    594594            'status' => 'public',
    595595        ) );
     
    632632     */
    633633    public function test_user_can_see_nav_item_explicit_for_logged_out_user() {
    634         $g = $this->factory->group->create( array(
     634        $g = self::factory()->group->create( array(
    635635            'status' => 'public',
    636636        ) );
     
    673673     */
    674674    public function test_user_can_see_nav_item_explicit_for_logged_in_user() {
    675         $g = $this->factory->group->create( array(
    676             'status' => 'public',
    677         ) );
    678         $g_obj = groups_get_group( $g );
    679 
    680         $u = $this->factory->user->create();
     675        $g = self::factory()->group->create( array(
     676            'status' => 'public',
     677        ) );
     678        $g_obj = groups_get_group( $g );
     679
     680        $u = self::factory()->user->create();
    681681        $old_current_user = get_current_user_id();
    682682        $this->set_current_user( $u );
     
    715715     */
    716716    public function test_user_can_see_nav_item_explicit_for_group_member() {
    717         $g = $this->factory->group->create( array(
    718             'status' => 'public',
    719         ) );
    720         $g_obj = groups_get_group( $g );
    721 
    722         $u = $this->factory->user->create();
     717        $g = self::factory()->group->create( array(
     718            'status' => 'public',
     719        ) );
     720        $g_obj = groups_get_group( $g );
     721
     722        $u = self::factory()->user->create();
    723723        $old_current_user = get_current_user_id();
    724724        $this->set_current_user( $u );
     
    759759     */
    760760    public function test_user_can_see_nav_item_explicit_for_group_mod() {
    761         $g = $this->factory->group->create( array(
    762             'status' => 'public',
    763         ) );
    764         $g_obj = groups_get_group( $g );
    765 
    766         $u = $this->factory->user->create();
     761        $g = self::factory()->group->create( array(
     762            'status' => 'public',
     763        ) );
     764        $g_obj = groups_get_group( $g );
     765
     766        $u = self::factory()->user->create();
    767767        $old_current_user = get_current_user_id();
    768768        $this->set_current_user( $u );
     
    805805     */
    806806    public function test_user_can_see_nav_item_explicit_for_group_admin() {
    807         $g = $this->factory->group->create( array(
    808             'status' => 'public',
    809         ) );
    810         $g_obj = groups_get_group( $g );
    811 
    812         $u = $this->factory->user->create();
     807        $g = self::factory()->group->create( array(
     808            'status' => 'public',
     809        ) );
     810        $g_obj = groups_get_group( $g );
     811
     812        $u = self::factory()->user->create();
    813813        $old_current_user = get_current_user_id();
    814814        $this->set_current_user( $u );
     
    851851     */
    852852    public function test_widget_on_group_home_page() {
    853         $g = $this->factory->group->create( array(
     853        $g = self::factory()->group->create( array(
    854854            'status' => 'public',
    855855        ) );
     
    872872     */
    873873    public function test_widget_on_group_members_page() {
    874         $g = $this->factory->group->create( array(
     874        $g = self::factory()->group->create( array(
    875875            'status' => 'public',
    876876        ) );
  • trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php

    r9819 r11737  
    1111     */
    1212    public function test_with_include() {
    13         $g = $this->factory->group->create();
    14         $u1 = $this->factory->user->create();
    15         $u2 = $this->factory->user->create();
    16         $u3 = $this->factory->user->create();
     13        $g = self::factory()->group->create();
     14        $u1 = self::factory()->user->create();
     15        $u2 = self::factory()->user->create();
     16        $u3 = self::factory()->user->create();
    1717        $time = time();
    1818
     
    3131    // Make sure we're falling back on 'member'
    3232    public function test_with_group_role_null() {
    33         $g = $this->factory->group->create();
    34         $u1 = $this->factory->user->create();
    35         $u2 = $this->factory->user->create();
    36         $u3 = $this->factory->user->create();
     33        $g = self::factory()->group->create();
     34        $u1 = self::factory()->user->create();
     35        $u2 = self::factory()->user->create();
     36        $u3 = self::factory()->user->create();
    3737        $time = time();
    3838
     
    5959
    6060    public function test_with_group_role_member() {
    61         $g = $this->factory->group->create();
    62         $u1 = $this->factory->user->create();
    63         $u2 = $this->factory->user->create();
    64         $u3 = $this->factory->user->create();
     61        $g = self::factory()->group->create();
     62        $u1 = self::factory()->user->create();
     63        $u2 = self::factory()->user->create();
     64        $u3 = self::factory()->user->create();
    6565        $time = time();
    6666
     
    8484
    8585    public function test_with_group_role_mod() {
    86         $g = $this->factory->group->create();
    87         $u1 = $this->factory->user->create();
    88         $u2 = $this->factory->user->create();
    89         $u3 = $this->factory->user->create();
     86        $g = self::factory()->group->create();
     87        $u1 = self::factory()->user->create();
     88        $u2 = self::factory()->user->create();
     89        $u3 = self::factory()->user->create();
    9090        $time = time();
    9191
     
    109109
    110110    public function test_with_group_role_admin() {
    111         $u1 = $this->factory->user->create();
    112         $u2 = $this->factory->user->create();
    113         $u3 = $this->factory->user->create();
    114         $g  = $this->factory->group->create( array(
     111        $u1 = self::factory()->user->create();
     112        $u2 = self::factory()->user->create();
     113        $u3 = self::factory()->user->create();
     114        $g  = self::factory()->group->create( array(
    115115            'creator_id' => $u1
    116116        ) );
     
    136136
    137137    public function test_with_group_role_member_mod() {
    138         $g = $this->factory->group->create();
    139         $u1 = $this->factory->user->create();
    140         $u2 = $this->factory->user->create();
    141         $u3 = $this->factory->user->create();
     138        $g = self::factory()->group->create();
     139        $u1 = self::factory()->user->create();
     140        $u2 = self::factory()->user->create();
     141        $u3 = self::factory()->user->create();
    142142        $time = time();
    143143
     
    161161
    162162    public function test_with_group_role_member_admin() {
    163         $u1 = $this->factory->user->create();
    164         $u2 = $this->factory->user->create();
    165         $u3 = $this->factory->user->create();
    166         $g  = $this->factory->group->create( array(
     163        $u1 = self::factory()->user->create();
     164        $u2 = self::factory()->user->create();
     165        $u3 = self::factory()->user->create();
     166        $g  = self::factory()->group->create( array(
    167167            'creator_id' => $u1,
    168168        ) );
     
    188188
    189189    public function test_with_group_role_mod_admin() {
    190         $u1 = $this->factory->user->create();
    191         $u2 = $this->factory->user->create();
    192         $u3 = $this->factory->user->create();
    193         $g  = $this->factory->group->create( array(
     190        $u1 = self::factory()->user->create();
     191        $u2 = self::factory()->user->create();
     192        $u3 = self::factory()->user->create();
     193        $g  = self::factory()->group->create( array(
    194194            'creator_id' => $u1,
    195195        ) );
     
    215215
    216216    public function test_with_group_role_member_mod_admin() {
    217         $u1 = $this->factory->user->create();
    218         $u2 = $this->factory->user->create();
    219         $u3 = $this->factory->user->create();
    220         $g  = $this->factory->group->create( array(
     217        $u1 = self::factory()->user->create();
     218        $u2 = self::factory()->user->create();
     219        $u3 = self::factory()->user->create();
     220        $g  = self::factory()->group->create( array(
    221221            'creator_id' => $u1,
    222222        ) );
     
    242242
    243243    public function test_with_group_role_member_mod_admin_banned() {
    244         $u1 = $this->factory->user->create();
    245         $u2 = $this->factory->user->create();
    246         $u3 = $this->factory->user->create();
    247         $u4 = $this->factory->user->create();
    248         $g  = $this->factory->group->create( array(
     244        $u1 = self::factory()->user->create();
     245        $u2 = self::factory()->user->create();
     246        $u3 = self::factory()->user->create();
     247        $u4 = self::factory()->user->create();
     248        $g  = self::factory()->group->create( array(
    249249            'creator_id' => $u1,
    250250        ) );
     
    276276     */
    277277    public function test_with_group_role_banned() {
    278         $g = $this->factory->group->create();
    279         $u1 = $this->factory->user->create();
    280         $u2 = $this->factory->user->create();
     278        $g = self::factory()->group->create();
     279        $u1 = self::factory()->user->create();
     280        $u2 = self::factory()->user->create();
    281281        $time = time();
    282282
     
    297297
    298298    public function test_group_has_no_members_of_role_mod() {
    299         $g = $this->factory->group->create();
    300         $u1 = $this->factory->user->create();
     299        $g = self::factory()->group->create();
     300        $u1 = self::factory()->user->create();
    301301        $time = time();
    302302
     
    313313
    314314    public function test_confirmed_members() {
    315         $g = $this->factory->group->create();
    316         $u1 = $this->factory->user->create();
    317         $u2 = $this->factory->user->create();
     315        $g = self::factory()->group->create();
     316        $u1 = self::factory()->user->create();
     317        $u2 = self::factory()->user->create();
    318318        $time = time();
    319319
     
    340340     */
    341341    public function test_get_with_type_last_joined() {
    342         $g = $this->factory->group->create();
    343         $u1 = $this->factory->user->create();
    344         $u2 = $this->factory->user->create();
     342        $g = self::factory()->group->create();
     343        $u1 = self::factory()->user->create();
     344        $u2 = self::factory()->user->create();
    345345        $time = time();
    346346
     
    366366     */
    367367    public function test_get_with_type_first_joined() {
    368         $g = $this->factory->group->create();
    369         $u1 = $this->factory->user->create();
    370         $u2 = $this->factory->user->create();
     368        $g = self::factory()->group->create();
     369        $u1 = self::factory()->user->create();
     370        $u2 = self::factory()->user->create();
    371371        $time = time();
    372372
     
    393393     */
    394394    public function test_get_with_type_group_activity_with_activity_component_disabled() {
    395         $g = $this->factory->group->create();
    396         $u1 = $this->factory->user->create();
    397         $u2 = $this->factory->user->create();
    398         $u3 = $this->factory->user->create();
     395        $g = self::factory()->group->create();
     396        $u1 = self::factory()->user->create();
     397        $u2 = self::factory()->user->create();
     398        $u3 = self::factory()->user->create();
    399399        $c = buddypress()->groups->id;
    400400        $time = time();
     
    412412        ) );
    413413
    414         $this->factory->activity->create( array(
     414        self::factory()->activity->create( array(
    415415            'component' => $c,
    416416            'type' => 'activity_update',
     
    420420        ) );
    421421
    422         $this->factory->activity->create( array(
     422        self::factory()->activity->create( array(
    423423            'component' => $c,
    424424            'type' => 'activity_update',
     
    428428        ) );
    429429
    430         $this->factory->activity->create( array(
     430        self::factory()->activity->create( array(
    431431            'component' => $c,
    432432            'type' => 'activity_update',
     
    464464     */
    465465    public function test_get_with_type_group_activity() {
    466         $g = $this->factory->group->create();
    467         $u1 = $this->factory->user->create();
    468         $u2 = $this->factory->user->create();
    469         $u3 = $this->factory->user->create();
     466        $g = self::factory()->group->create();
     467        $u1 = self::factory()->user->create();
     468        $u2 = self::factory()->user->create();
     469        $u3 = self::factory()->user->create();
    470470        $c = buddypress()->groups->id;
    471471        $time = time();
     
    483483        ) );
    484484
    485         $this->factory->activity->create( array(
     485        self::factory()->activity->create( array(
    486486            'component' => $c,
    487487            'type' => 'activity_update',
     
    491491        ) );
    492492
    493         $this->factory->activity->create( array(
     493        self::factory()->activity->create( array(
    494494            'component' => $c,
    495495            'type' => 'activity_update',
     
    499499        ) );
    500500
    501         $this->factory->activity->create( array(
     501        self::factory()->activity->create( array(
    502502            'component' => $c,
    503503            'type' => 'activity_update',
     
    521521     */
    522522    public function test_get_with_type_group_activity_no_dupes() {
    523         $g = $this->factory->group->create();
    524         $u1 = $this->factory->user->create();
     523        $g = self::factory()->group->create();
     524        $u1 = self::factory()->user->create();
    525525        $c = buddypress()->groups->id;
    526526        $time = time();
     
    530530        ) );
    531531
    532         $this->factory->activity->create( array(
     532        self::factory()->activity->create( array(
    533533            'component' => $c,
    534534            'type' => 'activity_update',
     
    538538        ) );
    539539
    540         $this->factory->activity->create( array(
     540        self::factory()->activity->create( array(
    541541            'component' => $c,
    542542            'type' => 'activity_update',
     
    558558     */
    559559    public function test_get_with_type_alphabetical() {
    560         $g = $this->factory->group->create();
    561         $u1 = $this->factory->user->create( array(
     560        $g = self::factory()->group->create();
     561        $u1 = self::factory()->user->create( array(
    562562            'display_name' => 'AAA',
    563563        ) );
    564         $u2 = $this->factory->user->create( array(
     564        $u2 = self::factory()->user->create( array(
    565565            'display_name' => 'CCC',
    566566        ) );
    567         $u3 = $this->factory->user->create( array(
     567        $u3 = self::factory()->user->create( array(
    568568            'display_name' => 'BBB',
    569569        ) );
     
    595595     */
    596596    public function test_with_invite_sent_true() {
    597         $g = $this->factory->group->create();
    598         $u1 = $this->factory->user->create();
    599         $u2 = $this->factory->user->create();
     597        $g = self::factory()->group->create();
     598        $u1 = self::factory()->user->create();
     599        $u2 = self::factory()->user->create();
    600600        $time = time();
    601601
     
    626626     */
    627627    public function test_with_invite_sent_false() {
    628         $g = $this->factory->group->create();
    629         $u1 = $this->factory->user->create();
    630         $u2 = $this->factory->user->create();
     628        $g = self::factory()->group->create();
     629        $u1 = self::factory()->user->create();
     630        $u2 = self::factory()->user->create();
    631631        $time = time();
    632632
     
    657657     */
    658658    public function test_with_inviter_id_false() {
    659         $g = $this->factory->group->create();
    660         $u1 = $this->factory->user->create();
    661         $u2 = $this->factory->user->create();
     659        $g = self::factory()->group->create();
     660        $u1 = self::factory()->user->create();
     661        $u2 = self::factory()->user->create();
    662662        $time = time();
    663663
     
    685685     */
    686686    public function test_with_inviter_id_specific() {
    687         $g = $this->factory->group->create();
    688         $u1 = $this->factory->user->create();
    689         $u2 = $this->factory->user->create();
    690         $u3 = $this->factory->user->create();
    691         $u4 = $this->factory->user->create();
     687        $g = self::factory()->group->create();
     688        $u1 = self::factory()->user->create();
     689        $u2 = self::factory()->user->create();
     690        $u3 = self::factory()->user->create();
     691        $u4 = self::factory()->user->create();
    692692        $time = time();
    693693
     
    725725     */
    726726    public function test_with_inviter_id_any() {
    727         $g = $this->factory->group->create();
    728         $u1 = $this->factory->user->create();
    729         $u2 = $this->factory->user->create();
    730         $u3 = $this->factory->user->create();
    731         $u4 = $this->factory->user->create();
     727        $g = self::factory()->group->create();
     728        $u1 = self::factory()->user->create();
     729        $u2 = self::factory()->user->create();
     730        $u3 = self::factory()->user->create();
     731        $u4 = self::factory()->user->create();
    732732        $time = time();
    733733
  • trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php

    r11533 r11737  
    2222     */
    2323    public function test_get_with_exclude() {
    24         $g1 = $this->factory->group->create();
    25         $g2 = $this->factory->group->create();
     24        $g1 = self::factory()->group->create();
     25        $g2 = self::factory()->group->create();
    2626        groups_update_groupmeta( $g1, 'foo', 'bar' );
    2727
     
    4040     */
    4141    public function test_get_with_include() {
    42         $g1 = $this->factory->group->create();
    43         $g2 = $this->factory->group->create();
     42        $g1 = self::factory()->group->create();
     43        $g2 = self::factory()->group->create();
    4444        groups_update_groupmeta( $g1, 'foo', 'bar' );
    4545
     
    5959     */
    6060    public function test_get_with_meta_query() {
    61         $g1 = $this->factory->group->create();
    62         $g2 = $this->factory->group->create();
     61        $g1 = self::factory()->group->create();
     62        $g2 = self::factory()->group->create();
    6363        groups_update_groupmeta( $g1, 'foo', 'bar' );
    6464
     
    8080     */
    8181    public function test_get_empty_meta_query() {
    82         $g1 = $this->factory->group->create();
    83         $g2 = $this->factory->group->create();
     82        $g1 = self::factory()->group->create();
     83        $g2 = self::factory()->group->create();
    8484        groups_update_groupmeta( $g1, 'foo', 'bar' );
    8585
     
    9797    public function test_get_with_meta_query_multiple_clauses() {
    9898        $now = time();
    99         $g1 = $this->factory->group->create( array(
     99        $g1 = self::factory()->group->create( array(
    100100            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
    101101        ) );
    102         $g2 = $this->factory->group->create( array(
     102        $g2 = self::factory()->group->create( array(
    103103            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
    104104        ) );
    105         $g3 = $this->factory->group->create( array(
     105        $g3 = self::factory()->group->create( array(
    106106            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ),
    107107        ) );
     
    134134    public function test_get_with_meta_query_multiple_clauses_relation_or() {
    135135        $now = time();
    136         $g1 = $this->factory->group->create( array(
     136        $g1 = self::factory()->group->create( array(
    137137            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
    138138        ) );
    139         $g2 = $this->factory->group->create( array(
     139        $g2 = self::factory()->group->create( array(
    140140            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
    141141        ) );
    142         $g3 = $this->factory->group->create( array(
     142        $g3 = self::factory()->group->create( array(
    143143            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ),
    144144        ) );
     
    172172    public function test_get_with_meta_query_multiple_clauses_relation_or_shared_meta_key() {
    173173        $now = time();
    174         $g1 = $this->factory->group->create( array(
     174        $g1 = self::factory()->group->create( array(
    175175            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
    176176        ) );
    177         $g2 = $this->factory->group->create( array(
     177        $g2 = self::factory()->group->create( array(
    178178            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
    179179        ) );
    180         $g3 = $this->factory->group->create( array(
     180        $g3 = self::factory()->group->create( array(
    181181            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ),
    182182        ) );
     
    210210    public function test_get_with_meta_query_multiple_keys_with_same_value() {
    211211        $now = time();
    212         $g1 = $this->factory->group->create( array(
     212        $g1 = self::factory()->group->create( array(
    213213            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ),
    214214        ) );
    215         $g2 = $this->factory->group->create( array(
     215        $g2 = self::factory()->group->create( array(
    216216            'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ),
    217217        ) );
     
    237237     */
    238238    public function test_get_normal_search() {
    239         $g1 = $this->factory->group->create( array(
     239        $g1 = self::factory()->group->create( array(
    240240            'name' => 'Cool Group',
    241241            'description' => 'This is one cool group',
    242242        ) );
    243         $g2 = $this->factory->group->create();
     243        $g2 = self::factory()->group->create();
    244244
    245245        $groups = BP_Groups_Group::get( array(
     
    255255     */
    256256    public function test_get_search_with_underscores() {
    257         $g1 = $this->factory->group->create( array(
     257        $g1 = self::factory()->group->create( array(
    258258            'name' => 'Cool Group',
    259259            'description' => '_cool_ dude',
    260260        ) );
    261         $g2 = $this->factory->group->create();
     261        $g2 = self::factory()->group->create();
    262262
    263263        $groups = BP_Groups_Group::get( array(
     
    273273     */
    274274    public function test_get_search_with_percent_sign() {
    275         $g1 = $this->factory->group->create( array(
     275        $g1 = self::factory()->group->create( array(
    276276            'name' => 'Cool Group',
    277277            'description' => '100% awesome',
    278278        ) );
    279         $g2 = $this->factory->group->create();
     279        $g2 = self::factory()->group->create();
    280280
    281281        $groups = BP_Groups_Group::get( array(
     
    291291     */
    292292    public function test_get_search_with_quotes() {
    293         $g1 = $this->factory->group->create( array(
     293        $g1 = self::factory()->group->create( array(
    294294            'name' => 'Cool Group',
    295295            'description' => "'tis sweet",
    296296        ) );
    297         $g2 = $this->factory->group->create();
     297        $g2 = self::factory()->group->create();
    298298
    299299        $groups = BP_Groups_Group::get( array(
     
    310310     */
    311311    public function test_get_search_with_left_wildcard() {
    312         $g1 = $this->factory->group->create( array(
     312        $g1 = self::factory()->group->create( array(
    313313            'name' => 'Ye Lads',
    314314            'description' => "My Bonnie lies over the ocean",
    315315        ) );
    316         $g2 = $this->factory->group->create();
     316        $g2 = self::factory()->group->create();
    317317
    318318        $groups = BP_Groups_Group::get( array(
     
    329329     */
    330330    public function test_get_search_with_left_wildcard_should_miss() {
    331         $g1 = $this->factory->group->create( array(
     331        $g1 = self::factory()->group->create( array(
    332332            'name' => 'Ye Lads',
    333333            'description' => "My Bonnie lies over the ocean",
    334334        ) );
    335         $g2 = $this->factory->group->create();
     335        $g2 = self::factory()->group->create();
    336336
    337337        $groups = BP_Groups_Group::get( array(
     
    348348     */
    349349    public function test_get_search_with_right_wildcard() {
    350         $g1 = $this->factory->group->create( array(
     350        $g1 = self::factory()->group->create( array(
    351351            'name' => 'Ye Lads',
    352352            'description' => "My Bonnie lies over the ocean",
    353353        ) );
    354         $g2 = $this->factory->group->create();
     354        $g2 = self::factory()->group->create();
    355355
    356356        $groups = BP_Groups_Group::get( array(
     
    367367     */
    368368    public function test_get_search_with_right_wildcard_should_miss() {
    369         $g1 = $this->factory->group->create( array(
     369        $g1 = self::factory()->group->create( array(
    370370            'name' => 'Ye Lads',
    371371            'description' => "My Bonnie lies over the ocean",
    372372        ) );
    373         $g2 = $this->factory->group->create();
     373        $g2 = self::factory()->group->create();
    374374
    375375        $groups = BP_Groups_Group::get( array(
     
    386386     */
    387387    public function test_get_search_with_both_wildcard() {
    388         $g1 = $this->factory->group->create( array(
     388        $g1 = self::factory()->group->create( array(
    389389            'name' => 'Ye Lads',
    390390            'description' => "My Bonnie lies over the ocean",
    391391        ) );
    392         $g2 = $this->factory->group->create();
     392        $g2 = self::factory()->group->create();
    393393
    394394        $groups = BP_Groups_Group::get( array(
     
    405405     */
    406406    public function test_get_search_limited_to_name_column() {
    407         $g1 = $this->factory->group->create( array(
     407        $g1 = self::factory()->group->create( array(
    408408            'name' => 'Ye Lads',
    409409            'description' => "My Bonnie lies over the ocean",
    410410        ) );
    411         $g2 = $this->factory->group->create();
    412         $g3 = $this->factory->group->create( array(
     411        $g2 = self::factory()->group->create();
     412        $g3 = self::factory()->group->create( array(
    413413            'name' => 'Bonnie Lasses',
    414414            'description' => "That lad is unknown to me",
     
    429429     */
    430430    public function test_get_search_limited_to_description_column() {
    431         $g1 = $this->factory->group->create( array(
     431        $g1 = self::factory()->group->create( array(
    432432            'name' => 'Ye Lads',
    433433            'description' => "My Bonnie lies over the ocean",
    434434        ) );
    435         $g2 = $this->factory->group->create();
    436         $g3 = $this->factory->group->create( array(
     435        $g2 = self::factory()->group->create();
     436        $g3 = self::factory()->group->create( array(
    437437            'name' => 'Bonnie Lasses',
    438438            'description' => "That lad is unknown to me",
     
    457457     */
    458458    public function test_get_with_default_type_value_should_be_newest() {
    459         $g1 = $this->factory->group->create( array(
     459        $g1 = self::factory()->group->create( array(
    460460            'name' => 'A Group',
    461461            'date_created' => bp_core_current_time(),
    462462        ) );
    463         $g2 = $this->factory->group->create( array(
     463        $g2 = self::factory()->group->create( array(
    464464            'name' => 'D Group',
    465465            'date_created' => gmdate( 'Y-m-d H:i:s', time() - 100 ),
    466466        ) );
    467         $g3 = $this->factory->group->create( array(
     467        $g3 = self::factory()->group->create( array(
    468468            'name' => 'B Group',
    469469            'date_created' => gmdate( 'Y-m-d H:i:s', time() - 100000 ),
    470470        ) );
    471         $g4 = $this->factory->group->create( array(
     471        $g4 = self::factory()->group->create( array(
    472472            'name' => 'C Group',
    473473            'date_created' => gmdate( 'Y-m-d H:i:s', time() - 1000 ),
     
    484484    public function test_get_with_type_newest() {
    485485        $time = time();
    486         $g1 = $this->factory->group->create( array(
     486        $g1 = self::factory()->group->create( array(
    487487            'name' => 'A Group',
    488488            'date_created' => bp_core_current_time(),
    489489        ) );
    490         $g2 = $this->factory->group->create( array(
     490        $g2 = self::factory()->group->create( array(
    491491            'name' => 'D Group',
    492492            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
    493493        ) );
    494         $g3 = $this->factory->group->create( array(
     494        $g3 = self::factory()->group->create( array(
    495495            'name' => 'B Group',
    496496            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ),
    497497        ) );
    498         $g4 = $this->factory->group->create( array(
     498        $g4 = self::factory()->group->create( array(
    499499            'name' => 'C Group',
    500500            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ),
     
    511511    public function test_get_with_type_popular() {
    512512        $time = time();
    513         $g1 = $this->factory->group->create( array(
     513        $g1 = self::factory()->group->create( array(
    514514            'name' => 'A Group',
    515515            'date_created' => bp_core_current_time(),
    516516        ) );
    517         $g2 = $this->factory->group->create( array(
     517        $g2 = self::factory()->group->create( array(
    518518            'name' => 'D Group',
    519519            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
    520520        ) );
    521         $g3 = $this->factory->group->create( array(
     521        $g3 = self::factory()->group->create( array(
    522522            'name' => 'B Group',
    523523            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ),
    524524        ) );
    525         $g4 = $this->factory->group->create( array(
     525        $g4 = self::factory()->group->create( array(
    526526            'name' => 'C Group',
    527527            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ),
     
    543543    public function test_get_with_type_alphabetical() {
    544544        $time = time();
    545         $g1 = $this->factory->group->create( array(
     545        $g1 = self::factory()->group->create( array(
    546546            'name' => 'A Group',
    547547            'date_created' => bp_core_current_time(),
    548548        ) );
    549         $g2 = $this->factory->group->create( array(
     549        $g2 = self::factory()->group->create( array(
    550550            'name' => 'D Group',
    551551            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
    552552        ) );
    553         $g3 = $this->factory->group->create( array(
     553        $g3 = self::factory()->group->create( array(
    554554            'name' => 'B Group',
    555555            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ),
    556556        ) );
    557         $g4 = $this->factory->group->create( array(
     557        $g4 = self::factory()->group->create( array(
    558558            'name' => 'C Group',
    559559            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ),
     
    573573        $time = time();
    574574
    575         $g1 = $this->factory->group->create( array(
     575        $g1 = self::factory()->group->create( array(
    576576            'name' => 'A Group',
    577577            'date_created' => bp_core_current_time(),
    578578        ) );
    579         $g2 = $this->factory->group->create( array(
     579        $g2 = self::factory()->group->create( array(
    580580            'name' => 'D Group',
    581581            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
    582582        ) );
    583         $g3 = $this->factory->group->create( array(
     583        $g3 = self::factory()->group->create( array(
    584584            'name' => 'B Group',
    585585            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ),
    586586        ) );
    587         $g4 = $this->factory->group->create( array(
     587        $g4 = self::factory()->group->create( array(
    588588            'name' => 'C Group',
    589589            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ),
     
    616616
    617617        for ( $i = 1; $i <= 25; $i++ ) {
    618             $group_ids[] = $this->factory->group->create();
     618            $group_ids[] = self::factory()->group->create();
    619619        }
    620620
     
    659659        global $wpdb;
    660660
    661         $g = $this->factory->group->create();
     661        $g = self::factory()->group->create();
    662662
    663663        $found1 = BP_Groups_Group::get();
     
    679679        global $wpdb;
    680680
    681         $groups = $this->factory->group->create_many( 2 );
     681        $groups = self::factory()->group->create_many( 2 );
    682682        groups_update_groupmeta( $groups[0], 'foo', 'bar' );
    683683        groups_update_groupmeta( $groups[1], 'foo', 'bar' );
     
    720720        bp_groups_register_group_type( 'bar' );
    721721
    722         $groups = $this->factory->group->create_many( 2 );
     722        $groups = self::factory()->group->create_many( 2 );
    723723        bp_groups_set_group_type( $groups[0], 'foo' );
    724724        bp_groups_set_group_type( $groups[1], 'bar' );
     
    750750        bp_groups_register_group_type( 'foo' );
    751751
    752         $groups = $this->factory->group->create_many( 2 );
     752        $groups = self::factory()->group->create_many( 2 );
    753753        bp_groups_set_group_type( $groups[0], 'foo' );
    754754        bp_groups_set_group_type( $groups[1], 'foo' );
     
    777777        global $wpdb;
    778778
    779         $groups = $this->factory->group->create_many( 2 );
     779        $groups = self::factory()->group->create_many( 2 );
    780780        groups_update_groupmeta( $groups[0], 'foo', 'bar' );
    781781        groups_update_groupmeta( $groups[1], 'foo', 'bar' );
     
    806806        global $wpdb;
    807807
    808         $groups = $this->factory->group->create_many( 2 );
     808        $groups = self::factory()->group->create_many( 2 );
    809809
    810810        $found1 = BP_Groups_Group::get();
     
    826826        $this->old_current_user = get_current_user_id();
    827827
    828         $u = $this->factory->user->create();
    829         $g = $this->factory->group->create( array( 'creator_id' => $u ) );
     828        $u = self::factory()->user->create();
     829        $g = self::factory()->group->create( array( 'creator_id' => $u ) );
    830830
    831831        // Instantiate group object.
     
    961961     */
    962962    public function test_get_orderby_meta_id() {
    963         $g1 = $this->factory->group->create();
    964         $g2 = $this->factory->group->create();
    965         $g3 = $this->factory->group->create();
     963        $g1 = self::factory()->group->create();
     964        $g2 = self::factory()->group->create();
     965        $g3 = self::factory()->group->create();
    966966
    967967        groups_update_groupmeta( $g2, 'orderup', 'sammy' );
     
    989989    public function test_get_orderby_meta_id_invalid_fallback_to_date_created() {
    990990        $time = time();
    991         $g1 = $this->factory->group->create( array(
     991        $g1 = self::factory()->group->create( array(
    992992            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 10000 ),
    993993        ) );
    994         $g2 = $this->factory->group->create( array(
     994        $g2 = self::factory()->group->create( array(
    995995            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ),
    996996        ) );
    997         $g3 = $this->factory->group->create( array(
     997        $g3 = self::factory()->group->create( array(
    998998            'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ),
    999999        ) );
     
    10101010
    10111011    public function test_filter_user_groups_normal_search() {
    1012         $g1 = $this->factory->group->create( array(
     1012        $g1 = self::factory()->group->create( array(
    10131013            'name' => 'Cool Group',
    10141014            'description' => 'This is one cool group',
    10151015        ) );
    1016         $g2 = $this->factory->group->create();
    1017         $u = $this->factory->user->create();
     1016        $g2 = self::factory()->group->create();
     1017        $u = self::factory()->user->create();
    10181018        self::add_user_to_group( $u, $g1 );
    10191019
     
    10251025
    10261026    public function test_filter_user_groups_normal_search_middle_of_string() {
    1027         $g1 = $this->factory->group->create( array(
     1027        $g1 = self::factory()->group->create( array(
    10281028            'name' => 'Cool Group',
    10291029            'description' => 'This group is for mandocellos and oboes.',
    10301030        ) );
    1031         $g2 = $this->factory->group->create();
    1032         $u = $this->factory->user->create();
     1031        $g2 = self::factory()->group->create();
     1032        $u = self::factory()->user->create();
    10331033        self::add_user_to_group( $u, $g1 );
    10341034
     
    10401040
    10411041    public function test_filter_user_groups_search_with_underscores() {
    1042         $g1 = $this->factory->group->create( array(
     1042        $g1 = self::factory()->group->create( array(
    10431043            'name' => 'Cool Group',
    10441044            'description' => '_cool_ dude',
    10451045        ) );
    1046         $g2 = $this->factory->group->create();
    1047 
    1048         $u = $this->factory->user->create();
     1046        $g2 = self::factory()->group->create();
     1047
     1048        $u = self::factory()->user->create();
    10491049        self::add_user_to_group( $u, $g1 );
    10501050        self::add_user_to_group( $u, $g2 );
     
    10571057
    10581058    public function test_filter_user_groups_search_with_percent_sign() {
    1059         $g1 = $this->factory->group->create( array(
     1059        $g1 = self::factory()->group->create( array(
    10601060            'name' => 'Cool Group',
    10611061            'description' => '100% awesome',
    10621062        ) );
    1063         $g2 = $this->factory->group->create();
    1064 
    1065         $u = $this->factory->user->create();
     1063        $g2 = self::factory()->group->create();
     1064
     1065        $u = self::factory()->user->create();
    10661066        self::add_user_to_group( $u, $g1 );
    10671067        self::add_user_to_group( $u, $g2 );
     
    10741074
    10751075    public function test_filter_user_groups_search_with_quotes() {
    1076         $g1 = $this->factory->group->create( array(
     1076        $g1 = self::factory()->group->create( array(
    10771077            'name' => 'Cool Group',
    10781078            'description' => "'tis sweet",
    10791079        ) );
    1080         $g2 = $this->factory->group->create();
    1081 
    1082         $u = $this->factory->user->create();
     1080        $g2 = self::factory()->group->create();
     1081
     1082        $u = self::factory()->user->create();
    10831083        self::add_user_to_group( $u, $g1 );
    10841084        self::add_user_to_group( $u, $g2 );
     
    10931093
    10941094    public function test_search_groups_normal_search() {
    1095         $g1 = $this->factory->group->create( array(
     1095        $g1 = self::factory()->group->create( array(
    10961096            'name' => 'Cool Group',
    10971097            'description' => 'This is one cool group',
    10981098        ) );
    1099         $g2 = $this->factory->group->create();
     1099        $g2 = self::factory()->group->create();
    11001100
    11011101        $groups = BP_Groups_Group::search_groups( 'Cool' );
     
    11061106
    11071107    public function test_search_groups_search_with_underscores() {
    1108         $g1 = $this->factory->group->create( array(
     1108        $g1 = self::factory()->group->create( array(
    11091109            'name' => 'Cool Group',
    11101110            'description' => '_cool_ dude',
    11111111        ) );
    1112         $g2 = $this->factory->group->create();
     1112        $g2 = self::factory()->group->create();
    11131113
    11141114        $groups = BP_Groups_Group::search_groups( '_cool_' );
     
    11191119
    11201120    public function test_search_groups_search_with_percent_sign() {
    1121         $g1 = $this->factory->group->create( array(
     1121        $g1 = self::factory()->group->create( array(
    11221122            'name' => 'Cool Group',
    11231123            'description' => '100% awesome',
    11241124        ) );
    1125         $g2 = $this->factory->group->create();
     1125        $g2 = self::factory()->group->create();
    11261126
    11271127        $groups = BP_Groups_Group::search_groups( '100%' );
     
    11321132
    11331133    public function test_search_groups_search_with_quotes() {
    1134         $g1 = $this->factory->group->create( array(
     1134        $g1 = self::factory()->group->create( array(
    11351135            'name' => 'Cool Group',
    11361136            'description' => "'tis sweet",
    11371137        ) );
    1138         $g2 = $this->factory->group->create();
     1138        $g2 = self::factory()->group->create();
    11391139
    11401140        $groups = BP_Groups_Group::search_groups( "'tis " );
     
    11461146
    11471147    public function test_get_by_letter_typical_use() {
    1148         $g1 = $this->factory->group->create( array(
     1148        $g1 = self::factory()->group->create( array(
    11491149            'name' => 'Awesome Cool Group',
    11501150            'description' => 'Neat',
    11511151        ) );
    1152         $g2 = $this->factory->group->create( array(
     1152        $g2 = self::factory()->group->create( array(
    11531153            'name' => 'Babylon Kong',
    11541154            'description' => 'Awesome',
     
    11641164
    11651165    public function test_get_by_letter_with_exclude() {
    1166         $g1 = $this->factory->group->create( array(
     1166        $g1 = self::factory()->group->create( array(
    11671167            'name' => 'Awesome Cool Group',
    11681168            'description' => 'Neat',
    11691169        ) );
    1170         $g2 = $this->factory->group->create( array(
     1170        $g2 = self::factory()->group->create( array(
    11711171            'name' => 'Another Cool Group',
    11721172            'description' => 'Awesome',
     
    11821182
    11831183    public function test_get_by_letter_starts_with_apostrophe() {
    1184         $g1 = $this->factory->group->create( array(
     1184        $g1 = self::factory()->group->create( array(
    11851185            'name' => "'Tis Sweet",
    11861186            'description' => 'Neat',
    11871187        ) );
    1188         $g2 = $this->factory->group->create( array(
     1188        $g2 = self::factory()->group->create( array(
    11891189            'name' => 'Another Cool Group',
    11901190            'description' => 'Awesome',
     
    12011201
    12021202    public function test_get_random_with_exclude() {
    1203         $g1 = $this->factory->group->create();
    1204         $g2 = $this->factory->group->create();
     1203        $g1 = self::factory()->group->create();
     1204        $g2 = self::factory()->group->create();
    12051205
    12061206        // There are only two groups, so excluding one should give us the other
     
    12131213
    12141214    public function test_get_random_with_search_terms() {
    1215         $g1 = $this->factory->group->create( array(
     1215        $g1 = self::factory()->group->create( array(
    12161216            'name' => 'Bodacious',
    12171217        ) );
    1218         $g2 = $this->factory->group->create( array(
     1218        $g2 = self::factory()->group->create( array(
    12191219            'name' => 'Crummy group',
    12201220        ) );
     
    12331233     */
    12341234    public function test_delete_clear_cache() {
    1235         $g = $this->factory->group->create();
     1235        $g = self::factory()->group->create();
    12361236
    12371237        // Prime cache
     
    12511251     */
    12521252    public function test_save_clear_cache() {
    1253         $g = $this->factory->group->create();
     1253        $g = self::factory()->group->create();
    12541254
    12551255        // Prime cache
     
    12991299     */
    13001300    public function test_get_group_extras_non_member() {
    1301         $u = $this->factory->user->create();
    1302         $g = $this->factory->group->create();
     1301        $u = self::factory()->user->create();
     1302        $g = self::factory()->group->create();
    13031303
    13041304        $paged_groups = array();
     
    13301330     */
    13311331    public function test_get_group_extras_member() {
    1332         $u = $this->factory->user->create();
    1333         $g = $this->factory->group->create();
     1332        $u = self::factory()->user->create();
     1333        $g = self::factory()->group->create();
    13341334        $this->add_user_to_group( $u, $g );
    13351335
     
    13621362     */
    13631363    public function test_get_group_extras_invited() {
    1364         $u = $this->factory->user->create();
    1365         $g = $this->factory->group->create();
     1364        $u = self::factory()->user->create();
     1365        $g = self::factory()->group->create();
    13661366
    13671367        $invite                = new BP_Groups_Member;
     
    14011401     */
    14021402    public function test_get_group_extras_pending() {
    1403         $u = $this->factory->user->create();
    1404         $g = $this->factory->group->create();
     1403        $u = self::factory()->user->create();
     1404        $g = self::factory()->group->create();
    14051405
    14061406        $invite                = new BP_Groups_Member;
     
    14401440     */
    14411441    public function test_get_group_extras_banned() {
    1442         $u = $this->factory->user->create();
    1443         $g = $this->factory->group->create();
     1442        $u = self::factory()->user->create();
     1443        $g = self::factory()->group->create();
    14441444
    14451445        $member                = new BP_Groups_Member;
     
    14781478     */
    14791479    public function test_admins_property() {
    1480         $user_1 = $this->factory->user->create_and_get();
    1481         $g = $this->factory->group->create( array(
     1480        $user_1 = self::factory()->user->create_and_get();
     1481        $g = self::factory()->group->create( array(
    14821482            'creator_id' => $user_1->ID,
    14831483        ) );
     
    15041504     */
    15051505    public function test_admins_property_should_match_users_without_wp_role() {
    1506         $user_1 = $this->factory->user->create_and_get();
    1507         $g = $this->factory->group->create( array(
     1506        $user_1 = self::factory()->user->create_and_get();
     1507        $g = self::factory()->group->create( array(
    15081508            'creator_id' => $user_1->ID,
    15091509        ) );
     
    15201520     */
    15211521    public function test_mods_property() {
    1522         $users = $this->factory->user->create_many( 2 );
     1522        $users = self::factory()->user->create_many( 2 );
    15231523        $user_1 = new WP_User( $users[0] );
    15241524        $user_2 = new WP_User( $users[1] );
    15251525
    1526         $g = $this->factory->group->create( array(
     1526        $g = self::factory()->group->create( array(
    15271527            'creator_id' => $user_1->ID,
    15281528        ) );
     
    15511551     */
    15521552    public function test_is_member_property() {
    1553         $users = $this->factory->user->create_many( 2 );
    1554 
    1555         $g = $this->factory->group->create( array(
     1553        $users = self::factory()->user->create_many( 2 );
     1554
     1555        $g = self::factory()->group->create( array(
    15561556            'creator_id' => $users[0],
    15571557        ) );
     
    15711571     */
    15721572    public function test_is_invited_property() {
    1573         $users = $this->factory->user->create_many( 2 );
    1574 
    1575         $g = $this->factory->group->create( array(
     1573        $users = self::factory()->user->create_many( 2 );
     1574
     1575        $g = self::factory()->group->create( array(
    15761576            'creator_id' => $users[0],
    15771577        ) );
     
    15951595     */
    15961596    public function test_is_pending_property() {
    1597         $users = $this->factory->user->create_many( 2 );
    1598 
    1599         $g = $this->factory->group->create( array(
     1597        $users = self::factory()->user->create_many( 2 );
     1598
     1599        $g = self::factory()->group->create( array(
    16001600            'creator_id' => $users[0],
    16011601        ) );
     
    16201620     */
    16211621    public function test_group_type_single_value() {
    1622         $g1 = $this->factory->group->create();
    1623         $g2 = $this->factory->group->create();
     1622        $g1 = self::factory()->group->create();
     1623        $g2 = self::factory()->group->create();
    16241624        bp_groups_register_group_type( 'foo' );
    16251625        bp_groups_register_group_type( 'bar' );
     
    16391639     */
    16401640    public function test_group_type_array_with_single_value() {
    1641         $g1 = $this->factory->group->create();
    1642         $g2 = $this->factory->group->create();
     1641        $g1 = self::factory()->group->create();
     1642        $g2 = self::factory()->group->create();
    16431643        bp_groups_register_group_type( 'foo' );
    16441644        bp_groups_register_group_type( 'bar' );
     
    16581658     */
    16591659    public function test_group_type_with_comma_separated_list() {
    1660         $g1 = $this->factory->group->create();
    1661         $g2 = $this->factory->group->create();
     1660        $g1 = self::factory()->group->create();
     1661        $g2 = self::factory()->group->create();
    16621662        bp_groups_register_group_type( 'foo' );
    16631663        bp_groups_register_group_type( 'bar' );
     
    16771677     */
    16781678    public function test_group_type_array_with_multiple_values() {
    1679         $g1 = $this->factory->group->create();
    1680         $g2 = $this->factory->group->create();
     1679        $g1 = self::factory()->group->create();
     1680        $g2 = self::factory()->group->create();
    16811681        bp_groups_register_group_type( 'foo' );
    16821682        bp_groups_register_group_type( 'bar' );
     
    16961696     */
    16971697    public function test_group_type_should_discart_non_existing_types_in_comma_separated_value() {
    1698         $g1 = $this->factory->group->create();
    1699         $g2 = $this->factory->group->create();
     1698        $g1 = self::factory()->group->create();
     1699        $g2 = self::factory()->group->create();
    17001700        bp_groups_register_group_type( 'foo' );
    17011701        bp_groups_register_group_type( 'bar' );
     
    17151715     */
    17161716    public function test_group_type_should_return_empty_when_no_groups_match_specified_types() {
    1717         $g1 = $this->factory->group->create();
    1718         $g2 = $this->factory->group->create();
     1717        $g1 = self::factory()->group->create();
     1718        $g2 = self::factory()->group->create();
    17191719
    17201720        $groups = BP_Groups_Group::get( array(
     
    17291729     */
    17301730    public function test_group_type__in_single_value() {
    1731         $g1 = $this->factory->group->create();
    1732         $g2 = $this->factory->group->create();
     1731        $g1 = self::factory()->group->create();
     1732        $g2 = self::factory()->group->create();
    17331733        bp_groups_register_group_type( 'foo' );
    17341734        bp_groups_register_group_type( 'bar' );
     
    17481748     */
    17491749    public function test_group_type__in_comma_separated_values() {
    1750         $g1 = $this->factory->group->create();
    1751         $g2 = $this->factory->group->create();
     1750        $g1 = self::factory()->group->create();
     1751        $g2 = self::factory()->group->create();
    17521752        bp_groups_register_group_type( 'foo' );
    17531753        bp_groups_register_group_type( 'bar' );
     
    17671767     */
    17681768    public function test_group_type__in_array_multiple_values() {
    1769         $g1 = $this->factory->group->create();
    1770         $g2 = $this->factory->group->create();
     1769        $g1 = self::factory()->group->create();
     1770        $g2 = self::factory()->group->create();
    17711771        bp_groups_register_group_type( 'foo' );
    17721772        bp_groups_register_group_type( 'bar' );
     
    17861786     */
    17871787    public function test_group_type__in_array_with_single_value() {
    1788         $g1 = $this->factory->group->create();
    1789         $g2 = $this->factory->group->create();
     1788        $g1 = self::factory()->group->create();
     1789        $g2 = self::factory()->group->create();
    17901790        bp_groups_register_group_type( 'foo' );
    17911791        bp_groups_register_group_type( 'bar' );
     
    18051805     */
    18061806    public function test_group_type__in_should_discart_non_existing_types_in_comma_separated_value() {
    1807         $g1 = $this->factory->group->create();
    1808         $g2 = $this->factory->group->create();
     1807        $g1 = self::factory()->group->create();
     1808        $g2 = self::factory()->group->create();
    18091809        bp_groups_register_group_type( 'foo' );
    18101810        bp_groups_register_group_type( 'bar' );
     
    18241824     */
    18251825    public function test_group_type__in_should_return_empty_when_no_groups_match_specified_types() {
    1826         $g1 = $this->factory->group->create();
    1827         $g2 = $this->factory->group->create();
     1826        $g1 = self::factory()->group->create();
     1827        $g2 = self::factory()->group->create();
    18281828
    18291829        $groups = BP_Groups_Group::get( array(
     
    18381838     */
    18391839    public function test_group_type_should_take_precedence_over_group_type__in() {
    1840         $g1 = $this->factory->group->create();
    1841         $g2 = $this->factory->group->create();
     1840        $g1 = self::factory()->group->create();
     1841        $g2 = self::factory()->group->create();
    18421842        bp_groups_register_group_type( 'foo' );
    18431843        bp_groups_register_group_type( 'bar' );
     
    18581858     */
    18591859    public function test_group_type__not_in_should_return_groups_with_types_and_without_types() {
    1860         $g1 = $this->factory->group->create();
    1861         $g2 = $this->factory->group->create();
    1862         $g3 = $this->factory->group->create();
     1860        $g1 = self::factory()->group->create();
     1861        $g2 = self::factory()->group->create();
     1862        $g3 = self::factory()->group->create();
    18631863        bp_groups_register_group_type( 'foo' );
    18641864        bp_groups_register_group_type( 'bar' );
     
    18781878     */
    18791879    public function test_group_type__not_in_comma_separated_values() {
    1880         $g1 = $this->factory->group->create();
    1881         $g2 = $this->factory->group->create();
    1882         $g3 = $this->factory->group->create();
     1880        $g1 = self::factory()->group->create();
     1881        $g2 = self::factory()->group->create();
     1882        $g3 = self::factory()->group->create();
    18831883        bp_groups_register_group_type( 'foo' );
    18841884        bp_groups_register_group_type( 'bar' );
     
    18991899     */
    19001900    public function test_group_type__not_array_with_multiple_values() {
    1901         $g1 = $this->factory->group->create();
    1902         $g2 = $this->factory->group->create();
    1903         $g3 = $this->factory->group->create();
     1901        $g1 = self::factory()->group->create();
     1902        $g2 = self::factory()->group->create();
     1903        $g3 = self::factory()->group->create();
    19041904        bp_groups_register_group_type( 'foo' );
    19051905        bp_groups_register_group_type( 'bar' );
     
    19201920     */
    19211921    public function test_group_type__not_in_should_return_no_results_when_all_groups_mathc_sepecified_type() {
    1922         $g1 = $this->factory->group->create();
    1923         $g2 = $this->factory->group->create();
    1924         $g3 = $this->factory->group->create();
     1922        $g1 = self::factory()->group->create();
     1923        $g2 = self::factory()->group->create();
     1924        $g3 = self::factory()->group->create();
    19251925        bp_groups_register_group_type( 'foo' );
    19261926        bp_groups_set_group_type( $g1, 'foo' );
     
    19391939     */
    19401940    public function test_group_type__not_in_takes_precedence_over_group_type() {
    1941         $g1 = $this->factory->group->create();
    1942         $g2 = $this->factory->group->create();
    1943         $g3 = $this->factory->group->create();
     1941        $g1 = self::factory()->group->create();
     1942        $g2 = self::factory()->group->create();
     1943        $g3 = self::factory()->group->create();
    19441944        bp_groups_register_group_type( 'foo' );
    19451945        bp_groups_set_group_type( $g1, 'foo' );
     
    19591959     */
    19601960    public function test_get_by_parent_id() {
    1961         $g1 = $this->factory->group->create();
    1962         $g2 = $this->factory->group->create( array(
     1961        $g1 = self::factory()->group->create();
     1962        $g2 = self::factory()->group->create( array(
    19631963            'parent_id' => $g1,
    19641964        ) );
    1965         $g3 = $this->factory->group->create( array(
     1965        $g3 = self::factory()->group->create( array(
    19661966            'parent_id' => $g2,
    19671967        ) );
    1968         $g4 = $this->factory->group->create();
     1968        $g4 = self::factory()->group->create();
    19691969
    19701970        $groups = BP_Groups_Group::get( array(
     
    19801980     */
    19811981    public function test_get_by_parent_id_ignore_grandparent() {
    1982         $g1 = $this->factory->group->create();
    1983         $g2 = $this->factory->group->create( array(
     1982        $g1 = self::factory()->group->create();
     1983        $g2 = self::factory()->group->create( array(
    19841984            'parent_id' => $g1,
    19851985        ) );
    1986         $g3 = $this->factory->group->create( array(
     1986        $g3 = self::factory()->group->create( array(
    19871987            'parent_id' => $g2,
    19881988        ) );
    1989         $g4 = $this->factory->group->create();
     1989        $g4 = self::factory()->group->create();
    19901990
    19911991        $groups = BP_Groups_Group::get( array(
     
    20012001     */
    20022002    public function test_get_by_parent_id_array() {
    2003         $g1 = $this->factory->group->create();
    2004         $g2 = $this->factory->group->create( array(
     2003        $g1 = self::factory()->group->create();
     2004        $g2 = self::factory()->group->create( array(
    20052005            'parent_id' => $g1,
    20062006        ) );
    2007         $g3 = $this->factory->group->create( array(
     2007        $g3 = self::factory()->group->create( array(
    20082008            'parent_id' => $g2,
    20092009        ) );
    2010         $g4 = $this->factory->group->create();
     2010        $g4 = self::factory()->group->create();
    20112011
    20122012        $groups = BP_Groups_Group::get( array(
     
    20222022     */
    20232023    public function test_get_by_parent_id_comma_separated_string() {
    2024         $g1 = $this->factory->group->create();
    2025         $g2 = $this->factory->group->create( array(
     2024        $g1 = self::factory()->group->create();
     2025        $g2 = self::factory()->group->create( array(
    20262026            'parent_id' => $g1,
    20272027        ) );
    2028         $g3 = $this->factory->group->create( array(
     2028        $g3 = self::factory()->group->create( array(
    20292029            'parent_id' => $g2,
    20302030        ) );
    2031         $g4 = $this->factory->group->create();
     2031        $g4 = self::factory()->group->create();
    20322032
    20332033        $groups = BP_Groups_Group::get( array(
     
    20432043     */
    20442044    public function test_get_by_parent_id_top_level_groups() {
    2045         $g1 = $this->factory->group->create();
    2046         $g2 = $this->factory->group->create( array(
     2045        $g1 = self::factory()->group->create();
     2046        $g2 = self::factory()->group->create( array(
    20472047            'parent_id' => $g1,
    20482048        ) );
    2049         $g3 = $this->factory->group->create( array(
     2049        $g3 = self::factory()->group->create( array(
    20502050            'parent_id' => $g2,
    20512051        ) );
    2052         $g4 = $this->factory->group->create();
     2052        $g4 = self::factory()->group->create();
    20532053
    20542054        $groups = BP_Groups_Group::get( array(
     
    20642064     */
    20652065    public function test_get_by_parent_id_top_level_groups_using_false() {
    2066         $g1 = $this->factory->group->create();
    2067         $g2 = $this->factory->group->create( array(
     2066        $g1 = self::factory()->group->create();
     2067        $g2 = self::factory()->group->create( array(
    20682068            'parent_id' => $g1,
    20692069        ) );
    2070         $g3 = $this->factory->group->create( array(
     2070        $g3 = self::factory()->group->create( array(
    20712071            'parent_id' => $g2,
    20722072        ) );
    2073         $g4 = $this->factory->group->create();
     2073        $g4 = self::factory()->group->create();
    20742074
    20752075        $groups = BP_Groups_Group::get( array(
     
    20852085     */
    20862086    public function test_get_by_slug() {
    2087         $g1 = $this->factory->group->create(array(
     2087        $g1 = self::factory()->group->create(array(
    20882088            'slug'      => 'apr'
    20892089        ) );
    2090         $g2 = $this->factory->group->create( array(
     2090        $g2 = self::factory()->group->create( array(
    20912091            'slug'      => 'jan'
    20922092        ) );
    2093         $g3 = $this->factory->group->create( array(
     2093        $g3 = self::factory()->group->create( array(
    20942094            'slug'      => 'mar'
    20952095        ) );
     
    21072107     */
    21082108    public function test_get_by_slug_accept_string() {
    2109         $g1 = $this->factory->group->create(array(
     2109        $g1 = self::factory()->group->create(array(
    21102110            'slug'      => 'apr'
    21112111        ) );
    2112         $g2 = $this->factory->group->create( array(
     2112        $g2 = self::factory()->group->create( array(
    21132113            'slug'      => 'jan'
    21142114        ) );
    2115         $g3 = $this->factory->group->create( array(
     2115        $g3 = self::factory()->group->create( array(
    21162116            'slug'      => 'mar'
    21172117        ) );
     
    21292129     */
    21302130    public function test_get_by_slug_accept_comma_separated_string() {
    2131         $g1 = $this->factory->group->create(array(
     2131        $g1 = self::factory()->group->create(array(
    21322132            'slug'      => 'apr'
    21332133        ) );
    2134         $g2 = $this->factory->group->create( array(
     2134        $g2 = self::factory()->group->create( array(
    21352135            'slug'      => 'jan'
    21362136        ) );
    2137         $g3 = $this->factory->group->create( array(
     2137        $g3 = self::factory()->group->create( array(
    21382138            'slug'      => 'mar'
    21392139        ) );
     
    21512151     */
    21522152    public function test_get_by_slug_accept_space_separated_string() {
    2153         $g1 = $this->factory->group->create(array(
     2153        $g1 = self::factory()->group->create(array(
    21542154            'slug'      => 'apr'
    21552155        ) );
    2156         $g2 = $this->factory->group->create( array(
     2156        $g2 = self::factory()->group->create( array(
    21572157            'slug'      => 'jan'
    21582158        ) );
    2159         $g3 = $this->factory->group->create( array(
     2159        $g3 = self::factory()->group->create( array(
    21602160            'slug'      => 'mar'
    21612161        ) );
     
    21732173     */
    21742174    public function test_get_by_status() {
    2175         $g1 = $this->factory->group->create(array(
     2175        $g1 = self::factory()->group->create(array(
    21762176            'status'      => 'private'
    21772177        ) );
    2178         $g2 = $this->factory->group->create( array(
     2178        $g2 = self::factory()->group->create( array(
    21792179            'status'      => 'public'
    21802180        ) );
    2181         $g3 = $this->factory->group->create( array(
     2181        $g3 = self::factory()->group->create( array(
    21822182            'status'      => 'hidden'
    21832183        ) );
     
    21952195     */
    21962196    public function test_get_by_status_accept_string() {
    2197         $g1 = $this->factory->group->create(array(
     2197        $g1 = self::factory()->group->create(array(
    21982198            'status'      => 'private'
    21992199        ) );
    2200         $g2 = $this->factory->group->create( array(
     2200        $g2 = self::factory()->group->create( array(
    22012201            'status'      => 'public'
    22022202        ) );
    2203         $g3 = $this->factory->group->create( array(
     2203        $g3 = self::factory()->group->create( array(
    22042204            'status'      => 'hidden'
    22052205        ) );
     
    22172217     */
    22182218    public function test_get_by_status_accept_comma_separated_string() {
    2219         $g1 = $this->factory->group->create(array(
     2219        $g1 = self::factory()->group->create(array(
    22202220            'status'      => 'private'
    22212221        ) );
    2222         $g2 = $this->factory->group->create( array(
     2222        $g2 = self::factory()->group->create( array(
    22232223            'status'      => 'public'
    22242224        ) );
    2225         $g3 = $this->factory->group->create( array(
     2225        $g3 = self::factory()->group->create( array(
    22262226            'status'      => 'hidden'
    22272227        ) );
  • trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php

    r11609 r11737  
    3131
    3232    public function test_get_recently_joined_with_filter() {
    33         $g1 = $this->factory->group->create( array(
     33        $g1 = self::factory()->group->create( array(
    3434            'name' => 'Tab',
    3535        ) );
    36         $g2 = $this->factory->group->create( array(
     36        $g2 = self::factory()->group->create( array(
    3737            'name' => 'Diet Rite',
    3838        ) );
    3939
    40         $u = $this->factory->user->create();
     40        $u = self::factory()->user->create();
    4141        self::add_user_to_group( $u, $g1 );
    4242        self::add_user_to_group( $u, $g2 );
     
    4949
    5050    public function test_get_is_admin_of_with_filter() {
    51         $g1 = $this->factory->group->create( array(
     51        $g1 = self::factory()->group->create( array(
    5252            'name' => 'RC Cola',
    5353        ) );
    54         $g2 = $this->factory->group->create( array(
     54        $g2 = self::factory()->group->create( array(
    5555            'name' => 'Pepsi',
    5656        ) );
    5757
    58         $u = $this->factory->user->create();
     58        $u = self::factory()->user->create();
    5959        self::add_user_to_group( $u, $g1 );
    6060        self::add_user_to_group( $u, $g2 );
     
    7272
    7373    public function test_get_is_mod_of_with_filter() {
    74         $g1 = $this->factory->group->create( array(
     74        $g1 = self::factory()->group->create( array(
    7575            'name' => 'RC Cola',
    7676        ) );
    77         $g2 = $this->factory->group->create( array(
     77        $g2 = self::factory()->group->create( array(
    7878            'name' => 'Pepsi',
    7979        ) );
    8080
    81         $u = $this->factory->user->create();
     81        $u = self::factory()->user->create();
    8282        self::add_user_to_group( $u, $g1 );
    8383        self::add_user_to_group( $u, $g2 );
     
    9595
    9696    public function test_get_is_banned_of_with_filter() {
    97         $g1 = $this->factory->group->create( array(
     97        $g1 = self::factory()->group->create( array(
    9898            'name' => 'RC Cola',
    9999        ) );
    100         $g2 = $this->factory->group->create( array(
     100        $g2 = self::factory()->group->create( array(
    101101            'name' => 'Pepsi',
    102102        ) );
    103103
    104         $u = $this->factory->user->create();
     104        $u = self::factory()->user->create();
    105105        self::add_user_to_group( $u, $g1 );
    106106        self::add_user_to_group( $u, $g2 );
     
    118118
    119119    public function test_get_invites_with_exclude() {
    120         $g1 = $this->factory->group->create( array(
     120        $g1 = self::factory()->group->create( array(
    121121            'name' => 'RC Cola',
    122122        ) );
    123         $g2 = $this->factory->group->create( array(
     123        $g2 = self::factory()->group->create( array(
    124124            'name' => 'Pepsi',
    125125        ) );
    126126
    127         $u1 = $this->factory->user->create();
    128         $u2 = $this->factory->user->create();
     127        $u1 = self::factory()->user->create();
     128        $u2 = self::factory()->user->create();
    129129        self::add_user_to_group( $u1, $g1 );
    130130        self::add_user_to_group( $u1, $g2 );
     
    142142     */
    143143    public function test_get_all_for_group_with_exclude() {
    144         $g1 = $this->factory->group->create();
    145 
    146         $u1 = $this->factory->user->create();
    147         $u2 = $this->factory->user->create();
     144        $g1 = self::factory()->group->create();
     145
     146        $u1 = self::factory()->user->create();
     147        $u2 = self::factory()->user->create();
    148148        self::add_user_to_group( $u1, $g1 );
    149149        self::add_user_to_group( $u2, $g1 );
     
    160160     */
    161161    public function test_bp_groups_user_can_send_invites() {
    162         $u_nonmembers = $this->factory->user->create();
    163         $u_members    = $this->factory->user->create();
    164         $u_mods       = $this->factory->user->create();
    165         $u_admins     = $this->factory->user->create();
    166         $u_siteadmin  = $this->factory->user->create();
     162        $u_nonmembers = self::factory()->user->create();
     163        $u_members    = self::factory()->user->create();
     164        $u_mods       = self::factory()->user->create();
     165        $u_admins     = self::factory()->user->create();
     166        $u_siteadmin  = self::factory()->user->create();
    167167
    168168        $user_siteadmin = new WP_User( $u_siteadmin );
    169169        $user_siteadmin->add_role( 'administrator' );
    170170
    171         $g = $this->factory->group->create();
     171        $g = self::factory()->group->create();
    172172
    173173        $time = time() - 60;
     
    261261     */
    262262    public function test_bp_groups_reject_membership_request_remove_request() {
    263         $u1 = $this->factory->user->create();
    264         $g = $this->factory->group->create( array(
     263        $u1 = self::factory()->user->create();
     264        $g = self::factory()->group->create( array(
    265265            'status' => 'private',
    266266        ) );
     
    279279     */
    280280    public function test_bp_groups_reject_membership_request_leave_memberships_intact() {
    281         $u1 = $this->factory->user->create();
    282         $g = $this->factory->group->create( array(
     281        $u1 = self::factory()->user->create();
     282        $g = self::factory()->group->create( array(
    283283            'status' => 'private',
    284284        ) );
     
    298298     */
    299299    public function test_bp_groups_reject_membership_request_leave_invites_intact() {
    300         $u1 = $this->factory->user->create();
    301         $u2 = $this->factory->user->create();
    302         $g = $this->factory->group->create( array(
     300        $u1 = self::factory()->user->create();
     301        $u2 = self::factory()->user->create();
     302        $g = self::factory()->group->create( array(
    303303            'status' => 'private',
    304304        ) );
     
    322322     */
    323323    public function test_bp_groups_delete_membership_request_remove_request() {
    324         $u1 = $this->factory->user->create();
    325         $g = $this->factory->group->create( array(
     324        $u1 = self::factory()->user->create();
     325        $g = self::factory()->group->create( array(
    326326            'status' => 'private',
    327327        ) );
     
    340340     */
    341341    public function test_bp_groups_delete_membership_request_leave_memberships_intact() {
    342         $u1 = $this->factory->user->create();
    343         $g = $this->factory->group->create( array(
     342        $u1 = self::factory()->user->create();
     343        $g = self::factory()->group->create( array(
    344344            'status' => 'private',
    345345        ) );
     
    359359     */
    360360    public function test_bp_groups_delete_membership_request_leave_invites_intact() {
    361         $u1 = $this->factory->user->create();
    362         $u2 = $this->factory->user->create();
    363         $g = $this->factory->group->create( array(
     361        $u1 = self::factory()->user->create();
     362        $u2 = self::factory()->user->create();
     363        $g = self::factory()->group->create( array(
    364364            'status' => 'private',
    365365        ) );
     
    383383     */
    384384    public function test_bp_groups_reject_invite_remove_invite() {
    385         $u1 = $this->factory->user->create();
    386         $u2 = $this->factory->user->create();
    387         $g = $this->factory->group->create( array(
     385        $u1 = self::factory()->user->create();
     386        $u2 = self::factory()->user->create();
     387        $g = self::factory()->group->create( array(
    388388            'status' => 'private',
    389389        ) );
     
    407407     */
    408408    public function test_bp_groups_reject_invite_leave_memberships_intact() {
    409         $u1 = $this->factory->user->create();
    410         $g = $this->factory->group->create( array(
     409        $u1 = self::factory()->user->create();
     410        $g = self::factory()->group->create( array(
    411411            'status' => 'private',
    412412        ) );
     
    429429     */
    430430    public function test_bp_groups_reject_invite_leave_requests_intact() {
    431         $u1 = $this->factory->user->create();
    432         $g = $this->factory->group->create( array(
     431        $u1 = self::factory()->user->create();
     432        $g = self::factory()->group->create( array(
    433433            'status' => 'private',
    434434        ) );
     
    447447     */
    448448    public function test_bp_groups_delete_invite_remove_invite() {
    449         $u1 = $this->factory->user->create();
    450         $u2 = $this->factory->user->create();
    451         $g = $this->factory->group->create( array(
     449        $u1 = self::factory()->user->create();
     450        $u2 = self::factory()->user->create();
     451        $g = self::factory()->group->create( array(
    452452            'status' => 'private',
    453453        ) );
     
    471471     */
    472472    public function test_bp_groups_delete_invite_remove_draft_invite() {
    473         $u1 = $this->factory->user->create();
    474         $u2 = $this->factory->user->create();
    475         $g  = $this->factory->group->create( array(
     473        $u1 = self::factory()->user->create();
     474        $u2 = self::factory()->user->create();
     475        $g  = self::factory()->group->create( array(
    476476            'status' => 'private',
    477477        ) );
     
    505505     */
    506506    public function test_bp_groups_delete_invite_leave_memberships_intact() {
    507         $u1 = $this->factory->user->create();
    508         $g  = $this->factory->group->create( array(
     507        $u1 = self::factory()->user->create();
     508        $g  = self::factory()->group->create( array(
    509509            'status' => 'private',
    510510        ) );
     
    526526     */
    527527    public function test_bp_groups_delete_invite_leave_requests_intact() {
    528         $u1 = $this->factory->user->create();
    529         $g = $this->factory->group->create( array(
     528        $u1 = self::factory()->user->create();
     529        $g = self::factory()->group->create( array(
    530530            'status' => 'private',
    531531        ) );
     
    544544     */
    545545    public function test_bp_groups_uninvite_user_remove_invite() {
    546         $u1 = $this->factory->user->create();
    547         $u2 = $this->factory->user->create();
    548         $g = $this->factory->group->create( array(
     546        $u1 = self::factory()->user->create();
     547        $u2 = self::factory()->user->create();
     548        $g = self::factory()->group->create( array(
    549549            'status' => 'private',
    550550        ) );
     
    568568     */
    569569    public function test_bp_groups_uninvite_user_leave_memberships_intact() {
    570         $u1 = $this->factory->user->create();
    571         $g = $this->factory->group->create( array(
     570        $u1 = self::factory()->user->create();
     571        $g = self::factory()->group->create( array(
    572572            'status' => 'private',
    573573        ) );
     
    591591     */
    592592    public function test_bp_groups_uninvite_user_leave_requests_intact() {
    593         $u1 = $this->factory->user->create();
    594         $g = $this->factory->group->create( array(
     593        $u1 = self::factory()->user->create();
     594        $g = self::factory()->group->create( array(
    595595            'status' => 'private',
    596596        ) );
     
    608608     */
    609609    public function test_groups_join_group_basic_join() {
    610         $u1 = $this->factory->user->create();
    611         $g = $this->factory->group->create();
     610        $u1 = self::factory()->user->create();
     611        $g = self::factory()->group->create();
    612612
    613613        groups_join_group( $g, $u1 );
     
    621621     */
    622622    public function test_groups_join_group_basic_join_use_current_user() {
    623         $u1 = $this->factory->user->create();
    624         $g = $this->factory->group->create();
     623        $u1 = self::factory()->user->create();
     624        $g = self::factory()->group->create();
    625625        $old_current_user = get_current_user_id();
    626626        $this->set_current_user( $u1 );
     
    637637     */
    638638    public function test_groups_join_group_already_member() {
    639         $u1 = $this->factory->user->create();
    640         $g = $this->factory->group->create();
     639        $u1 = self::factory()->user->create();
     640        $g = self::factory()->group->create();
    641641        $this->add_user_to_group( $u1, $g );
    642642
     
    649649     */
    650650    public function test_groups_join_group_cleanup_invites() {
    651         $u1 = $this->factory->user->create();
    652         $u2 = $this->factory->user->create();
    653         $g = $this->factory->group->create();
     651        $u1 = self::factory()->user->create();
     652        $u2 = self::factory()->user->create();
     653        $g = self::factory()->group->create();
    654654        $this->add_user_to_group( $u1, $g );
    655655
     
    669669     */
    670670    public function test_groups_join_group_cleanup_requests() {
    671         $u1 = $this->factory->user->create();
    672         $g = $this->factory->group->create();
     671        $u1 = self::factory()->user->create();
     672        $g = self::factory()->group->create();
    673673        self::create_group_membership_request( $u1, $g );
    674674
     
    684684    public function test_groups_leave_group_basic_leave_self_initiated() {
    685685        $old_current_user = get_current_user_id();
    686         $u1 = $this->factory->user->create();
    687         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    688         $u2 = $this->factory->user->create();
     686        $u1 = self::factory()->user->create();
     687        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     688        $u2 = self::factory()->user->create();
    689689        $this->add_user_to_group( $u2, $g );
    690690
     
    704704    public function test_groups_leave_group_basic_leave_use_current_user() {
    705705        $old_current_user = get_current_user_id();
    706         $u1 = $this->factory->user->create();
    707         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    708         $u2 = $this->factory->user->create();
     706        $u1 = self::factory()->user->create();
     707        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     708        $u2 = self::factory()->user->create();
    709709        $this->add_user_to_group( $u2, $g );
    710710
     
    724724    public function test_groups_leave_group_basic_leave_group_admin_initiated() {
    725725        $old_current_user = get_current_user_id();
    726         $u1 = $this->factory->user->create();
    727         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    728         $u2 = $this->factory->user->create();
     726        $u1 = self::factory()->user->create();
     727        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     728        $u2 = self::factory()->user->create();
    729729        $this->add_user_to_group( $u2, $g );
    730730
     
    744744    public function test_groups_leave_group_basic_leave_site_admin_initiated() {
    745745        $old_current_user = get_current_user_id();
    746         $u1 = $this->factory->user->create();
     746        $u1 = self::factory()->user->create();
    747747        $u1_siteadmin = new WP_User( $u1 );
    748748        $u1_siteadmin->add_role( 'administrator' );
    749         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    750         $u2 = $this->factory->user->create();
     749        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     750        $u2 = self::factory()->user->create();
    751751        $this->add_user_to_group( $u2, $g );
    752752
     
    766766    public function test_groups_leave_group_single_admin_prevent_leave() {
    767767        $old_current_user = get_current_user_id();
    768         $u1 = $this->factory->user->create();
    769         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    770         $u2 = $this->factory->user->create();
     768        $u1 = self::factory()->user->create();
     769        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     770        $u2 = self::factory()->user->create();
    771771        $this->add_user_to_group( $u2, $g );
    772772
     
    786786    public function test_groups_leave_group_multiple_admins_allow_leave() {
    787787        $old_current_user = get_current_user_id();
    788         $u1 = $this->factory->user->create();
    789         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    790         $u2 = $this->factory->user->create();
     788        $u1 = self::factory()->user->create();
     789        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     790        $u2 = self::factory()->user->create();
    791791        $this->add_user_to_group( $u2, $g );
    792792        $m2 = new BP_Groups_Member( $u2, $g );
     
    808808     */
    809809    public function test_groups_get_invites_for_user() {
    810         $u1 = $this->factory->user->create();
    811         $u2 = $this->factory->user->create();
    812         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    813         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    814         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     810        $u1 = self::factory()->user->create();
     811        $u2 = self::factory()->user->create();
     812        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     813        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     814        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    815815
    816816        self::invite_user_to_group( $u2, $g1, $u1 );
     
    831831        $old_current_user = get_current_user_id();
    832832
    833         $u1 = $this->factory->user->create();
    834         $u2 = $this->factory->user->create();
    835         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    836         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    837         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     833        $u1 = self::factory()->user->create();
     834        $u2 = self::factory()->user->create();
     835        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     836        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     837        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    838838
    839839        self::invite_user_to_group( $u2, $g1, $u1 );
     
    854854     */
    855855    public function test_groups_get_invites_for_user_with_exclude() {
    856         $u1 = $this->factory->user->create();
    857         $u2 = $this->factory->user->create();
    858         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    859         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    860         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     856        $u1 = self::factory()->user->create();
     857        $u2 = self::factory()->user->create();
     858        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     859        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     860        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    861861
    862862        self::invite_user_to_group( $u2, $g1, $u1 );
     
    874874     */
    875875    public function test_groups_get_invite_count_for_user() {
    876         $u1 = $this->factory->user->create();
    877         $u2 = $this->factory->user->create();
    878         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    879         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    880         $g3 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     876        $u1 = self::factory()->user->create();
     877        $u2 = self::factory()->user->create();
     878        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     879        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     880        $g3 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    881881
    882882        self::invite_user_to_group( $u2, $g1, $u1 );
     
    893893     */
    894894    public function test_groups_get_invite_count_for_user_ignore_drafts() {
    895         $u1 = $this->factory->user->create();
    896         $u2 = $this->factory->user->create();
    897         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     895        $u1 = self::factory()->user->create();
     896        $u2 = self::factory()->user->create();
     897        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    898898
    899899        // Create draft invitation.
     
    916916     */
    917917    public function test_groups_invite_user() {
    918         $u1 = $this->factory->user->create();
    919         $u2 = $this->factory->user->create();
    920         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     918        $u1 = self::factory()->user->create();
     919        $u2 = self::factory()->user->create();
     920        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    921921
    922922        // Create draft invitation
     
    940940     */
    941941    public function test_groups_send_invites() {
    942         $u1 = $this->factory->user->create();
    943         $u2 = $this->factory->user->create();
    944         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     942        $u1 = self::factory()->user->create();
     943        $u2 = self::factory()->user->create();
     944        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    945945
    946946        // Create draft invitation
     
    967967     */
    968968    public function test_groups_accept_invite() {
    969         $u1 = $this->factory->user->create();
    970         $u2 = $this->factory->user->create();
    971         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     969        $u1 = self::factory()->user->create();
     970        $u2 = self::factory()->user->create();
     971        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    972972
    973973        // Create draft invitation
     
    10001000     */
    10011001    public function test_groups_accept_invite_removes_membership_requests() {
    1002         $u1 = $this->factory->user->create();
    1003         $u2 = $this->factory->user->create();
    1004         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1002        $u1 = self::factory()->user->create();
     1003        $u2 = self::factory()->user->create();
     1004        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10051005
    10061006        // Create draft invitation
     
    10351035     */
    10361036    public function test_groups_sent_invite_plus_request_equals_member() {
    1037         $u1 = $this->factory->user->create();
    1038         $u2 = $this->factory->user->create();
    1039         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1037        $u1 = self::factory()->user->create();
     1038        $u2 = self::factory()->user->create();
     1039        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10401040
    10411041        // Create draft invitation
     
    10651065     */
    10661066    public function test_groups_delete_all_group_invites() {
    1067         $u1 = $this->factory->user->create();
    1068         $u2 = $this->factory->user->create();
    1069         $u3 = $this->factory->user->create();
    1070         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1067        $u1 = self::factory()->user->create();
     1068        $u2 = self::factory()->user->create();
     1069        $u3 = self::factory()->user->create();
     1070        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    10711071
    10721072        self::invite_user_to_group( $u2, $g1, $u1 );
     
    10921092     */
    10931093    public function test_groups_send_invites_fail_on_empty_group_id() {
    1094         $u1 = $this->factory->user->create();
    1095         $u2 = $this->factory->user->create();
     1094        $u1 = self::factory()->user->create();
     1095        $u2 = self::factory()->user->create();
    10961096
    10971097        // Create draft invitation with empty inviter_id
     
    11131113     */
    11141114    public function test_groups_send_invites_fail_on_empty_user_id() {
    1115         $u1 = $this->factory->user->create();
    1116         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1115        $u1 = self::factory()->user->create();
     1116        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11171117
    11181118        // Create draft invitation with empty inviter_id
     
    11341134     */
    11351135    public function test_groups_send_invites_fail_on_empty_inviter_id() {
    1136         $u1 = $this->factory->user->create();
    1137         $u2 = $this->factory->user->create();
    1138         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1136        $u1 = self::factory()->user->create();
     1137        $u2 = self::factory()->user->create();
     1138        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11391139
    11401140        // Create draft invitation with empty inviter_id
     
    11571157     */
    11581158    public function test_groups_get_invites_for_group_with_sent_parameter() {
    1159         $u1 = $this->factory->user->create();
    1160         $u2 = $this->factory->user->create();
    1161         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1159        $u1 = self::factory()->user->create();
     1160        $u2 = self::factory()->user->create();
     1161        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    11621162
    11631163        // Create draft invitation
     
    11921192     */
    11931193    public function test_groups_send_membership_request() {
    1194         $u1 = $this->factory->user->create();
    1195         $g1 = $this->factory->group->create();
     1194        $u1 = self::factory()->user->create();
     1195        $g1 = self::factory()->group->create();
    11961196
    11971197        // Create membership request
     
    12081208     */
    12091209    public function test_groups_accept_membership_request_by_membership_id() {
    1210         $u1 = $this->factory->user->create();
    1211         $g1 = $this->factory->group->create();
     1210        $u1 = self::factory()->user->create();
     1211        $g1 = self::factory()->group->create();
    12121212
    12131213        // Create membership request
     
    12311231     */
    12321232    public function test_groups_accept_membership_request_by_user_id_group_id() {
    1233         $u1 = $this->factory->user->create();
    1234         $g1 = $this->factory->group->create();
     1233        $u1 = self::factory()->user->create();
     1234        $g1 = self::factory()->group->create();
    12351235
    12361236        // Create membership request
     
    12511251     */
    12521252    public function test_groups_membership_request_plus_invite_equals_member() {
    1253         $u1 = $this->factory->user->create();
    1254         $u2 = $this->factory->user->create();
    1255         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     1253        $u1 = self::factory()->user->create();
     1254        $u2 = self::factory()->user->create();
     1255        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    12561256
    12571257        // Create membership request
     
    12811281     */
    12821282    public function test_groups_accept_all_pending_membership_requests() {
    1283         $u1 = $this->factory->user->create();
    1284         $u2 = $this->factory->user->create();
    1285         $u3 = $this->factory->user->create();
    1286         $g1 = $this->factory->group->create();
     1283        $u1 = self::factory()->user->create();
     1284        $u2 = self::factory()->user->create();
     1285        $u3 = self::factory()->user->create();
     1286        $g1 = self::factory()->group->create();
    12871287
    12881288        // Create membership request
     
    13101310     */
    13111311    public function test_get_memberships_by_id_with_single_id() {
    1312         $users = $this->factory->user->create_many( 2 );
    1313         $groups = $this->factory->group->create_many( 2 );
     1312        $users = self::factory()->user->create_many( 2 );
     1313        $groups = self::factory()->group->create_many( 2 );
    13141314
    13151315        $m0 = $this->add_user_to_group( $users[0], $groups[0] );
     
    13261326     */
    13271327    public function test_get_memberships_by_id_with_multiple_ids() {
    1328         $users = $this->factory->user->create_many( 2 );
    1329         $groups = $this->factory->group->create_many( 2 );
     1328        $users = self::factory()->user->create_many( 2 );
     1329        $groups = self::factory()->group->create_many( 2 );
    13301330
    13311331        $m0 = $this->add_user_to_group( $users[0], $groups[0] );
     
    13421342     */
    13431343    public function test_user_property_should_be_accessible() {
    1344         $user = $this->factory->user->create();
    1345         $group = $this->factory->group->create();
     1344        $user = self::factory()->user->create();
     1345        $group = self::factory()->group->create();
    13461346
    13471347        $this->add_user_to_group( $user, $group );
  • trunk/tests/phpunit/testcases/groups/functions.php

    r11558 r11737  
    77class BP_Tests_Groups_Functions extends BP_UnitTestCase {
    88    public function test_creating_new_group_as_authenticated_user() {
    9         $u = $this->factory->user->create();
     9        $u = self::factory()->user->create();
    1010        wp_set_current_user( $u );
    1111
    12         $this->factory->group->create();
     12        self::factory()->group->create();
    1313    }
    1414
     
    1818     */
    1919    public function test_total_group_count_groups_join_group() {
    20         $u1 = $this->factory->user->create();
    21         $u2 = $this->factory->user->create();
    22         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     20        $u1 = self::factory()->user->create();
     21        $u2 = self::factory()->user->create();
     22        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    2323
    2424        groups_join_group( $g, $u2 );
     
    3131     */
    3232    public function test_total_group_count_groups_leave_group() {
    33         $u1 = $this->factory->user->create();
    34         $u2 = $this->factory->user->create();
    35         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    36         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     33        $u1 = self::factory()->user->create();
     34        $u2 = self::factory()->user->create();
     35        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     36        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    3737        groups_join_group( $g1, $u2 );
    3838        groups_join_group( $g2, $u2 );
     
    4949     */
    5050    public function test_total_group_count_groups_ban_member() {
    51         $u1 = $this->factory->user->create();
    52         $u2 = $this->factory->user->create();
    53         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    54         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     51        $u1 = self::factory()->user->create();
     52        $u2 = self::factory()->user->create();
     53        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     54        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    5555        groups_join_group( $g1, $u2 );
    5656        groups_join_group( $g2, $u2 );
     
    7070     */
    7171    public function test_total_group_count_groups_unban_member() {
    72         $u1 = $this->factory->user->create();
    73         $u2 = $this->factory->user->create();
    74         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    75         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     72        $u1 = self::factory()->user->create();
     73        $u2 = self::factory()->user->create();
     74        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     75        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    7676        groups_join_group( $g1, $u2 );
    7777        groups_join_group( $g2, $u2 );
     
    9393     */
    9494    public function test_total_group_count_groups_accept_invite() {
    95         $u1 = $this->factory->user->create();
    96         $u2 = $this->factory->user->create();
    97         $g = $this->factory->group->create();
     95        $u1 = self::factory()->user->create();
     96        $u2 = self::factory()->user->create();
     97        $g = self::factory()->group->create();
    9898        groups_invite_user( array(
    9999            'user_id' => $u1,
     
    112112     */
    113113    public function test_total_group_count_groups_accept_membership_request() {
    114         $u1 = $this->factory->user->create();
    115         $u2 = $this->factory->user->create();
     114        $u1 = self::factory()->user->create();
     115        $u2 = self::factory()->user->create();
    116116
    117117        $current_user = bp_loggedin_user_id();
    118118        $this->set_current_user( $u2 );
    119119
    120         $g = $this->factory->group->create();
     120        $g = self::factory()->group->create();
    121121        groups_send_membership_request( $u1, $g );
    122122
     
    133133     */
    134134    public function test_total_group_count_groups_remove_member() {
    135         $u1 = $this->factory->user->create();
    136         $u2 = $this->factory->user->create();
    137         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    138         $g2 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     135        $u1 = self::factory()->user->create();
     136        $u2 = self::factory()->user->create();
     137        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     138        $g2 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    139139        groups_join_group( $g1, $u2 );
    140140        groups_join_group( $g2, $u2 );
     
    154154     */
    155155    public function test_total_member_count_groups_join_group() {
    156         $u1 = $this->factory->user->create();
    157         $u2 = $this->factory->user->create();
    158         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     156        $u1 = self::factory()->user->create();
     157        $u2 = self::factory()->user->create();
     158        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    159159
    160160        groups_join_group( $g, $u2 );
     
    167167     */
    168168    public function test_total_member_count_groups_leave_group() {
    169         $u1 = $this->factory->user->create();
    170         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     169        $u1 = self::factory()->user->create();
     170        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    171171        groups_join_group( $g1, $u1 );
    172172
     
    180180     */
    181181    public function test_total_member_count_groups_ban_member() {
    182         $u1 = $this->factory->user->create();
    183         $u2 = $this->factory->user->create();
    184         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     182        $u1 = self::factory()->user->create();
     183        $u2 = self::factory()->user->create();
     184        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    185185        groups_join_group( $g1, $u2 );
    186186
     
    199199     */
    200200    public function test_total_member_count_groups_unban_member() {
    201         $u1 = $this->factory->user->create();
    202         $u2 = $this->factory->user->create();
    203         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     201        $u1 = self::factory()->user->create();
     202        $u2 = self::factory()->user->create();
     203        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    204204        groups_join_group( $g1, $u2 );
    205205
     
    220220     */
    221221    public function test_total_member_count_groups_accept_invite() {
    222         $u1 = $this->factory->user->create();
    223         $u2 = $this->factory->user->create();
    224         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     222        $u1 = self::factory()->user->create();
     223        $u2 = self::factory()->user->create();
     224        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    225225        groups_invite_user( array(
    226226            'user_id' => $u1,
     
    239239     */
    240240    public function test_total_member_count_groups_accept_membership_request() {
    241         $u1 = $this->factory->user->create();
    242         $u2 = $this->factory->user->create();
    243         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     241        $u1 = self::factory()->user->create();
     242        $u2 = self::factory()->user->create();
     243        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    244244
    245245        groups_send_membership_request( $u2, $g );
     
    254254     */
    255255    public function test_total_member_count_groups_remove_member() {
    256         $u1 = $this->factory->user->create();
    257         $u2 = $this->factory->user->create();
    258         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     256        $u1 = self::factory()->user->create();
     257        $u2 = self::factory()->user->create();
     258        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    259259        groups_join_group( $g1, $u2 );
    260260
     
    273273     */
    274274    public function test_total_member_count_groups_create_group() {
    275         $u1 = $this->factory->user->create();
     275        $u1 = self::factory()->user->create();
    276276        $g = groups_create_group( array(
    277277            'creator_id' => $u1,
     
    291291     */
    292292    public function test_groups_create_group_dont_delete_description_for_existing_group_when_no_description_is_passed() {
    293         $g = $this->factory->group->create();
     293        $g = self::factory()->group->create();
    294294
    295295        $group_before = groups_get_group( $g );
     
    308308     */
    309309    public function test_groups_update_groupmeta_with_line_breaks() {
    310         $g = $this->factory->group->create();
     310        $g = self::factory()->group->create();
    311311        $meta_value = 'Foo!
    312312
     
    328328     */
    329329    public function test_groups_update_groupmeta_stripslashes() {
    330         $g = $this->factory->group->create();
     330        $g = self::factory()->group->create();
    331331        $value = "This string is totally slashin\'!";
    332332        groups_update_groupmeta( $g, 'foo', $value );
     
    339339     */
    340340    public function test_groups_update_groupmeta_new() {
    341         $g = $this->factory->group->create();
     341        $g = self::factory()->group->create();
    342342        $this->assertSame( '', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be empty for this group.' );
    343343        $this->assertNotEmpty( groups_update_groupmeta( $g, 'foo', 'bar' ) );
     
    349349     */
    350350    public function test_groups_update_groupmeta_existing() {
    351         $g = $this->factory->group->create();
     351        $g = self::factory()->group->create();
    352352        groups_update_groupmeta( $g, 'foo', 'bar' );
    353353        $this->assertSame( 'bar', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be set already for this group.' );
     
    360360     */
    361361    public function test_groups_update_groupmeta_existing_same_value() {
    362         $g = $this->factory->group->create();
     362        $g = self::factory()->group->create();
    363363        groups_update_groupmeta( $g, 'foo', 'bar' );
    364364        $this->assertSame( 'bar', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be set already for this group.' );
     
    372372     */
    373373    public function test_groups_update_groupmeta_prev_value() {
    374         $g = $this->factory->group->create();
     374        $g = self::factory()->group->create();
    375375        groups_add_groupmeta( $g, 'foo', 'bar' );
    376376
     
    393393     */
    394394    public function test_groups_get_groupmeta_with_illegal_key_characters() {
    395         $g = $this->factory->group->create();
     395        $g = self::factory()->group->create();
    396396        groups_update_groupmeta( $g, 'foo', 'bar' );
    397397
     
    404404     */
    405405    public function test_groups_get_groupmeta_all_metas() {
    406         $g = $this->factory->group->create();
     406        $g = self::factory()->group->create();
    407407        groups_update_groupmeta( $g, 'foo', 'bar' );
    408408        groups_update_groupmeta( $g, 'Boone', 'is cool' );
     
    430430     */
    431431    public function test_groups_get_groupmeta_all_metas_empty() {
    432         $g = $this->factory->group->create();
     432        $g = self::factory()->group->create();
    433433
    434434        // Get rid of any auto-created values
     
    447447     */
    448448    public function test_groups_get_groupmeta_empty() {
    449         $g = $this->factory->group->create();
     449        $g = self::factory()->group->create();
    450450        $this->assertSame( '', groups_get_groupmeta( $g, 'foo' ) );
    451451    }
     
    456456     */
    457457    public function test_bp_activity_get_meta_single_true() {
    458         $g = $this->factory->group->create();
     458        $g = self::factory()->group->create();
    459459        groups_add_groupmeta( $g, 'foo', 'bar' );
    460460        groups_add_groupmeta( $g, 'foo', 'baz' );
     
    468468     */
    469469    public function test_bp_activity_get_meta_single_false() {
    470         $g = $this->factory->group->create();
     470        $g = self::factory()->group->create();
    471471        groups_add_groupmeta( $g, 'foo', 'bar' );
    472472        groups_add_groupmeta( $g, 'foo', 'baz' );
     
    480480     */
    481481    public function test_groups_get_groupmeta_cache_all_on_get() {
    482         $g = $this->factory->group->create();
     482        $g = self::factory()->group->create();
    483483        groups_add_groupmeta( $g, 'foo', 'bar' );
    484484        groups_add_groupmeta( $g, 'foo1', 'baz' );
     
    505505     */
    506506    public function test_groups_delete_groupmeta_with_illegal_key_characters() {
    507         $g = $this->factory->group->create();
     507        $g = self::factory()->group->create();
    508508        $this->assertNotEmpty( groups_update_groupmeta( $g, 'foo', 'bar' ), 'Value of "foo" should be set at this point.' );
    509509
     
    520520        global $wpdb;
    521521
    522         $g = $this->factory->group->create();
     522        $g = self::factory()->group->create();
    523523        $m = groups_get_groupmeta( $g );
    524524        foreach ( $m as $mk => $mv ) {
     
    537537        // With no meta key, don't delete for all items - just delete
    538538        // all for a single item
    539         $g1 = $this->factory->group->create();
    540         $g2 = $this->factory->group->create();
     539        $g1 = self::factory()->group->create();
     540        $g2 = self::factory()->group->create();
    541541        groups_add_groupmeta( $g1, 'foo', 'bar' );
    542542        groups_add_groupmeta( $g1, 'foo1', 'bar1' );
     
    557557        // With no meta key, don't delete for all items - just delete
    558558        // all for a single item
    559         $g1 = $this->factory->group->create();
    560         $g2 = $this->factory->group->create();
     559        $g1 = self::factory()->group->create();
     560        $g2 = self::factory()->group->create();
    561561        groups_add_groupmeta( $g1, 'foo', 'bar' );
    562562        groups_add_groupmeta( $g1, 'foo1', 'bar1' );
     
    592592     */
    593593    public function test_groups_add_groupmeta_existing_unique() {
    594         $g = $this->factory->group->create();
     594        $g = self::factory()->group->create();
    595595        groups_add_groupmeta( $g, 'foo', 'bar' );
    596596        $this->assertFalse( groups_add_groupmeta( $g, 'foo', 'baz', true ) );
     
    602602     */
    603603    public function test_groups_add_groupmeta_existing_not_unique() {
    604         $g = $this->factory->group->create();
     604        $g = self::factory()->group->create();
    605605        groups_add_groupmeta( $g, 'foo', 'bar' );
    606606        $this->assertNotEmpty( groups_add_groupmeta( $g, 'foo', 'baz' ) );
     
    611611     */
    612612    public function test_get_invite_count_for_user() {
    613         $u1 = $this->factory->user->create();
    614         $u2 = $this->factory->user->create();
    615         $g = $this->factory->group->create( array( 'creator_id' => $u1 ) );
     613        $u1 = self::factory()->user->create();
     614        $u2 = self::factory()->user->create();
     615        $g = self::factory()->group->create( array( 'creator_id' => $u1 ) );
    616616
    617617        // create invitation
     
    640640     */
    641641    public function test_update_orphaned_groups_on_group_delete_top_level() {
    642         $g1 = $this->factory->group->create();
    643         $g2 = $this->factory->group->create( array(
     642        $g1 = self::factory()->group->create();
     643        $g2 = self::factory()->group->create( array(
    644644            'parent_id' => $g1,
    645645        ) );
     
    655655     */
    656656    public function test_update_orphaned_groups_on_group_delete_two_levels() {
    657         $g1 = $this->factory->group->create();
    658         $g2 = $this->factory->group->create( array(
     657        $g1 = self::factory()->group->create();
     658        $g2 = self::factory()->group->create( array(
    659659            'parent_id' => $g1,
    660660        ) );
    661         $g3 = $this->factory->group->create( array(
     661        $g3 = self::factory()->group->create( array(
    662662            'parent_id' => $g2,
    663663        ) );
     
    674674     */
    675675    public function test_groups_get_group_accept_integer() {
    676         $g1 = $this->factory->group->create();
     676        $g1 = self::factory()->group->create();
    677677        $group = groups_get_group( $g1 );
    678678
     
    685685     */
    686686    public function test_groups_get_group_accept_numeric() {
    687         $g1 = $this->factory->group->create();
     687        $g1 = self::factory()->group->create();
    688688        $group = groups_get_group( (string) $g1 );
    689689
     
    696696     */
    697697    public function test_groups_get_group_accept_array() {
    698         $g1 = $this->factory->group->create();
     698        $g1 = self::factory()->group->create();
    699699        $group = groups_get_group( array( 'group_id' => $g1 ) );
    700700
     
    707707     */
    708708    public function test_groups_get_group_accept_query_string() {
    709         $g1 = $this->factory->group->create();
     709        $g1 = self::factory()->group->create();
    710710        $group = groups_get_group( 'group_id=' . $g1 );
    711711
     
    718718     */
    719719    public function test_groups_edit_base_group_details_test_backcompat_arguments() {
    720         $g1 = $this->factory->group->create();
     720        $g1 = self::factory()->group->create();
    721721        $name = 'Great Scott';
    722722        $description = 'A must-see in time for the holidays!';
     
    742742     */
    743743    public function test_groups_edit_base_group_details_test_new_arguments() {
    744         $g1 = $this->factory->group->create();
     744        $g1 = self::factory()->group->create();
    745745        $name = 'Great Scott';
    746746        $slug = 'what-about-it';
     
    776776    public function test_groups_edit_base_group_details_avoid_slug_collisions() {
    777777        $slug = 'circe';
    778         $g1 = $this->factory->group->create( array( 'slug' => $slug ) );
    779         $g2 = $this->factory->group->create( array( 'slug' => 'loom' ) );
     778        $g1 = self::factory()->group->create( array( 'slug' => $slug ) );
     779        $g2 = self::factory()->group->create( array( 'slug' => 'loom' ) );
    780780
    781781        // Attempt to use a duplicate slug.
     
    795795    public function test_groups_edit_base_group_details_slug_no_change() {
    796796        $slug = 'circe';
    797         $g1 = $this->factory->group->create( array( 'slug' => $slug ) );
     797        $g1 = self::factory()->group->create( array( 'slug' => $slug ) );
    798798
    799799        // Make sure the slug doesn't get incremented when there's no change.
     
    813813    public function test_groups_edit_base_group_details_slug_null_value() {
    814814        $slug = 'circe';
    815         $g1 = $this->factory->group->create( array( 'slug' => $slug ) );
     815        $g1 = self::factory()->group->create( array( 'slug' => $slug ) );
    816816
    817817        // Make sure the slug doesn't get changed when null is passed.
     
    831831    public function test_groups_get_id_by_previous_slug() {
    832832        $slug = 'circe';
    833         $g1 = $this->factory->group->create( array( 'slug' => $slug ) );
    834         $g2 = $this->factory->group->create( array( 'slug' => 'loom' ) );
     833        $g1 = self::factory()->group->create( array( 'slug' => $slug ) );
     834        $g2 = self::factory()->group->create( array( 'slug' => 'loom' ) );
    835835
    836836        groups_edit_base_group_details( array(
  • trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php

    r11735 r11737  
    5454     */
    5555    public function test_creator_id_should_be_fall_back_to_existing_creator_id_for_existing_group() {
    56         $group_id = $this->factory->group->create( array(
     56        $group_id = self::factory()->group->create( array(
    5757            'creator_id' => self::$user_id + 1,
    5858        ) );
  • trunk/tests/phpunit/testcases/groups/notifications.php

    r11278 r11737  
    1414        parent::setUp();
    1515        $this->current_user = get_current_user_id();
    16         $this->set_current_user( $this->factory->user->create() );
    17 
    18         $this->requesting_user_id = $this->factory->user->create();
    19         $this->group = $this->factory->group->create();
     16        $this->set_current_user( self::factory()->user->create() );
     17
     18        $this->requesting_user_id = self::factory()->user->create();
     19        $this->group = self::factory()->group->create();
    2020        $this->filter_fired = '';
    2121    }
     
    167167
    168168        // Admin
    169         $n = $this->factory->notification->create( array(
     169        $n = self::factory()->notification->create( array(
    170170            'component_name' => 'groups',
    171171            'user_id' => $u,
     
    191191
    192192        // Mod
    193         $n = $this->factory->notification->create( array(
     193        $n = self::factory()->notification->create( array(
    194194            'component_name' => 'groups',
    195195            'user_id' => $u,
     
    224224     */
    225225    public function test_membership_request_notifications_should_be_cleared_when_request_is_accepted() {
    226         $users = $this->factory->user->create_many( 3 );
     226        $users = self::factory()->user->create_many( 3 );
    227227
    228228        $this->add_user_to_group( $users[0], $this->group, array(
  • trunk/tests/phpunit/testcases/groups/template.php

    r11095 r11737  
    1111     */
    1212    public function test_bp_has_groups_with_meta_query() {
    13         $g1 = $this->factory->group->create();
    14         $g2 = $this->factory->group->create();
     13        $g1 = self::factory()->group->create();
     14        $g2 = self::factory()->group->create();
    1515        groups_update_groupmeta( $g1, 'foo', 'bar' );
    1616
     
    3737    public function test_bp_has_groups_with_order_orderby_with_null_type() {
    3838        $now = time();
    39         $g1 = $this->factory->group->create( array(
     39        $g1 = self::factory()->group->create( array(
    4040            'name' => 'AAAAA',
    4141            'date_created' => gmdate( 'Y-m-d H:i:s', $now - 100 ),
    4242            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ),
    4343        ) );
    44         $g2 = $this->factory->group->create( array(
     44        $g2 = self::factory()->group->create( array(
    4545            'name' => 'BBBBB',
    4646            'date_created' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ),
    4747            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 10000 ),
    4848        ) );
    49         $g3 = $this->factory->group->create( array(
     49        $g3 = self::factory()->group->create( array(
    5050            'name' => 'CCCCC',
    5151            'date_created' => gmdate( 'Y-m-d H:i:s', $now - 10000 ),
     
    7373    public function test_bp_has_groups_defaults_to_DESC_last_activity_for_default_type_active_backpat() {
    7474        $now = time();
    75         $g1 = $this->factory->group->create( array(
     75        $g1 = self::factory()->group->create( array(
    7676            'name' => 'AAAAA',
    7777            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 100 ),
    7878        ) );
    79         $g2 = $this->factory->group->create( array(
     79        $g2 = self::factory()->group->create( array(
    8080            'name' => 'BBBBB',
    8181            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ),
    8282        ) );
    83         $g3 = $this->factory->group->create( array(
     83        $g3 = self::factory()->group->create( array(
    8484            'name' => 'CCCCC',
    8585            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 10000 ),
     
    102102     */
    103103    public function test_bp_has_groups_single_group_with_slug() {
    104         $g1 = $this->factory->group->create( array(
     104        $g1 = self::factory()->group->create( array(
    105105            'name' => 'Test Group',
    106106            'slug' => 'test-group',
     
    124124     */
    125125    public function test_bp_has_groups_parent_id() {
    126         $g1 = $this->factory->group->create();
    127         $g2 = $this->factory->group->create( array(
     126        $g1 = self::factory()->group->create();
     127        $g2 = self::factory()->group->create( array(
    128128            'parent_id' => $g1,
    129129        ) );
    130         $g3 = $this->factory->group->create( array(
     130        $g3 = self::factory()->group->create( array(
    131131            'parent_id' => $g2,
    132132        ) );
    133         $g4 = $this->factory->group->create();
     133        $g4 = self::factory()->group->create();
    134134
    135135        global $groups_template;
     
    146146     */
    147147    public function test_bp_has_groups_parent_id_array() {
    148         $g1 = $this->factory->group->create();
    149         $g2 = $this->factory->group->create( array(
     148        $g1 = self::factory()->group->create();
     149        $g2 = self::factory()->group->create( array(
    150150            'parent_id' => $g1,
    151151        ) );
    152         $g3 = $this->factory->group->create( array(
     152        $g3 = self::factory()->group->create( array(
    153153            'parent_id' => $g2,
    154154        ) );
    155         $g4 = $this->factory->group->create();
     155        $g4 = self::factory()->group->create();
    156156
    157157        global $groups_template;
     
    168168     */
    169169    public function test_bp_has_groups_parent_id_comma_separated() {
    170         $g1 = $this->factory->group->create();
    171         $g2 = $this->factory->group->create( array(
     170        $g1 = self::factory()->group->create();
     171        $g2 = self::factory()->group->create( array(
    172172            'parent_id' => $g1,
    173173        ) );
    174         $g3 = $this->factory->group->create( array(
     174        $g3 = self::factory()->group->create( array(
    175175            'parent_id' => $g2,
    176176        ) );
    177         $g4 = $this->factory->group->create();
     177        $g4 = self::factory()->group->create();
    178178
    179179        global $groups_template;
     
    190190     */
    191191    public function test_bp_has_groups_parent_id_null() {
    192         $g1 = $this->factory->group->create();
    193         $g2 = $this->factory->group->create( array(
     192        $g1 = self::factory()->group->create();
     193        $g2 = self::factory()->group->create( array(
    194194            'parent_id' => $g1,
    195195        ) );
    196         $g3 = $this->factory->group->create( array(
     196        $g3 = self::factory()->group->create( array(
    197197            'parent_id' => $g2,
    198198        ) );
    199         $g4 = $this->factory->group->create();
     199        $g4 = self::factory()->group->create();
    200200
    201201        global $groups_template;
     
    212212     */
    213213    public function test_bp_has_groups_parent_id_top_level_groups() {
    214         $g1 = $this->factory->group->create();
    215         $g2 = $this->factory->group->create( array(
     214        $g1 = self::factory()->group->create();
     215        $g2 = self::factory()->group->create( array(
    216216            'parent_id' => $g1,
    217217        ) );
    218         $g3 = $this->factory->group->create( array(
     218        $g3 = self::factory()->group->create( array(
    219219            'parent_id' => $g2,
    220220        ) );
    221         $g4 = $this->factory->group->create();
     221        $g4 = self::factory()->group->create();
    222222
    223223        global $groups_template;
     
    234234     */
    235235    public function test_bp_has_groups_parent_id_top_level_groups_using_false() {
    236         $g1 = $this->factory->group->create();
    237         $g2 = $this->factory->group->create( array(
     236        $g1 = self::factory()->group->create();
     237        $g2 = self::factory()->group->create( array(
    238238            'parent_id' => $g1,
    239239        ) );
    240         $g3 = $this->factory->group->create( array(
     240        $g3 = self::factory()->group->create( array(
    241241            'parent_id' => $g2,
    242242        ) );
    243         $g4 = $this->factory->group->create();
     243        $g4 = self::factory()->group->create();
    244244
    245245        global $groups_template;
     
    256256     */
    257257    public function test_bp_group_has_members_vanilla() {
    258         $u1 = $this->factory->user->create();
    259         $u2 = $this->factory->user->create();
    260         $g  = $this->factory->group->create( array(
     258        $u1 = self::factory()->user->create();
     259        $u2 = self::factory()->user->create();
     260        $g  = self::factory()->group->create( array(
    261261            'creator_id' => $u1,
    262262        ) );
     
    284284     */
    285285    public function test_bp_group_has_members_backpat_retval_format() {
    286         $u1 = $this->factory->user->create();
    287         $u2 = $this->factory->user->create();
    288         $g = $this->factory->group->create( array( 'creator_id' => $u2 ) );
     286        $u1 = self::factory()->user->create();
     287        $u2 = self::factory()->user->create();
     288        $g = self::factory()->group->create( array( 'creator_id' => $u2 ) );
    289289
    290290        $date_modified = gmdate( 'Y-m-d H:i:s', time() - 100 );
     
    324324     */
    325325    public function test_bp_group_has_members_with_per_page() {
    326         $g = $this->factory->group->create();
     326        $g = self::factory()->group->create();
    327327
    328328        $users = array();
    329329        for ( $i = 1; $i <= 5; $i++ ) {
    330             $users[ $i ] = $this->factory->user->create();
     330            $users[ $i ] = self::factory()->user->create();
    331331        }
    332332
     
    362362     */
    363363    public function test_bp_group_has_members_with_max() {
    364         $g = $this->factory->group->create();
     364        $g = self::factory()->group->create();
    365365
    366366        $users = array();
    367367        for ( $i = 1; $i <= 5; $i++ ) {
    368             $users[ $i ] = $this->factory->user->create();
     368            $users[ $i ] = self::factory()->user->create();
    369369        }
    370370
     
    388388     */
    389389    public function test_bp_group_has_members_with_exclude() {
    390         $g = $this->factory->group->create();
    391         $u1 = $this->factory->user->create();
    392         $u2 = $this->factory->user->create();
     390        $g = self::factory()->group->create();
     391        $u1 = self::factory()->user->create();
     392        $u2 = self::factory()->user->create();
    393393
    394394        $this->add_user_to_group( $u1, $g );
     
    409409     */
    410410    public function test_bp_group_has_members_with_exclude_admins_mods_1() {
    411         $g = $this->factory->group->create();
    412         $u1 = $this->factory->user->create();
    413         $u2 = $this->factory->user->create();
    414         $u3 = $this->factory->user->create();
     411        $g = self::factory()->group->create();
     412        $u1 = self::factory()->user->create();
     413        $u2 = self::factory()->user->create();
     414        $u3 = self::factory()->user->create();
    415415
    416416        $this->add_user_to_group( $u1, $g );
     
    437437     */
    438438    public function test_bp_group_has_members_with_exclude_admins_mods_0() {
    439         $u1 = $this->factory->user->create();
    440         $u2 = $this->factory->user->create();
    441         $u3 = $this->factory->user->create();
    442         $g = $this->factory->group->create( array(
     439        $u1 = self::factory()->user->create();
     440        $u2 = self::factory()->user->create();
     441        $u3 = self::factory()->user->create();
     442        $g = self::factory()->group->create( array(
    443443            'creator_id' => $u1,
    444444        ) );
     
    471471     */
    472472    public function test_bp_group_has_members_with_exclude_banned_1() {
    473         $g = $this->factory->group->create();
    474         $u1 = $this->factory->user->create();
    475         $u2 = $this->factory->user->create();
     473        $g = self::factory()->group->create();
     474        $u1 = self::factory()->user->create();
     475        $u2 = self::factory()->user->create();
    476476
    477477        $this->add_user_to_group( $u1, $g );
     
    495495     */
    496496    public function test_bp_group_has_members_with_exclude_banned_0() {
    497         $u1 = $this->factory->user->create();
    498         $u2 = $this->factory->user->create();
    499         $u3 = $this->factory->user->create();
    500 
    501         $g = $this->factory->group->create( array(
     497        $u1 = self::factory()->user->create();
     498        $u2 = self::factory()->user->create();
     499        $u3 = self::factory()->user->create();
     500
     501        $g = self::factory()->group->create( array(
    502502            'creator_id' => $u1,
    503503        ) );
     
    533533    public function test_bp_group_has_members_default_order() {
    534534        $now = time();
    535         $u1 = $this->factory->user->create( array(
     535        $u1 = self::factory()->user->create( array(
    536536            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ),
    537537        ) );
    538         $u2 = $this->factory->user->create( array(
     538        $u2 = self::factory()->user->create( array(
    539539            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 600 ),
    540540        ) );
    541         $u3 = $this->factory->user->create( array(
     541        $u3 = self::factory()->user->create( array(
    542542            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 6000 ),
    543543        ) );
    544544
    545         $g = $this->factory->group->create( array(
     545        $g = self::factory()->group->create( array(
    546546            'creator_id' => $u1,
    547547        ) );
     
    572572    public function test_bp_group_has_invites_template_structure() {
    573573        $now = time();
    574         $u1 = $this->factory->user->create( array(
     574        $u1 = self::factory()->user->create( array(
    575575            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ),
    576576        ) );
    577         $u2 = $this->factory->user->create( array(
     577        $u2 = self::factory()->user->create( array(
    578578            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 600 ),
    579579        ) );
    580         $u3 = $this->factory->user->create( array(
     580        $u3 = self::factory()->user->create( array(
    581581            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 6000 ),
    582582        ) );
    583         $u4 = $this->factory->user->create( array(
     583        $u4 = self::factory()->user->create( array(
    584584            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60000 ),
    585585        ) );
    586586
    587587
    588         $g = $this->factory->group->create( array(
     588        $g = self::factory()->group->create( array(
    589589            'creator_id' => $u1,
    590590        ) );
     
    652652     */
    653653    public function test_bp_group_has_invites_pagination() {
    654         $u1 = $this->factory->user->create( array(
     654        $u1 = self::factory()->user->create( array(
    655655            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 60 ),
    656656        ) );
    657657
    658         $g = $this->factory->group->create( array(
     658        $g = self::factory()->group->create( array(
    659659            'creator_id' => $u1,
    660660        ) );
     
    663663        $now = time();
    664664        for ( $i = 1; $i < 6; $i++ ) {
    665             $users[ $i ] = $this->factory->user->create( array(
     665            $users[ $i ] = self::factory()->user->create( array(
    666666                'last_activity' => gmdate( 'Y-m-d H:i:s', $now - $i ),
    667667            ) );
     
    696696    public function test_bp_group_has_membership_requests_results() {
    697697        $now = time();
    698         $u1 = $this->factory->user->create( array(
     698        $u1 = self::factory()->user->create( array(
    699699            'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ),
    700700        ) );
    701701
    702         $g = $this->factory->group->create( array(
     702        $g = self::factory()->group->create( array(
    703703            'creator_id' => $u1,
    704704        ) );
     
    707707        $memberships = array();
    708708        for ( $i = 1; $i < 5; $i++ ) {
    709             $users[ $i ] = $this->factory->user->create( array(
     709            $users[ $i ] = self::factory()->user->create( array(
    710710                'last_activity' => gmdate( 'Y-m-d H:i:s', $now - ( 100 - $i ) ),
    711711            ) );
     
    761761     */
    762762    public function test_bp_group_has_membership_requests_format() {
    763         $u1 = $this->factory->user->create( array(
     763        $u1 = self::factory()->user->create( array(
    764764            'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 60 ),
    765765        ) );
    766766
    767         $g = $this->factory->group->create( array(
     767        $g = self::factory()->group->create( array(
    768768            'creator_id' => $u1,
    769769        ) );
     
    771771        $time = time();
    772772
    773         $user = $this->factory->user->create( array(
     773        $user = self::factory()->user->create( array(
    774774            'last_activity' => gmdate( 'Y-m-d H:i:s', $time ),
    775775        ) );
     
    830830    public function test_bp_group_is_user_banned_in_groups_loop() {
    831831        $now = time();
    832         $u1 = $this->factory->user->create( array(
     832        $u1 = self::factory()->user->create( array(
    833833            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    834834        ) );
    835         $u2 = $this->factory->user->create( array(
     835        $u2 = self::factory()->user->create( array(
    836836            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    837837        ) );
    838838
    839         $g1 = $this->factory->group->create( array(
     839        $g1 = self::factory()->group->create( array(
    840840            'creator_id' => $u1,
    841841            'last_activity' => $now - 100,
    842842        ) );
    843         $g2 = $this->factory->group->create( array(
     843        $g2 = self::factory()->group->create( array(
    844844            'creator_id' => $u2,
    845845            'last_activity' => $now - 200,
     
    883883    public function test_bp_group_is_user_banned_not_in_groups_loop() {
    884884        $now = time();
    885         $u1 = $this->factory->user->create( array(
     885        $u1 = self::factory()->user->create( array(
    886886            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    887887        ) );
    888         $u2 = $this->factory->user->create( array(
     888        $u2 = self::factory()->user->create( array(
    889889            'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ),
    890890        ) );
    891         $g1 = $this->factory->group->create( array( 'creator_id' => $u1 ) );
    892         $g2 = $this->factory->group->create( array( 'creator_id' => $u2 ) );
     891        $g1 = self::factory()->group->create( array( 'creator_id' => $u1 ) );
     892        $g2 = self::factory()->group->create( array( 'creator_id' => $u2 ) );
    893893
    894894        $this->add_user_to_group( $u1, $g2, array(
  • trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php

    r11091 r11737  
    3131     */
    3232    public function test_private_group_where_logged_in_user_has_not_requested_membership_but_has_been_invited() {
    33         $users = $this->factory->user->create_many( 2 );
    34         $g = $this->factory->group->create( array( 'status' => 'private' ) );
     33        $users = self::factory()->user->create_many( 2 );
     34        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    3535
    3636        $this->set_current_user( $users[0] );
     
    5757     */
    5858    public function test_private_group_where_logged_in_user_has_not_requested_membership_and_has_not_been_invited() {
    59         $u = $this->factory->user->create();
    60         $g = $this->factory->group->create( array( 'status' => 'private' ) );
     59        $u = self::factory()->user->create();
     60        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    6161
    6262        $this->set_current_user( $u );
     
    7777     */
    7878    public function test_private_group_visited_by_a_non_logged_in_user() {
    79         $g = $this->factory->group->create( array( 'status' => 'private' ) );
     79        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    8080
    8181        if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) {
     
    9494     */
    9595    public function test_private_group_where_loggedin_user_has_requested_membership() {
    96         $u = $this->factory->user->create();
    97         $g = $this->factory->group->create( array( 'status' => 'private' ) );
     96        $u = self::factory()->user->create();
     97        $g = self::factory()->group->create( array( 'status' => 'private' ) );
    9898
    9999        $this->set_current_user( $u );
     
    116116     */
    117117    public function test_hidden_group() {
    118         $u = $this->factory->user->create();
    119         $g = $this->factory->group->create( array( 'status' => 'hidden' ) );
     118        $u = self::factory()->user->create();
     119        $g = self::factory()->group->create( array( 'status' => 'hidden' ) );
    120120
    121121        $this->set_current_user( $u );
     
    133133     */
    134134    public function test_group_parameter_should_be_obeyed() {
    135         $u = $this->factory->user->create();
    136         $groups = $this->factory->group->create_many( 2, array( 'status' => 'private' ) );
     135        $u = self::factory()->user->create();
     136        $groups = self::factory()->group->create_many( 2, array( 'status' => 'private' ) );
    137137
    138138        $this->set_current_user( $u );
  • trunk/tests/phpunit/testcases/groups/types.php

    r11144 r11737  
    107107
    108108    public function test_groups_set_type_success() {
    109         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     109        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    110110        bp_groups_register_group_type( 'foo' );
    111111
     
    114114
    115115    public function test_groups_set_type_should_remove_type_when_passing_an_empty_value() {
    116         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     116        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    117117        bp_groups_register_group_type( 'foo' );
    118118        bp_groups_set_group_type( $g, 'foo' );
     
    126126
    127127    public function test_groups_get_type_with_default_value_for_single() {
    128         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     128        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    129129        bp_groups_register_group_type( 'foo' );
    130130        bp_groups_register_group_type( 'bar' );
     
    136136
    137137    public function test_groups_get_type_with_single_true() {
    138         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     138        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    139139        bp_groups_register_group_type( 'foo' );
    140140        bp_groups_register_group_type( 'bar' );
     
    146146
    147147    public function test_groups_get_type_with_single_false() {
    148         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     148        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    149149        bp_groups_register_group_type( 'foo' );
    150150        bp_groups_register_group_type( 'bar' );
     
    156156
    157157    public function test_groups_get_type_should_return_false_when_no_value_is_found() {
    158         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     158        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    159159        bp_groups_register_group_type( 'foo' );
    160160
     
    171171
    172172    public function test_groups_remove_type_should_return_false_when_group_is_not_of_provided_type() {
    173         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     173        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    174174        bp_groups_register_group_type( 'foo' );
    175175        bp_groups_register_group_type( 'bar' );
     
    181181
    182182    public function tests_groups_remove_type_should_return_true_on_successful_deletion() {
    183         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     183        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    184184        bp_groups_register_group_type( 'foo' );
    185185        bp_groups_register_group_type( 'bar' );
     
    206206
    207207    public function test_groups_has_type_should_return_false_when_group_is_not_of_provided_type() {
    208         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     208        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    209209        bp_groups_register_group_type( 'foo' );
    210210        bp_groups_register_group_type( 'bar' );
     
    215215
    216216    public function test_groups_has_type_should_return_true_on_success() {
    217         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     217        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    218218        bp_groups_register_group_type( 'foo' );
    219219        bp_groups_register_group_type( 'bar' );
     
    229229     */
    230230    public function test_groups_get_type_should_hit_cache() {
    231         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     231        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    232232        bp_groups_register_group_type( 'foo' );
    233233        bp_groups_set_group_type( $g, 'foo' );
     
    254254
    255255    public function test_groups_get_type_should_not_return_unregistered_types() {
    256         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     256        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    257257        bp_groups_register_group_type( 'foo' );
    258258        bp_groups_set_group_type( $g, 'foo' );
     
    291291
    292292    public function test_bp_groups_set_group_type_should_remove_types_when_passing_an_empty_value() {
    293         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     293        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    294294        bp_groups_register_group_type( 'foo' );
    295295        bp_groups_set_group_type( $g, 'foo' );
     
    303303
    304304    public function test_bp_groups_set_group_type_should_set_multiple_types_when_passing_array_of_types() {
    305         $g = $this->factory->group->create( array( 'creator_id' => self::$u1 ) );
     305        $g = self::factory()->group->create( array( 'creator_id' => self::$u1 ) );
    306306        bp_groups_register_group_type( 'foo' );
    307307        bp_groups_register_group_type( 'bar' );
  • trunk/tests/phpunit/testcases/members/activity.php

    r9819 r11737  
    1212     */
    1313    public function test_bp_members_format_activity_action_new_member() {
    14         $u = $this->factory->user->create();
    15         $a = $this->factory->activity->create( array(
     14        $u = self::factory()->user->create();
     15        $a = self::factory()->activity->create( array(
    1616            'component' => buddypress()->members->id,
    1717            'type' => 'new_member',
     
    3333        $bp = buddypress();
    3434
    35         $u1 = $this->factory->user->create();
    36         $u2 = $this->factory->user->create();
    37         $u3 = $this->factory->user->create();
     35        $u1 = self::factory()->user->create();
     36        $u2 = self::factory()->user->create();
     37        $u3 = self::factory()->user->create();
    3838
    39         $au1 = $this->factory->activity->create( array(
     39        $au1 = self::factory()->activity->create( array(
    4040            'component' => 'xprofile',
    4141            'type' => 'new_member',
     
    4343        ) );
    4444
    45         $au2 = $this->factory->activity->create( array(
     45        $au2 = self::factory()->activity->create( array(
    4646            'component' => 'xprofile',
    4747            'type' => 'new_member',
     
    4949        ) );
    5050
    51         $au3 = $this->factory->activity->create( array(
     51        $au3 = self::factory()->activity->create( array(
    5252            'component' => 'xprofile',
    5353            'type' => 'new_member',
  • trunk/tests/phpunit/testcases/members/cache.php

    r11706 r11737  
    3232        global $wpdb;
    3333
    34         $u1 = $this->factory->user->create();
    35         $u2 = $this->factory->user->create();
     34        $u1 = self::factory()->user->create();
     35        $u2 = self::factory()->user->create();
    3636
    3737        $time_1 = date( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
  • trunk/tests/phpunit/testcases/members/class-bp-signup.php

    r11639 r11737  
    102102     */
    103103    public function test_get_with_offset() {
    104         $s1 = $this->factory->signup->create();
    105         $s2 = $this->factory->signup->create();
    106         $s3 = $this->factory->signup->create();
     104        $s1 = self::factory()->signup->create();
     105        $s2 = self::factory()->signup->create();
     106        $s3 = self::factory()->signup->create();
    107107
    108108        $ss = BP_Signup::get( array(
     
    117117     */
    118118    public function test_get_with_number() {
    119         $s1 = $this->factory->signup->create();
    120         $s2 = $this->factory->signup->create();
    121         $s3 = $this->factory->signup->create();
     119        $s1 = self::factory()->signup->create();
     120        $s2 = self::factory()->signup->create();
     121        $s3 = self::factory()->signup->create();
    122122
    123123        $ss = BP_Signup::get( array(
     
    132132     */
    133133    public function test_get_with_usersearch() {
    134         $s1 = $this->factory->signup->create( array(
     134        $s1 = self::factory()->signup->create( array(
    135135            'user_email' => 'fghij@example.com',
    136136        ) );
    137         $s2 = $this->factory->signup->create();
    138         $s3 = $this->factory->signup->create();
     137        $s2 = self::factory()->signup->create();
     138        $s3 = self::factory()->signup->create();
    139139
    140140        $ss = BP_Signup::get( array(
     
    149149     */
    150150    public function test_get_with_orderby_email() {
    151         $s1 = $this->factory->signup->create( array(
     151        $s1 = self::factory()->signup->create( array(
    152152            'user_email' => 'fghij@example.com',
    153153        ) );
    154         $s2 = $this->factory->signup->create( array(
     154        $s2 = self::factory()->signup->create( array(
    155155            'user_email' => 'abcde@example.com',
    156156        ) );
    157         $s3 = $this->factory->signup->create( array(
     157        $s3 = self::factory()->signup->create( array(
    158158            'user_email' => 'zzzzz@example.com',
    159159        ) );
     
    172172     */
    173173    public function test_get_with_orderby_email_asc() {
    174         $s1 = $this->factory->signup->create( array(
     174        $s1 = self::factory()->signup->create( array(
    175175            'user_email' => 'fghij@example.com',
    176176        ) );
    177         $s2 = $this->factory->signup->create( array(
     177        $s2 = self::factory()->signup->create( array(
    178178            'user_email' => 'abcde@example.com',
    179179        ) );
    180         $s3 = $this->factory->signup->create( array(
     180        $s3 = self::factory()->signup->create( array(
    181181            'user_email' => 'zzzzz@example.com',
    182182        ) );
     
    195195     */
    196196    public function test_get_with_include() {
    197         $s1 = $this->factory->signup->create();
    198         $s2 = $this->factory->signup->create();
    199         $s3 = $this->factory->signup->create();
     197        $s1 = self::factory()->signup->create();
     198        $s2 = self::factory()->signup->create();
     199        $s3 = self::factory()->signup->create();
    200200
    201201        $ss = BP_Signup::get( array(
     
    210210     */
    211211    public function test_get_with_activation_key() {
    212         $s1 = $this->factory->signup->create( array(
     212        $s1 = self::factory()->signup->create( array(
    213213            'activation_key' => 'foo',
    214214        ) );
    215         $s2 = $this->factory->signup->create( array(
     215        $s2 = self::factory()->signup->create( array(
    216216            'activation_key' => 'bar',
    217217        ) );
    218         $s3 = $this->factory->signup->create( array(
     218        $s3 = self::factory()->signup->create( array(
    219219            'activation_key' => 'baz',
    220220        ) );
     
    231231     */
    232232    public function test_get_with_user_login() {
    233         $s1 = $this->factory->signup->create( array(
     233        $s1 = self::factory()->signup->create( array(
    234234            'user_login' => 'aaaafoo',
    235235        ) );
    236         $s2 = $this->factory->signup->create( array(
     236        $s2 = self::factory()->signup->create( array(
    237237            'user_login' => 'zzzzfoo',
    238238        ) );
    239         $s3 = $this->factory->signup->create( array(
     239        $s3 = self::factory()->signup->create( array(
    240240            'user_login' => 'jjjjfoo',
    241241        ) );
     
    254254        $signups = array();
    255255
    256         $signups['accountone'] = $this->factory->signup->create( array(
     256        $signups['accountone'] = self::factory()->signup->create( array(
    257257            'user_login'     => 'accountone',
    258258            'user_email'     => 'accountone@example.com',
     
    260260        ) );
    261261
    262         $signups['accounttwo'] = $this->factory->signup->create( array(
     262        $signups['accounttwo'] = self::factory()->signup->create( array(
    263263            'user_login'     => 'accounttwo',
    264264            'user_email'     => 'accounttwo@example.com',
     
    266266        ) );
    267267
    268         $signups['accountthree'] = $this->factory->signup->create( array(
     268        $signups['accountthree'] = self::factory()->signup->create( array(
    269269            'user_login'     => 'accountthree',
    270270            'user_email'     => 'accountthree@example.com',
     
    297297
    298298        // Can't trust this first signup :(
    299         $signups['testpath1'] = $this->factory->signup->create( array(
     299        $signups['testpath1'] = self::factory()->signup->create( array(
    300300            'user_login'     => 'testpath1',
    301301            'user_email'     => 'blogone@example.com',
     
    306306        ) );
    307307
    308         $signups['blogtwo'] = $this->factory->signup->create( array(
     308        $signups['blogtwo'] = self::factory()->signup->create( array(
    309309            'user_login'     => 'blogtwo',
    310310            'user_email'     => 'blogtwo@example.com',
     
    315315        ) );
    316316
    317         $signups['blogthree'] = $this->factory->signup->create( array(
     317        $signups['blogthree'] = self::factory()->signup->create( array(
    318318            'user_login'     => 'blogthree',
    319319            'user_email'     => 'blogthree@example.com',
     
    324324        ) );
    325325
    326         $signups['blogfour'] = $this->factory->signup->create( array(
     326        $signups['blogfour'] = self::factory()->signup->create( array(
    327327            'user_login'     => 'blogfour',
    328328            'user_email'     => 'blogfour@example.com',
  • trunk/tests/phpunit/testcases/members/functions.php

    r11217 r11737  
    1515
    1616        // Create an admin for testing
    17         $admin_user = $this->factory->user->create( array( 'role' => 'administrator' ) );
     17        $admin_user = self::factory()->user->create( array( 'role' => 'administrator' ) );
    1818        $this->grant_super_admin( $admin_user );
    1919
    2020        // 1. Admin can delete user account
    2121        $this->set_current_user( $admin_user );
    22         $user1 = $this->factory->user->create( array( 'role' => 'subscriber' ) );
     22        $user1 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
    2323        bp_core_delete_account( $user1 );
    2424        $maybe_user = new WP_User( $user1 );
     
    2828
    2929        // 2. Admin cannot delete superadmin account
    30         $user2 = $this->factory->user->create( array( 'role' => 'administrator' ) );
     30        $user2 = self::factory()->user->create( array( 'role' => 'administrator' ) );
    3131        $this->grant_super_admin( $user2 );
    3232        bp_core_delete_account( $user2 );
     
    3636
    3737        // User cannot delete other's account
    38         $user3 = $this->factory->user->create( array( 'role' => 'subscriber' ) );
    39         $user4 = $this->factory->user->create( array( 'role' => 'subscriber' ) );
     38        $user3 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
     39        $user4 = self::factory()->user->create( array( 'role' => 'subscriber' ) );
    4040        $this->set_current_user( $user3 );
    4141        bp_core_delete_account( $user4 );
     
    5555    public function test_bp_core_get_user_domain_after_directory_page_update() {
    5656        // Generate user
    57         $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
     57        $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
    5858
    5959        // Set object cache first for user domain
     
    8484     */
    8585    public function test_bp_core_get_user_displayname_translate_username() {
    86         $u = $this->factory->user->create();
     86        $u = self::factory()->user->create();
    8787
    8888        $user = new WP_User( $u );
     
    108108        buddypress()->active_components['xprofile'] = '1';
    109109
    110         $u = $this->factory->user->create( array(
     110        $u = self::factory()->user->create( array(
    111111            'display_name' => 'Foo',
    112112        ) );
     
    128128        buddypress()->active_components['xprofile'] = '1';
    129129
    130         $u = $this->factory->user->create();
     130        $u = self::factory()->user->create();
    131131        xprofile_set_field_data( 1, $u, 'Foo Foo' );
    132132
     
    145145        buddypress()->active_components['xprofile'] = '1';
    146146
    147         $u = $this->factory->user->create();
     147        $u = self::factory()->user->create();
    148148        xprofile_set_field_data( 1, $u, 'Foo Foo' );
    149149
     
    163163        $bp->active_components['xprofile'] = '1';
    164164
    165         $u = $this->factory->user->create( array(
     165        $u = self::factory()->user->create( array(
    166166            'display_name' => 'Foo Foo',
    167167        ) );
     
    194194     */
    195195    public function test_bp_core_get_user_displaynames_all_uncached() {
    196         $u1 = $this->factory->user->create();
    197         $u2 = $this->factory->user->create();
     196        $u1 = self::factory()->user->create();
     197        $u2 = self::factory()->user->create();
    198198
    199199        xprofile_set_field_data( 1, $u1, 'Foo' );
     
    212212     */
    213213    public function test_bp_core_get_user_displaynames_one_not_in_xprofile() {
    214         $u1 = $this->factory->user->create();
    215         $u2 = $this->factory->user->create( array(
     214        $u1 = self::factory()->user->create();
     215        $u2 = self::factory()->user->create( array(
    216216            'display_name' => 'Bar',
    217217        ) );
     
    239239     */
    240240    public function test_bp_core_get_user_displaynames_one_in_cache() {
    241         $u1 = $this->factory->user->create();
     241        $u1 = self::factory()->user->create();
    242242        xprofile_set_field_data( 1, $u1, 'Foo' );
    243243
     
    258258     */
    259259    public function test_bp_members_migrate_signups_standard() {
    260         $u = $this->factory->user->create();
     260        $u = self::factory()->user->create();
    261261        $u_obj = new WP_User( $u );
    262262
     
    292292     */
    293293    public function test_bp_members_migrate_signups_activation_key_but_user_status_0() {
    294         $u = $this->factory->user->create();
     294        $u = self::factory()->user->create();
    295295        $u_obj = new WP_User( $u );
    296296
     
    323323     */
    324324    public function test_bp_members_migrate_signups_no_activation_key_but_user_status_2() {
    325         $u = $this->factory->user->create();
     325        $u = self::factory()->user->create();
    326326        $u_obj = new WP_User( $u );
    327327
     
    353353        // We explicitly do not want last_activity created, so use the
    354354        // WP factory methods
    355         $u1 = $this->factory->user->create();
    356         $u2 = $this->factory->user->create();
    357         $u3 = $this->factory->user->create();
     355        $u1 = self::factory()->user->create();
     356        $u2 = self::factory()->user->create();
     357        $u3 = self::factory()->user->create();
    358358
    359359        $time = time();
     
    414414        // We explicitly do not want last_activity created, so use the
    415415        // WP factory methods
    416         $user = $this->factory->user->create();
     416        $user = self::factory()->user->create();
    417417        $time = date( 'Y-m-d H:i:s', time() - 50 );
    418418
     
    449449        $displayed_user = $bp->displayed_user;
    450450
    451         $u1 = $this->factory->user->create();
     451        $u1 = self::factory()->user->create();
    452452        $bp->displayed_user->id = $u1;
    453453
     
    477477        $displayed_user = $bp->displayed_user;
    478478
    479         $u1 = $this->factory->user->create();
     479        $u1 = self::factory()->user->create();
    480480        $bp->displayed_user->id = $u1;
    481481
     
    505505        $displayed_user = $bp->displayed_user;
    506506
    507         $u1 = $this->factory->user->create();
     507        $u1 = self::factory()->user->create();
    508508        $bp->displayed_user->id = $u1;
    509509
     
    528528        add_filter( 'make_spam_user', array( $this, 'notification_filter_callback' ) );
    529529
    530         $u1 = $this->factory->user->create();
     530        $u1 = self::factory()->user->create();
    531531        $n = bp_core_process_spammer_status( $u1, 'spam' );
    532532
     
    540540        add_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) );
    541541
    542         $u1 = $this->factory->user->create();
     542        $u1 = self::factory()->user->create();
    543543        $n = bp_core_process_spammer_status( $u1, 'ham' );
    544544
     
    552552        add_filter( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) );
    553553
    554         $u1 = $this->factory->user->create();
     554        $u1 = self::factory()->user->create();
    555555        $n = bp_core_process_spammer_status( $u1, 'spam' );
    556556
     
    564564        add_filter( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) );
    565565
    566         $u1 = $this->factory->user->create();
     566        $u1 = self::factory()->user->create();
    567567        $n = bp_core_process_spammer_status( $u1, 'ham' );
    568568
     
    597597
    598598        $signups = array( 'no-blog' =>
    599             array( 'signup_id' => $this->factory->signup->create( array(
     599            array( 'signup_id' => self::factory()->signup->create( array(
    600600                    'user_login'     => 'noblog',
    601601                    'user_email'     => 'noblog@example.com',
     
    611611
    612612        if ( is_multisite() ) {
    613             $signups['ms-blog'] = array( 'signup_id' => $this->factory->signup->create( array(
     613            $signups['ms-blog'] = array( 'signup_id' => self::factory()->signup->create( array(
    614614                    'user_login'     => 'msblog',
    615615                    'user_email'     => 'msblog@example.com',
  • trunk/tests/phpunit/testcases/members/template.php

    r10382 r11737  
    55class BP_Tests_Members_Template extends BP_UnitTestCase {
    66    public function test_bp_has_members_include_on_user_page() {
    7         $u1 = $this->factory->user->create();
    8         $u2 = $this->factory->user->create();
     7        $u1 = self::factory()->user->create();
     8        $u2 = self::factory()->user->create();
    99
    1010        $this->go_to( bp_core_get_user_domain( $u1 ) );
     
    3030     */
    3131    public function test_bp_has_members_search_pagination_with_spaces() {
    32         $u1 = $this->factory->user->create( array( 'display_name' => '~ tilde u1' ) );
    33         $u2 = $this->factory->user->create( array( 'display_name' => '~ tilde u2' ) );
     32        $u1 = self::factory()->user->create( array( 'display_name' => '~ tilde u1' ) );
     33        $u2 = self::factory()->user->create( array( 'display_name' => '~ tilde u2' ) );
    3434
    3535        $template_args = array(
     
    5252
    5353    public function test_bp_has_members_friendship_requests() {
    54         $u1 = $this->factory->user->create();
    55         $u2 = $this->factory->user->create();
     54        $u1 = self::factory()->user->create();
     55        $u2 = self::factory()->user->create();
    5656
    5757        friends_add_friend( $u1, $u2 );
     
    8181     */
    8282    public function test_bp_has_members_friendship_requests_with_no_requests() {
    83         $u1 = $this->factory->user->create();
    84         $u2 = $this->factory->user->create();
     83        $u1 = self::factory()->user->create();
     84        $u2 = self::factory()->user->create();
    8585
    8686        $old_user = get_current_user_id();
     
    114114        bp_register_member_type( 'foo' );
    115115        bp_register_member_type( 'bar' );
    116         $users = $this->factory->user->create_many( 3 );
     116        $users = self::factory()->user->create_many( 3 );
    117117        bp_set_member_type( $users[0], 'foo' );
    118118        bp_set_member_type( $users[1], 'bar' );
     
    139139        bp_register_member_type( 'foo' );
    140140        bp_register_member_type( 'bar' );
    141         $users = $this->factory->user->create_many( 3 );
     141        $users = self::factory()->user->create_many( 3 );
    142142        bp_set_member_type( $users[0], 'foo' );
    143143        bp_set_member_type( $users[1], 'bar' );
     
    166166        bp_register_member_type( 'bar' );
    167167        bp_register_member_type( 'baz' );
    168         $users = $this->factory->user->create_many( 4 );
     168        $users = self::factory()->user->create_many( 4 );
    169169        bp_set_member_type( $users[0], 'foo' );
    170170        bp_set_member_type( $users[1], 'bar' );
  • trunk/tests/phpunit/testcases/members/template/bpGetMemberClass.php

    r10690 r11737  
    1313        bp_register_member_type( 'bar' );
    1414
    15         $u = $this->factory->user->create();
     15        $u = self::factory()->user->create();
    1616        bp_set_member_type( $u, 'bar' );
    1717
  • trunk/tests/phpunit/testcases/members/types.php

    r11110 r11737  
    152152
    153153    public function test_bp_set_member_type_should_remove_member_type_when_passing_an_empty_value() {
    154         $u = $this->factory->user->create();
     154        $u = self::factory()->user->create();
    155155        bp_register_member_type( 'foo' );
    156156        bp_set_member_type( $u, 'foo' );
     
    164164
    165165    public function test_bp_set_member_type_success() {
    166         $u = $this->factory->user->create();
     166        $u = self::factory()->user->create();
    167167        bp_register_member_type( 'foo' );
    168168
     
    171171
    172172    public function test_bp_get_member_type_with_default_value_for_single() {
    173         $u = $this->factory->user->create();
     173        $u = self::factory()->user->create();
    174174        bp_register_member_type( 'foo' );
    175175        bp_register_member_type( 'bar' );
     
    181181
    182182    public function test_bp_get_member_type_with_single_true() {
    183         $u = $this->factory->user->create();
     183        $u = self::factory()->user->create();
    184184        bp_register_member_type( 'foo' );
    185185        bp_register_member_type( 'bar' );
     
    191191
    192192    public function test_bp_get_member_type_with_single_false() {
    193         $u = $this->factory->user->create();
     193        $u = self::factory()->user->create();
    194194        bp_register_member_type( 'foo' );
    195195        bp_register_member_type( 'bar' );
     
    201201
    202202    public function test_bp_get_member_type_should_return_false_when_no_value_is_found() {
    203         $u = $this->factory->user->create();
     203        $u = self::factory()->user->create();
    204204        bp_register_member_type( 'foo' );
    205205
     
    211211     */
    212212    public function test_bp_get_member_type_should_hit_cache() {
    213         $u = $this->factory->user->create();
     213        $u = self::factory()->user->create();
    214214        bp_register_member_type( 'foo' );
    215215        bp_set_member_type( $u, 'foo' );
     
    230230     */
    231231    public function test_bp_members_prefetch_member_type_array_cache_set() {
    232         $u1 = $this->factory->user->create();
    233         $u2 = $this->factory->user->create();
     232        $u1 = self::factory()->user->create();
     233        $u2 = self::factory()->user->create();
    234234        bp_register_member_type( 'foo' );
    235235        bp_register_member_type( 'bar' );
     
    254254     */
    255255    public function test_bp_get_member_type_should_return_false_for_deleted_user() {
    256         $u = $this->factory->user->create();
     256        $u = self::factory()->user->create();
    257257        bp_register_member_type( 'foo' );
    258258        bp_set_member_type( $u, 'foo' );
     
    279279
    280280        // Offset IDs.
    281         $dummy_terms = $this->factory->tag->create_many( 7 );
    282 
    283         $u1 = $this->factory->user->create();
     281        $dummy_terms = self::factory()->tag->create_many( 7 );
     282
     283        $u1 = self::factory()->user->create();
    284284        bp_register_member_type( 'foo' );
    285285        bp_set_member_type( $u1, 'foo' );
     
    289289
    290290        // Make sure the user's ID matches a term ID, to force a cache confusion.
    291         $u2 = $this->factory->user->create();
     291        $u2 = self::factory()->user->create();
    292292        $new_user_id = $terms[0]->term_id;
    293293        $wpdb->update( $wpdb->users, array( 'ID' => $new_user_id ), array( 'ID' => $u2 ) );
     
    319319     */
    320320    public function test_bp_remove_member_type_should_return_false_when_member_is_not_of_provided_type() {
    321         $u1 = $this->factory->user->create();
     321        $u1 = self::factory()->user->create();
    322322        bp_register_member_type( 'foo' );
    323323        bp_register_member_type( 'bar' );
     
    333333     */
    334334    public function test_bp_remove_member_type_should_return_true_for_successful_deletion() {
    335         $u1 = $this->factory->user->create();
     335        $u1 = self::factory()->user->create();
    336336        bp_register_member_type( 'foo' );
    337337        bp_register_member_type( 'bar' );
     
    371371     */
    372372    public function test_bp_has_member_type_should_return_false_when_member_is_not_of_provided_type() {
    373         $u1 = $this->factory->user->create();
     373        $u1 = self::factory()->user->create();
    374374        bp_register_member_type( 'foo' );
    375375        bp_register_member_type( 'bar' );
     
    383383     */
    384384    public function test_bp_has_member_type_should_return_true_on_success() {
    385         $u1 = $this->factory->user->create();
     385        $u1 = self::factory()->user->create();
    386386        bp_register_member_type( 'foo' );
    387387        bp_register_member_type( 'bar' );
     
    395395
    396396    public function test_bp_get_member_type_should_not_return_unregistered_types() {
    397         $u1 = $this->factory->user->create();
     397        $u1 = self::factory()->user->create();
    398398        bp_register_member_type( 'foo' );
    399399        bp_set_member_type( $u1, 'foo' );
  • trunk/tests/phpunit/testcases/messages/cache.php

    r11044 r11737  
    1010     */
    1111    public function test_bp_messages_update_meta_cache() {
    12         $u1 = $this->factory->user->create();
    13         $u2 = $this->factory->user->create();
     12        $u1 = self::factory()->user->create();
     13        $u2 = self::factory()->user->create();
    1414
    1515        // create the thread
    16         $message_1 = $this->factory->message->create_and_get( array(
     16        $message_1 = self::factory()->message->create_and_get( array(
    1717            'sender_id'  => $u1,
    1818            'recipients' => array( $u2 ),
     
    2121
    2222        // create a reply
    23         $message_2 = $this->factory->message->create_and_get( array(
     23        $message_2 = self::factory()->message->create_and_get( array(
    2424            'thread_id'  => $message_1->thread_id,
    2525            'sender_id'  => $u2,
     
    8383     */
    8484    public function test_bp_messages_metadata_cache_in_message_loop() {
    85         $u1 = $this->factory->user->create();
    86         $u2 = $this->factory->user->create();
     85        $u1 = self::factory()->user->create();
     86        $u2 = self::factory()->user->create();
    8787
    8888        // create the message and thread
    89         $m = $this->factory->message->create_and_get( array(
     89        $m = self::factory()->message->create_and_get( array(
    9090            'sender_id'  => $u1,
    9191            'recipients' => array( $u2 ),
     
    112112        $this->old_current_user = get_current_user_id();
    113113
    114         $u1 = $this->factory->user->create();
    115         $u2 = $this->factory->user->create();
     114        $u1 = self::factory()->user->create();
     115        $u2 = self::factory()->user->create();
    116116
    117117        // create the thread
    118         $message_1 = $this->factory->message->create_and_get( array(
     118        $message_1 = self::factory()->message->create_and_get( array(
    119119            'sender_id'  => $u1,
    120120            'recipients' => array( $u2 ),
     
    123123
    124124        // create a reply
    125         $message_2 = $this->factory->message->create_and_get( array(
     125        $message_2 = self::factory()->message->create_and_get( array(
    126126            'thread_id'  => $message_1->thread_id,
    127127            'sender_id'  => $u2,
  • trunk/tests/phpunit/testcases/messages/class.bp-messages-notice.php

    r9819 r11737  
    1111        parent::setUp();
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php

    r11044 r11737  
    1111     */
    1212    public function test_construct_cache() {
    13         $u1 = $this->factory->user->create();
    14         $u2 = $this->factory->user->create();
    15 
    16         $message = $this->factory->message->create_and_get( array(
     13        $u1 = self::factory()->user->create();
     14        $u2 = self::factory()->user->create();
     15
     16        $message = self::factory()->message->create_and_get( array(
    1717            'sender_id' => $u1,
    1818            'recipients' => array( $u2 ),
     
    3535     */
    3636    public function test_construct_order_desc() {
    37         $u1 = $this->factory->user->create();
    38         $u2 = $this->factory->user->create();
     37        $u1 = self::factory()->user->create();
     38        $u2 = self::factory()->user->create();
    3939
    4040        // create thread
    41         $message_1 = $this->factory->message->create_and_get( array(
     41        $message_1 = self::factory()->message->create_and_get( array(
    4242            'sender_id' => $u1,
    4343            'recipients' => array( $u2 ),
     
    4747
    4848        // create reply
    49         $message_2 = $this->factory->message->create_and_get( array(
     49        $message_2 = self::factory()->message->create_and_get( array(
    5050            'thread_id' => $message_1->thread_id,
    5151            'sender_id' => $u1,
     
    6969     */
    7070    public function test_get_current_threads_for_user_with_search_terms_inbox() {
    71         $u1 = $this->factory->user->create();
    72         $u2 = $this->factory->user->create();
    73 
    74         $message_1 = $this->factory->message->create_and_get( array(
    75             'sender_id' => $u1,
    76             'recipients' => array( $u2 ),
    77             'subject' => 'Foo',
    78         ) );
    79 
    80         $message_2 = $this->factory->message->create_and_get( array(
     71        $u1 = self::factory()->user->create();
     72        $u2 = self::factory()->user->create();
     73
     74        $message_1 = self::factory()->message->create_and_get( array(
     75            'sender_id' => $u1,
     76            'recipients' => array( $u2 ),
     77            'subject' => 'Foo',
     78        ) );
     79
     80        $message_2 = self::factory()->message->create_and_get( array(
    8181            'sender_id' => $u1,
    8282            'recipients' => array( $u2 ),
     
    9999     */
    100100    public function test_get_current_threads_for_user_with_search_terms_sentbox() {
    101         $u1 = $this->factory->user->create();
    102         $u2 = $this->factory->user->create();
    103 
    104         $message_1 = $this->factory->message->create_and_get( array(
    105             'sender_id' => $u1,
    106             'recipients' => array( $u2 ),
    107             'subject' => 'Foo',
    108         ) );
    109 
    110         $message_2 = $this->factory->message->create_and_get( array(
     101        $u1 = self::factory()->user->create();
     102        $u2 = self::factory()->user->create();
     103
     104        $message_1 = self::factory()->message->create_and_get( array(
     105            'sender_id' => $u1,
     106            'recipients' => array( $u2 ),
     107            'subject' => 'Foo',
     108        ) );
     109
     110        $message_2 = self::factory()->message->create_and_get( array(
    111111            'sender_id' => $u1,
    112112            'recipients' => array( $u2 ),
     
    131131     */
    132132    public function test_get_current_threads_for_user_with_old_args() {
    133         $u1 = $this->factory->user->create();
    134         $u2 = $this->factory->user->create();
    135 
    136         $message_1 = $this->factory->message->create_and_get( array(
    137             'sender_id' => $u1,
    138             'recipients' => array( $u2 ),
    139             'subject' => 'Foo',
    140         ) );
    141 
    142         $message_2 = $this->factory->message->create_and_get( array(
     133        $u1 = self::factory()->user->create();
     134        $u2 = self::factory()->user->create();
     135
     136        $message_1 = self::factory()->message->create_and_get( array(
     137            'sender_id' => $u1,
     138            'recipients' => array( $u2 ),
     139            'subject' => 'Foo',
     140        ) );
     141
     142        $message_2 = self::factory()->message->create_and_get( array(
    143143            'sender_id' => $u1,
    144144            'recipients' => array( $u2 ),
     
    161161        global $wpdb;
    162162
    163         $u1 = $this->factory->user->create();
    164         $u2 = $this->factory->user->create();
    165 
    166         $message = $this->factory->message->create_and_get( array(
     163        $u1 = self::factory()->user->create();
     164        $u2 = self::factory()->user->create();
     165
     166        $message = self::factory()->message->create_and_get( array(
    167167            'sender_id' => $u1,
    168168            'recipients' => array( $u2 ),
     
    187187        global $wpdb;
    188188
    189         $u1 = $this->factory->user->create();
    190         $u2 = $this->factory->user->create();
    191 
    192         $message = $this->factory->message->create_and_get( array(
     189        $u1 = self::factory()->user->create();
     190        $u2 = self::factory()->user->create();
     191
     192        $message = self::factory()->message->create_and_get( array(
    193193            'sender_id' => $u1,
    194194            'recipients' => array( $u2 ),
     
    225225        global $wpdb;
    226226
    227         $u1 = $this->factory->user->create();
    228         $u2 = $this->factory->user->create();
    229 
    230         $message = $this->factory->message->create_and_get( array(
     227        $u1 = self::factory()->user->create();
     228        $u2 = self::factory()->user->create();
     229
     230        $message = self::factory()->message->create_and_get( array(
    231231            'sender_id' => $u1,
    232232            'recipients' => array( $u2 ),
     
    257257        global $wpdb;
    258258
    259         $u1 = $this->factory->user->create();
    260         $u2 = $this->factory->user->create();
    261 
    262         $message = $this->factory->message->create_and_get( array(
     259        $u1 = self::factory()->user->create();
     260        $u2 = self::factory()->user->create();
     261
     262        $message = self::factory()->message->create_and_get( array(
    263263            'sender_id' => $u1,
    264264            'recipients' => array( $u2 ),
     
    289289        global $wpdb;
    290290
    291         $u1 = $this->factory->user->create();
    292         $u2 = $this->factory->user->create();
    293 
    294         $message = $this->factory->message->create_and_get( array(
     291        $u1 = self::factory()->user->create();
     292        $u2 = self::factory()->user->create();
     293
     294        $message = self::factory()->message->create_and_get( array(
    295295            'sender_id' => $u1,
    296296            'recipients' => array( $u2 ),
     
    326326        global $wpdb;
    327327
    328         $u1 = $this->factory->user->create();
    329         $u2 = $this->factory->user->create();
    330 
    331         $message = $this->factory->message->create_and_get( array(
     328        $u1 = self::factory()->user->create();
     329        $u2 = self::factory()->user->create();
     330
     331        $message = self::factory()->message->create_and_get( array(
    332332            'sender_id' => $u1,
    333333            'recipients' => array( $u2 ),
     
    360360     */
    361361    public function test_check_access_valid_thread() {
    362         $u1 = $this->factory->user->create();
    363         $u2 = $this->factory->user->create();
    364 
    365         $message = $this->factory->message->create_and_get( array(
     362        $u1 = self::factory()->user->create();
     363        $u2 = self::factory()->user->create();
     364
     365        $message = self::factory()->message->create_and_get( array(
    366366            'sender_id' => $u1,
    367367            'recipients' => array( $u2 ),
     
    390390     */
    391391    public function test_is_valid_valid_thread() {
    392         $u1 = $this->factory->user->create();
    393         $u2 = $this->factory->user->create();
    394 
    395         $message = $this->factory->message->create_and_get( array(
     392        $u1 = self::factory()->user->create();
     393        $u2 = self::factory()->user->create();
     394
     395        $message = self::factory()->message->create_and_get( array(
    396396            'sender_id' => $u1,
    397397            'recipients' => array( $u2 ),
     
    415415     */
    416416    public function test_last_message_populated() {
    417         $u1 = $this->factory->user->create();
    418         $u2 = $this->factory->user->create();
     417        $u1 = self::factory()->user->create();
     418        $u2 = self::factory()->user->create();
    419419
    420420        $date = bp_core_current_time();
    421421
    422         $message = $this->factory->message->create_and_get( array(
     422        $message = self::factory()->message->create_and_get( array(
    423423            'sender_id' => $u1,
    424424            'recipients' => array( $u2 ),
  • trunk/tests/phpunit/testcases/messages/functions.php

    r10585 r11737  
    1111     */
    1212    public function test_get_unread_count() {
    13         $u1 = $this->factory->user->create();
    14         $u2 = $this->factory->user->create();
     13        $u1 = self::factory()->user->create();
     14        $u2 = self::factory()->user->create();
    1515
    1616        // send a private message
     
    4646     */
    4747    public function test_messages_new_message_invalid_recipient_error_message() {
    48         $u1 = $this->factory->user->create();
     48        $u1 = self::factory()->user->create();
    4949
    5050        // attempt to send a private message to an invalid username
     
    6464     */
    6565    public function test_messages_new_message_wp_error_generic() {
    66         $u1 = $this->factory->user->create();
    67         $u2 = $this->factory->user->create();
     66        $u1 = self::factory()->user->create();
     67        $u2 = self::factory()->user->create();
    6868
    6969        // Emulate a plugin disabling messages.
  • trunk/tests/phpunit/testcases/messages/notifications.php

    r9819 r11737  
    2121        // Dummy thread ID
    2222        $t = 12;
    23         $u = $this->factory->user->create();
     23        $u = self::factory()->user->create();
    2424        $this->set_current_user( $u );
    2525
    2626        // Admin
    27         $n = $this->factory->notification->create( array(
     27        $n = self::factory()->notification->create( array(
    2828            'component_name' => 'messages',
    2929            'user_id' => $u,
     
    4545        // Dummy thread ID
    4646        $t = 12;
    47         $u = $this->factory->user->create();
     47        $u = self::factory()->user->create();
    4848        $this->set_current_user( $u );
    4949
    5050        // Admin
    51         $n = $this->factory->notification->create( array(
     51        $n = self::factory()->notification->create( array(
    5252            'component_name' => 'messages',
    5353            'user_id' => $u,
     
    6969        // Dummy thread ID
    7070        $t = 12;
    71         $u = $this->factory->user->create();
     71        $u = self::factory()->user->create();
    7272        $this->set_current_user( $u );
    7373
    7474        // Admin
    75         $n = $this->factory->notification->create( array(
     75        $n = self::factory()->notification->create( array(
    7676            'component_name' => 'messages',
    7777            'user_id' => $u,
     
    9393        // Dummy thread ID
    9494        $t = 12;
    95         $u = $this->factory->user->create();
     95        $u = self::factory()->user->create();
    9696        $this->set_current_user( $u );
    9797
    9898        // Admin
    99         $n = $this->factory->notification->create( array(
     99        $n = self::factory()->notification->create( array(
    100100            'component_name' => 'messages',
    101101            'user_id' => $u,
     
    119119        }
    120120
    121         $u1 = $this->factory->user->create();
    122         $u2 = $this->factory->user->create();
     121        $u1 = self::factory()->user->create();
     122        $u2 = self::factory()->user->create();
    123123
    124124        $t1 = messages_new_message( array(
  • trunk/tests/phpunit/testcases/messages/star.php

    r11044 r11737  
    1111     */
    1212    public function test_is_message_starred() {
    13         $u1 = $this->factory->user->create();
    14         $u2 = $this->factory->user->create();
     13        $u1 = self::factory()->user->create();
     14        $u2 = self::factory()->user->create();
    1515
    1616        // create the thread
    17         $message_1 = $this->factory->message->create_and_get( array(
     17        $message_1 = self::factory()->message->create_and_get( array(
    1818            'sender_id'  => $u1,
    1919            'recipients' => array( $u2 ),
     
    2222
    2323        // create a reply
    24         $message_2 = $this->factory->message->create_and_get( array(
     24        $message_2 = self::factory()->message->create_and_get( array(
    2525            'thread_id'  => $message_1->thread_id,
    2626            'sender_id'  => $u2,
     
    5959     */
    6060    public function test_star_set_action_bulk_unstar() {
    61         $u1 = $this->factory->user->create();
    62         $u2 = $this->factory->user->create();
     61        $u1 = self::factory()->user->create();
     62        $u2 = self::factory()->user->create();
    6363
    6464        // create the thread
    65         $message_1 = $this->factory->message->create_and_get( array(
     65        $message_1 = self::factory()->message->create_and_get( array(
    6666            'sender_id'  => $u1,
    6767            'recipients' => array( $u2 ),
     
    7070
    7171        // create a reply
    72         $message_2 = $this->factory->message->create_and_get( array(
     72        $message_2 = self::factory()->message->create_and_get( array(
    7373            'thread_id'  => $message_1->thread_id,
    7474            'sender_id'  => $u2,
     
    113113    public function test_get_starred_threads_should_not_include_deleted_thread() {
    114114        $old_current_user = get_current_user_id();
    115         $u1 = $this->factory->user->create();
    116         $u2 = $this->factory->user->create();
     115        $u1 = self::factory()->user->create();
     116        $u2 = self::factory()->user->create();
    117117
    118118        // create three threads
    119         $message_1 = $this->factory->message->create_and_get( array(
     119        $message_1 = self::factory()->message->create_and_get( array(
    120120            'sender_id'  => $u1,
    121121            'recipients' => array( $u2 ),
    122122            'subject'    => 'A',
    123123        ) );
    124         $message_2 = $this->factory->message->create_and_get( array(
     124        $message_2 = self::factory()->message->create_and_get( array(
    125125            'sender_id'  => $u1,
    126126            'recipients' => array( $u2 ),
    127127            'subject'    => 'B',
    128128        ) );
    129         $message_3 = $this->factory->message->create_and_get( array(
     129        $message_3 = self::factory()->message->create_and_get( array(
    130130            'sender_id'  => $u1,
    131131            'recipients' => array( $u2 ),
  • trunk/tests/phpunit/testcases/messages/template.php

    r11044 r11737  
    1010     */
    1111    public function test_has_message_threads() {
    12         $u1 = $this->factory->user->create();
    13         $u2 = $this->factory->user->create();
     12        $u1 = self::factory()->user->create();
     13        $u2 = self::factory()->user->create();
    1414
    1515        // create initial thread
    16         $message_1 = $this->factory->message->create_and_get( array(
     16        $message_1 = self::factory()->message->create_and_get( array(
    1717            'sender_id'  => $u1,
    1818            'recipients' => array( $u2 ),
     
    2020
    2121        // create some replies to thread
    22         $message_2 = $this->factory->message->create_and_get( array(
     22        $message_2 = self::factory()->message->create_and_get( array(
    2323            'thread_id' => $message_1->thread_id,
    2424            'sender_id' => $u2,
    2525            'recipients' => array( $u1 ),
    2626        ) );
    27         $message_3 = $this->factory->message->create_and_get( array(
     27        $message_3 = self::factory()->message->create_and_get( array(
    2828            'thread_id' => $message_1->thread_id,
    2929            'sender_id' => $u2,
     
    4343     */
    4444    public function test_has_message_threads_old_args() {
    45         $u1 = $this->factory->user->create();
    46         $u2 = $this->factory->user->create();
     45        $u1 = self::factory()->user->create();
     46        $u2 = self::factory()->user->create();
    4747
    4848        // create initial thread
    49         $message_1 = $this->factory->message->create_and_get( array(
     49        $message_1 = self::factory()->message->create_and_get( array(
    5050            'sender_id'  => $u1,
    5151            'recipients' => array( $u2 ),
     
    5353
    5454        // create some replies to thread
    55         $message_2 = $this->factory->message->create_and_get( array(
     55        $message_2 = self::factory()->message->create_and_get( array(
    5656            'thread_id' => $message_1->thread_id,
    5757            'sender_id' => $u2,
    5858            'recipients' => array( $u1 ),
    5959        ) );
    60         $message_3 = $this->factory->message->create_and_get( array(
     60        $message_3 = self::factory()->message->create_and_get( array(
    6161            'thread_id' => $message_1->thread_id,
    6262            'sender_id' => $u2,
     
    7575     */
    7676    public function test_thread_has_messages_meta_query() {
    77         $u1 = $this->factory->user->create();
    78         $u2 = $this->factory->user->create();
     77        $u1 = self::factory()->user->create();
     78        $u2 = self::factory()->user->create();
    7979
    8080        // create some threads
    81         $message_1 = $this->factory->message->create_and_get( array(
     81        $message_1 = self::factory()->message->create_and_get( array(
    8282            'sender_id'  => $u1,
    8383            'recipients' => array( $u2 ),
    8484            'subject'    => 'This is a knive',
    8585        ) );
    86         $message_2 = $this->factory->message->create_and_get( array(
     86        $message_2 = self::factory()->message->create_and_get( array(
    8787            'sender_id'  => $u1,
    8888            'recipients' => array( $u2 ),
     
    9191
    9292        // misc threads
    93         $this->factory->message->create_many( 3, array(
     93        self::factory()->message->create_many( 3, array(
    9494            'sender_id'  => $u1,
    9595            'recipients' => array( $u2 ),
     
    100100
    101101        // create some replies for thread 1
    102         $message_3 = $this->factory->message->create_and_get( array(
     102        $message_3 = self::factory()->message->create_and_get( array(
    103103            'thread_id'  => $t1,
    104104            'sender_id'  => $u2,
     
    106106            'content'    => "That's a spoon",
    107107        ) );
    108         $message_4 = $this->factory->message->create_and_get( array(
     108        $message_4 = self::factory()->message->create_and_get( array(
    109109            'thread_id'  => $t1,
    110110            'sender_id'  => $u1,
     
    112112            'content'    => "I see you've played knivey-spooney before.",
    113113        ) );
    114         $message_5 = $this->factory->message->create_and_get( array(
     114        $message_5 = self::factory()->message->create_and_get( array(
    115115            'thread_id'  => $t1,
    116116            'sender_id'  => $u2,
     
    120120
    121121        // create some replies for thread 2
    122         $message_6 = $this->factory->message->create_and_get( array(
     122        $message_6 = self::factory()->message->create_and_get( array(
    123123            'thread_id'  => $t2,
    124124            'sender_id'  => $u2,
     
    170170     */
    171171    public function test_thread_has_messages_meta_query_multiple_clauses_relation_and() {
    172         $u1 = $this->factory->user->create();
    173         $u2 = $this->factory->user->create();
     172        $u1 = self::factory()->user->create();
     173        $u2 = self::factory()->user->create();
    174174
    175175        // create some threads
    176         $message_1 = $this->factory->message->create_and_get( array(
     176        $message_1 = self::factory()->message->create_and_get( array(
    177177            'sender_id'  => $u1,
    178178            'recipients' => array( $u2 ),
    179179            'subject'    => 'This is a knive',
    180180        ) );
    181         $message_2 = $this->factory->message->create_and_get( array(
     181        $message_2 = self::factory()->message->create_and_get( array(
    182182            'sender_id'  => $u1,
    183183            'recipients' => array( $u2 ),
     
    186186
    187187        // misc threads
    188         $this->factory->message->create_many( 3, array(
     188        self::factory()->message->create_many( 3, array(
    189189            'sender_id'  => $u1,
    190190            'recipients' => array( $u2 ),
     
    195195
    196196        // create some replies for thread 1
    197         $message_3 = $this->factory->message->create_and_get( array(
     197        $message_3 = self::factory()->message->create_and_get( array(
    198198            'thread_id'  => $t1,
    199199            'sender_id'  => $u2,
     
    201201            'content'    => "That's a spoon",
    202202        ) );
    203         $message_4 = $this->factory->message->create_and_get( array(
     203        $message_4 = self::factory()->message->create_and_get( array(
    204204            'thread_id'  => $t1,
    205205            'sender_id'  => $u1,
     
    207207            'content'    => "I see you've played knivey-spooney before.",
    208208        ) );
    209         $message_5 = $this->factory->message->create_and_get( array(
     209        $message_5 = self::factory()->message->create_and_get( array(
    210210            'thread_id'  => $t1,
    211211            'sender_id'  => $u2,
     
    215215
    216216        // create some replies for thread 2
    217         $message_6 = $this->factory->message->create_and_get( array(
     217        $message_6 = self::factory()->message->create_and_get( array(
    218218            'thread_id'  => $t2,
    219219            'sender_id'  => $u2,
     
    269269     */
    270270    public function test_has_message_threads_anonymous_user_should_not_see_threads() {
    271         $u1 = $this->factory->user->create();
    272         $u2 = $this->factory->user->create();
     271        $u1 = self::factory()->user->create();
     272        $u2 = self::factory()->user->create();
    273273
    274274        // create initial thread
    275         $this->factory->message->create( array(
     275        self::factory()->message->create( array(
    276276            'sender_id'  => $u1,
    277277            'recipients' => array( $u2 ),
  • trunk/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php

    r9819 r11737  
    99     */
    1010    public function test_get_null_component_name() {
    11         $u = $this->factory->user->create();
    12         $n1 = $this->factory->notification->create( array(
    13             'component_name' => 'groups',
    14             'user_id' => $u,
    15         ) );
    16         $n2 = $this->factory->notification->create( array(
     11        $u = self::factory()->user->create();
     12        $n1 = self::factory()->notification->create( array(
     13            'component_name' => 'groups',
     14            'user_id' => $u,
     15        ) );
     16        $n2 = self::factory()->notification->create( array(
    1717            'component_name' => 'messages',
    1818            'user_id' => $u,
     
    5353     */
    5454    public function test_get_total_count_null_component_name() {
    55         $u = $this->factory->user->create();
    56         $n1 = $this->factory->notification->create( array(
    57             'component_name' => 'groups',
    58             'user_id' => $u,
    59         ) );
    60         $n2 = $this->factory->notification->create( array(
     55        $u = self::factory()->user->create();
     56        $n1 = self::factory()->notification->create( array(
     57            'component_name' => 'groups',
     58            'user_id' => $u,
     59        ) );
     60        $n2 = self::factory()->notification->create( array(
    6161            'component_name' => 'messages',
    6262            'user_id' => $u,
     
    9595     */
    9696    public function test_get_total_count_with_component_name() {
    97         $u = $this->factory->user->create();
    98         $n1 = $this->factory->notification->create( array(
    99             'component_name' => 'groups',
    100             'user_id' => $u,
    101         ) );
    102         $n2 = $this->factory->notification->create( array(
    103             'component_name' => 'groups',
    104             'user_id' => $u,
    105         ) );
    106         $n3 = $this->factory->notification->create( array(
     97        $u = self::factory()->user->create();
     98        $n1 = self::factory()->notification->create( array(
     99            'component_name' => 'groups',
     100            'user_id' => $u,
     101        ) );
     102        $n2 = self::factory()->notification->create( array(
     103            'component_name' => 'groups',
     104            'user_id' => $u,
     105        ) );
     106        $n3 = self::factory()->notification->create( array(
    107107            'component_name' => 'messages',
    108108            'user_id' => $u,
     
    123123    public function test_order_by_date() {
    124124        $now = time();
    125         $u = $this->factory->user->create();
    126         $n1 = $this->factory->notification->create( array(
     125        $u = self::factory()->user->create();
     126        $n1 = self::factory()->notification->create( array(
    127127            'component_name' => 'friends',
    128128            'user_id' => $u,
    129129            'date_notified' => date( 'Y-m-d H:i:s', $now - 500 ),
    130130        ) );
    131         $n2 = $this->factory->notification->create( array(
     131        $n2 = self::factory()->notification->create( array(
    132132            'component_name' => 'groups',
    133133            'user_id' => $u,
    134134            'date_notified' => date( 'Y-m-d H:i:s', $now - 100 ),
    135135        ) );
    136         $n3 = $this->factory->notification->create( array(
     136        $n3 = self::factory()->notification->create( array(
    137137            'component_name' => 'messages',
    138138            'user_id' => $u,
     
    156156     */
    157157    public function test_is_new_true() {
    158         $u = $this->factory->user->create();
    159         $n1 = $this->factory->notification->create( array(
    160             'component_name' => 'friends',
    161             'user_id' => $u,
    162             'is_new' => false,
    163         ) );
    164         $n2 = $this->factory->notification->create( array(
    165             'component_name' => 'groups',
    166             'user_id' => $u,
    167             'is_new' => true,
    168         ) );
    169         $n3 = $this->factory->notification->create( array(
     158        $u = self::factory()->user->create();
     159        $n1 = self::factory()->notification->create( array(
     160            'component_name' => 'friends',
     161            'user_id' => $u,
     162            'is_new' => false,
     163        ) );
     164        $n2 = self::factory()->notification->create( array(
     165            'component_name' => 'groups',
     166            'user_id' => $u,
     167            'is_new' => true,
     168        ) );
     169        $n3 = self::factory()->notification->create( array(
    170170            'component_name' => 'messages',
    171171            'user_id' => $u,
     
    188188     */
    189189    public function test_is_new_false() {
    190         $u = $this->factory->user->create();
    191         $n1 = $this->factory->notification->create( array(
    192             'component_name' => 'friends',
    193             'user_id' => $u,
    194             'is_new' => false,
    195         ) );
    196         $n2 = $this->factory->notification->create( array(
    197             'component_name' => 'groups',
    198             'user_id' => $u,
    199             'is_new' => true,
    200         ) );
    201         $n3 = $this->factory->notification->create( array(
     190        $u = self::factory()->user->create();
     191        $n1 = self::factory()->notification->create( array(
     192            'component_name' => 'friends',
     193            'user_id' => $u,
     194            'is_new' => false,
     195        ) );
     196        $n2 = self::factory()->notification->create( array(
     197            'component_name' => 'groups',
     198            'user_id' => $u,
     199            'is_new' => true,
     200        ) );
     201        $n3 = self::factory()->notification->create( array(
    202202            'component_name' => 'messages',
    203203            'user_id' => $u,
     
    220220     */
    221221    public function test_is_new_both() {
    222         $u = $this->factory->user->create();
    223         $n1 = $this->factory->notification->create( array(
    224             'component_name' => 'friends',
    225             'user_id' => $u,
    226             'is_new' => false,
    227         ) );
    228         $n2 = $this->factory->notification->create( array(
    229             'component_name' => 'groups',
    230             'user_id' => $u,
    231             'is_new' => true,
    232         ) );
    233         $n3 = $this->factory->notification->create( array(
     222        $u = self::factory()->user->create();
     223        $n1 = self::factory()->notification->create( array(
     224            'component_name' => 'friends',
     225            'user_id' => $u,
     226            'is_new' => false,
     227        ) );
     228        $n2 = self::factory()->notification->create( array(
     229            'component_name' => 'groups',
     230            'user_id' => $u,
     231            'is_new' => true,
     232        ) );
     233        $n3 = self::factory()->notification->create( array(
    234234            'component_name' => 'messages',
    235235            'user_id' => $u,
     
    253253     */
    254254    public function test_get_with_search_terms() {
    255         $u = $this->factory->user->create();
    256         $n1 = $this->factory->notification->create( array(
    257             'component_name' => 'friends',
    258             'user_id' => $u,
    259             'is_new' => false,
    260         ) );
    261         $n2 = $this->factory->notification->create( array(
    262             'component_name' => 'groups',
    263             'user_id' => $u,
    264             'is_new' => true,
    265         ) );
    266         $n3 = $this->factory->notification->create( array(
     255        $u = self::factory()->user->create();
     256        $n1 = self::factory()->notification->create( array(
     257            'component_name' => 'friends',
     258            'user_id' => $u,
     259            'is_new' => false,
     260        ) );
     261        $n2 = self::factory()->notification->create( array(
     262            'component_name' => 'groups',
     263            'user_id' => $u,
     264            'is_new' => true,
     265        ) );
     266        $n3 = self::factory()->notification->create( array(
    267267            'component_name' => 'messages',
    268268            'user_id' => $u,
     
    286286     */
    287287    public function test_get_paged_sql() {
    288         $u = $this->factory->user->create();
     288        $u = self::factory()->user->create();
    289289
    290290        $notifications = array();
    291291        for ( $i = 1; $i <= 6; $i++ ) {
    292             $notifications[] = $this->factory->notification->create( array(
     292            $notifications[] = self::factory()->notification->create( array(
    293293                'component_name' => 'activity',
    294294                'secondary_item_id' => $i,
  • trunk/tests/phpunit/testcases/notifications/class-bp-notifications-template.php

    r10487 r11737  
    1212     */
    1313    public function test_pagination_params_in_url_should_be_passed_to_query() {
    14         $u = $this->factory->user->create();
     14        $u = self::factory()->user->create();
    1515
    1616        $notifications = array();
    1717        for ( $i = 1; $i <= 6; $i++ ) {
    18             $notifications[] = $this->factory->notification->create( array(
     18            $notifications[] = self::factory()->notification->create( array(
    1919                'component_name' => 'activity',
    2020                'secondary_item_id' => $i,
  • trunk/tests/phpunit/testcases/notifications/functions.php

    r10911 r11737  
    1010     */
    1111    public function test_cache_invalidation_all_for_user_on_save() {
    12         $u = $this->factory->user->create();
    13 
    14         $this->factory->notification->create( array(
    15             'component_name' => 'groups',
    16             'user_id'        => $u
    17         ) );
    18         $this->factory->notification->create( array(
     12        $u = self::factory()->user->create();
     13
     14        self::factory()->notification->create( array(
     15            'component_name' => 'groups',
     16            'user_id'        => $u
     17        ) );
     18        self::factory()->notification->create( array(
    1919            'component_name' => 'messages',
    2020            'user_id'        => $u,
     
    2929
    3030        // Trigger invalidation via save
    31         $this->factory->notification->create( array(
     31        self::factory()->notification->create( array(
    3232            'component_name' => 'messages',
    3333            'user_id'        => $u,
     
    4242     */
    4343    public function test_cache_invalidation_all_for_user_on_delete() {
    44         $u  = $this->factory->user->create();
    45         $n1 = $this->factory->notification->create( array(
    46             'component_name' => 'groups',
    47             'user_id'        => $u
    48         ) );
    49         $this->factory->notification->create( array(
     44        $u  = self::factory()->user->create();
     45        $n1 = self::factory()->notification->create( array(
     46            'component_name' => 'groups',
     47            'user_id'        => $u
     48        ) );
     49        self::factory()->notification->create( array(
    5050            'component_name' => 'messages',
    5151            'user_id'        => $u
     
    6868     */
    6969    public function test_cache_invalidation_all_for_user_on_update_user_id() {
    70         $u = $this->factory->user->create();
    71 
    72         $this->factory->notification->create( array(
    73             'component_name' => 'groups',
    74             'user_id'        => $u
    75         ) );
    76         $this->factory->notification->create( array(
     70        $u = self::factory()->user->create();
     71
     72        self::factory()->notification->create( array(
     73            'component_name' => 'groups',
     74            'user_id'        => $u
     75        ) );
     76        self::factory()->notification->create( array(
    7777            'component_name' => 'messages',
    7878            'user_id'        => $u
     
    9898     */
    9999    public function test_cache_invalidation_all_for_user_on_update_id() {
    100         $u  = $this->factory->user->create();
    101         $n1 = $this->factory->notification->create( array(
    102             'component_name' => 'groups',
    103             'user_id'        => $u
    104         ) );
    105 
    106         $this->factory->notification->create( array(
     100        $u  = self::factory()->user->create();
     101        $n1 = self::factory()->notification->create( array(
     102            'component_name' => 'groups',
     103            'user_id'        => $u
     104        ) );
     105
     106        self::factory()->notification->create( array(
    107107            'component_name' => 'messages',
    108108            'user_id'        => $u
     
    128128     */
    129129    public function test_bp_notifications_update_meta_cache() {
    130         $u = $this->factory->user->create();
    131 
    132         $n1 = $this->factory->notification->create( array(
    133             'component_name' => 'messages',
    134             'user_id'        => $u
    135         ) );
    136 
    137         $n2 = $this->factory->notification->create( array(
     130        $u = self::factory()->user->create();
     131
     132        $n1 = self::factory()->notification->create( array(
     133            'component_name' => 'messages',
     134            'user_id'        => $u
     135        ) );
     136
     137        $n2 = self::factory()->notification->create( array(
    138138            'component_name' => 'groups',
    139139            'user_id'        => $u
     
    190190        );
    191191
    192         $this->factory->notification->create( $args );
     192        self::factory()->notification->create( $args );
    193193
    194194        $this->assertFalse( bp_notifications_add_notification( $args ) );
     
    207207        );
    208208
    209         $this->factory->notification->create( $args );
     209        self::factory()->notification->create( $args );
    210210
    211211        $args['allow_duplicate'] = true;
     
    219219     */
    220220    public function test_bp_notifications_get_unread_notification_count_cache() {
    221         $u1 = $this->factory->user->create();
    222         $u2 = $this->factory->user->create();
    223 
    224         $this->factory->notification->create( array(
     221        $u1 = self::factory()->user->create();
     222        $u2 = self::factory()->user->create();
     223
     224        self::factory()->notification->create( array(
    225225            'component_name'    => 'messages',
    226226            'component_action'  => 'new_message',
     
    248248     */
    249249    public function test_bp_has_notifications_filtering() {
    250         $u1 = $this->factory->user->create();
    251         $u2 = $this->factory->user->create();
     250        $u1 = self::factory()->user->create();
     251        $u2 = self::factory()->user->create();
    252252
    253253        // create a mixture of different notifications
    254         $this->factory->notification->create( array(
     254        self::factory()->notification->create( array(
    255255            'component_name'    => 'messages',
    256256            'component_action'  => 'new_message',
     
    261261        ) );
    262262
    263         $this->factory->notification->create( array(
     263        self::factory()->notification->create( array(
    264264            'component_name'    => 'activity',
    265265            'component_action'  => 'new_at_mention',
     
    270270        ) );
    271271
    272         $this->factory->notification->create( array(
     272        self::factory()->notification->create( array(
    273273            'component_name'    => 'activity',
    274274            'component_action'  => 'new_at_mention',
     
    294294     */
    295295    public function test_bp_notifications_delete_notifications_on_user_delete_should_delete_all_notifications() {
    296         $u = $this->factory->user->create();
     296        $u = self::factory()->user->create();
    297297
    298298        // Create notifications
    299         $n1 = $this->factory->notification->create( array(
     299        $n1 = self::factory()->notification->create( array(
    300300            'component_name'    => 'messages',
    301301            'component_action'  => 'new_message',
     
    304304        ) );
    305305
    306         $n2 = $this->factory->notification->create( array(
     306        $n2 = self::factory()->notification->create( array(
    307307            'component_name'    => 'activity',
    308308            'component_action'  => 'new_at_mention',
     
    311311        ) );
    312312
    313         $n3 = $this->factory->notification->create( array(
     313        $n3 = self::factory()->notification->create( array(
    314314            'component_name' => 'groups',
    315315            'user_id'        => $u,
    316316        ) );
    317317
    318         $n4 = $this->factory->notification->create( array(
     318        $n4 = self::factory()->notification->create( array(
    319319            'component_name'   => 'friends',
    320320            'component_action' => 'friendship_request',
     
    323323
    324324        // Create notification for non-core component
    325         $n5 = $this->factory->notification->create( array(
     325        $n5 = self::factory()->notification->create( array(
    326326            'component_name'    => 'foo',
    327327            'component_action'  => 'bar',
     
    355355     */
    356356    public function test_notification_callback_parameter_integrity() {
    357         $u = $this->factory->user->create();
    358 
    359         $n = $this->factory->notification->create( array(
     357        $u = self::factory()->user->create();
     358
     359        $n = self::factory()->notification->create( array(
    360360            'component_name'    => 'activity',
    361361            'component_action'  => 'new_at_mention',
  • trunk/tests/phpunit/testcases/routing/activity.php

    r9819 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
     
    2828     */
    2929    function test_activity_permalink() {
    30         $a = $this->factory->activity->create();
    31         $activity = $this->factory->activity->get_object_by_id( $a );
     30        $a = self::factory()->activity->create();
     31        $activity = self::factory()->activity->get_object_by_id( $a );
    3232
    3333        $url = bp_core_get_user_domain( $activity->user_id ) . bp_get_activity_slug() . '/' . $activity->id . '/';
  • trunk/tests/phpunit/testcases/routing/core.php

    r10753 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/routing/friends.php

    r9819 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/routing/groups.php

    r11559 r11737  
    1212        buddypress()->members->types = array();
    1313        $this->old_current_user = get_current_user_id();
    14         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     14        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1515    }
    1616
     
    6969     */
    7070    public function test_group_previous_slug_current_slug_should_resolve() {
    71         $g1 = $this->factory->group->create( array(
     71        $g1 = self::factory()->group->create( array(
    7272            'slug' => 'george',
    7373        ) );
     
    8686     */
    8787    public function test_group_previous_slug_should_resolve() {
    88         $g1 = $this->factory->group->create( array(
     88        $g1 = self::factory()->group->create( array(
    8989            'slug' => 'george',
    9090        ) );
     
    104104     */
    105105    public function test_group_previous_slug_most_recent_takes_precedence() {
    106         $g1 = $this->factory->group->create( array(
     106        $g1 = self::factory()->group->create( array(
    107107            'slug' => 'george',
    108108        ) );
     
    112112            'notify_members' => false,
    113113        ) );
    114         $g2 = $this->factory->group->create( array(
     114        $g2 = self::factory()->group->create( array(
    115115            'slug' => 'george',
    116116        ) );
  • trunk/tests/phpunit/testcases/routing/members.php

    r10791 r11737  
    1212        buddypress()->members->types = array();
    1313        $this->old_current_user = get_current_user_id();
    14         $this->set_current_user( $this->factory->user->create( array( 'user_login' => 'paulgibbs', 'role' => 'subscriber' ) ) );
     14        $this->set_current_user( self::factory()->user->create( array( 'user_login' => 'paulgibbs', 'role' => 'subscriber' ) ) );
    1515    }
    1616
     
    3434     */
    3535    public function test_member_directory_when_nested_under_wp_page() {
    36         $p = $this->factory->post->create( array(
     36        $p = self::factory()->post->create( array(
    3737            'post_type' => 'page',
    3838            'post_name' => 'foo',
     
    9595     */
    9696    public function test_member_directory_with_member_type_should_be_overridden_by_member_with_same_nicename() {
    97         $u = $this->factory->user->create( array( 'user_nicename' => 'foo' ) );
     97        $u = self::factory()->user->create( array( 'user_nicename' => 'foo' ) );
    9898        bp_register_member_type( 'foo' );
    9999        $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' );
  • trunk/tests/phpunit/testcases/routing/messages.php

    r9819 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/routing/root-profiles.php

    r10212 r11737  
    1515
    1616        $this->old_current_user = get_current_user_id();
    17         $uid = $this->factory->user->create( array(
     17        $uid = self::factory()->user->create( array(
    1818            'user_login' => 'boone',
    1919            'user_nicename' => 'boone',
     
    4747     */
    4848    public function test_member_permalink_when_members_page_is_nested_under_wp_page() {
    49         $p = $this->factory->post->create( array(
     49        $p = self::factory()->post->create( array(
    5050            'post_type' => 'page',
    5151            'post_name' => 'foo',
  • trunk/tests/phpunit/testcases/routing/settings.php

    r9819 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/routing/url.php

    r11255 r11737  
    4343        if ( is_multisite() ) {
    4444            $original_root_blog = bp_get_root_blog_id();
    45             $blog_id = $this->factory->blog->create( array(
     45            $blog_id = self::factory()->blog->create( array(
    4646                'path' => '/path' . rand() . time() . '/',
    4747            ) );
  • trunk/tests/phpunit/testcases/routing/xprofile.php

    r9936 r11737  
    1111
    1212        $this->old_current_user = get_current_user_id();
    13         $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
     13        $this->set_current_user( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
    1414    }
    1515
  • trunk/tests/phpunit/testcases/testsuite/factory.php

    r11063 r11737  
    99     */
    1010    public function test_message_create_and_get_should_return_message_object() {
    11         $m = $this->factory->message->create_and_get();
     11        $m = self::factory()->message->create_and_get();
    1212
    1313        $this->assertTrue( $m instanceof BP_Messages_Message );
     
    1818     */
    1919    public function test_message_should_create_default_sender_and_recipient() {
    20         $m = $this->factory->message->create_and_get();
     20        $m = self::factory()->message->create_and_get();
    2121
    2222        $this->assertNotEmpty( $m->sender_id );
     
    2828     */
    2929    public function test_friendship_should_create_default_initiator_and_friend() {
    30         $f = $this->factory->friendship->create_and_get();
     30        $f = self::factory()->friendship->create_and_get();
    3131
    3232        $u1 = new WP_User( $f->initiator_user_id );
     
    4141     */
    4242    public function test_friendship_should_respect_passed_initiator_and_friend() {
    43         $u1 = $this->factory->user->create();
    44         $u2 = $this->factory->user->create();
     43        $u1 = self::factory()->user->create();
     44        $u2 = self::factory()->user->create();
    4545
    46         $f = $this->factory->friendship->create_and_get( array(
     46        $f = self::factory()->friendship->create_and_get( array(
    4747            'initiator_user_id' => $u1,
    4848            'friend_user_id' => $u2,
  • trunk/tests/phpunit/testcases/xprofile/BP_XProfile_Field/member_types.php

    r10022 r11737  
    1616        bp_register_member_type( 'bar' );
    1717
    18         $this->field_group_id = $this->factory->xprofile_group->create();
    19         $this->field_id = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
     18        $this->field_group_id = self::factory()->xprofile_group->create();
     19        $this->field_id = self::factory()->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
    2020        $this->field = new BP_XProfile_Field( $this->field_id );
    2121    }
     
    120120
    121121    public function test_passing_member_type_any_to_get_fields_for_member_type_should_return_unrestricted_fields() {
    122         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
     122        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
    123123
    124124        $field_2 = new BP_XProfile_Field( $f2 );
     
    130130
    131131    public function test_passing_empty_member_type_to_get_fields_for_member_type_should_return_unrestricted_fields() {
    132         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
     132        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
    133133
    134134        $field_2 = new BP_XProfile_Field( $f2 );
     
    146146
    147147    public function test_get_fields_for_member_type_should_accept_an_array_of_member_types() {
    148         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
     148        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $this->field_group_id ) );
    149149        bp_xprofile_add_meta( $this->field_id, 'field', 'member_type', 'foo' );
    150150        bp_xprofile_add_meta( $f2, 'field', 'member_type', 'bar' );
  • trunk/tests/phpunit/testcases/xprofile/activity.php

    r10276 r11737  
    4141        $now_time = date( 'Y-m-d H:i:s', $time );
    4242
    43         $this->factory->activity->create( array(
     43        self::factory()->activity->create( array(
    4444            'user_id' => $d['u'],
    4545            'component' => buddypress()->profile->id,
     
    7575        $now_time = date( 'Y-m-d H:i:s', $time );
    7676
    77         $this->factory->activity->create( array(
     77        self::factory()->activity->create( array(
    7878            'user_id' => $d['u'],
    7979            'component' => buddypress()->profile->id,
     
    278278     */
    279279    public function test_bp_xprofile_format_activity_action_new_avatar() {
    280         $u = $this->factory->user->create();
    281         $a = $this->factory->activity->create( array(
     280        $u = self::factory()->user->create();
     281        $a = self::factory()->activity->create( array(
    282282            'component' => 'profile',
    283283            'type' => 'new_avatar',
     
    297297     */
    298298    public function test_bp_xprofile_format_activity_action_updated_profile() {
    299         $u = $this->factory->user->create();
    300         $a = $this->factory->activity->create( array(
     299        $u = self::factory()->user->create();
     300        $a = self::factory()->activity->create( array(
    301301            'component' => buddypress()->profile->id,
    302302            'type' => 'updated_profile',
     
    312312
    313313    protected function setup_updated_profile_data() {
    314         $this->updated_profile_data['u'] = $this->factory->user->create();
    315         $this->updated_profile_data['g'] = $this->factory->xprofile_group->create();
    316         $this->updated_profile_data['f'] = $this->factory->xprofile_field->create( array(
     314        $this->updated_profile_data['u'] = self::factory()->user->create();
     315        $this->updated_profile_data['g'] = self::factory()->xprofile_group->create();
     316        $this->updated_profile_data['f'] = self::factory()->xprofile_field->create( array(
    317317            'field_group_id' => $this->updated_profile_data['g'],
    318318        ) );
  • trunk/tests/phpunit/testcases/xprofile/cache.php

    r11352 r11737  
    1010     */
    1111    public function test_bp_xprofile_update_meta_cache() {
    12         $u = $this->factory->user->create();
    13         $g = $this->factory->xprofile_group->create();
    14         $f = $this->factory->xprofile_field->create( array(
     12        $u = self::factory()->user->create();
     13        $g = self::factory()->xprofile_group->create();
     14        $f = self::factory()->xprofile_field->create( array(
    1515            'field_group_id' => $g,
    1616        ) );
     
    6464     */
    6565    public function test_bp_has_profile_meta_cache() {
    66         $u = $this->factory->user->create();
    67         $g = $this->factory->xprofile_group->create();
    68         $f = $this->factory->xprofile_field->create( array(
     66        $u = self::factory()->user->create();
     67        $g = self::factory()->xprofile_group->create();
     68        $f = self::factory()->xprofile_field->create( array(
    6969            'field_group_id' => $g,
    7070        ) );
     
    117117     */
    118118    public function test_bp_has_profile_meta_cache_update_meta_cache_false() {
    119         $u = $this->factory->user->create();
    120         $g = $this->factory->xprofile_group->create();
    121         $f = $this->factory->xprofile_field->create( array(
     119        $u = self::factory()->user->create();
     120        $g = self::factory()->xprofile_group->create();
     121        $f = self::factory()->xprofile_field->create( array(
    122122            'field_group_id' => $g,
    123123        ) );
     
    150150     */
    151151    public function test_field_cache_should_be_invalidated_on_save() {
    152         $g = $this->factory->xprofile_group->create();
    153         $f = $this->factory->xprofile_field->create( array(
     152        $g = self::factory()->xprofile_group->create();
     153        $f = self::factory()->xprofile_field->create( array(
    154154            'field_group_id' => $g,
    155155            'name' => 'Foo',
     
    172172        global $wpdb;
    173173
    174         $g = $this->factory->xprofile_group->create();
    175         $f = $this->factory->xprofile_field->create( array(
     174        $g = self::factory()->xprofile_group->create();
     175        $f = self::factory()->xprofile_field->create( array(
    176176            'field_group_id' => $g,
    177177            'name' => 'Foo',
     
    191191     */
    192192    public function test_get_field_id_from_name_cache_should_be_invalidated_on_field_update() {
    193         $g = $this->factory->xprofile_group->create();
    194         $f1 = $this->factory->xprofile_field->create( array(
    195             'field_group_id' => $g,
    196             'name' => 'Foo',
    197         ) );
    198         $f2 = $this->factory->xprofile_field->create( array(
     193        $g = self::factory()->xprofile_group->create();
     194        $f1 = self::factory()->xprofile_field->create( array(
     195            'field_group_id' => $g,
     196            'name' => 'Foo',
     197        ) );
     198        $f2 = self::factory()->xprofile_field->create( array(
    199199            'field_group_id' => $g,
    200200            'name' => 'Bar',
     
    222222     */
    223223    public function test_get_field_id_from_name_cache_should_be_invalidated_on_field_deletion() {
    224         $g = $this->factory->xprofile_group->create();
    225         $f = $this->factory->xprofile_field->create( array(
     224        $g = self::factory()->xprofile_group->create();
     225        $f = self::factory()->xprofile_field->create( array(
    226226            'field_group_id' => $g,
    227227            'name' => 'Foo',
  • trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php

    r11253 r11737  
    1010     */
    1111    public function test_can_delete_save() {
    12         $group = $this->factory->xprofile_group->create();
    13         $field = $this->factory->xprofile_field->create( array(
     12        $group = self::factory()->xprofile_group->create();
     13        $field = self::factory()->xprofile_field->create( array(
    1414            'field_group_id' => $group,
    1515        ) );
     
    2727     */
    2828    public function test_get_id_from_name_field_name_option_value_conflict() {
    29         $group = $this->factory->xprofile_group->create();
     29        $group = self::factory()->xprofile_group->create();
    3030
    3131        // force some checkbox options for our profile field
     
    3636
    3737        // checkbox field
    38         $f1 = $this->factory->xprofile_field->create( array(
     38        $f1 = self::factory()->xprofile_field->create( array(
    3939            'field_group_id' => $group,
    4040            'type' => 'checkbox',
     
    4343
    4444        // textbox field with the same name as our checkbox value
    45         $f2 = $this->factory->xprofile_field->create( array(
     45        $f2 = self::factory()->xprofile_field->create( array(
    4646            'field_group_id' => $group,
    4747            'type' => 'textbox',
     
    128128        global $wpdb;
    129129
    130         $group = $this->factory->xprofile_group->create();
    131         $field = $this->factory->xprofile_field->create( array(
     130        $group = self::factory()->xprofile_group->create();
     131        $field = self::factory()->xprofile_field->create( array(
    132132            'field_group_id' => $group,
    133133        ) );
     
    155155        global $wpdb;
    156156
    157         $group = $this->factory->xprofile_group->create();
    158         $field = $this->factory->xprofile_field->create( array(
     157        $group = self::factory()->xprofile_group->create();
     158        $field = self::factory()->xprofile_field->create( array(
    159159            'field_group_id' => $group,
    160160        ) );
     
    189189     */
    190190    public function test_update_position_should_invalidate_cache() {
    191         $group = $this->factory->xprofile_group->create();
    192         $field = $this->factory->xprofile_field->create( array(
     191        $group = self::factory()->xprofile_group->create();
     192        $field = self::factory()->xprofile_field->create( array(
    193193            'field_group_id' => $group,
    194194        ) );
     
    210210     */
    211211    public function test_empty_datebox_fields_should_not_return_unix_epoch() {
    212         $user  = $this->factory->user->create( array( 'role' => 'subscriber' ) );
    213         $group = $this->factory->xprofile_group->create();
    214         $field = $this->factory->xprofile_field->create( array(
     212        $user  = self::factory()->user->create( array( 'role' => 'subscriber' ) );
     213        $group = self::factory()->xprofile_group->create();
     214        $field = self::factory()->xprofile_field->create( array(
    215215            'field_group_id' => $group,
    216216            'type' => 'datebox',
  • trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php

    r10242 r11737  
    1111     */
    1212    public function test_save_should_not_return_false_when_no_fields_have_been_altered() {
    13         $g = $this->factory->xprofile_group->create();
     13        $g = self::factory()->xprofile_group->create();
    1414        $group = new BP_XProfile_Group( $g );
    1515
     
    2323     */
    2424    public function test_fetch_visibility_level() {
    25         $u = $this->factory->user->create();
    26         $g = $this->factory->xprofile_group->create();
    27         $f = $this->factory->xprofile_field->create( array(
     25        $u = self::factory()->user->create();
     26        $g = self::factory()->xprofile_group->create();
     27        $f = self::factory()->xprofile_field->create( array(
    2828            'field_group_id' => $g,
    2929        ) );
     
    8585     */
    8686    public function test_get_xprofile_groups() {
    87         $g1 = $this->factory->xprofile_group->create();
    88         $g2 = $this->factory->xprofile_group->create();
    89         $g3 = $this->factory->xprofile_group->create();
     87        $g1 = self::factory()->xprofile_group->create();
     88        $g2 = self::factory()->xprofile_group->create();
     89        $g3 = self::factory()->xprofile_group->create();
    9090
    9191        $all = BP_XProfile_Group::get();
     
    118118     */
    119119    public function test_member_type_restrictions_should_be_ignored_when_user_id_is_null_and_member_type_is_not_explicitly_provided() {
    120         $g = $this->factory->xprofile_group->create();
    121         $f = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     120        $g = self::factory()->xprofile_group->create();
     121        $f = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    122122        bp_register_member_type( 'foo' );
    123123
     
    145145     */
    146146    public function test_member_type_restrictions_should_be_ignored_when_user_id_is_0_and_member_type_is_false() {
    147         $g = $this->factory->xprofile_group->create();
    148         $f = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     147        $g = self::factory()->xprofile_group->create();
     148        $f = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    149149        bp_register_member_type( 'foo' );
    150150
     
    173173     */
    174174    public function test_member_type_restrictions_should_be_obeyed_for_nonzero_user_id() {
    175         $g = $this->factory->xprofile_group->create();
    176         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    177         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    178         $f3 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    179         $f4 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     175        $g = self::factory()->xprofile_group->create();
     176        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     177        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     178        $f3 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     179        $f4 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    180180        bp_register_member_type( 'foo' );
    181181        bp_register_member_type( 'bar' );
     
    196196
    197197        // User is in 'foo', so should have f1 and f3 only.
    198         $u = $this->factory->user->create();
     198        $u = self::factory()->user->create();
    199199        bp_set_member_type( $u, 'foo' );
    200200
     
    222222     */
    223223    public function test_member_type_restrictions_should_be_obeyed_for_nonzero_user_id_with_no_member_types() {
    224         $g = $this->factory->xprofile_group->create();
    225         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    226         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    227         $f3 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     224        $g = self::factory()->xprofile_group->create();
     225        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     226        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     227        $f3 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    228228        bp_register_member_type( 'foo' );
    229229        bp_register_member_type( 'bar' );
     
    240240
    241241        // User has no member types, so should see f2 and f3 .
    242         $u = $this->factory->user->create();
     242        $u = self::factory()->user->create();
    243243
    244244        $found_groups = BP_XProfile_Group::get( array(
     
    264264     */
    265265    public function test_member_types_of_provided_user_id_should_take_precedence_over_provided_member_type() {
    266         $g = $this->factory->xprofile_group->create();
    267         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    268         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     266        $g = self::factory()->xprofile_group->create();
     267        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     268        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    269269        bp_register_member_type( 'foo' );
    270270        bp_register_member_type( 'bar' );
     
    275275        $field2->set_member_types( array( 'bar' ) );
    276276
    277         $u = $this->factory->user->create();
     277        $u = self::factory()->user->create();
    278278        bp_set_member_type( $u, 'foo' );
    279279
     
    299299     */
    300300    public function test_member_type_single_value_should_be_respected() {
    301         $g = $this->factory->xprofile_group->create();
    302         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    303         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     301        $g = self::factory()->xprofile_group->create();
     302        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     303        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    304304        bp_register_member_type( 'foo' );
    305305        bp_register_member_type( 'bar' );
     
    331331     */
    332332    public function test_member_type_array_value_should_be_respected() {
    333         $g = $this->factory->xprofile_group->create();
    334         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    335         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     333        $g = self::factory()->xprofile_group->create();
     334        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     335        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    336336        bp_register_member_type( 'foo' );
    337337        bp_register_member_type( 'bar' );
     
    363363     */
    364364    public function test_member_type_null_should_be_respected() {
    365         $g = $this->factory->xprofile_group->create();
    366         $f1 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
    367         $f2 = $this->factory->xprofile_field->create( array( 'field_group_id' => $g ) );
     365        $g = self::factory()->xprofile_group->create();
     366        $f1 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
     367        $f2 = self::factory()->xprofile_field->create( array( 'field_group_id' => $g ) );
    368368        bp_register_member_type( 'foo' );
    369369        bp_register_member_type( 'bar' );
     
    392392     */
    393393    public function test_save_xprofile_group_name() {
    394         $g1 = $this->factory->xprofile_group->create( array(
     394        $g1 = self::factory()->xprofile_group->create( array(
    395395            'name' => "Test ' Name"
    396396        ) );
     
    415415
    416416        // Create a group
    417         $g1 = $this->factory->xprofile_group->create( array(
     417        $g1 = self::factory()->xprofile_group->create( array(
    418418            'name' => $pristine_name
    419419        ) );
  • trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php

    r10004 r11737  
    1010     */
    1111    public function test_exists_when_doesnt_exist() {
    12         $u = $this->factory->user->create();
    13         $g = $this->factory->xprofile_group->create();
    14         $f = $this->factory->xprofile_field->create( array(
     12        $u = self::factory()->user->create();
     13        $g = self::factory()->xprofile_group->create();
     14        $f = self::factory()->xprofile_field->create( array(
    1515            'field_group_id' => $g,
    1616        ) );
     
    2525     */
    2626    public function test_exists_when_exists_uncached() {
    27         $u = $this->factory->user->create();
    28         $g = $this->factory->xprofile_group->create();
    29         $f = $this->factory->xprofile_field->create( array(
     27        $u = self::factory()->user->create();
     28        $g = self::factory()->xprofile_group->create();
     29        $f = self::factory()->xprofile_field->create( array(
    3030            'field_group_id' => $g,
    3131        ) );
     
    4444     */
    4545    public function test_exists_when_exists_in_cache() {
    46         $u = $this->factory->user->create();
    47         $g = $this->factory->xprofile_group->create();
    48         $f = $this->factory->xprofile_field->create( array(
     46        $u = self::factory()->user->create();
     47        $g = self::factory()->xprofile_group->create();
     48        $f = self::factory()->xprofile_field->create( array(
    4949            'field_group_id' => $g,
    5050        ) );
     
    6363     */
    6464    public function test_get_fielddataid_byid_when_doesnt_exist() {
    65         $u = $this->factory->user->create();
    66         $g = $this->factory->xprofile_group->create();
    67         $f = $this->factory->xprofile_field->create( array(
     65        $u = self::factory()->user->create();
     66        $g = self::factory()->xprofile_group->create();
     67        $f = self::factory()->xprofile_field->create( array(
    6868            'field_group_id' => $g,
    6969        ) );
     
    7979     */
    8080    public function test_get_fielddataid_byid_when_exists_uncached() {
    81         $u = $this->factory->user->create();
    82         $g = $this->factory->xprofile_group->create();
    83         $f = $this->factory->xprofile_field->create( array(
     81        $u = self::factory()->user->create();
     82        $g = self::factory()->xprofile_group->create();
     83        $f = self::factory()->xprofile_field->create( array(
    8484            'field_group_id' => $g,
    8585        ) );
     
    101101     */
    102102    public function test_get_fielddataid_byid_when_exists_in_cache() {
    103         $u = $this->factory->user->create();
    104         $g = $this->factory->xprofile_group->create();
    105         $f = $this->factory->xprofile_field->create( array(
     103        $u = self::factory()->user->create();
     104        $g = self::factory()->xprofile_group->create();
     105        $f = self::factory()->xprofile_field->create( array(
    106106            'field_group_id' => $g,
    107107        ) );
     
    119119     */
    120120    public function test_get_value_byid_singleuser_uncached() {
    121         $u = $this->factory->user->create();
    122         $g = $this->factory->xprofile_group->create();
    123         $f = $this->factory->xprofile_field->create( array(
     121        $u = self::factory()->user->create();
     122        $g = self::factory()->xprofile_group->create();
     123        $f = self::factory()->xprofile_field->create( array(
    124124            'field_group_id' => $g,
    125125        ) );
     
    143143        $time = date( 'Y-m-d H:i:s', time() - 60*60*24 );
    144144
    145         $u1 = $this->factory->user->create();
    146         $u2 = $this->factory->user->create();
    147         $g = $this->factory->xprofile_group->create();
    148         $f = $this->factory->xprofile_field->create( array(
     145        $u1 = self::factory()->user->create();
     146        $u2 = self::factory()->user->create();
     147        $g = self::factory()->xprofile_group->create();
     148        $f = self::factory()->xprofile_field->create( array(
    149149            'field_group_id' => $g,
    150150        ) );
     
    198198     */
    199199    public function test_get_value_byid_singleuser_cached() {
    200         $u = $this->factory->user->create();
    201         $g = $this->factory->xprofile_group->create();
    202         $f = $this->factory->xprofile_field->create( array(
     200        $u = self::factory()->user->create();
     201        $g = self::factory()->xprofile_group->create();
     202        $f = self::factory()->xprofile_field->create( array(
    203203            'field_group_id' => $g,
    204204        ) );
     
    221221        $time = date( 'Y-m-d H:i:s', time() - 60*60*24 );
    222222
    223         $u1 = $this->factory->user->create();
    224         $u2 = $this->factory->user->create();
    225         $g = $this->factory->xprofile_group->create();
    226         $f = $this->factory->xprofile_field->create( array(
     223        $u1 = self::factory()->user->create();
     224        $u2 = self::factory()->user->create();
     225        $g = self::factory()->xprofile_group->create();
     226        $f = self::factory()->xprofile_field->create( array(
    227227            'field_group_id' => $g,
    228228        ) );
     
    269269     */
    270270    public function test_get_all_for_user_uncached() {
    271         $u = $this->factory->user->create();
    272         $g1 = $this->factory->xprofile_group->create();
    273         $g2 = $this->factory->xprofile_group->create();
    274         $f1 = $this->factory->xprofile_field->create( array(
     271        $u = self::factory()->user->create();
     272        $g1 = self::factory()->xprofile_group->create();
     273        $g2 = self::factory()->xprofile_group->create();
     274        $f1 = self::factory()->xprofile_field->create( array(
    275275            'type' => 'textbox',
    276276            'field_group_id' => $g1,
    277277        ) );
    278         $f2 = $this->factory->xprofile_field->create( array(
     278        $f2 = self::factory()->xprofile_field->create( array(
    279279            'type' => 'radio',
    280280            'field_group_id' => $g2,
     
    348348     */
    349349    public function test_get_all_for_user_cached() {
    350         $u = $this->factory->user->create();
    351         $g1 = $this->factory->xprofile_group->create();
    352         $g2 = $this->factory->xprofile_group->create();
    353         $f1 = $this->factory->xprofile_field->create( array(
     350        $u = self::factory()->user->create();
     351        $g1 = self::factory()->xprofile_group->create();
     352        $g2 = self::factory()->xprofile_group->create();
     353        $f1 = self::factory()->xprofile_field->create( array(
    354354            'type' => 'textbox',
    355355            'field_group_id' => $g1,
    356356        ) );
    357         $f2 = $this->factory->xprofile_field->create( array(
     357        $f2 = self::factory()->xprofile_field->create( array(
    358358            'type' => 'radio',
    359359            'field_group_id' => $g2,
  • trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php

    r11018 r11737  
    5959    public function test_translate_field_name_to_field_id() {
    6060        $this->create_fields( 0 );
    61         $f = $this->factory->xprofile_field->create( array(
     61        $f = self::factory()->xprofile_field->create( array(
    6262            'field_group_id' => $this->group,
    6363            'type' => 'textbox',
     
    628628
    629629    protected function create_fields( $count ) {
    630         $this->group = $this->factory->xprofile_group->create();
     630        $this->group = self::factory()->xprofile_group->create();
    631631        for ( $i = 0; $i < $count; $i++ ) {
    632             $this->fields[] = $this->factory->xprofile_field->create( array(
     632            $this->fields[] = self::factory()->xprofile_field->create( array(
    633633                'field_group_id' => $this->group,
    634634                'type' => 'textbox',
     
    639639    protected function create_users( $count ) {
    640640        for ( $i = 0; $i < $count; $i++ ) {
    641             $this->users[] = $this->factory->user->create();
     641            $this->users[] = self::factory()->user->create();
    642642        }
    643643    }
  • trunk/tests/phpunit/testcases/xprofile/functions.php

    r11288 r11737  
    77class BP_Tests_XProfile_Functions extends BP_UnitTestCase {
    88    public function test_get_hidden_field_types_for_user_loggedout() {
    9         $duser = $this->factory->user->create();
     9        $duser = self::factory()->user->create();
    1010
    1111        $old_current_user = bp_loggedin_user_id();
     
    1818
    1919    public function test_get_hidden_field_types_for_user_loggedin() {
    20         $duser = $this->factory->user->create();
    21         $cuser = $this->factory->user->create();
     20        $duser = self::factory()->user->create();
     21        $cuser = self::factory()->user->create();
    2222
    2323        $old_current_user = bp_loggedin_user_id();
     
    3030
    3131    public function test_get_hidden_field_types_for_user_friends() {
    32         $duser = $this->factory->user->create();
    33         $cuser = $this->factory->user->create();
     32        $duser = self::factory()->user->create();
     33        $cuser = self::factory()->user->create();
    3434        friends_add_friend( $duser, $cuser, true );
    3535
     
    4343
    4444    public function test_get_hidden_field_types_for_user_admin() {
    45         $duser = $this->factory->user->create();
    46         $cuser = $this->factory->user->create();
     45        $duser = self::factory()->user->create();
     46        $cuser = self::factory()->user->create();
    4747        $this->grant_bp_moderate( $cuser );
    4848
     
    6161     */
    6262    public function test_bp_xprofile_update_meta_with_line_breaks() {
    63         $g = $this->factory->xprofile_group->create();
    64         $f = $this->factory->xprofile_field->create( array(
     63        $g = self::factory()->xprofile_group->create();
     64        $f = self::factory()->xprofile_field->create( array(
    6565            'field_group_id' => $g,
    6666        ) );
     
    9898     */
    9999    public function test_bp_xprofile_get_field_visibility_level_user_set() {
    100         $u = $this->factory->user->create();
    101         $g = $this->factory->xprofile_group->create();
    102         $f = $this->factory->xprofile_field->create( array(
     100        $u = self::factory()->user->create();
     101        $g = self::factory()->xprofile_group->create();
     102        $f = self::factory()->xprofile_field->create( array(
    103103            'field_group_id' => $g,
    104104        ) );
     
    116116     */
    117117    public function test_bp_xprofile_get_field_visibility_level_user_unset() {
    118         $u = $this->factory->user->create();
    119         $g = $this->factory->xprofile_group->create();
    120         $f = $this->factory->xprofile_field->create( array(
     118        $u = self::factory()->user->create();
     119        $g = self::factory()->xprofile_group->create();
     120        $f = self::factory()->xprofile_field->create( array(
    121121            'field_group_id' => $g,
    122122        ) );
     
    133133     */
    134134    public function test_bp_xprofile_get_field_visibility_level_admin_override() {
    135         $u = $this->factory->user->create();
    136         $g = $this->factory->xprofile_group->create();
    137         $f = $this->factory->xprofile_field->create( array(
     135        $u = self::factory()->user->create();
     136        $g = self::factory()->xprofile_group->create();
     137        $f = self::factory()->xprofile_field->create( array(
    138138            'field_group_id' => $g,
    139139        ) );
     
    177177     */
    178178    public function test_bp_xprofile_delete_meta_illegal_characters() {
    179         $g = $this->factory->xprofile_group->create();
     179        $g = self::factory()->xprofile_group->create();
    180180        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    181181        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     
    192192     */
    193193    public function test_bp_xprofile_delete_meta_trim_meta_value() {
    194         $g = $this->factory->xprofile_group->create();
     194        $g = self::factory()->xprofile_group->create();
    195195        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    196196        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     
    205205     */
    206206    public function test_bp_xprofile_delete_meta_meta_value_match() {
    207         $g = $this->factory->xprofile_group->create();
     207        $g = self::factory()->xprofile_group->create();
    208208        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    209209        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     
    217217     */
    218218    public function test_bp_xprofile_delete_meta_delete_all() {
    219         $g = $this->factory->xprofile_group->create();
     219        $g = self::factory()->xprofile_group->create();
    220220        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    221221        bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' );
     
    236236        // With no meta key, don't delete for all items - just delete
    237237        // all for a single item
    238         $g1 = $this->factory->xprofile_group->create();
    239         $g2 = $this->factory->xprofile_group->create();
     238        $g1 = self::factory()->xprofile_group->create();
     239        $g2 = self::factory()->xprofile_group->create();
    240240        bp_xprofile_add_meta( $g1, 'group', 'foo', 'bar' );
    241241        bp_xprofile_add_meta( $g1, 'group', 'foo1', 'bar1' );
     
    256256        // With no meta key, don't delete for all items - just delete
    257257        // all for a single item
    258         $g1 = $this->factory->xprofile_group->create();
    259         $g2 = $this->factory->xprofile_group->create();
     258        $g1 = self::factory()->xprofile_group->create();
     259        $g2 = self::factory()->xprofile_group->create();
    260260        bp_xprofile_add_meta( $g1, 'group', 'foo', 'bar' );
    261261        bp_xprofile_add_meta( $g1, 'group', 'foo1', 'bar1' );
     
    299299     */
    300300    public function test_bp_xprofile_get_meta_no_meta_key() {
    301         $g = $this->factory->xprofile_group->create();
     301        $g = self::factory()->xprofile_group->create();
    302302        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    303303        bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' );
     
    319319     */
    320320    public function test_bp_xprofile_get_meta_single_true() {
    321         $g = $this->factory->xprofile_group->create();
     321        $g = self::factory()->xprofile_group->create();
    322322        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
    323323        bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' );
     
    331331     */
    332332    public function test_bp_xprofile_get_meta_single_false() {
    333         $g = $this->factory->xprofile_group->create();
     333        $g = self::factory()->xprofile_group->create();
    334334        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
    335335        bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' );
     
    342342     */
    343343    public function test_bp_xprofile_get_meta_no_meta_key_no_results() {
    344         $g = $this->factory->xprofile_group->create();
     344        $g = self::factory()->xprofile_group->create();
    345345
    346346        $expected = array();
     
    378378     */
    379379    public function test_bp_xprofile_update_meta_illegal_characters() {
    380         $g = $this->factory->xprofile_group->create();
     380        $g = self::factory()->xprofile_group->create();
    381381        $krazy_key = ' f!@#$%^o *(){}o?+';
    382382        bp_xprofile_update_meta( $g, 'group', $krazy_key, 'bar' );
     
    389389     */
    390390    public function test_bp_xprofile_update_meta_stripslashes() {
    391         $g = $this->factory->xprofile_group->create();
     391        $g = self::factory()->xprofile_group->create();
    392392        $v = "Totally \'tubular\'";
    393393        bp_xprofile_update_meta( $g, 'group', 'foo', $v );
     
    400400     */
    401401    public function test_bp_xprofile_update_meta_empty_value_delete() {
    402         $g = $this->factory->xprofile_group->create();
     402        $g = self::factory()->xprofile_group->create();
    403403        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    404404        bp_xprofile_update_meta( $g, 'group', 'foo', '' );
     
    411411     */
    412412    public function test_bp_xprofile_update_meta_new() {
    413         $g = $this->factory->xprofile_group->create();
     413        $g = self::factory()->xprofile_group->create();
    414414        $this->assertSame( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    415415        $this->assertNotEmpty( bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ) );
     
    422422     */
    423423    public function test_bp_xprofile_update_meta_existing() {
    424         $g = $this->factory->xprofile_group->create();
     424        $g = self::factory()->xprofile_group->create();
    425425        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    426426        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     
    434434     */
    435435    public function test_bp_xprofile_update_meta_same_value() {
    436         $g = $this->factory->xprofile_group->create();
     436        $g = self::factory()->xprofile_group->create();
    437437        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
    438438        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     
    445445     */
    446446    public function test_bp_xprofile_update_meta_prev_value() {
    447         $g = $this->factory->xprofile_group->create();
     447        $g = self::factory()->xprofile_group->create();
    448448        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
    449449
     
    466466     */
    467467    public function test_bp_xprofile_update_meta_where_sql_filter_keywords_are_in_quoted_value() {
    468         $g = $this->factory->xprofile_group->create();
     468        $g = self::factory()->xprofile_group->create();
    469469        $value = "SELECT object_id FROM wp_bp_xprofile_groups WHERE \"foo\" VALUES (foo = 'bar'";
    470470        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
     
    479479     */
    480480    public function test_bp_xprofile_update_meta_where_meta_id_is_in_quoted_value() {
    481         $g = $this->factory->xprofile_group->create();
     481        $g = self::factory()->xprofile_group->create();
    482482        $value = "foo meta_id bar";
    483483        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
     
    507507     */
    508508    public function test_bp_xprofile_add_meta_existing_unique() {
    509         $g = $this->factory->xprofile_group->create();
     509        $g = self::factory()->xprofile_group->create();
    510510        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
    511511        $this->assertFalse( bp_xprofile_add_meta( $g, 'group', 'foo', 'baz', true ) );
     
    517517     */
    518518    public function test_bp_xprofile_add_meta_existing_not_unique() {
    519         $g = $this->factory->xprofile_group->create();
     519        $g = self::factory()->xprofile_group->create();
    520520        bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' );
    521521        $this->assertNotEmpty( bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' ) );
     
    526526     */
    527527    public function test_bp_get_member_profile_data_inside_loop() {
    528         $u = $this->factory->user->create();
    529         $g = $this->factory->xprofile_group->create();
    530         $f = $this->factory->xprofile_field->create( array(
     528        $u = self::factory()->user->create();
     529        $g = self::factory()->xprofile_group->create();
     530        $f = self::factory()->xprofile_field->create( array(
    531531            'field_group_id' => $g,
    532532            'name' => 'Neato',
     
    550550     */
    551551    public function test_bp_get_member_profile_data_outside_of_loop() {
    552         $u = $this->factory->user->create();
    553         $g = $this->factory->xprofile_group->create();
    554         $f = $this->factory->xprofile_field->create( array(
     552        $u = self::factory()->user->create();
     553        $g = self::factory()->xprofile_group->create();
     554        $f = self::factory()->xprofile_field->create( array(
    555555            'field_group_id' => $g,
    556556            'name' => 'Kewl',
     
    570570     */
    571571    public function test_get_field_data_integer_zero() {
    572         $u = $this->factory->user->create();
    573         $g = $this->factory->xprofile_group->create();
    574         $f = $this->factory->xprofile_field->create( array(
     572        $u = self::factory()->user->create();
     573        $g = self::factory()->xprofile_group->create();
     574        $f = self::factory()->xprofile_field->create( array(
    575575            'field_group_id' => $g,
    576576            'type' => 'number',
     
    621621     */
    622622    public function test_xprofile_insert_field_type_option() {
    623         $g = $this->factory->xprofile_group->create();
    624         $parent = $this->factory->xprofile_field->create( array(
     623        $g = self::factory()->xprofile_group->create();
     624        $parent = self::factory()->xprofile_field->create( array(
    625625            'field_group_id' => $g,
    626626            'type' => 'selectbox',
     
    644644     */
    645645    public function test_xprofile_insert_field_should_process_falsey_values_for_boolean_params_on_existing_fields() {
    646         $g = $this->factory->xprofile_group->create();
     646        $g = self::factory()->xprofile_group->create();
    647647        $f = xprofile_insert_field( array(
    648648            'field_group_id' => $g,
     
    702702     */
    703703    public function test_xprofile_insert_field_type_option_option_order() {
    704         $g = $this->factory->xprofile_group->create();
    705         $parent = $this->factory->xprofile_field->create( array(
     704        $g = self::factory()->xprofile_group->create();
     705        $parent = self::factory()->xprofile_field->create( array(
    706706            'field_group_id' => $g,
    707707            'type' => 'selectbox',
     
    727727     */
    728728    public function test_xprofile_insert_field_should_set_is_default_option_to_false_for_new_option() {
    729         $g = $this->factory->xprofile_group->create();
    730         $parent = $this->factory->xprofile_field->create( array(
     729        $g = self::factory()->xprofile_group->create();
     730        $parent = self::factory()->xprofile_field->create( array(
    731731            'field_group_id' => $g,
    732732            'type' => 'selectbox',
     
    753753     */
    754754    public function test_xprofile_insert_field_should_set_is_default_option_to_true_for_new_option() {
    755         $g = $this->factory->xprofile_group->create();
    756         $parent = $this->factory->xprofile_field->create( array(
     755        $g = self::factory()->xprofile_group->create();
     756        $parent = self::factory()->xprofile_field->create( array(
    757757            'field_group_id' => $g,
    758758            'type' => 'selectbox',
     
    779779     */
    780780    public function test_xprofile_insert_field_should_set_is_default_option_to_false_for_existing_option() {
    781         $g = $this->factory->xprofile_group->create();
    782         $parent = $this->factory->xprofile_field->create( array(
     781        $g = self::factory()->xprofile_group->create();
     782        $parent = self::factory()->xprofile_field->create( array(
    783783            'field_group_id' => $g,
    784784            'type' => 'selectbox',
     
    815815     */
    816816    public function test_xprofile_insert_field_should_set_is_default_option_to_true_for_existing_option() {
    817         $g = $this->factory->xprofile_group->create();
    818         $parent = $this->factory->xprofile_field->create( array(
     817        $g = self::factory()->xprofile_group->create();
     818        $parent = self::factory()->xprofile_field->create( array(
    819819            'field_group_id' => $g,
    820820            'type' => 'selectbox',
     
    852852     */
    853853    public function test_bp_profile_get_field_groups_update_position() {
    854         $g1 = $this->factory->xprofile_group->create();
    855         $g2 = $this->factory->xprofile_group->create();
    856         $g3 = $this->factory->xprofile_group->create();
     854        $g1 = self::factory()->xprofile_group->create();
     855        $g2 = self::factory()->xprofile_group->create();
     856        $g3 = self::factory()->xprofile_group->create();
    857857
    858858        // prime the cache
     
    876876        global $wpdb;
    877877
    878         $g = $this->factory->xprofile_group->create();
    879         $f = $this->factory->xprofile_field->create( array(
     878        $g = self::factory()->xprofile_group->create();
     879        $f = self::factory()->xprofile_field->create( array(
    880880            'field_group_id' => $g,
    881881            'type' => 'selectbox',
     
    895895        global $wpdb;
    896896
    897         $g = $this->factory->xprofile_group->create();
    898         $f = $this->factory->xprofile_field->create( array(
     897        $g = self::factory()->xprofile_group->create();
     898        $f = self::factory()->xprofile_field->create( array(
    899899            'field_group_id' => $g,
    900900            'type' => 'selectbox',
     
    919919     */
    920920    public function test_bp_xprofie_is_richtext_enabled_for_field_should_default_to_true_for_textareas() {
    921         $g = $this->factory->xprofile_group->create();
    922         $f = $this->factory->xprofile_field->create( array(
     921        $g = self::factory()->xprofile_group->create();
     922        $f = self::factory()->xprofile_field->create( array(
    923923            'field_group_id' => $g,
    924924            'type' => 'textarea',
     
    932932     */
    933933    public function test_bp_xprofie_is_richtext_enabled_for_field_should_default_to_false_for_non_textareas() {
    934         $g = $this->factory->xprofile_group->create();
    935         $f = $this->factory->xprofile_field->create( array(
     934        $g = self::factory()->xprofile_group->create();
     935        $f = self::factory()->xprofile_field->create( array(
    936936            'field_group_id' => $g,
    937937            'type' => 'radio',
     
    10481048     */
    10491049    public function test_field_comma_seperated_values_are_autolinked() {
    1050         $field_group_id = $this->factory->xprofile_group->create();
    1051         $field_id = $this->factory->xprofile_field->create( array( 'field_group_id' => $field_group_id ) );
     1050        $field_group_id = self::factory()->xprofile_group->create();
     1051        $field_id = self::factory()->xprofile_field->create( array( 'field_group_id' => $field_group_id ) );
    10521052        $GLOBALS['field'] = new BP_XProfile_Field( $field_id );
    10531053        $GLOBALS['field']->do_autolink = true;
     
    10641064     */
    10651065    public function test_field_semicolon_seperated_values_are_autolinked() {
    1066         $field_group_id = $this->factory->xprofile_group->create();
    1067         $field_id = $this->factory->xprofile_field->create( array( 'field_group_id' => $field_group_id ) );
     1066        $field_group_id = self::factory()->xprofile_group->create();
     1067        $field_id = self::factory()->xprofile_field->create( array( 'field_group_id' => $field_group_id ) );
    10681068        $GLOBALS['field'] = new BP_XProfile_Field( $field_id );
    10691069        $GLOBALS['field']->do_autolink = true;
Note: See TracChangeset for help on using the changeset viewer.