Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
02/14/2014 12:17:53 PM (11 years ago)
Author:
boonebgorges
Message:

Tests: xprofile factory create() methods should return IDs, not objects

This is more consistent with other components

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/testcases/xprofile/functions.php

    r7862 r7873  
    7171        $g = $this->factory->xprofile_group->create();
    7272        $f = $this->factory->xprofile_field->create( array(
    73             'field_group_id' => $g->id,
     73            'field_group_id' => $g,
    7474            'type' => 'textbox',
    7575        ) );
    … …  
    7878
    7979Bar!';
    80         bp_xprofile_update_meta( $f->id, 'field', 'linebreak_field', $meta_value );
    81         $this->assertEquals( $meta_value, bp_xprofile_get_meta( $f->id, 'field', 'linebreak_field' ) );
     80        bp_xprofile_update_meta( $f, 'field', 'linebreak_field', $meta_value );
     81        $this->assertEquals( $meta_value, bp_xprofile_get_meta( $f, 'field', 'linebreak_field' ) );
    8282    }
    8383
    … …  
    109109        $g = $this->factory->xprofile_group->create();
    110110        $f = $this->factory->xprofile_field->create( array(
    111             'field_group_id' => $g->id,
     111            'field_group_id' => $g,
    112112            'type' => 'textbox',
    113113        ) );
    114114
    115         bp_xprofile_update_meta( $f->id, 'field', 'default_visibility', 'adminsonly' );
    116         bp_xprofile_update_meta( $f->id, 'field', 'allow_custom_visibility', 'allowed' );
    117 
    118         xprofile_set_field_visibility_level( $f->id, $u, 'loggedin' );
    119 
    120         $this->assertSame( 'loggedin', xprofile_get_field_visibility_level( $f->id, $u ) );
     115        bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
     116        bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'allowed' );
     117
     118        xprofile_set_field_visibility_level( $f, $u, 'loggedin' );
     119
     120        $this->assertSame( 'loggedin', xprofile_get_field_visibility_level( $f, $u ) );
    121121    }
    122122
    … …  
    128128        $g = $this->factory->xprofile_group->create();
    129129        $f = $this->factory->xprofile_field->create( array(
    130             'field_group_id' => $g->id,
     130            'field_group_id' => $g,
    131131            'type' => 'textbox',
    132132        ) );
    133133
    134         bp_xprofile_update_meta( $f->id, 'field', 'default_visibility', 'adminsonly' );
    135         bp_xprofile_update_meta( $f->id, 'field', 'allow_custom_visibility', 'allowed' );
    136 
    137         $this->assertSame( 'adminsonly', xprofile_get_field_visibility_level( $f->id, $u ) );
     134        bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
     135        bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'allowed' );
     136
     137        $this->assertSame( 'adminsonly', xprofile_get_field_visibility_level( $f, $u ) );
    138138
    139139    }
    … …  
    146146        $g = $this->factory->xprofile_group->create();
    147147        $f = $this->factory->xprofile_field->create( array(
    148             'field_group_id' => $g->id,
     148            'field_group_id' => $g,
    149149            'type' => 'textbox',
    150150        ) );
    151151
    152         bp_xprofile_update_meta( $f->id, 'field', 'default_visibility', 'adminsonly' );
    153         bp_xprofile_update_meta( $f->id, 'field', 'allow_custom_visibility', 'disabled' );
    154 
    155         xprofile_set_field_visibility_level( $f->id, $u, 'loggedin' );
    156 
    157         $this->assertSame( 'adminsonly', xprofile_get_field_visibility_level( $f->id, $u ) );
     152        bp_xprofile_update_meta( $f, 'field', 'default_visibility', 'adminsonly' );
     153        bp_xprofile_update_meta( $f, 'field', 'allow_custom_visibility', 'disabled' );
     154
     155        xprofile_set_field_visibility_level( $f, $u, 'loggedin' );
     156
     157        $this->assertSame( 'adminsonly', xprofile_get_field_visibility_level( $f, $u ) );
    158158    }
    159159
    … …  
    188188    public function test_bp_xprofile_delete_meta_illegal_characters() {
    189189        $g = $this->factory->xprofile_group->create();
    190         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    191         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     190        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     191        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    192192
    193193        $krazy_key = ' f!@#$%^o *(){}o?+';
    194         $this->assertTrue( bp_xprofile_delete_meta( $g->id, 'group', 'foo' ) );
    195         $this->assertEquals( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     194        $this->assertTrue( bp_xprofile_delete_meta( $g, 'group', 'foo' ) );
     195        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    196196    }
    197197
    … …  
    202202    public function test_bp_xprofile_delete_meta_trim_meta_value() {
    203203        $g = $this->factory->xprofile_group->create();
    204         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    205         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    206 
    207         $this->assertTrue( bp_xprofile_delete_meta( $g->id, 'group', 'foo', ' bar  ' ) );
    208         $this->assertEquals( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     204        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     205        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     206
     207        $this->assertTrue( bp_xprofile_delete_meta( $g, 'group', 'foo', ' bar  ' ) );
     208        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    209209    }
    210210
    … …  
    215215    public function test_bp_xprofile_delete_meta_meta_value_match() {
    216216        $g = $this->factory->xprofile_group->create();
    217         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    218         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    219         $this->assertTrue( bp_xprofile_delete_meta( $g->id, 'group', 'foo', 'bar' ) );
    220         $this->assertEquals( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     217        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     218        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     219        $this->assertTrue( bp_xprofile_delete_meta( $g, 'group', 'foo', 'bar' ) );
     220        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    221221    }
    222222
    … …  
    227227    public function test_bp_xprofile_delete_meta_delete_all() {
    228228        $g = $this->factory->xprofile_group->create();
    229         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    230         bp_xprofile_update_meta( $g->id, 'group', 'foo2', 'bar' );
    231         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    232         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo2' ) );
    233 
    234         $this->assertTrue( bp_xprofile_delete_meta( $g->id, 'group' ) );
     229        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     230        bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' );
     231        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     232        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo2' ) );
     233
     234        $this->assertTrue( bp_xprofile_delete_meta( $g, 'group' ) );
    235235
    236236        // These will fail because of a caching bug
    237         $this->assertEquals( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    238         $this->assertEquals( '', bp_xprofile_get_meta( $g->id, 'group', 'foo2' ) );
     237        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     238        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo2' ) );
    239239    }
    240240
    … …  
    269269    public function test_bp_xprofile_get_meta_no_meta_key() {
    270270        $g = $this->factory->xprofile_group->create();
    271         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    272         bp_xprofile_update_meta( $g->id, 'group', 'foo2', 'bar' );
     271        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     272        bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' );
    273273
    274274        $expected = array( 'bar', 'bar', );
    275         $this->assertSame( $expected, bp_xprofile_get_meta( $g->id, 'group' ) );
     275        $this->assertSame( $expected, bp_xprofile_get_meta( $g, 'group' ) );
    276276    }
    277277
    … …  
    284284
    285285        $expected = array();
    286         $this->assertSame( $expected, bp_xprofile_get_meta( $g->id, 'group' ) );
     286        $this->assertSame( $expected, bp_xprofile_get_meta( $g, 'group' ) );
    287287    }
    288288
    … …  
    318318        $g = $this->factory->xprofile_group->create();
    319319        $krazy_key = ' f!@#$%^o *(){}o?+';
    320         bp_xprofile_update_meta( $g->id, 'group', $krazy_key, 'bar' );
    321         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     320        bp_xprofile_update_meta( $g, 'group', $krazy_key, 'bar' );
     321        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    322322    }
    323323
    … …  
    329329        $g = $this->factory->xprofile_group->create();
    330330        $v = "Totally \'tubular\'";
    331         bp_xprofile_update_meta( $g->id, 'group', 'foo', $v );
    332         $this->assertSame( stripslashes( $v ), bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     331        bp_xprofile_update_meta( $g, 'group', 'foo', $v );
     332        $this->assertSame( stripslashes( $v ), bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    333333    }
    334334
    … …  
    339339    public function test_bp_xprofile_update_meta_empty_value_delete() {
    340340        $g = $this->factory->xprofile_group->create();
    341         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    342         bp_xprofile_update_meta( $g->id, 'group', 'foo', '' );
    343         $this->assertSame( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     341        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     342        bp_xprofile_update_meta( $g, 'group', 'foo', '' );
     343        $this->assertSame( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    344344    }
    345345
    … …  
    350350    public function test_bp_xprofile_update_meta_new() {
    351351        $g = $this->factory->xprofile_group->create();
    352         $this->assertSame( '', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    353         $this->assertTrue( bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' ) );
    354         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     352        $this->assertSame( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     353        $this->assertTrue( bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ) );
     354        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    355355    }
    356356
    … …  
    361361    public function test_bp_xprofile_update_meta_existing() {
    362362        $g = $this->factory->xprofile_group->create();
    363         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    364         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    365         $this->assertTrue( bp_xprofile_update_meta( $g->id, 'group', 'foo', 'baz' ) );
    366         $this->assertSame( 'baz', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
     363        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     364        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     365        $this->assertTrue( bp_xprofile_update_meta( $g, 'group', 'foo', 'baz' ) );
     366        $this->assertSame( 'baz', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
    367367    }
    368368
    … …  
    373373    public function test_bp_xprofile_update_meta_same_value() {
    374374        $g = $this->factory->xprofile_group->create();
    375         bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' );
    376         $this->assertSame( 'bar', bp_xprofile_get_meta( $g->id, 'group', 'foo' ) );
    377         $this->assertFalse( bp_xprofile_update_meta( $g->id, 'group', 'foo', 'bar' ) );
     375        bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
     376        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     377        $this->assertFalse( bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ) );
    378378    }
    379379}
Note: See TracChangeset for help on using the changeset viewer.