Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
11/14/2014 02:01:18 PM (10 years ago)
Author:
boonebgorges
Message:

In automated tests, move user creation to a proper factory method.

BP user creation requires that a couple of extra pieces of data be set up
(last activity, display name, etc). So we previously had a wrapper in
BP_UnitTestCase called create_user() that performed the extra setup.
However, the wrapper made it impossible to use create_user() statically,
because the user_login and user_email iterator was not persistent from call to
call. (The create_user() syntax is also a break with the rest of our unit
tests, which is not ideal.)

This changeset introduces BP_UnitTest_Factory_For_User, which reproduces the
customizations of create_user(), but in a proper factory method. All
instances of create_user() throughout the test suite have also been replaced.

See #6009.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php

    r9120 r9139  
    2222    public function test_with_include() {
    2323        $g = $this->factory->group->create();
    24         $u1 = $this->create_user();
    25         $u2 = $this->create_user();
    26         $u3 = $this->create_user();
     24        $u1 = $this->factory->user->create();
     25        $u2 = $this->factory->user->create();
     26        $u3 = $this->factory->user->create();
    2727        $time = time();
    2828
    … …  
    4242    public function test_with_group_role_null() {
    4343        $g = $this->factory->group->create();
    44         $u1 = $this->create_user();
    45         $u2 = $this->create_user();
    46         $u3 = $this->create_user();
     44        $u1 = $this->factory->user->create();
     45        $u2 = $this->factory->user->create();
     46        $u3 = $this->factory->user->create();
    4747        $time = time();
    4848
    … …  
    7070    public function test_with_group_role_member() {
    7171        $g = $this->factory->group->create();
    72         $u1 = $this->create_user();
    73         $u2 = $this->create_user();
    74         $u3 = $this->create_user();
     72        $u1 = $this->factory->user->create();
     73        $u2 = $this->factory->user->create();
     74        $u3 = $this->factory->user->create();
    7575        $time = time();
    7676
    … …  
    9595    public function test_with_group_role_mod() {
    9696        $g = $this->factory->group->create();
    97         $u1 = $this->create_user();
    98         $u2 = $this->create_user();
    99         $u3 = $this->create_user();
     97        $u1 = $this->factory->user->create();
     98        $u2 = $this->factory->user->create();
     99        $u3 = $this->factory->user->create();
    100100        $time = time();
    101101
    … …  
    119119
    120120    public function test_with_group_role_admin() {
    121         $u1 = $this->create_user();
    122         $u2 = $this->create_user();
    123         $u3 = $this->create_user();
     121        $u1 = $this->factory->user->create();
     122        $u2 = $this->factory->user->create();
     123        $u3 = $this->factory->user->create();
    124124        $g  = $this->factory->group->create( array(
    125125            'creator_id' => $u1
    … …  
    147147    public function test_with_group_role_member_mod() {
    148148        $g = $this->factory->group->create();
    149         $u1 = $this->create_user();
    150         $u2 = $this->create_user();
    151         $u3 = $this->create_user();
     149        $u1 = $this->factory->user->create();
     150        $u2 = $this->factory->user->create();
     151        $u3 = $this->factory->user->create();
    152152        $time = time();
    153153
    … …  
    171171
    172172    public function test_with_group_role_member_admin() {
    173         $u1 = $this->create_user();
    174         $u2 = $this->create_user();
    175         $u3 = $this->create_user();
     173        $u1 = $this->factory->user->create();
     174        $u2 = $this->factory->user->create();
     175        $u3 = $this->factory->user->create();
    176176        $g  = $this->factory->group->create( array(
    177177            'creator_id' => $u1,
    … …  
    198198
    199199    public function test_with_group_role_mod_admin() {
    200         $u1 = $this->create_user();
    201         $u2 = $this->create_user();
    202         $u3 = $this->create_user();
     200        $u1 = $this->factory->user->create();
     201        $u2 = $this->factory->user->create();
     202        $u3 = $this->factory->user->create();
    203203        $g  = $this->factory->group->create( array(
    204204            'creator_id' => $u1,
    … …  
    225225
    226226    public function test_with_group_role_member_mod_admin() {
    227         $u1 = $this->create_user();
    228         $u2 = $this->create_user();
    229         $u3 = $this->create_user();
     227        $u1 = $this->factory->user->create();
     228        $u2 = $this->factory->user->create();
     229        $u3 = $this->factory->user->create();
    230230        $g  = $this->factory->group->create( array(
    231231            'creator_id' => $u1,
    … …  
    252252
    253253    public function test_with_group_role_member_mod_admin_banned() {
    254         $u1 = $this->create_user();
    255         $u2 = $this->create_user();
    256         $u3 = $this->create_user();
    257         $u4 = $this->create_user();
     254        $u1 = $this->factory->user->create();
     255        $u2 = $this->factory->user->create();
     256        $u3 = $this->factory->user->create();
     257        $u4 = $this->factory->user->create();
    258258        $g  = $this->factory->group->create( array(
    259259            'creator_id' => $u1,
    … …  
    287287    public function test_with_group_role_banned() {
    288288        $g = $this->factory->group->create();
    289         $u1 = $this->create_user();
    290         $u2 = $this->create_user();
     289        $u1 = $this->factory->user->create();
     290        $u2 = $this->factory->user->create();
    291291        $time = time();
    292292
    … …  
    308308    public function test_group_has_no_members_of_role_mod() {
    309309        $g = $this->factory->group->create();
    310         $u1 = $this->create_user();
     310        $u1 = $this->factory->user->create();
    311311        $time = time();
    312312
    … …  
    324324    public function test_confirmed_members() {
    325325        $g = $this->factory->group->create();
    326         $u1 = $this->create_user();
    327         $u2 = $this->create_user();
     326        $u1 = $this->factory->user->create();
     327        $u2 = $this->factory->user->create();
    328328        $time = time();
    329329
    … …  
    351351    public function test_get_with_type_last_joined() {
    352352        $g = $this->factory->group->create();
    353         $u1 = $this->create_user();
    354         $u2 = $this->create_user();
     353        $u1 = $this->factory->user->create();
     354        $u2 = $this->factory->user->create();
    355355        $time = time();
    356356
    … …  
    377377    public function test_get_with_type_first_joined() {
    378378        $g = $this->factory->group->create();
    379         $u1 = $this->create_user();
    380         $u2 = $this->create_user();
     379        $u1 = $this->factory->user->create();
     380        $u2 = $this->factory->user->create();
    381381        $time = time();
    382382
    … …  
    404404    public function test_get_with_type_group_activity_with_activity_component_disabled() {
    405405        $g = $this->factory->group->create();
    406         $u1 = $this->create_user();
    407         $u2 = $this->create_user();
    408         $u3 = $this->create_user();
     406        $u1 = $this->factory->user->create();
     407        $u2 = $this->factory->user->create();
     408        $u3 = $this->factory->user->create();
    409409        $c = buddypress()->groups->id;
    410410        $time = time();
    … …  
    475475    public function test_get_with_type_group_activity() {
    476476        $g = $this->factory->group->create();
    477         $u1 = $this->create_user();
    478         $u2 = $this->create_user();
    479         $u3 = $this->create_user();
     477        $u1 = $this->factory->user->create();
     478        $u2 = $this->factory->user->create();
     479        $u3 = $this->factory->user->create();
    480480        $c = buddypress()->groups->id;
    481481        $time = time();
    … …  
    532532    public function test_get_with_type_group_activity_no_dupes() {
    533533        $g = $this->factory->group->create();
    534         $u1 = $this->create_user();
     534        $u1 = $this->factory->user->create();
    535535        $c = buddypress()->groups->id;
    536536        $time = time();
    … …  
    569569    public function test_get_with_type_alphabetical() {
    570570        $g = $this->factory->group->create();
    571         $u1 = $this->create_user( array(
     571        $u1 = $this->factory->user->create( array(
    572572            'display_name' => 'AAA',
    573573        ) );
    574         $u2 = $this->create_user( array(
     574        $u2 = $this->factory->user->create( array(
    575575            'display_name' => 'CCC',
    576576        ) );
    577         $u3 = $this->create_user( array(
     577        $u3 = $this->factory->user->create( array(
    578578            'display_name' => 'BBB',
    579579        ) );
    … …  
    606606    public function test_with_invite_sent_true() {
    607607        $g = $this->factory->group->create();
    608         $u1 = $this->create_user();
    609         $u2 = $this->create_user();
     608        $u1 = $this->factory->user->create();
     609        $u2 = $this->factory->user->create();
    610610        $time = time();
    611611
    … …  
    637637    public function test_with_invite_sent_false() {
    638638        $g = $this->factory->group->create();
    639         $u1 = $this->create_user();
    640         $u2 = $this->create_user();
     639        $u1 = $this->factory->user->create();
     640        $u2 = $this->factory->user->create();
    641641        $time = time();
    642642
    … …  
    668668    public function test_with_inviter_id_false() {
    669669        $g = $this->factory->group->create();
    670         $u1 = $this->create_user();
    671         $u2 = $this->create_user();
     670        $u1 = $this->factory->user->create();
     671        $u2 = $this->factory->user->create();
    672672        $time = time();
    673673
    … …  
    696696    public function test_with_inviter_id_specific() {
    697697        $g = $this->factory->group->create();
    698         $u1 = $this->create_user();
    699         $u2 = $this->create_user();
    700         $u3 = $this->create_user();
    701         $u4 = $this->create_user();
     698        $u1 = $this->factory->user->create();
     699        $u2 = $this->factory->user->create();
     700        $u3 = $this->factory->user->create();
     701        $u4 = $this->factory->user->create();
    702702        $time = time();
    703703
    … …  
    736736    public function test_with_inviter_id_any() {
    737737        $g = $this->factory->group->create();
    738         $u1 = $this->create_user();
    739         $u2 = $this->create_user();
    740         $u3 = $this->create_user();
    741         $u4 = $this->create_user();
     738        $u1 = $this->factory->user->create();
     739        $u2 = $this->factory->user->create();
     740        $u3 = $this->factory->user->create();
     741        $u4 = $this->factory->user->create();
    742742        $time = time();
    743743
Note: See TracChangeset for help on using the changeset viewer.