Changeset 11737
- Timestamp:
- 11/03/2017 07:44:10 PM (7 years ago)
- Location:
- trunk/tests/phpunit/testcases
- Files:
-
- 86 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/tests/phpunit/testcases/activity/actions.php
r11256 r11737 16 16 ) ); 17 17 18 $post_id = $this->factory->post->create( array(18 $post_id = self::factory()->post->create( array( 19 19 'post_status' => 'publish', 20 20 'post_type' => 'foo', … … 40 40 ) ); 41 41 42 $post_id = $this->factory->post->create( array(42 $post_id = self::factory()->post->create( array( 43 43 'post_status' => 'publish', 44 44 'post_type' => 'foo', … … 58 58 */ 59 59 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(); 61 61 62 62 $labels = array( … … 85 85 86 86 // Create the initial post. 87 $p = $this->factory->post->create( array(87 $p = self::factory()->post->create( array( 88 88 'post_author' => $u, 89 89 'post_type' => 'foo', … … 119 119 ) ); 120 120 121 $post_id = $this->factory->post->create( array(121 $post_id = self::factory()->post->create( array( 122 122 'post_status' => 'publish', 123 123 'post_type' => 'foo', … … 151 151 ) ); 152 152 153 $post_id = $this->factory->post->create( array(153 $post_id = self::factory()->post->create( array( 154 154 'post_status' => 'publish', 155 155 'post_type' => 'foo', -
trunk/tests/phpunit/testcases/activity/cache.php
r11076 r11737 10 10 */ 11 11 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(); 14 14 15 15 // Set up some data … … 59 59 */ 60 60 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( 64 64 'component' => buddypress()->activity->id, 65 65 'type' => 'activity_update', … … 92 92 global $wpdb; 93 93 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( 96 96 'component' => buddypress()->activity->id, 97 97 'type' => 'activity_update', … … 123 123 global $wpdb; 124 124 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( 127 127 'component' => buddypress()->activity->id, 128 128 'type' => 'activity_update', … … 162 162 global $wpdb; 163 163 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( 166 166 'component' => buddypress()->activity->id, 167 167 'type' => 'activity_update', … … 179 179 180 180 // Bust the cache. 181 $a2 = $this->factory->activity->create( array(181 $a2 = self::factory()->activity->create( array( 182 182 'component' => buddypress()->activity->id, 183 183 'type' => 'activity_update', … … 204 204 global $wpdb; 205 205 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( 208 208 'component' => buddypress()->activity->id, 209 209 'type' => 'activity_update', … … 221 221 222 222 // Bust the cache. 223 $this->factory->activity->create( array(223 self::factory()->activity->create( array( 224 224 'id' => $a, 225 225 'component' => buddypress()->activity->id, … … 244 244 global $wpdb; 245 245 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( 248 248 'component' => buddypress()->activity->id, 249 249 'type' => 'activity_update', … … 281 281 global $wpdb; 282 282 283 $activities = $this->factory->activity->create_many( 2 );283 $activities = self::factory()->activity->create_many( 2 ); 284 284 bp_activity_add_meta( $activities[0], 'foo', 'bar' ); 285 285 … … 309 309 global $wpdb; 310 310 311 $activities = $this->factory->activity->create_many( 2 );311 $activities = self::factory()->activity->create_many( 2 ); 312 312 bp_activity_add_meta( $activities[0], 'foo', 'bar' ); 313 313 bp_activity_add_meta( $activities[1], 'foo', 'baz' ); … … 338 338 global $wpdb; 339 339 340 $activities = $this->factory->activity->create_many( 2 );340 $activities = self::factory()->activity->create_many( 2 ); 341 341 bp_activity_add_meta( $activities[0], 'foo', 'bar' ); 342 342 bp_activity_add_meta( $activities[1], 'foo', 'bar' ); -
trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php
r11312 r11737 10 10 public function test_check_exists_by_content() { 11 11 $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( 13 13 'content' => $content, 14 14 'type' => 'activity_update', … … 23 23 */ 24 24 public function test_delete_activity_item_comments() { 25 $parent_activity = $this->factory->activity->create( array(25 $parent_activity = self::factory()->activity->create( array( 26 26 'type' => 'activity_update', 27 27 ) ); 28 28 29 $comments = $this->factory->activity->create_many( 3, array(29 $comments = self::factory()->activity->create_many( 3, array( 30 30 'item_id' => $parent_activity, 31 31 'type' => 'activity_comment', … … 44 44 */ 45 45 public function test_delete_activity_meta_entries() { 46 $activity = $this->factory->activity->create( array(46 $activity = self::factory()->activity->create( array( 47 47 'type' => 'activity_update', 48 48 ) ); … … 61 61 */ 62 62 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( 64 64 'type' => 'activity_update', 65 65 ) ); … … 75 75 */ 76 76 public function test_hide_all_for_user() { 77 $activity = $this->factory->activity->create( array(77 $activity = self::factory()->activity->create( array( 78 78 'type' => 'activity_update', 79 79 ) ); … … 93 93 */ 94 94 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(); 97 97 bp_activity_update_meta( $a1, 'foo', 'bar' ); 98 98 … … 114 114 public function test_get_with_meta_query_two_clauses_with_or_relation() { 115 115 $now = time(); 116 $a1 = $this->factory->activity->create( array(116 $a1 = self::factory()->activity->create( array( 117 117 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 118 118 ) ); 119 $a2 = $this->factory->activity->create( array(119 $a2 = self::factory()->activity->create( array( 120 120 'recorded_time' => date( 'Y-m-d H:i:s', $now - 60 ), 121 121 ) ); 122 $a3 = $this->factory->activity->create( array(122 $a3 = self::factory()->activity->create( array( 123 123 'recorded_time' => date( 'Y-m-d H:i:s', $now - 120 ), 124 124 ) ); … … 157 157 } 158 158 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( 161 161 'recorded_time' => '2001-01-01 12:00' 162 162 ) ); 163 $a3 = $this->factory->activity->create( array(163 $a3 = self::factory()->activity->create( array( 164 164 'recorded_time' => '2005-01-01 12:00' 165 165 ) ); … … 188 188 } 189 189 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( 192 192 'recorded_time' => '2001-01-01 12:00' 193 193 ) ); 194 $a3 = $this->factory->activity->create( array(194 $a3 = self::factory()->activity->create( array( 195 195 'recorded_time' => '2005-01-01 12:00' 196 196 ) ); … … 221 221 } 222 222 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( 225 225 'recorded_time' => '2001-01-01 12:00' 226 226 ) ); 227 $a3 = $this->factory->activity->create( array(227 $a3 = self::factory()->activity->create( array( 228 228 'recorded_time' => '2005-01-01 12:00' 229 229 ) ); … … 242 242 */ 243 243 public function test_get_with_search_terms() { 244 $a1 = $this->factory->activity->create( array(244 $a1 = self::factory()->activity->create( array( 245 245 'content' => 'Boone is a cool guy', 246 246 ) ); 247 $a2 = $this->factory->activity->create( array(247 $a2 = self::factory()->activity->create( array( 248 248 'content' => 'No he isn\'t', 249 249 ) ); … … 260 260 */ 261 261 public function test_get_with_display_comments_threaded() { 262 $u = $this->factory->user->create();262 $u = self::factory()->user->create(); 263 263 264 264 $now = time(); 265 $a1 = $this->factory->activity->create( array(265 $a1 = self::factory()->activity->create( array( 266 266 'user_id' => $u, 267 267 'content' => 'Life Rules', 268 268 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 269 269 ) ); 270 $a2 = $this->factory->activity->create( array(270 $a2 = self::factory()->activity->create( array( 271 271 'user_id' => $u, 272 272 'content' => 'Life Drools', … … 303 303 public function test_get_with_display_comments_stream() { 304 304 $now = time(); 305 $a1 = $this->factory->activity->create( array(305 $a1 = self::factory()->activity->create( array( 306 306 'content' => 'Life Rules', 307 307 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 308 308 ) ); 309 $a2 = $this->factory->activity->create( array(309 $a2 = self::factory()->activity->create( array( 310 310 'content' => 'Life Drools', 311 311 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 336 336 public function test_get_with_display_comments_false() { 337 337 $now = time(); 338 $a1 = $this->factory->activity->create( array(338 $a1 = self::factory()->activity->create( array( 339 339 'content' => 'Life Rules', 340 340 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 341 341 ) ); 342 $a2 = $this->factory->activity->create( array(342 $a2 = self::factory()->activity->create( array( 343 343 'content' => 'Life Drools', 344 344 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 362 362 public function test_get_with_offset() { 363 363 $now = time(); 364 $a1 = $this->factory->activity->create( array(364 $a1 = self::factory()->activity->create( array( 365 365 'content' => 'Life Rules', 366 366 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 367 367 ) ); 368 $a2 = $this->factory->activity->create( array(368 $a2 = self::factory()->activity->create( array( 369 369 'content' => 'Life Drools', 370 370 'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ), 371 371 ) ); 372 $a3 = $this->factory->activity->create( array(372 $a3 = self::factory()->activity->create( array( 373 373 'content' => 'Life Drools', 374 374 'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ), … … 389 389 public function test_get_with_since() { 390 390 $now = time(); 391 $a1 = $this->factory->activity->create( array(391 $a1 = self::factory()->activity->create( array( 392 392 'content' => 'Life Rules', 393 393 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 394 394 ) ); 395 $a2 = $this->factory->activity->create( array(395 $a2 = self::factory()->activity->create( array( 396 396 'content' => 'Life Drools', 397 397 'recorded_time' => date( 'Y-m-d H:i:s', $now - 50 ), 398 398 ) ); 399 $a3 = $this->factory->activity->create( array(399 $a3 = self::factory()->activity->create( array( 400 400 'content' => 'Life Drools', 401 401 'recorded_time' => date( 'Y-m-d H:i:s', $now - 10 ), … … 416 416 */ 417 417 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(); 420 420 421 421 $activity = BP_Activity_Activity::get( array( … … 431 431 */ 432 432 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(); 435 435 436 436 $activity = BP_Activity_Activity::get( array( … … 446 446 */ 447 447 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(); 450 450 451 451 $activity = BP_Activity_Activity::get(); … … 458 458 */ 459 459 public function test_get_id_with_item_id() { 460 $a1 = $this->factory->activity->create( array(460 $a1 = self::factory()->activity->create( array( 461 461 'item_id' => 523, 462 462 ) ); 463 $a2 = $this->factory->activity->create( array(463 $a2 = self::factory()->activity->create( array( 464 464 'item_id' => 1888, 465 465 ) ); … … 473 473 */ 474 474 public function test_get_id_with_secondary_item_id() { 475 $a1 = $this->factory->activity->create( array(475 $a1 = self::factory()->activity->create( array( 476 476 'secondary_item_id' => 523, 477 477 ) ); 478 $a2 = $this->factory->activity->create( array(478 $a2 = self::factory()->activity->create( array( 479 479 'secondary_content' => 1888, 480 480 ) ); … … 488 488 */ 489 489 public function test_delete_with_item_id() { 490 $a1 = $this->factory->activity->create( array(490 $a1 = self::factory()->activity->create( array( 491 491 'item_id' => 523, 492 492 ) ); 493 $a2 = $this->factory->activity->create( array(493 $a2 = self::factory()->activity->create( array( 494 494 'item_id' => 1888, 495 495 ) ); … … 505 505 */ 506 506 public function test_delete_with_secondary_item_id() { 507 $a1 = $this->factory->activity->create( array(507 $a1 = self::factory()->activity->create( array( 508 508 'secondary_item_id' => 523, 509 509 ) ); 510 $a2 = $this->factory->activity->create( array(510 $a2 = self::factory()->activity->create( array( 511 511 'secondary_item_id' => 1888, 512 512 ) ); … … 527 527 $now = time(); 528 528 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( 533 533 'content' => 'Life Rules', 534 534 'recorded_time' => date( 'Y-m-d H:i:s', $now ), … … 602 602 public function test_get_last_updated() { 603 603 $now = time(); 604 $a1 = $this->factory->activity->create( array(604 $a1 = self::factory()->activity->create( array( 605 605 'recorded_time' => date( 'Y-m-d H:i:s', $now - 500 ), 606 606 ) ); 607 $a2 = $this->factory->activity->create( array(607 $a2 = self::factory()->activity->create( array( 608 608 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 609 609 ) ); 610 $a3 = $this->factory->activity->create( array(610 $a3 = self::factory()->activity->create( array( 611 611 'recorded_time' => date( 'Y-m-d H:i:s', $now - 300 ), 612 612 ) ); … … 619 619 */ 620 620 public function test_get_recorded_components_skip_last_activity_false() { 621 $a1 = $this->factory->activity->create( array(621 $a1 = self::factory()->activity->create( array( 622 622 'component' => 'members', 623 623 'action' => 'last_activity', 624 624 ) ); 625 $a2 = $this->factory->activity->create( array(625 $a2 = self::factory()->activity->create( array( 626 626 'component' => 'groups', 627 627 'action' => 'created_group', 628 628 ) ); 629 $a3 = $this->factory->activity->create( array(629 $a3 = self::factory()->activity->create( array( 630 630 'component' => 'friends', 631 631 'action' => 'friendship_accepted', … … 642 642 */ 643 643 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( 645 645 'component' => 'members', 646 646 'action' => 'last_activity', 647 647 ) ); 648 $a2 = $this->factory->activity->create( array(648 $a2 = self::factory()->activity->create( array( 649 649 'component' => 'groups', 650 650 'action' => 'created_group', 651 651 ) ); 652 $a3 = $this->factory->activity->create( array(652 $a3 = self::factory()->activity->create( array( 653 653 'component' => 'friends', 654 654 'action' => 'friendship_accepted', … … 665 665 */ 666 666 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( 668 668 'component' => 'members', 669 669 'action' => 'last_activity', 670 670 ) ); 671 $a2 = $this->factory->activity->create( array(671 $a2 = self::factory()->activity->create( array( 672 672 'component' => 'groups', 673 673 'action' => 'created_group', 674 674 ) ); 675 $a3 = $this->factory->activity->create( array(675 $a3 = self::factory()->activity->create( array( 676 676 'component' => 'friends', 677 677 'action' => 'friendship_accepted', 678 678 ) ); 679 $a4 = $this->factory->activity->create( array(679 $a4 = self::factory()->activity->create( array( 680 680 'component' => 'members', 681 681 'action' => 'foo', … … 692 692 */ 693 693 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( 695 695 'component' => 'members', 696 696 'action' => 'last_activity', 697 697 ) ); 698 $a2 = $this->factory->activity->create( array(698 $a2 = self::factory()->activity->create( array( 699 699 'component' => 'groups', 700 700 'action' => 'created_group', 701 701 ) ); 702 $a3 = $this->factory->activity->create( array(702 $a3 = self::factory()->activity->create( array( 703 703 'component' => 'friends', 704 704 'action' => 'friendship_accepted', 705 705 ) ); 706 $a4 = $this->factory->activity->create( array(706 $a4 = self::factory()->activity->create( array( 707 707 'component' => 'groups', 708 708 'action' => 'last_activity', … … 726 726 727 727 // Create the activity item with a manual activity string 728 $a = $this->factory->activity->create( array(728 $a = self::factory()->activity->create( array( 729 729 'component' => 'foo', 730 730 'type' => 'bar', … … 744 744 745 745 // Create the activity item with a manual activity string 746 $a = $this->factory->activity->create( array(746 $a = self::factory()->activity->create( array( 747 747 'component' => 'foo', 748 748 'type' => 'bar1', … … 762 762 763 763 // Create the activity item with a manual activity string 764 $a = $this->factory->activity->create( array(764 $a = self::factory()->activity->create( array( 765 765 'component' => 'foo', 766 766 'type' => 'bar2', … … 776 776 */ 777 777 public function test_nonexistent_activity_should_have_id_0_after_population() { 778 $a = $this->factory->activity->create();778 $a = self::factory()->activity->create(); 779 779 bp_activity_delete_by_activity_id( $a ); 780 780 -
trunk/tests/phpunit/testcases/activity/filters.php
r10960 r11737 10 10 */ 11 11 public function test_bp_activity_at_name_filter() { 12 $u1 = $this->factory->user->create( array(12 $u1 = self::factory()->user->create( array( 13 13 'user_login' => 'foobarbaz', 14 14 'user_nicename' => 'foobarbaz', 15 15 ) ); 16 16 17 $u2 = $this->factory->user->create( array(17 $u2 = self::factory()->user->create( array( 18 18 'user_login' => 'foo2', 19 19 'user_nicename' => 'foo2', -
trunk/tests/phpunit/testcases/activity/functions.php
r11583 r11737 28 28 29 29 // create an activity update 30 $activity = $this->factory->activity->create( array(30 $activity = self::factory()->activity->create( array( 31 31 'type' => 'activity_update' 32 32 ) ); … … 57 57 58 58 // 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 ); 63 63 64 64 // now delete the activity items … … 83 83 84 84 // 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 ); 89 89 90 90 // now delete the activity items … … 109 109 110 110 // 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 ); 115 115 116 116 // now delete the activity items … … 130 130 131 131 // create an activity update 132 $activity = $this->factory->activity->create( array(132 $activity = self::factory()->activity->create( array( 133 133 'type' => 'activity_update' 134 134 ) ); … … 153 153 154 154 // create an activity update 155 $activity = $this->factory->activity->create( array(155 $activity = self::factory()->activity->create( array( 156 156 'type' => 'activity_update' 157 157 ) ); … … 188 188 189 189 // create an activity update 190 $parent_activity = $this->factory->activity->create( array(190 $parent_activity = self::factory()->activity->create( array( 191 191 'type' => 'activity_update', 192 192 ) ); 193 193 194 194 // create some activity comments 195 $comment_one = $this->factory->activity->create( array(195 $comment_one = self::factory()->activity->create( array( 196 196 'type' => 'activity_comment', 197 197 'item_id' => $parent_activity, … … 199 199 ) ); 200 200 201 $comment_two = $this->factory->activity->create( array(201 $comment_two = self::factory()->activity->create( array( 202 202 'type' => 'activity_comment', 203 203 'item_id' => $parent_activity, … … 227 227 228 228 // create an activity update 229 $parent_activity = $this->factory->activity->create( array(229 $parent_activity = self::factory()->activity->create( array( 230 230 'type' => 'activity_update', 231 231 ) ); 232 232 233 233 // create some activity comments 234 $comment_one = $this->factory->activity->create( array(234 $comment_one = self::factory()->activity->create( array( 235 235 'type' => 'activity_comment', 236 236 'item_id' => $parent_activity, … … 238 238 ) ); 239 239 240 $comment_two = $this->factory->activity->create( array(240 $comment_two = self::factory()->activity->create( array( 241 241 'type' => 'activity_comment', 242 242 'item_id' => $parent_activity, … … 271 271 */ 272 272 public function test_bp_activity_update_meta_with_line_breaks() { 273 $a = $this->factory->activity->create();273 $a = self::factory()->activity->create(); 274 274 $meta_value = 'Foo! 275 275 … … 285 285 */ 286 286 public function test_bp_activity_update_meta_with_0() { 287 $a = $this->factory->activity->create();287 $a = self::factory()->activity->create(); 288 288 $meta_value = 0; 289 289 … … 307 307 */ 308 308 public function test_bp_activity_update_meta_with_illegal_key_characters() { 309 $a = $this->factory->activity->create();309 $a = self::factory()->activity->create(); 310 310 $krazy_key = ' f!@#$%^o *(){}o?+'; 311 311 bp_activity_update_meta( $a, $krazy_key, 'bar' ); … … 319 319 */ 320 320 public function test_bp_activity_update_meta_stripslashes() { 321 $a = $this->factory->activity->create();321 $a = self::factory()->activity->create(); 322 322 $value = "This string is totally slashin\'!"; 323 323 bp_activity_update_meta( $a, 'foo', $value ); … … 331 331 */ 332 332 public function test_bp_activity_update_meta_false_value_deletes() { 333 $a = $this->factory->activity->create();333 $a = self::factory()->activity->create(); 334 334 bp_activity_update_meta( $a, 'foo', false ); 335 335 $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) ); … … 341 341 */ 342 342 public function test_bp_activity_update_meta_new() { 343 $a = $this->factory->activity->create();343 $a = self::factory()->activity->create(); 344 344 $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ), '"foo" meta should be empty for this activity item.' ); 345 345 $this->assertNotEmpty( bp_activity_update_meta( $a, 'foo', 'bar' ) ); … … 352 352 */ 353 353 public function test_bp_activity_update_meta_existing() { 354 $a = $this->factory->activity->create();354 $a = self::factory()->activity->create(); 355 355 bp_activity_update_meta( $a, 'foo', 'bar' ); 356 356 $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) ); … … 364 364 */ 365 365 public function test_bp_activity_update_meta_same_value() { 366 $a = $this->factory->activity->create();366 $a = self::factory()->activity->create(); 367 367 bp_activity_update_meta( $a, 'foo', 'bar' ); 368 368 $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) ); … … 376 376 */ 377 377 public function test_bp_activity_update_meta_prev_value() { 378 $a = $this->factory->activity->create();378 $a = self::factory()->activity->create(); 379 379 bp_activity_add_meta( $a, 'foo', 'bar' ); 380 380 … … 413 413 */ 414 414 public function test_bp_activity_get_meta_with_illegal_characters() { 415 $a = $this->factory->activity->create();415 $a = self::factory()->activity->create(); 416 416 bp_activity_update_meta( $a, 'foo', 'bar' ); 417 417 … … 425 425 */ 426 426 public function test_bp_activity_get_meta_multiple() { 427 $a = $this->factory->activity->create();427 $a = self::factory()->activity->create(); 428 428 bp_activity_update_meta( $a, 'foo', 'bar' ); 429 429 bp_activity_update_meta( $a, 'foo1', 'bar1' ); … … 447 447 */ 448 448 public function test_bp_activity_get_meta_no_results_returns_false() { 449 $a = $this->factory->activity->create();449 $a = self::factory()->activity->create(); 450 450 451 451 $this->assertSame( '', bp_activity_get_meta( $a, 'foo' ) ); … … 457 457 */ 458 458 public function test_bp_activity_get_meta_single_true() { 459 $a = $this->factory->activity->create();459 $a = self::factory()->activity->create(); 460 460 bp_activity_add_meta( $a, 'foo', 'bar' ); 461 461 bp_activity_add_meta( $a, 'foo', 'baz' ); … … 469 469 */ 470 470 public function test_bp_activity_get_meta_single_false() { 471 $a = $this->factory->activity->create();471 $a = self::factory()->activity->create(); 472 472 bp_activity_add_meta( $a, 'foo', 'bar' ); 473 473 bp_activity_add_meta( $a, 'foo', 'baz' ); … … 481 481 */ 482 482 public function test_bp_activity_get_meta_cache_all_on_get() { 483 $a = $this->factory->activity->create();483 $a = self::factory()->activity->create(); 484 484 bp_activity_add_meta( $a, 'foo', 'bar' ); 485 485 bp_activity_add_meta( $a, 'foo1', 'baz' ); … … 507 507 */ 508 508 public function test_bp_activity_delete_meta_trim_meta_value() { 509 $a = $this->factory->activity->create();509 $a = self::factory()->activity->create(); 510 510 bp_activity_update_meta( $a, 'foo', 'bar' ); 511 511 bp_activity_delete_meta( $a, 'foo', ' bar ' ); … … 518 518 */ 519 519 public function test_bp_activity_delete_meta_single() { 520 $a = $this->factory->activity->create();520 $a = self::factory()->activity->create(); 521 521 bp_activity_update_meta( $a, 'foo', 'bar' ); 522 522 $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) ); … … 529 529 */ 530 530 public function test_bp_activity_delete_meta_all_for_activity() { 531 $a = $this->factory->activity->create();531 $a = self::factory()->activity->create(); 532 532 bp_activity_update_meta( $a, 'foo', 'bar' ); 533 533 bp_activity_update_meta( $a, 'foo1', 'bar1' ); … … 542 542 */ 543 543 public function test_bp_activity_delete_meta_with_meta_value() { 544 $a = $this->factory->activity->create();544 $a = self::factory()->activity->create(); 545 545 bp_activity_update_meta( $a, 'foo', 'bar' ); 546 546 $this->assertTrue( bp_activity_delete_meta( $a, 'foo', 'bar' ) ); … … 555 555 // With no meta key, don't delete for all items - just delete 556 556 // 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(); 559 559 bp_activity_update_meta( $a1, 'foo', 'bar' ); 560 560 bp_activity_update_meta( $a1, 'foo1', 'bar1' ); … … 575 575 // With no meta key, don't delete for all items - just delete 576 576 // 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(); 579 579 bp_activity_update_meta( $a1, 'foo', 'bar' ); 580 580 bp_activity_update_meta( $a1, 'foo1', 'bar1' ); … … 610 610 */ 611 611 public function test_bp_activity_add_meta_existing_unique() { 612 $a = $this->factory->activity->create();612 $a = self::factory()->activity->create(); 613 613 bp_activity_add_meta( $a, 'foo', 'bar' ); 614 614 $this->assertFalse( bp_activity_add_meta( $a, 'foo', 'baz', true ) ); … … 620 620 */ 621 621 public function test_bp_activity_add_meta_existing_not_unique() { 622 $a = $this->factory->activity->create();622 $a = self::factory()->activity->create(); 623 623 bp_activity_add_meta( $a, 'foo', 'bar' ); 624 624 $this->assertNotEmpty( bp_activity_add_meta( $a, 'foo', 'baz' ) ); … … 631 631 add_filter( 'bp_is_username_compatibility_mode', '__return_false' ); 632 632 633 $u = $this->factory->user->create( array(633 $u = self::factory()->user->create( array( 634 634 'user_login' => 'foo bar baz', 635 635 'user_nicename' => 'foo-bar-baz', … … 647 647 add_filter( 'bp_is_username_compatibility_mode', '__return_true' ); 648 648 649 $u1 = $this->factory->user->create( array(649 $u1 = self::factory()->user->create( array( 650 650 'user_login' => 'foo bar baz', 651 651 'user_nicename' => 'foo-bar-baz', 652 652 ) ); 653 653 654 $u2 = $this->factory->user->create( array(654 $u2 = self::factory()->user->create( array( 655 655 'user_login' => 'foo.bar.baz', 656 656 'user_nicename' => 'foo-bar-baz', … … 669 669 add_filter( 'bp_is_username_compatibility_mode', '__return_false' ); 670 670 671 $u = $this->factory->user->create( array(671 $u = self::factory()->user->create( array( 672 672 'user_login' => 'foo bar baz', 673 673 'user_nicename' => 'foo-bar-baz', … … 686 686 687 687 // all spaces are hyphens 688 $u1 = $this->factory->user->create( array(688 $u1 = self::factory()->user->create( array( 689 689 'user_login' => 'foo bar baz', 690 690 'user_nicename' => 'foobarbaz', … … 692 692 693 693 // no spaces are hyphens 694 $u2 = $this->factory->user->create( array(694 $u2 = self::factory()->user->create( array( 695 695 'user_login' => 'foo-bar-baz-1', 696 696 'user_nicename' => 'foobarbaz-1', … … 698 698 699 699 // some spaces are hyphens 700 $u3 = $this->factory->user->create( array(700 $u3 = self::factory()->user->create( array( 701 701 'user_login' => 'foo bar-baz 2', 702 702 'user_nicename' => 'foobarbaz-2', 703 703 ) ); 704 704 705 $u4 = $this->factory->user->create( array(705 $u4 = self::factory()->user->create( array( 706 706 'user_login' => 'foo.bar.baz', 707 707 'user_nicename' => 'foo-bar-baz', … … 721 721 */ 722 722 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( 725 725 'component' => buddypress()->activity->id, 726 726 'type' => 'activity_update', … … 740 740 */ 741 741 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( 744 744 'component' => buddypress()->activity->id, 745 745 'type' => 'activity_comment', … … 773 773 bp_activity_get_actions(); 774 774 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( 777 777 'post_author' => $u, 778 778 'post_type' => 'foo', 779 779 ) ); 780 780 781 $a = $this->factory->activity->create( array(781 $a = self::factory()->activity->create( array( 782 782 'component' => 'activity', 783 783 'type' => 'new_foo', … … 811 811 } 812 812 813 $b = $this->factory->blog->create();814 $u = $this->factory->user->create();813 $b = self::factory()->blog->create(); 814 $u = self::factory()->user->create(); 815 815 816 816 switch_to_blog( $b ); … … 825 825 bp_activity_get_actions(); 826 826 827 $p = $this->factory->post->create( array(827 $p = self::factory()->post->create( array( 828 828 'post_author' => $u, 829 829 'post_type' => 'foo', … … 843 843 restore_current_blog(); 844 844 845 $a = $this->factory->activity->create( $activity_args );845 $a = self::factory()->activity->create( $activity_args ); 846 846 847 847 $a_obj = new BP_Activity_Activity( $a ); … … 886 886 bp_activity_get_actions(); 887 887 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( 890 890 'post_author' => $u, 891 891 'post_type' => 'foo', 892 892 ) ); 893 893 894 $a = $this->factory->activity->create( array(894 $a = self::factory()->activity->create( array( 895 895 'component' => 'activity', 896 896 'type' => 'foo_bar', … … 923 923 } 924 924 925 $b = $this->factory->blog->create();926 $u = $this->factory->user->create();925 $b = self::factory()->blog->create(); 926 $u = self::factory()->user->create(); 927 927 928 928 switch_to_blog( $b ); … … 943 943 bp_activity_get_actions(); 944 944 945 $p = $this->factory->post->create( array(945 $p = self::factory()->post->create( array( 946 946 'post_author' => $u, 947 947 'post_type' => 'foo', … … 960 960 restore_current_blog(); 961 961 962 $a = $this->factory->activity->create( $activity_args );962 $a = self::factory()->activity->create( $activity_args ); 963 963 964 964 $a_obj = new BP_Activity_Activity( $a ); … … 990 990 bp_activity_get_actions(); 991 991 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( 995 995 'post_author' => $u, 996 996 'post_status' => 'publish', … … 1054 1054 public function test_bp_activity_format_activity_action_custom_post_type_comment() { 1055 1055 if ( is_multisite() ) { 1056 $b = $this->factory->blog->create();1056 $b = self::factory()->blog->create(); 1057 1057 switch_to_blog( $b ); 1058 1058 add_filter( 'comment_flood_filter', '__return_false' ); … … 1061 1061 } 1062 1062 1063 $u = $this->factory->user->create();1063 $u = self::factory()->user->create(); 1064 1064 $userdata = get_userdata( $u ); 1065 1065 … … 1084 1084 bp_activity_get_actions(); 1085 1085 1086 $p = $this->factory->post->create( array(1086 $p = self::factory()->post->create( array( 1087 1087 'post_author' => $u, 1088 1088 'post_type' => 'foo', … … 1127 1127 */ 1128 1128 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( 1131 1131 'user_id' => $u, 1132 1132 ) ); … … 1181 1181 */ 1182 1182 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( 1185 1185 'user_id' => $u, 1186 1186 ) ); … … 1253 1253 */ 1254 1254 public function test_bp_activity_delete_comment_clear_cache() { 1255 $u = $this->factory->user->create();1255 $u = self::factory()->user->create(); 1256 1256 // add new activity update and comment to this update 1257 $a1 = $this->factory->activity->create( array(1257 $a1 = self::factory()->activity->create( array( 1258 1258 'user_id' => $u, 1259 1259 ) ); … … 1283 1283 */ 1284 1284 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(); 1286 1286 1287 1287 // create an activity update 1288 $parent_activity = $this->factory->activity->create( array(1288 $parent_activity = self::factory()->activity->create( array( 1289 1289 'type' => 'activity_update', 1290 1290 'user_id' => $u … … 1330 1330 */ 1331 1331 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(); 1334 1334 1335 1335 bp_activity_delete_by_activity_id( $a ); … … 1350 1350 */ 1351 1351 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(); 1354 1354 1355 1355 // bp_activity_add_user_favorite() requires a logged-in user. … … 1371 1371 */ 1372 1372 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(); 1375 1375 1376 1376 // bp_activity_add_user_favorite() requires a logged-in user. … … 1387 1387 */ 1388 1388 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(); 1392 1392 1393 1393 // bp_activity_add_user_favorite() requires a logged-in user. … … 1426 1426 */ 1427 1427 public function test_bp_activity_post_update_success() { 1428 $u = $this->factory->user->create();1428 $u = self::factory()->user->create(); 1429 1429 1430 1430 $a = bp_activity_post_update( array( … … 1448 1448 ); 1449 1449 1450 $a = $this->factory->activity->create( $args );1450 $a = self::factory()->activity->create( $args ); 1451 1451 1452 1452 $this->assertEquals( $a, bp_activity_get_activity_id( $args ) ); … … 1465 1465 ); 1466 1466 1467 $a = $this->factory->activity->create( $args );1467 $a = self::factory()->activity->create( $args ); 1468 1468 1469 1469 $this->assertTrue( bp_activity_delete_by_item_id( $args ) ); -
trunk/tests/phpunit/testcases/activity/functions/bpActivityGetCommentDepth.php
r11413 r11737 10 10 */ 11 11 public function test_depth_inside_activity_comment_loop() { 12 $u = $this->factory->user->create();12 $u = self::factory()->user->create(); 13 13 14 14 // create an activity update 15 $parent_activity = $this->factory->activity->create( array(15 $parent_activity = self::factory()->activity->create( array( 16 16 'type' => 'activity_update', 17 17 'user_id' => $u … … 77 77 */ 78 78 public function test_depth_outside_of_activity_comment_loop() { 79 $u = $this->factory->user->create();79 $u = self::factory()->user->create(); 80 80 81 81 // create an activity update 82 $parent_activity = $this->factory->activity->create( array(82 $parent_activity = self::factory()->activity->create( array( 83 83 'type' => 'activity_update', 84 84 'user_id' => $u -
trunk/tests/phpunit/testcases/activity/notifications.php
r11256 r11737 15 15 parent::setUp(); 16 16 $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(); 19 19 $this->set_current_user( $this->u1 ); 20 20 … … 274 274 protected function create_notifications() { 275 275 $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( 277 277 'user_id' => $this->u2, 278 278 'component' => buddypress()->activity->id, … … 281 281 ) ); 282 282 $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( 284 284 'user_id' => $this->u1, 285 285 'component' => buddypress()->activity->id, … … 296 296 297 297 // 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( 299 299 'user_id' => $this->u2, 300 300 'component' => buddypress()->activity->id, … … 338 338 */ 339 339 public function test_bp_activity_comment_add_notification() { 340 $a = $this->factory->activity->create( array(340 $a = self::factory()->activity->create( array( 341 341 'user_id' => $this->u1, 342 342 'component' => buddypress()->activity->id, … … 352 352 ) ); 353 353 354 $u3 = $this->factory->user->create();354 $u3 = self::factory()->user->create(); 355 355 356 356 $r3 = bp_activity_new_comment( array( … … 381 381 public function test_activity_reply_notifications_for_blog_comment_to_activity_comment_sync() { 382 382 $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(); 386 386 387 387 $this->set_current_user( $u1 ); … … 395 395 396 396 // create the blog post 397 $post_id = $this->factory->post->create( array(397 $post_id = self::factory()->post->create( array( 398 398 'post_status' => 'publish', 399 399 'post_type' => 'post', … … 415 415 ) ); 416 416 // 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 ) ); 418 418 419 419 $this->set_current_user( $u3 ); … … 431 431 ) ); 432 432 // 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 ) ); 434 434 435 435 // Get activity IDs. -
trunk/tests/phpunit/testcases/activity/template.php
r11091 r11737 10 10 public function test_user_can_delete() { 11 11 $bp = buddypress(); 12 $u = $this->factory->user->create();12 $u = self::factory()->user->create(); 13 13 $original_user = bp_loggedin_user_id(); 14 14 $this->set_current_user( $u ); 15 15 16 $a = $this->factory->activity->create( array(16 $a = self::factory()->activity->create( array( 17 17 'type' => 'activity_update', 18 18 'user_id' => $u, … … 20 20 21 21 // 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 ); 23 23 $this->assertTrue( bp_activity_user_can_delete( $activity ) ); 24 24 … … 28 28 29 29 // 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' ) ); 31 31 $this->set_current_user( $misc_user ); 32 32 $this->assertFalse( bp_activity_user_can_delete( $activity ) ); … … 52 52 // save the current user and override logged-in user 53 53 $old_user = get_current_user_id(); 54 $u = $this->factory->user->create();54 $u = self::factory()->user->create(); 55 55 $this->set_current_user( $u ); 56 56 57 57 // create an activity update for the user 58 $this->factory->activity->create( array(58 self::factory()->activity->create( array( 59 59 'component' => buddypress()->activity->id, 60 60 'type' => 'activity_update', … … 81 81 */ 82 82 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( 88 88 'type' => 'activity_update', 89 89 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 90 90 ) ); 91 91 92 $a2 = $this->factory->activity->create( array(92 $a2 = self::factory()->activity->create( array( 93 93 'type' => 'joined_group', 94 94 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 141 141 */ 142 142 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(); 145 145 146 146 // save the current user and override logged-in user … … 151 151 152 152 // activity item 153 $a1 = $this->factory->activity->create( array(153 $a1 = self::factory()->activity->create( array( 154 154 'user_id' => $u1, 155 155 'component' => 'activity', … … 160 160 // misc activity items 161 161 162 $this->factory->activity->create( array(162 self::factory()->activity->create( array( 163 163 'user_id' => $u2, 164 164 'component' => 'activity', … … 166 166 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 167 167 ) ); 168 $this->factory->activity->create( array(168 self::factory()->activity->create( array( 169 169 'user_id' => $u2, 170 170 'component' => 'groups', … … 197 197 */ 198 198 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(); 201 201 202 202 $now = time(); … … 204 204 // mentioned activity item 205 205 $mention_username = '@' . bp_activity_get_user_mentionname( $u1 ); 206 $a1 = $this->factory->activity->create( array(206 $a1 = self::factory()->activity->create( array( 207 207 'user_id' => $u2, 208 208 'type' => 'activity_update', … … 212 212 213 213 // misc activity items 214 $this->factory->activity->create( array(214 self::factory()->activity->create( array( 215 215 'user_id' => $u1, 216 216 'component' => 'blogs', … … 219 219 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 220 220 ) ); 221 $this->factory->activity->create( array(221 self::factory()->activity->create( array( 222 222 'user_id' => $u2, 223 223 'component' => 'activity', … … 225 225 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 226 226 ) ); 227 $this->factory->activity->create( array(227 self::factory()->activity->create( array( 228 228 'user_id' => $u2, 229 229 'component' => 'groups', … … 254 254 */ 255 255 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(); 259 259 260 260 // user 1 becomes friends with user 2 … … 264 264 265 265 // friend status update 266 $a1 = $this->factory->activity->create( array(266 $a1 = self::factory()->activity->create( array( 267 267 'user_id' => $u2, 268 268 'type' => 'activity_update', … … 272 272 // mentioned item by non-friend 273 273 $mention_username = '@' . bp_activity_get_user_mentionname( $u1 ); 274 $a2 = $this->factory->activity->create( array(274 $a2 = self::factory()->activity->create( array( 275 275 'user_id' => $u3, 276 276 'component' => 'activity', … … 281 281 282 282 // misc activity items 283 $this->factory->activity->create( array(283 self::factory()->activity->create( array( 284 284 'user_id' => $u1, 285 285 'component' => 'blogs', … … 288 288 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 289 289 ) ); 290 $this->factory->activity->create( array(290 self::factory()->activity->create( array( 291 291 'user_id' => $u3, 292 292 'component' => 'activity', … … 294 294 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 295 295 ) ); 296 $this->factory->activity->create( array(296 self::factory()->activity->create( array( 297 297 'user_id' => $u3, 298 298 'component' => 'groups', … … 323 323 */ 324 324 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(); 328 328 329 329 // user 1 becomes friends with user 2 … … 331 331 332 332 // 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 ) ); 335 335 336 336 $now = time(); 337 337 338 338 // friend status update 339 $a1 = $this->factory->activity->create( array(339 $a1 = self::factory()->activity->create( array( 340 340 'user_id' => $u2, 341 341 'type' => 'activity_update', … … 344 344 345 345 // group activity 346 $a2 = $this->factory->activity->create( array(346 $a2 = self::factory()->activity->create( array( 347 347 'user_id' => $u3, 348 348 'component' => 'groups', … … 353 353 354 354 // misc activity items 355 $this->factory->activity->create( array(355 self::factory()->activity->create( array( 356 356 'user_id' => $u3, 357 357 'component' => 'blogs', … … 360 360 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 361 361 ) ); 362 $this->factory->activity->create( array(362 self::factory()->activity->create( array( 363 363 'user_id' => $u3, 364 364 'component' => 'activity', … … 370 370 global $wpdb, $bp; 371 371 $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( 373 373 'user_id' => $u3, 374 374 'component' => 'groups', … … 399 399 */ 400 400 function test_bp_has_activities_scope_friends_no_items() { 401 $u1 = $this->factory->user->create();401 $u1 = self::factory()->user->create(); 402 402 403 403 $now = time(); 404 404 405 405 // Create a random activity 406 $this->factory->activity->create( array(406 self::factory()->activity->create( array( 407 407 'user_id' => $u1, 408 408 'type' => 'activity_update', … … 432 432 */ 433 433 function test_bp_has_activities_scope_favorites_no_items() { 434 $u1 = $this->factory->user->create();434 $u1 = self::factory()->user->create(); 435 435 436 436 $now = time(); 437 437 438 438 // Create a random activity 439 $this->factory->activity->create( array(439 self::factory()->activity->create( array( 440 440 'user_id' => $u1, 441 441 'type' => 'activity_update', … … 465 465 */ 466 466 function test_bp_has_activities_scope_groups_no_items() { 467 $u1 = $this->factory->user->create();467 $u1 = self::factory()->user->create(); 468 468 469 469 $now = time(); 470 470 471 471 // Create a random activity 472 $this->factory->activity->create( array(472 self::factory()->activity->create( array( 473 473 'user_id' => $u1, 474 474 'type' => 'activity_update', … … 498 498 */ 499 499 function test_bp_has_activities_scope_mentions_no_items() { 500 $u1 = $this->factory->user->create();500 $u1 = self::factory()->user->create(); 501 501 502 502 $now = time(); 503 503 504 504 // Create a random activity 505 $this->factory->activity->create( array(505 self::factory()->activity->create( array( 506 506 'user_id' => $u1, 507 507 'type' => 'activity_update', … … 530 530 */ 531 531 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(); 534 534 535 535 friends_add_friend( $u1, $u2, true ); 536 536 537 537 // Friend's very fast status updates. 538 $a1 = $this->factory->activity->create( array(538 $a1 = self::factory()->activity->create( array( 539 539 'user_id' => $u2, 540 540 'type' => 'activity_update', 541 541 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ), 542 542 ) ); 543 $a2 = $this->factory->activity->create( array(543 $a2 = self::factory()->activity->create( array( 544 544 'user_id' => $u2, 545 545 'type' => 'activity_update', … … 569 569 */ 570 570 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 ) ); 576 576 577 577 // Two user join first user's group same time 578 $a1 = $this->factory->activity->create( array(578 $a1 = self::factory()->activity->create( array( 579 579 'user_id' => $u2, 580 580 'component' => 'groups', … … 583 583 'recorded_time' => date( 'Y-m-d H:i:s', 1451944920 ), 584 584 ) ); 585 $a2 = $this->factory->activity->create( array(585 $a2 = self::factory()->activity->create( array( 586 586 'user_id' => $u3, 587 587 'component' => 'groups', … … 613 613 */ 614 614 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( 622 622 'user_id' => $u3, 623 623 'component' => 'blogs', … … 626 626 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 627 627 ) ); 628 $a2 = $this->factory->activity->create( array(628 $a2 = self::factory()->activity->create( array( 629 629 'user_id' => $u2, 630 630 'component' => 'activity', … … 634 634 635 635 // misc activity items 636 $this->factory->activity->create( array(636 self::factory()->activity->create( array( 637 637 'user_id' => $u3, 638 638 'component' => 'activity', … … 640 640 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 641 641 ) ); 642 $this->factory->activity->create( array(642 self::factory()->activity->create( array( 643 643 'user_id' => $u3, 644 644 'component' => 'groups', … … 683 683 */ 684 684 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(); 688 688 689 689 $now = time(); 690 690 691 691 // misc activity items 692 $a1 = $this->factory->activity->create( array(692 $a1 = self::factory()->activity->create( array( 693 693 'user_id' => $u3, 694 694 'component' => 'blogs', … … 697 697 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 698 698 ) ); 699 $a2 = $this->factory->activity->create( array(699 $a2 = self::factory()->activity->create( array( 700 700 'user_id' => $u2, 701 701 'component' => 'activity', … … 703 703 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 704 704 ) ); 705 $a3 = $this->factory->activity->create( array(705 $a3 = self::factory()->activity->create( array( 706 706 'user_id' => $u3, 707 707 'component' => 'activity', … … 709 709 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 710 710 ) ); 711 $a4 = $this->factory->activity->create( array(711 $a4 = self::factory()->activity->create( array( 712 712 'user_id' => $u3, 713 713 'component' => 'groups', … … 741 741 */ 742 742 function test_bp_has_activities_with_filter_query_compare_between_operator() { 743 $u1 = $this->factory->user->create();743 $u1 = self::factory()->user->create(); 744 744 745 745 $now = time(); 746 746 747 747 // misc activity items 748 $a1 = $this->factory->activity->create( array(748 $a1 = self::factory()->activity->create( array( 749 749 'user_id' => $u1, 750 750 'component' => 'blogs', … … 753 753 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 754 754 ) ); 755 $a2 = $this->factory->activity->create( array(755 $a2 = self::factory()->activity->create( array( 756 756 'user_id' => $u1, 757 757 'component' => 'activity', … … 759 759 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 760 760 ) ); 761 $a3 = $this->factory->activity->create( array(761 $a3 = self::factory()->activity->create( array( 762 762 'user_id' => $u1, 763 763 'component' => 'activity', … … 765 765 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 766 766 ) ); 767 $a4 = $this->factory->activity->create( array(767 $a4 = self::factory()->activity->create( array( 768 768 'user_id' => $u1, 769 769 'component' => 'groups', … … 797 797 */ 798 798 function test_bp_has_activities_with_filter_query_compare_arithmetic_comparisons() { 799 $u1 = $this->factory->user->create();799 $u1 = self::factory()->user->create(); 800 800 801 801 $now = time(); 802 802 803 803 // misc activity items 804 $a1 = $this->factory->activity->create( array(804 $a1 = self::factory()->activity->create( array( 805 805 'user_id' => $u1, 806 806 'component' => 'activity', … … 809 809 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 810 810 ) ); 811 $a2 = $this->factory->activity->create( array(811 $a2 = self::factory()->activity->create( array( 812 812 'user_id' => $u1, 813 813 'component' => 'activity', … … 816 816 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 817 817 ) ); 818 $a3 = $this->factory->activity->create( array(818 $a3 = self::factory()->activity->create( array( 819 819 'user_id' => $u1, 820 820 'component' => 'activity', … … 823 823 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 824 824 ) ); 825 $a4 = $this->factory->activity->create( array(825 $a4 = self::factory()->activity->create( array( 826 826 'user_id' => $u1, 827 827 'component' => 'activity', … … 913 913 */ 914 914 function test_bp_has_activities_with_filter_query_compare_regex() { 915 $u1 = $this->factory->user->create();915 $u1 = self::factory()->user->create(); 916 916 917 917 $now = time(); 918 918 919 919 // misc activity items 920 $a1 = $this->factory->activity->create( array(920 $a1 = self::factory()->activity->create( array( 921 921 'user_id' => $u1, 922 922 'component' => 'blogs', … … 925 925 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 926 926 ) ); 927 $a2 = $this->factory->activity->create( array(927 $a2 = self::factory()->activity->create( array( 928 928 'user_id' => $u1, 929 929 'component' => 'blogs', … … 931 931 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 932 932 ) ); 933 $a3 = $this->factory->activity->create( array(933 $a3 = self::factory()->activity->create( array( 934 934 'user_id' => $u1, 935 935 'component' => 'activity', … … 937 937 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), 938 938 ) ); 939 $a4 = $this->factory->activity->create( array(939 $a4 = self::factory()->activity->create( array( 940 940 'user_id' => $u1, 941 941 'component' => 'groups', … … 1003 1003 $reset_current_action = $bp->current_action; 1004 1004 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(); 1008 1008 1009 1009 $this->set_current_user( $u1 ); 1010 1010 1011 $g = $this->factory->group->create( array(1011 $g = self::factory()->group->create( array( 1012 1012 'status' => 'private', 1013 1013 ) ); … … 1016 1016 groups_join_group( $g, $u3 ); 1017 1017 1018 $a1 = $this->factory->activity->create( array(1018 $a1 = self::factory()->activity->create( array( 1019 1019 'component' => $bp->groups->id, 1020 1020 'item_id' => $g, … … 1024 1024 ) ); 1025 1025 1026 $a2 = $this->factory->activity->create( array(1026 $a2 = self::factory()->activity->create( array( 1027 1027 'component' => $bp->groups->id, 1028 1028 'item_id' => $g, … … 1057 1057 $reset_current_action = $bp->current_action; 1058 1058 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(); 1062 1062 1063 1063 $this->set_current_user( $u1 ); 1064 1064 1065 $g = $this->factory->group->create( array(1065 $g = self::factory()->group->create( array( 1066 1066 'status' => 'hidden', 1067 1067 ) ); … … 1070 1070 groups_join_group( $g, $u3 ); 1071 1071 1072 $a1 = $this->factory->activity->create( array(1072 $a1 = self::factory()->activity->create( array( 1073 1073 'component' => $bp->groups->id, 1074 1074 'item_id' => $g, … … 1078 1078 ) ); 1079 1079 1080 $a2 = $this->factory->activity->create( array(1080 $a2 = self::factory()->activity->create( array( 1081 1081 'component' => $bp->groups->id, 1082 1082 'item_id' => $g, … … 1105 1105 */ 1106 1106 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(); 1109 1109 bp_activity_update_meta( $a1, 'foo', 'bar' ); 1110 1110 … … 1129 1129 public function test_bp_has_activities_with_display_comments_false() { 1130 1130 $now = time(); 1131 $a1 = $this->factory->activity->create( array(1131 $a1 = self::factory()->activity->create( array( 1132 1132 'content' => 'Life Rules', 1133 1133 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1134 1134 ) ); 1135 $a2 = $this->factory->activity->create( array(1135 $a2 = self::factory()->activity->create( array( 1136 1136 'content' => 'Life Drools', 1137 1137 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1159 1159 public function test_bp_has_activities_with_display_comments_0() { 1160 1160 $now = time(); 1161 $a1 = $this->factory->activity->create( array(1161 $a1 = self::factory()->activity->create( array( 1162 1162 'content' => 'Life Rules', 1163 1163 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1164 1164 ) ); 1165 $a2 = $this->factory->activity->create( array(1165 $a2 = self::factory()->activity->create( array( 1166 1166 'content' => 'Life Drools', 1167 1167 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1189 1189 public function test_bp_has_activities_with_display_comments_0_querystring() { 1190 1190 $now = time(); 1191 $a1 = $this->factory->activity->create( array(1191 $a1 = self::factory()->activity->create( array( 1192 1192 'content' => 'Life Rules', 1193 1193 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1194 1194 ) ); 1195 $a2 = $this->factory->activity->create( array(1195 $a2 = self::factory()->activity->create( array( 1196 1196 'content' => 'Life Drools', 1197 1197 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1217 1217 public function test_bp_has_activities_with_display_comments_none_querystring() { 1218 1218 $now = time(); 1219 $a1 = $this->factory->activity->create( array(1219 $a1 = self::factory()->activity->create( array( 1220 1220 'content' => 'Life Rules', 1221 1221 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1222 1222 ) ); 1223 $a2 = $this->factory->activity->create( array(1223 $a2 = self::factory()->activity->create( array( 1224 1224 'content' => 'Life Drools', 1225 1225 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1245 1245 public function test_bp_has_activities_with_update_meta_cache_false() { 1246 1246 $now = time(); 1247 $a1 = $this->factory->activity->create( array(1247 $a1 = self::factory()->activity->create( array( 1248 1248 'content' => 'Life Rules', 1249 1249 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1250 1250 ) ); 1251 $a2 = $this->factory->activity->create( array(1251 $a2 = self::factory()->activity->create( array( 1252 1252 'content' => 'Life Drools', 1253 1253 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1272 1272 public function test_bp_has_activities_with_update_meta_cache_true() { 1273 1273 $now = time(); 1274 $a1 = $this->factory->activity->create( array(1274 $a1 = self::factory()->activity->create( array( 1275 1275 'content' => 'Life Rules', 1276 1276 'recorded_time' => date( 'Y-m-d H:i:s', $now ), 1277 1277 ) ); 1278 $a2 = $this->factory->activity->create( array(1278 $a2 = self::factory()->activity->create( array( 1279 1279 'content' => 'Life Drools', 1280 1280 'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ), … … 1300 1300 add_filter( 'bp_disable_blogforum_comments', '__return_false' ); 1301 1301 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( 1306 1306 'content' => 'Life Rules', 1307 1307 'component' => 'blogs', … … 1310 1310 'user_id' => $u, 1311 1311 ) ); 1312 $a2 = $this->factory->activity->create( array(1312 $a2 = self::factory()->activity->create( array( 1313 1313 'content' => 'Life Drools', 1314 1314 'component' => 'blogs', … … 1327 1327 ) ); 1328 1328 1329 $a4 = $this->factory->activity->create( array(1329 $a4 = self::factory()->activity->create( array( 1330 1330 'content' => 'Life Rulez', 1331 1331 'component' => 'activity', … … 1513 1513 */ 1514 1514 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(); 1517 1517 1518 1518 $args = array( … … 1531 1531 */ 1532 1532 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(); 1537 1537 1538 1538 $args = array( … … 1552 1552 */ 1553 1553 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(); 1558 1558 1559 1559 $args = array( … … 1572 1572 */ 1573 1573 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(); 1578 1578 1579 1579 $args = array( … … 1600 1600 } 1601 1601 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( 1604 1604 'recorded_time' => '2001-01-01 12:00' 1605 1605 ) ); 1606 $a3 = $this->factory->activity->create( array(1606 $a3 = self::factory()->activity->create( array( 1607 1607 'recorded_time' => '2005-01-01 12:00' 1608 1608 ) ); -
trunk/tests/phpunit/testcases/admin/functions.php
r11513 r11737 9 9 parent::setUp(); 10 10 $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' ) ) ); 12 12 13 13 if ( ! function_exists( 'bp_admin' ) ) { … … 139 139 $bp->foo->name = 'Foo'; 140 140 $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( 142 142 'post_type' => 'page', 143 143 'post_title' => $bp->foo->name, -
trunk/tests/phpunit/testcases/blogs/activity.php
r10868 r11737 30 30 } 31 31 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( 35 35 'component' => buddypress()->blogs->id, 36 36 'type' => 'new_blog', … … 55 55 } 56 56 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( 59 59 'post_author' => $u, 60 60 ) ); 61 $a = $this->factory->activity->create( array(61 $a = self::factory()->activity->create( array( 62 62 'component' => buddypress()->blogs->id, 63 63 'type' => 'new_blog_post', … … 89 89 } 90 90 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( 93 93 'post_author' => $u, 94 94 ) ); 95 $a = $this->factory->activity->create( array(95 $a = self::factory()->activity->create( array( 96 96 'component' => buddypress()->blogs->id, 97 97 'type' => 'new_blog_post', … … 123 123 } 124 124 125 $b = $this->factory->blog->create();126 $u = $this->factory->user->create();125 $b = self::factory()->blog->create(); 126 $u = self::factory()->user->create(); 127 127 128 128 switch_to_blog( $b ); 129 $p = $this->factory->post->create( array(129 $p = self::factory()->post->create( array( 130 130 'post_author' => $u, 131 131 ) ); … … 133 133 restore_current_blog(); 134 134 135 $a = $this->factory->activity->create( array(135 $a = self::factory()->activity->create( array( 136 136 'component' => buddypress()->blogs->id, 137 137 'type' => 'new_blog_post', … … 164 164 } 165 165 166 $b = $this->factory->blog->create();167 $u = $this->factory->user->create();166 $b = self::factory()->blog->create(); 167 $u = self::factory()->user->create(); 168 168 169 169 switch_to_blog( $b ); 170 $p = $this->factory->post->create( array(170 $p = self::factory()->post->create( array( 171 171 'post_author' => $u, 172 172 ) ); 173 173 $p_obj = get_post( $p ); 174 $c = $this->factory->comment->create( array(174 $c = self::factory()->comment->create( array( 175 175 'comment_post_ID' => $p, 176 176 ) ); … … 178 178 restore_current_blog(); 179 179 180 $a = $this->factory->activity->create( array(180 $a = self::factory()->activity->create( array( 181 181 'component' => buddypress()->blogs->id, 182 182 'type' => 'new_blog_comment', … … 209 209 add_filter( 'bp_blogs_activity_created_blog_action', array( $this, 'created_blog_passthrough' ), 10, 2 ); 210 210 211 $b = $this->factory->blog->create();212 $u = $this->factory->user->create();211 $b = self::factory()->blog->create(); 212 $u = self::factory()->user->create(); 213 213 214 214 $recorded_blog = new BP_Blogs_Blog; … … 217 217 $recorded_blog_id = $recorded_blog->save(); 218 218 219 $a = $this->factory->activity->create( array(219 $a = self::factory()->activity->create( array( 220 220 'component' => buddypress()->blogs->id, 221 221 'type' => 'new_blog', … … 237 237 add_filter( 'bp_blogs_activity_new_post_action', array( $this, 'new_post_passthrough' ), 10, 2 ); 238 238 239 $b = $this->factory->blog->create();239 $b = self::factory()->blog->create(); 240 240 241 241 switch_to_blog( $b ); 242 $p = $this->factory->post->create();242 $p = self::factory()->post->create(); 243 243 restore_current_blog(); 244 244 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( 247 247 'component' => buddypress()->blogs->id, 248 248 'type' => 'new_blog_post', … … 265 265 add_filter( 'bp_blogs_activity_new_comment_action', array( $this, 'new_comment_passthrough' ), 10, 2 ); 266 266 267 $b = $this->factory->blog->create();267 $b = self::factory()->blog->create(); 268 268 269 269 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( 272 272 'comment_post_ID' => $p, 273 273 ) ); 274 274 restore_current_blog(); 275 275 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( 278 278 'component' => buddypress()->blogs->id, 279 279 'type' => 'new_blog_comment', … … 296 296 } 297 297 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( 301 301 'component' => buddypress()->blogs->id, 302 302 'item_id' => 1, … … 322 322 buddypress()->activity->actions = new stdClass(); 323 323 324 $u = $this->factory->user->create();324 $u = self::factory()->user->create(); 325 325 $p = wp_insert_post( array( 326 326 'post_author' => $u, … … 359 359 buddypress()->activity->actions = new stdClass(); 360 360 361 $u = $this->factory->user->create();361 $u = self::factory()->user->create(); 362 362 $p = wp_insert_post( array( 363 363 'post_author' => $u, … … 409 409 public function test_bp_blogs_sync_add_from_activity_comment() { 410 410 $old_user = get_current_user_id(); 411 $u = $this->factory->user->create();411 $u = self::factory()->user->create(); 412 412 $this->set_current_user( $u ); 413 413 $userdata = get_userdata( $u ); … … 417 417 418 418 // create the blog post 419 $post_id = $this->factory->post->create( array(419 $post_id = self::factory()->post->create( array( 420 420 'post_status' => 'publish', 421 421 'post_type' => 'post', … … 457 457 public function test_bp_blogs_sync_delete_from_activity_comment() { 458 458 $old_user = get_current_user_id(); 459 $u = $this->factory->user->create();459 $u = self::factory()->user->create(); 460 460 $this->set_current_user( $u ); 461 461 $userdata = get_userdata( $u ); … … 465 465 466 466 // create the blog post 467 $post_id = $this->factory->post->create( array(467 $post_id = self::factory()->post->create( array( 468 468 'post_status' => 'publish', 469 469 'post_type' => 'post', … … 505 505 public function test_bp_blogs_sync_activity_edit_to_post_comment_spam_unspam_activity_comment() { 506 506 $old_user = get_current_user_id(); 507 $u = $this->factory->user->create();507 $u = self::factory()->user->create(); 508 508 $this->set_current_user( $u ); 509 509 $userdata = get_userdata( $u ); … … 513 513 514 514 // create the blog post 515 $post_id = $this->factory->post->create( array(515 $post_id = self::factory()->post->create( array( 516 516 'post_status' => 'publish', 517 517 'post_type' => 'post', … … 565 565 public function test_bp_blogs_sync_activity_edit_to_post_comment_spam_activity_comment_unspam_post_comment() { 566 566 $old_user = get_current_user_id(); 567 $u = $this->factory->user->create();567 $u = self::factory()->user->create(); 568 568 $this->set_current_user( $u ); 569 569 $userdata = get_userdata( $u ); … … 573 573 574 574 // create the blog post 575 $post_id = $this->factory->post->create( array(575 $post_id = self::factory()->post->create( array( 576 576 'post_status' => 'publish', 577 577 'post_type' => 'post', … … 623 623 public function test_bp_blogs_sync_activity_edit_to_post_comment_trash_comment_ham_activity() { 624 624 $old_user = get_current_user_id(); 625 $u = $this->factory->user->create();625 $u = self::factory()->user->create(); 626 626 $this->set_current_user( $u ); 627 627 $userdata = get_userdata( $u ); … … 631 631 632 632 // create the blog post 633 $post_id = $this->factory->post->create( array(633 $post_id = self::factory()->post->create( array( 634 634 'post_status' => 'publish', 635 635 'post_type' => 'post', … … 680 680 public function test_spammed_activity_comment_should_not_create_post_comment() { 681 681 $old_user = get_current_user_id(); 682 $u = $this->factory->user->create();682 $u = self::factory()->user->create(); 683 683 $this->set_current_user( $u ); 684 684 $userdata = get_userdata( $u ); … … 688 688 689 689 // create the blog post. 690 $post_id = $this->factory->post->create( array(690 $post_id = self::factory()->post->create( array( 691 691 'post_status' => 'publish', 692 692 'post_type' => 'post', -
trunk/tests/phpunit/testcases/blogs/cache.php
r9839 r11737 14 14 } 15 15 16 $b1 = $this->factory->blog->create();17 $b2 = $this->factory->blog->create();16 $b1 = self::factory()->blog->create(); 17 $b2 = self::factory()->blog->create(); 18 18 19 19 bp_blogs_add_blogmeta( $b1, 'foo', 'bar' ); … … 95 95 } 96 96 97 $u = $this->factory->user->create();97 $u = self::factory()->user->create(); 98 98 99 99 // Switch user so we have access to non-public blogs … … 101 101 $this->set_current_user( $u ); 102 102 103 $b1 = $this->factory->blog->create();104 $b2 = $this->factory->blog->create();103 $b1 = self::factory()->blog->create(); 104 $b2 = self::factory()->blog->create(); 105 105 106 106 bp_blogs_record_blog( $b1, $u, true ); … … 189 189 } 190 190 191 $u = $this->factory->user->create();191 $u = self::factory()->user->create(); 192 192 193 193 // Switch user so we have access to non-public blogs … … 195 195 $this->set_current_user( $u ); 196 196 197 $b1 = $this->factory->blog->create();198 $b2 = $this->factory->blog->create();197 $b1 = self::factory()->blog->create(); 198 $b2 = self::factory()->blog->create(); 199 199 200 200 bp_blogs_record_blog( $b1, $u, true ); … … 264 264 } 265 265 266 $u = $this->factory->user->create();266 $u = self::factory()->user->create(); 267 267 268 268 // 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( 270 270 'meta' => array( 271 271 'public' => 1 272 272 ) 273 273 ) ); 274 $b2 = $this->factory->blog->create( array(274 $b2 = self::factory()->blog->create( array( 275 275 'meta' => array( 276 276 'public' => 1 … … 298 298 } 299 299 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(); 303 303 bp_blogs_record_blog( $b1, $u, true ); 304 304 -
trunk/tests/phpunit/testcases/blogs/class-bp-blogs-blog.php
r9980 r11737 13 13 $old_user = get_current_user_id(); 14 14 15 $u = $this->factory->user->create();15 $u = self::factory()->user->create(); 16 16 $this->set_current_user( $u ); 17 $b = $this->factory->blog->create( array(17 $b = self::factory()->blog->create( array( 18 18 'title' => 'The Foo Bar Blog', 19 19 'user_id' => $u, … … 40 40 $old_user = get_current_user_id(); 41 41 42 $u = $this->factory->user->create();42 $u = self::factory()->user->create(); 43 43 $this->set_current_user( $u ); 44 $b = $this->factory->blog->create( array(44 $b = self::factory()->blog->create( array( 45 45 'title' => 'The Foo Bar Blog', 46 46 'domain' => __METHOD__, … … 67 67 $old_user = get_current_user_id(); 68 68 69 $u = $this->factory->user->create();69 $u = self::factory()->user->create(); 70 70 $this->set_current_user( $u ); 71 $b = $this->factory->blog->create( array(71 $b = self::factory()->blog->create( array( 72 72 'title' => 'The Foo Bar Blog', 73 73 'user_id' => $u, … … 95 95 $old_user = get_current_user_id(); 96 96 97 $u = $this->factory->user->create();97 $u = self::factory()->user->create(); 98 98 $this->set_current_user( $u ); 99 $b = $this->factory->blog->create( array(99 $b = self::factory()->blog->create( array( 100 100 'title' => 'Foo Bar Blog', 101 101 'user_id' => $u, … … 123 123 $old_user = get_current_user_id(); 124 124 125 $u = $this->factory->user->create();125 $u = self::factory()->user->create(); 126 126 $this->set_current_user( $u ); 127 127 $bs = array( 128 'foobar' => $this->factory->blog->create( array(128 'foobar' => self::factory()->blog->create( array( 129 129 'title' => 'Foo Bar Blog', 130 130 'user_id' => $u, 131 131 'path' => '/path' . rand() . time() . '/', 132 132 ) ), 133 'barfoo' => $this->factory->blog->create( array(133 'barfoo' => self::factory()->blog->create( array( 134 134 'title' => 'Bar foo Blog', 135 135 'user_id' => $u, -
trunk/tests/phpunit/testcases/blogs/filters.php
r11256 r11737 46 46 */ 47 47 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( 49 49 'post_status' => 'publish', 50 50 'post_type' => 'using_old_filter', … … 59 59 */ 60 60 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 ); 63 63 64 $post_id = $this->factory->post->create( array(64 $post_id = self::factory()->post->create( array( 65 65 'post_status' => 'publish', 66 66 'post_type' => 'using_old_filter', … … 68 68 ) ); 69 69 70 $comment_id = $this->factory->comment->create( array(70 $comment_id = self::factory()->comment->create( array( 71 71 'user_id' => $u, 72 72 'comment_author_email' => $user->user_email, … … 75 75 76 76 // 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 ) ); 78 78 79 79 $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' ); … … 85 85 */ 86 86 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 ); 89 89 90 90 add_filter( 'bp_disable_blogforum_comments', '__return_false' ); 91 91 92 $post_id = $this->factory->post->create( array(92 $post_id = self::factory()->post->create( array( 93 93 'post_status' => 'publish', 94 94 'post_type' => 'using_old_filter', … … 103 103 ) ); 104 104 105 $comment_id = $this->factory->comment->create( array(105 $comment_id = self::factory()->comment->create( array( 106 106 'user_id' => $u, 107 107 'comment_author_email' => $user->user_email, … … 110 110 111 111 // 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 ) ); 113 113 114 114 $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 289 289 290 290 // Create a regular member 291 $u = $this->factory->user->create();291 $u = self::factory()->user->create(); 292 292 293 293 // 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 ) ); 296 296 297 297 $expected = array( … … 323 323 */ 324 324 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( 326 326 'post_status' => 'publish', 327 327 'post_type' => 'post', … … 344 344 */ 345 345 public function test_transition_post_status_password_publish() { 346 $post_id = $this->factory->post->create( array(346 $post_id = self::factory()->post->create( array( 347 347 'post_status' => 'publish', 348 348 'post_type' => 'post', … … 359 359 */ 360 360 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( 362 362 'post_status' => 'publish', 363 363 'post_type' => 'post', … … 380 380 */ 381 381 public function test_transition_post_status_private_publish() { 382 $post_id = $this->factory->post->create( array(382 $post_id = self::factory()->post->create( array( 383 383 'post_status' => 'private', 384 384 'post_type' => 'post', … … 401 401 */ 402 402 public function test_transition_post_status_publish_private() { 403 $post_id = $this->factory->post->create( array(403 $post_id = self::factory()->post->create( array( 404 404 'post_status' => 'publish', 405 405 'post_type' => 'post', … … 422 422 */ 423 423 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( 425 425 'post_status' => 'draft', 426 426 'post_type' => 'post', … … 442 442 */ 443 443 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( 445 445 'post_status' => 'draft', 446 446 'post_type' => 'post', … … 462 462 */ 463 463 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( 465 465 'post_status' => 'publish', 466 466 'post_type' => 'post', … … 482 482 */ 483 483 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( 485 485 'post_status' => 'publish', 486 486 'post_type' => 'post', … … 499 499 */ 500 500 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( 502 502 'post_status' => 'publish', 503 503 'post_type' => 'post', … … 519 519 // save the current user and override logged-in user 520 520 $old_user = get_current_user_id(); 521 $u = $this->factory->user->create();521 $u = self::factory()->user->create(); 522 522 $this->set_current_user( $u ); 523 523 $userdata = get_userdata( $u ); 524 524 525 525 // create the blog post 526 $post_id = $this->factory->post->create( array(526 $post_id = self::factory()->post->create( array( 527 527 'post_status' => 'publish', 528 528 'post_type' => 'post', … … 604 604 // save the current user and override logged-in user 605 605 $old_user = get_current_user_id(); 606 $u = $this->factory->user->create();606 $u = self::factory()->user->create(); 607 607 $this->set_current_user( $u ); 608 608 $userdata = get_userdata( $u ); 609 609 610 610 // create the blog post 611 $post_id = $this->factory->post->create( array(611 $post_id = self::factory()->post->create( array( 612 612 'post_status' => 'publish', 613 613 'post_type' => 'post', … … 666 666 public function test_bp_blogs_post_type_remove_comment() { 667 667 $old_user = get_current_user_id(); 668 $u = $this->factory->user->create();668 $u = self::factory()->user->create(); 669 669 $this->set_current_user( $u ); 670 670 $userdata = get_userdata( $u ); 671 671 672 672 // create the blog post 673 $p = $this->factory->post->create( array(673 $p = self::factory()->post->create( array( 674 674 'post_status' => 'publish', 675 675 'post_type' => 'post', … … 708 708 add_filter( 'bp_blogs_is_blog_trackable', '__return_false' ); 709 709 710 $post_id = $this->factory->post->create( array(710 $post_id = self::factory()->post->create( array( 711 711 'post_status' => 'publish', 712 712 'post_type' => 'post', … … 737 737 add_filter( 'bp_is_blog_public', '__return_zero' ); 738 738 739 $post_id = $this->factory->post->create( array(739 $post_id = self::factory()->post->create( array( 740 740 'post_status' => 'publish', 741 741 'post_type' => 'post', … … 764 764 // save the current user and override logged-in user 765 765 $old_user = get_current_user_id(); 766 $u = $this->factory->user->create();766 $u = self::factory()->user->create(); 767 767 $this->set_current_user( $u ); 768 768 $userdata = get_userdata( $u ); … … 777 777 778 778 // create the blog post 779 $post_id = $this->factory->post->create( array(779 $post_id = self::factory()->post->create( array( 780 780 'post_status' => 'publish', 781 781 'post_type' => 'post', … … 828 828 // Save the current user and override logged-in user 829 829 $old_user = get_current_user_id(); 830 $u = $this->factory->user->create();830 $u = self::factory()->user->create(); 831 831 $this->set_current_user( $u ); 832 832 … … 838 838 839 839 // Create the blog post 840 $post_id = $this->factory->post->create( array(840 $post_id = self::factory()->post->create( array( 841 841 'post_status' => 'publish', 842 842 'post_type' => 'post', … … 887 887 public function test_bp_blogs_comment_sync_activity_comment_for_custom_post_type() { 888 888 if ( is_multisite() ) { 889 $b = $this->factory->blog->create();889 $b = self::factory()->blog->create(); 890 890 switch_to_blog( $b ); 891 891 add_filter( 'comment_flood_filter', '__return_false' ); … … 894 894 } 895 895 896 $u = $this->factory->user->create();896 $u = self::factory()->user->create(); 897 897 $userdata = get_userdata( $u ); 898 898 … … 916 916 add_filter( 'bp_disable_blogforum_comments', '__return_false' ); 917 917 918 $p = $this->factory->post->create( array(918 $p = self::factory()->post->create( array( 919 919 'post_author' => $u, 920 920 'post_type' => 'foo', … … 995 995 $old_user = get_current_user_id(); 996 996 997 $u = $this->factory->user->create();997 $u = self::factory()->user->create(); 998 998 $this->set_current_user( $u ); 999 999 1000 1000 // Create three sites. 1001 $this->factory->blog->create_many( 3, array(1001 self::factory()->blog->create_many( 3, array( 1002 1002 'user_id' => $u 1003 1003 ) ); … … 1031 1031 $_POST['blog_public'] = 1; 1032 1032 1033 $u = $this->factory->user->create();1033 $u = self::factory()->user->create(); 1034 1034 $this->set_current_user( $u ); 1035 1035 1036 1036 // Create three sites. 1037 $b = $this->factory->blog->create( array(1037 $b = self::factory()->blog->create( array( 1038 1038 'user_id' => $u 1039 1039 ) ); … … 1078 1078 $_POST['blog_public'] = 1; 1079 1079 1080 $u = $this->factory->user->create();1080 $u = self::factory()->user->create(); 1081 1081 $this->set_current_user( $u ); 1082 1082 1083 1083 // Create three sites. 1084 $b = $this->factory->blog->create( array(1084 $b = self::factory()->blog->create( array( 1085 1085 'user_id' => $u 1086 1086 ) ); 1087 1087 1088 $u2 = $this->factory->user->create();1088 $u2 = self::factory()->user->create(); 1089 1089 add_user_to_blog( $b, $u2, 'contributor' ); 1090 1090 -
trunk/tests/phpunit/testcases/core/avatars.php
r11256 r11737 26 26 } 27 27 28 $u = $this->factory->user->create();28 $u = self::factory()->user->create(); 29 29 30 30 // get BP root blog's upload directory data … … 32 32 33 33 // create new subsite 34 $blog_id = $this->factory->blog->create( array(34 $blog_id = self::factory()->blog->create( array( 35 35 'user_id' => $u, 36 36 'title' => 'Test Title', … … 54 54 $this->clean_existing_avatars(); 55 55 56 $u = $this->factory->user->create();56 $u = self::factory()->user->create(); 57 57 $this->assertFalse( bp_get_user_has_avatar( $u ) ); 58 58 } … … 62 62 */ 63 63 public function test_bp_get_user_has_avatar_has_avatar_uploaded() { 64 $u = $this->factory->user->create();64 $u = self::factory()->user->create(); 65 65 66 66 // Fake it … … 176 176 */ 177 177 public function test_bp_core_fetch_avatar_class_attribute() { 178 $u = $this->factory->user->create();178 $u = self::factory()->user->create(); 179 179 180 180 $hw = 100; -
trunk/tests/phpunit/testcases/core/cache.php
r9819 r11737 11 11 public function test_bp_update_meta_cache_with_cache_misses() { 12 12 // Use activity just because 13 $a1 = $this->factory->activity->create();13 $a1 = self::factory()->activity->create(); 14 14 15 15 // Confirm that all activitymeta is deleted -
trunk/tests/phpunit/testcases/core/caps.php
r11256 r11737 11 11 } 12 12 13 $b = $this->factory->blog->create();14 $u = $this->factory->user->create();13 $b = self::factory()->blog->create(); 14 $u = self::factory()->user->create(); 15 15 16 16 $this->set_current_user( $u ); … … 33 33 } 34 34 35 $b = $this->factory->blog->create();36 $u = $this->factory->user->create();35 $b = self::factory()->blog->create(); 36 $u = self::factory()->user->create(); 37 37 38 38 $this->set_current_user( $u ); -
trunk/tests/phpunit/testcases/core/class-bp-attachment.php
r11540 r11737 224 224 $bp->displayed_user = new stdClass; 225 225 226 $u1 = $this->factory->user->create();226 $u1 = self::factory()->user->create(); 227 227 $bp->displayed_user->id = $u1; 228 228 … … 274 274 $reset_current_group = $bp->groups->current_group; 275 275 276 $g = $this->factory->group->create();276 $g = self::factory()->group->create(); 277 277 278 278 $bp->groups->current_group = groups_get_group( $g ); … … 348 348 $bp->displayed_user = new stdClass; 349 349 350 $u1 = $this->factory->user->create();350 $u1 = self::factory()->user->create(); 351 351 $bp->displayed_user->id = $u1; 352 352 -
trunk/tests/phpunit/testcases/core/class-bp-button.php
r11117 r11737 10 10 */ 11 11 public function test_block_self_own_profile() { 12 $u = $this->factory->user->create();12 $u = self::factory()->user->create(); 13 13 $this->set_current_user( $u ); 14 14 … … 28 28 */ 29 29 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(); 34 34 $this->go_to( bp_core_get_user_domain( $u2 ) ); 35 35 … … 48 48 public function test_block_self_inside_members_loop() { 49 49 $now = time(); 50 $u1 = $this->factory->user->create( array(50 $u1 = self::factory()->user->create( array( 51 51 'last_activity' => date( 'Y-m-d H:i:s', $now ), 52 52 ) ); 53 $u2 = $this->factory->user->create( array(53 $u2 = self::factory()->user->create( array( 54 54 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 55 55 ) ); … … 88 88 public function test_block_self_false_inside_members_loop() { 89 89 $now = time(); 90 $u1 = $this->factory->user->create( array(90 $u1 = self::factory()->user->create( array( 91 91 'last_activity' => date( 'Y-m-d H:i:s', $now ), 92 92 ) ); 93 $u2 = $this->factory->user->create( array(93 $u2 = self::factory()->user->create( array( 94 94 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 95 95 ) ); … … 128 128 public function test_block_self_inside_members_loop_on_my_profile_page() { 129 129 $now = time(); 130 $u1 = $this->factory->user->create( array(130 $u1 = self::factory()->user->create( array( 131 131 'last_activity' => date( 'Y-m-d H:i:s', $now ), 132 132 ) ); 133 $u2 = $this->factory->user->create( array(133 $u2 = self::factory()->user->create( array( 134 134 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 135 135 ) ); -
trunk/tests/phpunit/testcases/core/class-bp-core-user.php
r9819 r11737 10 10 */ 11 11 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(); 15 15 16 16 $exclude_qs = $u1 . ',junkstring,' . $u3; … … 26 26 */ 27 27 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(); 31 31 32 32 $exclude_array = array( … … 46 46 */ 47 47 public function test_get_users_with_include_querystring() { 48 $u1 = $this->factory->user->create( array(48 $u1 = self::factory()->user->create( array( 49 49 'last_activity' => gmdate( 'Y-m-d H:i:s' ), 50 50 ) ); 51 $u2 = $this->factory->user->create( array(51 $u2 = self::factory()->user->create( array( 52 52 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ), 53 53 ) ); 54 $u3 = $this->factory->user->create( array(54 $u3 = self::factory()->user->create( array( 55 55 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ), 56 56 ) ); … … 68 68 */ 69 69 public function test_get_users_with_include_array() { 70 $u1 = $this->factory->user->create( array(70 $u1 = self::factory()->user->create( array( 71 71 'last_activity' => gmdate( 'Y-m-d H:i:s' ), 72 72 ) ); 73 $u2 = $this->factory->user->create( array(73 $u2 = self::factory()->user->create( array( 74 74 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ), 75 75 ) ); 76 $u3 = $this->factory->user->create( array(76 $u3 = self::factory()->user->create( array( 77 77 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ), 78 78 ) ); … … 100 100 */ 101 101 public function test_type_alphabetical() { 102 $u1 = $this->factory->user->create( array(102 $u1 = self::factory()->user->create( array( 103 103 'display_name' => 'foo', 104 104 ) ); 105 $u2 = $this->factory->user->create( array(105 $u2 = self::factory()->user->create( array( 106 106 'display_name' => 'bar', 107 107 ) ); … … 119 119 */ 120 120 public function test_get_users_by_letter() { 121 $u1 = $this->factory->user->create( array(121 $u1 = self::factory()->user->create( array( 122 122 'display_name' => 'foo', 123 123 ) ); 124 $u2 = $this->factory->user->create( array(124 $u2 = self::factory()->user->create( array( 125 125 'display_name' => 'bar', 126 126 ) ); … … 136 136 */ 137 137 public function test_search_users() { 138 $u1 = $this->factory->user->create( array(138 $u1 = self::factory()->user->create( array( 139 139 'display_name' => 'foo', 140 140 ) ); 141 $u2 = $this->factory->user->create( array(141 $u2 = self::factory()->user->create( array( 142 142 'display_name' => 'bar', 143 143 ) ); … … 150 150 151 151 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(); 155 155 156 156 $include_array = array( … … 170 170 */ 171 171 public function test_get_last_activity() { 172 $u = $this->factory->user->create();172 $u = self::factory()->user->create(); 173 173 $time = bp_core_current_time(); 174 174 … … 186 186 */ 187 187 public function test_get_last_activity_store_in_cache() { 188 $u = $this->factory->user->create();188 $u = self::factory()->user->create(); 189 189 $time = bp_core_current_time(); 190 190 … … 204 204 */ 205 205 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(); 208 208 $time = bp_core_current_time(); 209 209 … … 225 225 */ 226 226 public function test_get_last_activity_from_cache_single_user() { 227 $u = $this->factory->user->create();227 $u = self::factory()->user->create(); 228 228 $time = bp_core_current_time(); 229 229 … … 248 248 */ 249 249 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(); 252 252 $time = bp_core_current_time(); 253 253 … … 273 273 */ 274 274 public function test_update_last_activity() { 275 $u = $this->factory->user->create();275 $u = self::factory()->user->create(); 276 276 $time = bp_core_current_time(); 277 277 $time2 = '1968-12-25 01:23:45'; … … 292 292 */ 293 293 public function test_delete_last_activity() { 294 $u = $this->factory->user->create();294 $u = self::factory()->user->create(); 295 295 $time = bp_core_current_time(); 296 296 -
trunk/tests/phpunit/testcases/core/class-bp-email-recipient.php
r10792 r11737 10 10 parent::setUp(); 11 11 12 $this->u1 = $this->factory->user->create( array(12 $this->u1 = self::factory()->user->create( array( 13 13 'display_name' => 'Unit Test', 14 14 'user_email' => 'test@example.com', -
trunk/tests/phpunit/testcases/core/class-bp-email.php
r10761 r11737 11 11 parent::setUp(); 12 12 13 $this->u1 = $this->factory->user->create( array(13 $this->u1 = self::factory()->user->create( array( 14 14 'display_name' => 'Unit Test', 15 15 'user_email' => 'test1@example.com', 16 16 ) ); 17 17 18 $this->u2 = $this->factory->user->create( array(18 $this->u2 = self::factory()->user->create( array( 19 19 'display_name' => 'Unit Test2', 20 20 'user_email' => 'test2@example.com', -
trunk/tests/phpunit/testcases/core/class-bp-media-extractor.php
r10223 r11737 144 144 145 145 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' ) ); 147 147 $media = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::LINKS | BP_Media_Extractor::MENTIONS ); 148 148 … … 153 153 154 154 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 ) ); 156 156 $media = self::$media_extractor->extract( get_post( $post_id ), BP_Media_Extractor::LINKS ); 157 157 … … 190 190 191 191 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' ) ); 193 193 $media = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::MENTIONS ); 194 194 … … 198 198 199 199 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' ) ); 201 201 $was_activity_enabled = false; 202 202 … … 304 304 public function test_extract_images_from_content_with_galleries_variant_no_ids() { 305 305 // 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( 308 308 'post_mime_type' => 'image/jpeg', 309 309 'post_type' => 'attachment' … … 329 329 $attachment_ids[] = $this->fake_attachment_upload( DIR_TESTDATA . '/images/canola.jpg' ); 330 330 $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}']" ) ); 332 332 333 333 // Extract the gallery images. … … 345 345 346 346 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 ) ); 348 348 $media = self::$media_extractor->extract( self::$richtext, BP_Media_Extractor::IMAGES, array( 349 349 'post' => get_post( $post_id ), … … 356 356 357 357 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"]' ) ); 359 359 $media = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array( 360 360 'post' => get_post( $post_id ), … … 372 372 373 373 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( 376 376 'post_mime_type' => 'image/jpeg', 377 377 'post_type' => 'attachment' … … 393 393 394 394 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 ) ); 396 396 $media = self::$media_extractor->extract( '', BP_Media_Extractor::IMAGES, array( 397 397 'post' => get_post( $post_id ), -
trunk/tests/phpunit/testcases/core/class-bp-user-query.php
r11366 r11737 10 10 */ 11 11 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(); 15 15 friends_add_friend( $u1, $u2, true ); 16 16 … … 28 28 */ 29 29 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(); 34 34 friends_add_friend( $u1, $u2, true ); 35 35 friends_add_friend( $u1, $u3, true ); … … 49 49 50 50 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(); 55 55 56 56 $q = new BP_User_Query( array( … … 94 94 public function test_bp_user_query_user_ids_with_invalid_user_id() { 95 95 $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(); 98 98 99 99 // invalid user ID … … 116 116 117 117 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(); 122 122 123 123 bp_update_user_meta( $u1, bp_get_user_meta_key( 'total_friend_count' ), '5' ); … … 142 142 public function test_bp_user_query_type_online() { 143 143 $now = time(); 144 $u1 = $this->factory->user->create( array(144 $u1 = self::factory()->user->create( array( 145 145 'last_activity' => date( 'Y-m-d H:i:s', $now ), 146 146 ) ); 147 $u2 = $this->factory->user->create( array(147 $u2 = self::factory()->user->create( array( 148 148 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*13 ), 149 149 ) ); 150 $u3 = $this->factory->user->create( array(150 $u3 = self::factory()->user->create( array( 151 151 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*16 ), 152 152 ) ); … … 166 166 public function test_bp_user_query_type_online_five_minute_interval() { 167 167 $now = time(); 168 $u1 = $this->factory->user->create( array(168 $u1 = self::factory()->user->create( array( 169 169 'last_activity' => date( 'Y-m-d H:i:s', $now ), 170 170 ) ); 171 $u2 = $this->factory->user->create( array(171 $u2 = self::factory()->user->create( array( 172 172 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*4 ), 173 173 ) ); 174 $u3 = $this->factory->user->create( array(174 $u3 = self::factory()->user->create( array( 175 175 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*6 ), 176 176 ) ); … … 190 190 public function test_bp_user_query_search_with_apostrophe() { 191 191 // Apostrophe. Search_terms must escaped to mimic POST payload 192 $user_id = $this->factory->user->create();192 $user_id = self::factory()->user->create(); 193 193 xprofile_set_field_data( 1, $user_id, "Foo'Bar" ); 194 194 $q = new BP_User_Query( array( 'search_terms' => "oo\'Ba", ) ); … … 206 206 207 207 // LIKE special character: % 208 $user_id = $this->factory->user->create();208 $user_id = self::factory()->user->create(); 209 209 xprofile_set_field_data( 1, $user_id, "Foo%Bar" ); 210 210 $q = new BP_User_Query( array( 'search_terms' => "oo%Bar", ) ); … … 223 223 224 224 // LIKE special character: _ 225 $user_id = $this->factory->user->create();225 $user_id = self::factory()->user->create(); 226 226 xprofile_set_field_data( 1, $user_id, "Foo_Bar" ); 227 227 $q = new BP_User_Query( array( 'search_terms' => "oo_Bar", ) ); … … 239 239 240 240 // LIKE special character: & 241 $user_id = $this->factory->user->create();241 $user_id = self::factory()->user->create(); 242 242 xprofile_set_field_data( 1, $user_id, "a&mpersand" ); 243 243 $q = new BP_User_Query( array( 'search_terms' => "a&m", ) ); … … 257 257 */ 258 258 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( 260 260 'user_login' => 'foo', 261 261 ) ); … … 273 273 274 274 public function test_bp_user_query_search_wildcards() { 275 $u1 = $this->factory->user->create( array(275 $u1 = self::factory()->user->create( array( 276 276 'user_login' => 'xfoo', 277 277 ) ); … … 279 279 $q1 = new BP_User_Query( array( 'search_terms' => 'foo', 'search_wildcard' => 'left' ) ); 280 280 281 $u2 = $this->factory->user->create( array(281 $u2 = self::factory()->user->create( array( 282 282 'user_login' => 'foox', 283 283 ) ); … … 285 285 $q2 = new BP_User_Query( array( 'search_terms' => 'foo', 'search_wildcard' => 'right' ) ); 286 286 287 $u3 = $this->factory->user->create( array(287 $u3 = self::factory()->user->create( array( 288 288 'user_login' => 'xfoox', 289 289 ) ); … … 313 313 $existing_users = $wpdb->get_col( "SELECT ID FROM {$wpdb->users}" ); 314 314 315 $u1 = $this->factory->user->create();316 $u2 = $this->factory->user->create();315 $u1 = self::factory()->user->create(); 316 $u2 = self::factory()->user->create(); 317 317 318 318 $exclude = array_merge( array( $u1 ), $existing_users ); … … 341 341 add_filter( 'bp_disable_profile_sync', '__return_false' ); 342 342 343 $u1 = $this->factory->user->create();344 $u2 = $this->factory->user->create();343 $u1 = self::factory()->user->create(); 344 $u2 = self::factory()->user->create(); 345 345 346 346 global $wpdb; … … 372 372 */ 373 373 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(); 376 376 377 377 // Make sure xprofile and profile sync are off … … 407 407 */ 408 408 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(); 411 411 412 412 bp_update_user_meta( $u2, 'foo', 'bar' ); … … 429 429 */ 430 430 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(); 433 433 434 434 $q = new BP_User_Query( array( … … 448 448 bp_register_member_type( 'foo' ); 449 449 bp_register_member_type( 'bar' ); 450 $users = $this->factory->user->create_many( 3 );450 $users = self::factory()->user->create_many( 3 ); 451 451 bp_set_member_type( $users[0], 'foo' ); 452 452 bp_set_member_type( $users[1], 'bar' ); … … 466 466 bp_register_member_type( 'foo' ); 467 467 bp_register_member_type( 'bar' ); 468 $users = $this->factory->user->create_many( 3 );468 $users = self::factory()->user->create_many( 3 ); 469 469 bp_set_member_type( $users[0], 'foo' ); 470 470 bp_set_member_type( $users[1], 'bar' ); … … 484 484 bp_register_member_type( 'foo' ); 485 485 bp_register_member_type( 'bar' ); 486 $users = $this->factory->user->create_many( 3 );486 $users = self::factory()->user->create_many( 3 ); 487 487 bp_set_member_type( $users[0], 'foo' ); 488 488 bp_set_member_type( $users[1], 'bar' ); … … 502 502 bp_register_member_type( 'foo' ); 503 503 bp_register_member_type( 'bar' ); 504 $users = $this->factory->user->create_many( 3 );504 $users = self::factory()->user->create_many( 3 ); 505 505 bp_set_member_type( $users[0], 'foo' ); 506 506 bp_set_member_type( $users[1], 'bar' ); … … 520 520 bp_register_member_type( 'foo' ); 521 521 bp_register_member_type( 'bar' ); 522 $users = $this->factory->user->create_many( 3 );522 $users = self::factory()->user->create_many( 3 ); 523 523 bp_set_member_type( $users[0], 'foo' ); 524 524 bp_set_member_type( $users[1], 'bar' ); … … 538 538 public function test_should_return_no_results_when_no_users_match_the_specified_member_type() { 539 539 bp_register_member_type( 'foo' ); 540 $users = $this->factory->user->create_many( 3 );540 $users = self::factory()->user->create_many( 3 ); 541 541 542 542 $q = new BP_User_Query( array( … … 553 553 bp_register_member_type( 'foo' ); 554 554 bp_register_member_type( 'bar' ); 555 $users = $this->factory->user->create_many( 3 );555 $users = self::factory()->user->create_many( 3 ); 556 556 bp_set_member_type( $users[0], 'foo' ); 557 557 bp_set_member_type( $users[1], 'bar' ); … … 571 571 bp_register_member_type( 'foo' ); 572 572 bp_register_member_type( 'bar' ); 573 $users = $this->factory->user->create_many( 3 );573 $users = self::factory()->user->create_many( 3 ); 574 574 bp_set_member_type( $users[0], 'foo' ); 575 575 bp_set_member_type( $users[1], 'bar' ); … … 589 589 bp_register_member_type( 'foo' ); 590 590 bp_register_member_type( 'bar' ); 591 $users = $this->factory->user->create_many( 3 );591 $users = self::factory()->user->create_many( 3 ); 592 592 bp_set_member_type( $users[0], 'foo' ); 593 593 bp_set_member_type( $users[1], 'bar' ); … … 607 607 bp_register_member_type( 'foo' ); 608 608 bp_register_member_type( 'bar' ); 609 $users = $this->factory->user->create_many( 3 );609 $users = self::factory()->user->create_many( 3 ); 610 610 bp_set_member_type( $users[0], 'foo' ); 611 611 bp_set_member_type( $users[1], 'bar' ); … … 625 625 bp_register_member_type( 'foo' ); 626 626 bp_register_member_type( 'bar' ); 627 $users = $this->factory->user->create_many( 3 );627 $users = self::factory()->user->create_many( 3 ); 628 628 bp_set_member_type( $users[0], 'foo' ); 629 629 bp_set_member_type( $users[1], 'bar' ); … … 642 642 public function test_should_return_no_results_when_no_users_match_the_specified_member_type__in() { 643 643 bp_register_member_type( 'foo' ); 644 $users = $this->factory->user->create_many( 3 );644 $users = self::factory()->user->create_many( 3 ); 645 645 646 646 $q = new BP_User_Query( array( … … 657 657 bp_register_member_type( 'foo' ); 658 658 bp_register_member_type( 'bar' ); 659 $users = $this->factory->user->create_many( 3 );659 $users = self::factory()->user->create_many( 3 ); 660 660 bp_set_member_type( $users[0], 'foo' ); 661 661 bp_set_member_type( $users[1], 'bar' ); … … 676 676 bp_register_member_type( 'foo' ); 677 677 bp_register_member_type( 'bar' ); 678 $users = $this->factory->user->create_many( 3 );678 $users = self::factory()->user->create_many( 3 ); 679 679 bp_set_member_type( $users[0], 'foo' ); 680 680 bp_set_member_type( $users[1], 'bar' ); … … 693 693 public function test_should_return_no_results_when_all_users_match_the_specified_member_type__not_in() { 694 694 bp_register_member_type( 'foo' ); 695 $users = $this->factory->user->create_many( 3 );695 $users = self::factory()->user->create_many( 3 ); 696 696 bp_set_member_type( $users[0], 'foo' ); 697 697 bp_set_member_type( $users[1], 'foo' ); … … 710 710 public function test_member_type__not_in_takes_precedence_over_member_type() { 711 711 bp_register_member_type( 'foo' ); 712 $users = $this->factory->user->create_many( 3 );712 $users = self::factory()->user->create_many( 3 ); 713 713 bp_set_member_type( $users[0], 'foo' ); 714 714 bp_set_member_type( $users[1], 'foo' ); … … 728 728 public function test_member_type__not_in_takes_precedence_over_member_type__in() { 729 729 bp_register_member_type( 'foo' ); 730 $users = $this->factory->user->create_many( 3 );730 $users = self::factory()->user->create_many( 3 ); 731 731 bp_set_member_type( $users[0], 'foo' ); 732 732 bp_set_member_type( $users[1], 'foo' ); … … 748 748 bp_register_member_type( 'foo' ); 749 749 bp_register_member_type( 'bar' ); 750 $users = $this->factory->user->create_many( 4 );750 $users = self::factory()->user->create_many( 4 ); 751 751 bp_set_member_type( $users[0], 'foo' ); 752 752 bp_set_member_type( $users[1], 'bar' ); -
trunk/tests/phpunit/testcases/core/functions.php
r11097 r11737 701 701 702 702 if ( is_multisite() ) { 703 $b = $this->factory->blog->create();703 $b = self::factory()->blog->create(); 704 704 switch_to_blog( $b ); 705 705 } -
trunk/tests/phpunit/testcases/core/functions/bpCoreGetDirectoryPageIds.php
r11256 r11737 45 45 $old_page_ids = bp_core_get_directory_page_ids(); 46 46 47 $p = $this->factory->post->create( array(47 $p = self::factory()->post->create( array( 48 48 'post_status' => 'publish', 49 49 'post_type' => 'page', … … 263 263 264 264 // 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 ) ); 267 267 268 268 // switch to blog and create some dummy posts until we reach a post ID that 269 269 // matches our BP activity page ID 270 270 switch_to_blog( $b1 ); 271 $p = $this->factory->post->create();271 $p = self::factory()->post->create(); 272 272 while( $p <= $dir_pages->activity->id ) { 273 $p = $this->factory->post->create();273 $p = self::factory()->post->create(); 274 274 } 275 275 -
trunk/tests/phpunit/testcases/core/nav/backCompat.php
r11091 r11737 46 46 */ 47 47 protected function set_up_group() { 48 $g = $this->factory->group->create( array(48 $g = self::factory()->group->create( array( 49 49 'slug' => 'testgroup', 50 50 ) ); -
trunk/tests/phpunit/testcases/core/nav/bpCoreMaybeHookNewSubnavScreenFunction.php
r11091 r11737 54 54 55 55 public function test_user_has_access_false_user_logged_in_my_profile() { 56 $u = $this->factory->user->create();56 $u = self::factory()->user->create(); 57 57 $old_current_user = get_current_user_id(); 58 58 $this->set_current_user( $u ); … … 73 73 74 74 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(); 77 77 $old_current_user = get_current_user_id(); 78 78 $this->set_current_user( $u1 ); … … 108 108 109 109 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(); 112 112 $old_current_user = get_current_user_id(); 113 113 $this->set_current_user( $u1 ); … … 144 144 145 145 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(); 148 148 $old_current_user = get_current_user_id(); 149 149 $this->set_current_user( $u ); … … 168 168 169 169 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(); 172 172 $old_current_user = get_current_user_id(); 173 173 $this->set_current_user( $u ); -
trunk/tests/phpunit/testcases/core/nav/bpCoreNewNavItem.php
r11091 r11737 12 12 $bp_nav = buddypress()->bp_nav; 13 13 14 $u = $this->factory->user->create();14 $u = self::factory()->user->create(); 15 15 $old_current_user = get_current_user_id(); 16 16 $this->set_current_user( $u ); … … 52 52 $bp_nav = buddypress()->bp_nav; 53 53 54 $u = $this->factory->user->create();55 $g = $this->factory->group->create();54 $u = self::factory()->user->create(); 55 $g = self::factory()->group->create(); 56 56 $old_current_user = get_current_user_id(); 57 57 $this->set_current_user( $u ); … … 143 143 $bp_nav = buddypress()->bp_nav; 144 144 145 $u = $this->factory->user->create();146 $u2 = $this->factory->user->create();145 $u = self::factory()->user->create(); 146 $u2 = self::factory()->user->create(); 147 147 $old_current_user = get_current_user_id(); 148 148 $this->set_current_user( $u2 ); … … 178 178 $bp_nav = buddypress()->bp_nav; 179 179 180 $u = $this->factory->user->create();181 $u2 = $this->factory->user->create();180 $u = self::factory()->user->create(); 181 $u2 = self::factory()->user->create(); 182 182 $old_current_user = get_current_user_id(); 183 183 $this->set_current_user( $u2 ); -
trunk/tests/phpunit/testcases/core/nav/bpCoreNewSubnavItem.php
r10745 r11737 12 12 $bp_options_nav = buddypress()->bp_options_nav; 13 13 14 $u = $this->factory->user->create();14 $u = self::factory()->user->create(); 15 15 $old_current_user = get_current_user_id(); 16 16 $this->set_current_user( $u ); -
trunk/tests/phpunit/testcases/core/nav/bpCoreRemoveSubnavItem.php
r11091 r11737 73 73 74 74 public function test_backcompat_remove_group_nav_items() { 75 $g1 = $this->factory->group->create();75 $g1 = self::factory()->group->create(); 76 76 77 77 // In group context -
trunk/tests/phpunit/testcases/core/nav/bpGetNavMenuItems.php
r10874 r11737 10 10 */ 11 11 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 ); 13 13 14 14 $this->set_current_user( $users[0] ); … … 34 34 */ 35 35 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(); 37 37 38 38 $this->set_current_user( 0 ); -
trunk/tests/phpunit/testcases/core/template/bpUserHasAccess.php
r9989 r11737 6 6 class BP_Tests_Core_Template_BpUserHasAccess extends BP_UnitTestCase { 7 7 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 ); 9 9 10 10 $this->grant_bp_moderate( $users[0] ); … … 17 17 18 18 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 ); 20 20 21 21 $this->set_current_user( $users[0] ); … … 27 27 28 28 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 ); 30 30 31 31 $this->set_current_user( $users[0] ); -
trunk/tests/phpunit/testcases/friends/activity.php
r10748 r11737 11 11 */ 12 12 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( 17 17 'component' => buddypress()->friends->id, 18 18 'type' => 'friendship_accepted', … … 33 33 */ 34 34 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( 39 39 'component' => buddypress()->friends->id, 40 40 'type' => 'friendship_created', … … 56 56 $old_user = get_current_user_id(); 57 57 58 $u1 = $this->factory->user->create();59 $u2 = $this->factory->user->create();58 $u1 = self::factory()->user->create(); 59 $u2 = self::factory()->user->create(); 60 60 61 61 friends_add_friend( $u2, $u1 ); … … 70 70 71 71 // 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 ) ); 74 74 75 75 $fc_act = bp_activity_get( array( … … 103 103 $old_user = get_current_user_id(); 104 104 105 $u1 = $this->factory->user->create();106 $u2 = $this->factory->user->create();105 $u1 = self::factory()->user->create(); 106 $u2 = self::factory()->user->create(); 107 107 108 108 friends_add_friend( $u2, $u1 ); … … 141 141 $old_user = get_current_user_id(); 142 142 143 $u1 = $this->factory->user->create();144 $u2 = $this->factory->user->create();143 $u1 = self::factory()->user->create(); 144 $u2 = self::factory()->user->create(); 145 145 $users = array( $u1, $u2 ); 146 146 … … 155 155 $this->set_current_user( $old_user ); 156 156 157 $users[] = $this->factory->user->create();158 $users[] = $this->factory->user->create();157 $users[] = self::factory()->user->create(); 158 $users[] = self::factory()->user->create(); 159 159 160 160 foreach( $users as $u ) { … … 192 192 $old_user = get_current_user_id(); 193 193 194 $u1 = $this->factory->user->create();195 $u2 = $this->factory->user->create();194 $u1 = self::factory()->user->create(); 195 $u2 = self::factory()->user->create(); 196 196 197 197 friends_add_friend( $u2, $u1 ); … … 222 222 public function test_delete_user_with_no_activities() { 223 223 $old_user = get_current_user_id(); 224 $u1 = $this->factory->user->create();224 $u1 = self::factory()->user->create(); 225 225 $this->set_current_user( $u1 ); 226 226 -
trunk/tests/phpunit/testcases/friends/class-bp-friends-friendship.php
r11122 r11737 6 6 class BP_Tests_BP_Friends_Friendship_TestCases extends BP_UnitTestCase { 7 7 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(); 11 11 12 12 xprofile_set_field_data( 1, $u2, 'Cool Dude' ); … … 26 26 $this->deactivate_component( 'xprofile' ); 27 27 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(); 31 31 32 32 add_user_meta( $u2, 'nickname', 'Cool Dude' ); … … 41 41 42 42 public function test_get_bulk_last_active() { 43 $u1 = $this->factory->user->create( array(43 $u1 = self::factory()->user->create( array( 44 44 'last_activity' => gmdate( 'Y-m-d H:i:s' ), 45 45 ) ); 46 $u2 = $this->factory->user->create( array(46 $u2 = self::factory()->user->create( array( 47 47 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 1000 ), 48 48 ) ); 49 $u3 = $this->factory->user->create( array(49 $u3 = self::factory()->user->create( array( 50 50 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 50 ), 51 51 ) ); … … 57 57 58 58 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(); 62 62 63 63 xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' ); … … 71 71 72 72 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(); 76 76 77 77 xprofile_set_field_data( 1, $u1, 'Freedom Isn\'t Free' ); … … 88 88 */ 89 89 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(); 92 92 $this->assertEquals( 'not_friends', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) ); 93 93 } … … 97 97 */ 98 98 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(); 101 101 friends_add_friend( $u1, $u2, false ); 102 102 $this->assertEquals( 'pending', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) ); … … 107 107 */ 108 108 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(); 111 111 friends_add_friend( $u1, $u2, false ); 112 112 $this->assertEquals( 'awaiting_response', BP_Friends_Friendship::check_is_friend( $u2, $u1 ) ); … … 117 117 */ 118 118 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(); 121 121 friends_add_friend( $u1, $u2, true ); 122 122 $this->assertEquals( 'is_friend', BP_Friends_Friendship::check_is_friend( $u1, $u2 ) ); … … 127 127 */ 128 128 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(); 131 131 132 132 $friendship = new BP_Friends_Friendship(); … … 155 155 global $wpdb; 156 156 $now = time(); 157 $u1 = $this->factory->user->create( array(157 $u1 = self::factory()->user->create( array( 158 158 'last_activity' => date( 'Y-m-d H:i:s', $now ), 159 159 ) ); 160 $u2 = $this->factory->user->create( array(160 $u2 = self::factory()->user->create( array( 161 161 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 162 162 ) ); -
trunk/tests/phpunit/testcases/friends/functions.php
r11354 r11737 20 20 */ 21 21 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(); 25 25 26 26 // request friendship … … 55 55 */ 56 56 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(); 60 60 61 61 // request friendship … … 85 85 */ 86 86 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(); 89 89 90 90 // request friendship … … 113 113 */ 114 114 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(); 117 117 118 118 // request friendship … … 139 139 */ 140 140 public function test_friends_add_friend_fail_on_self() { 141 $u1 = $this->factory->user->create();141 $u1 = self::factory()->user->create(); 142 142 $this->assertFalse( friends_add_friend( $u1, $u1 ) ); 143 143 } … … 147 147 */ 148 148 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(); 151 151 152 152 friends_add_friend( $u1, $u2, true ); … … 160 160 public function test_friends_check_friendship_status_in_members_loop() { 161 161 $now = time(); 162 $u1 = $this->factory->user->create( array(162 $u1 = self::factory()->user->create( array( 163 163 'last_activity' => date( 'Y-m-d H:i:s', $now ), 164 164 ) ); 165 $u2 = $this->factory->user->create( array(165 $u2 = self::factory()->user->create( array( 166 166 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 167 167 ) ); 168 $u3 = $this->factory->user->create( array(168 $u3 = self::factory()->user->create( array( 169 169 'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ), 170 170 ) ); 171 $u4 = $this->factory->user->create( array(171 $u4 = self::factory()->user->create( array( 172 172 'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ), 173 173 ) ); 174 $u5 = $this->factory->user->create( array(174 $u5 = self::factory()->user->create( array( 175 175 'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ), 176 176 ) ); … … 208 208 public function test_friends_check_friendship_status_not_in_members_loop() { 209 209 $now = time(); 210 $u1 = $this->factory->user->create( array(210 $u1 = self::factory()->user->create( array( 211 211 'last_activity' => date( 'Y-m-d H:i:s', $now ), 212 212 ) ); 213 $u2 = $this->factory->user->create( array(213 $u2 = self::factory()->user->create( array( 214 214 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 215 215 ) ); 216 $u3 = $this->factory->user->create( array(216 $u3 = self::factory()->user->create( array( 217 217 'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ), 218 218 ) ); 219 $u4 = $this->factory->user->create( array(219 $u4 = self::factory()->user->create( array( 220 220 'last_activity' => date( 'Y-m-d H:i:s', $now - 300 ), 221 221 ) ); 222 $u5 = $this->factory->user->create( array(222 $u5 = self::factory()->user->create( array( 223 223 'last_activity' => date( 'Y-m-d H:i:s', $now - 400 ), 224 224 ) ); … … 251 251 */ 252 252 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(); 255 255 256 256 add_filter( 'friends_friendship_requested', array( $this, 'friends_friendship_filter_callback' ) ); … … 265 265 */ 266 266 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(); 269 269 270 270 add_filter( 'friends_friendship_accepted', array( $this, 'friends_friendship_filter_callback' ) ); … … 286 286 global $wpdb; 287 287 $now = time(); 288 $u1 = $this->factory->user->create( array(288 $u1 = self::factory()->user->create( array( 289 289 'last_activity' => date( 'Y-m-d H:i:s', $now ), 290 290 ) ); 291 $u2 = $this->factory->user->create( array(291 $u2 = self::factory()->user->create( array( 292 292 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 293 293 ) ); 294 $u3 = $this->factory->user->create( array(294 $u3 = self::factory()->user->create( array( 295 295 'last_activity' => date( 'Y-m-d H:i:s', $now - 200 ), 296 296 ) ); … … 313 313 global $wpdb; 314 314 $now = time(); 315 $u1 = $this->factory->user->create( array(315 $u1 = self::factory()->user->create( array( 316 316 'last_activity' => date( 'Y-m-d H:i:s', $now ), 317 317 ) ); 318 $u2 = $this->factory->user->create( array(318 $u2 = self::factory()->user->create( array( 319 319 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 320 320 ) ); … … 335 335 336 336 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(); 341 341 342 342 // request friendship … … 357 357 358 358 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(); 362 362 363 363 // request friendship … … 378 378 379 379 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(); 384 384 385 385 // request friendship -
trunk/tests/phpunit/testcases/friends/notifications.php
r9819 r11737 12 12 parent::setUp(); 13 13 $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() ); 15 15 16 $this->friend = $this->factory->user->create();16 $this->friend = self::factory()->user->create(); 17 17 $this->filter_fired = ''; 18 18 } -
trunk/tests/phpunit/testcases/groups/activity.php
r11557 r11737 11 11 */ 12 12 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( 16 16 'component' => buddypress()->groups->id, 17 17 'type' => 'created_group', … … 33 33 */ 34 34 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( 38 38 'component' => buddypress()->groups->id, 39 39 'type' => 'joined_group', … … 55 55 */ 56 56 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(); 58 58 groups_edit_base_group_details( array( 59 59 'group_id' => $group->id, … … 78 78 */ 79 79 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(); 81 81 groups_edit_base_group_details( array( 82 82 'group_id' => $group->id, … … 102 102 public function test_bp_groups_format_activity_action_group_details_updated_with_updated_name() { 103 103 $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(); 108 108 groups_edit_base_group_details( array( 109 109 'group_id' => $group->id, … … 134 134 public function test_bp_groups_format_activity_action_group_details_updated_with_updated_description() { 135 135 $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(); 140 140 groups_edit_base_group_details( array( 141 141 'group_id' => $group->id, … … 166 166 public function test_bp_groups_format_activity_action_group_details_updated_with_updated_slug() { 167 167 $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(); 172 172 groups_edit_base_group_details( array( 173 173 'group_id' => $group->id, … … 199 199 public function test_bp_groups_format_activity_action_group_details_updated_with_updated_name_and_description() { 200 200 $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(); 205 205 groups_edit_base_group_details( array( 206 206 'group_id' => $group->id, -
trunk/tests/phpunit/testcases/groups/avatars.php
r9819 r11737 10 10 */ 11 11 public function test_bp_get_group_has_avatar_no_avatar_uploaded() { 12 $g = $this->factory->group->create();12 $g = self::factory()->group->create(); 13 13 $this->assertFalse( bp_get_group_has_avatar( $g ) ); 14 14 } … … 18 18 */ 19 19 public function test_bp_get_group_has_avatar_has_avatar_uploaded() { 20 $g = $this->factory->group->create();20 $g = self::factory()->group->create(); 21 21 22 22 // Fake it -
trunk/tests/phpunit/testcases/groups/cache.php
r11091 r11737 10 10 */ 11 11 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(); 14 14 15 15 $time = bp_core_current_time(); … … 71 71 */ 72 72 public function test_bp_groups_delete_group_cache_on_metadata_add() { 73 $g = $this->factory->group->create();73 $g = self::factory()->group->create(); 74 74 75 75 // Prime cache … … 89 89 */ 90 90 public function test_bp_groups_delete_group_cache_on_metadata_change() { 91 $g = $this->factory->group->create();91 $g = self::factory()->group->create(); 92 92 93 93 // Prime cache … … 106 106 */ 107 107 public function test_bp_groups_prefetch_activity_object_data_all_cached() { 108 $g = $this->factory->group->create();108 $g = self::factory()->group->create(); 109 109 110 110 // Prime cache … … 130 130 */ 131 131 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(); 134 134 135 135 // Prime cache … … 160 160 */ 161 161 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 ) ); 165 165 166 166 // User 2 joins the group … … 185 185 */ 186 186 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 ) ); 190 190 191 191 // User 2 joins the group … … 207 207 */ 208 208 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 ) ); 212 212 213 213 // prime cache … … 225 225 */ 226 226 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 ) ); 230 230 231 231 // prime cache -
trunk/tests/phpunit/testcases/groups/class-bp-group-extension.php
r11091 r11737 223 223 $old_options_nav = buddypress()->bp_options_nav; 224 224 225 $g = $this->factory->group->create();225 $g = self::factory()->group->create(); 226 226 $g_obj = groups_get_group( $g ); 227 227 … … 246 246 $old_options_nav = buddypress()->bp_options_nav; 247 247 248 $g = $this->factory->group->create();248 $g = self::factory()->group->create(); 249 249 $g_obj = groups_get_group( $g ); 250 250 … … 270 270 $old_current_user = get_current_user_id(); 271 271 272 $g = $this->factory->group->create( array(272 $g = self::factory()->group->create( array( 273 273 'status' => 'private', 274 274 ) ); … … 288 288 289 289 // Test as group member 290 $u = $this->factory->user->create();290 $u = self::factory()->user->create(); 291 291 $this->set_current_user( $u ); 292 292 $this->add_user_to_group( $u, $g ); … … 314 314 $old_current_user = get_current_user_id(); 315 315 316 $g = $this->factory->group->create( array(316 $g = self::factory()->group->create( array( 317 317 'status' => 'private', 318 318 ) ); … … 332 332 333 333 // Test as group member 334 $u = $this->factory->user->create();334 $u = self::factory()->user->create(); 335 335 $this->set_current_user( $u ); 336 336 $this->add_user_to_group( $u, $g ); … … 350 350 $old_current_user = get_current_user_id(); 351 351 352 $g = $this->factory->group->create( array(352 $g = self::factory()->group->create( array( 353 353 'status' => 'public', 354 354 ) ); … … 376 376 $this->set_current_user( 0 ); 377 377 378 $g = $this->factory->group->create( array(378 $g = self::factory()->group->create( array( 379 379 'status' => 'public', 380 380 ) ); … … 413 413 */ 414 414 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(); 421 421 $old_current_user = get_current_user_id(); 422 422 $this->set_current_user( $u ); … … 455 455 */ 456 456 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(); 463 463 $old_current_user = get_current_user_id(); 464 464 $this->set_current_user( $u ); … … 499 499 */ 500 500 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(); 507 507 $old_current_user = get_current_user_id(); 508 508 $this->set_current_user( $u ); … … 545 545 */ 546 546 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(); 553 553 $old_current_user = get_current_user_id(); 554 554 $this->set_current_user( $u ); … … 591 591 */ 592 592 public function test_user_can_see_nav_item_implied() { 593 $g = $this->factory->group->create( array(593 $g = self::factory()->group->create( array( 594 594 'status' => 'public', 595 595 ) ); … … 632 632 */ 633 633 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( 635 635 'status' => 'public', 636 636 ) ); … … 673 673 */ 674 674 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(); 681 681 $old_current_user = get_current_user_id(); 682 682 $this->set_current_user( $u ); … … 715 715 */ 716 716 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(); 723 723 $old_current_user = get_current_user_id(); 724 724 $this->set_current_user( $u ); … … 759 759 */ 760 760 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(); 767 767 $old_current_user = get_current_user_id(); 768 768 $this->set_current_user( $u ); … … 805 805 */ 806 806 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(); 813 813 $old_current_user = get_current_user_id(); 814 814 $this->set_current_user( $u ); … … 851 851 */ 852 852 public function test_widget_on_group_home_page() { 853 $g = $this->factory->group->create( array(853 $g = self::factory()->group->create( array( 854 854 'status' => 'public', 855 855 ) ); … … 872 872 */ 873 873 public function test_widget_on_group_members_page() { 874 $g = $this->factory->group->create( array(874 $g = self::factory()->group->create( array( 875 875 'status' => 'public', 876 876 ) ); -
trunk/tests/phpunit/testcases/groups/class-bp-group-member-query.php
r9819 r11737 11 11 */ 12 12 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(); 17 17 $time = time(); 18 18 … … 31 31 // Make sure we're falling back on 'member' 32 32 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(); 37 37 $time = time(); 38 38 … … 59 59 60 60 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(); 65 65 $time = time(); 66 66 … … 84 84 85 85 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(); 90 90 $time = time(); 91 91 … … 109 109 110 110 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( 115 115 'creator_id' => $u1 116 116 ) ); … … 136 136 137 137 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(); 142 142 $time = time(); 143 143 … … 161 161 162 162 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( 167 167 'creator_id' => $u1, 168 168 ) ); … … 188 188 189 189 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( 194 194 'creator_id' => $u1, 195 195 ) ); … … 215 215 216 216 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( 221 221 'creator_id' => $u1, 222 222 ) ); … … 242 242 243 243 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( 249 249 'creator_id' => $u1, 250 250 ) ); … … 276 276 */ 277 277 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(); 281 281 $time = time(); 282 282 … … 297 297 298 298 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(); 301 301 $time = time(); 302 302 … … 313 313 314 314 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(); 318 318 $time = time(); 319 319 … … 340 340 */ 341 341 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(); 345 345 $time = time(); 346 346 … … 366 366 */ 367 367 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(); 371 371 $time = time(); 372 372 … … 393 393 */ 394 394 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(); 399 399 $c = buddypress()->groups->id; 400 400 $time = time(); … … 412 412 ) ); 413 413 414 $this->factory->activity->create( array(414 self::factory()->activity->create( array( 415 415 'component' => $c, 416 416 'type' => 'activity_update', … … 420 420 ) ); 421 421 422 $this->factory->activity->create( array(422 self::factory()->activity->create( array( 423 423 'component' => $c, 424 424 'type' => 'activity_update', … … 428 428 ) ); 429 429 430 $this->factory->activity->create( array(430 self::factory()->activity->create( array( 431 431 'component' => $c, 432 432 'type' => 'activity_update', … … 464 464 */ 465 465 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(); 470 470 $c = buddypress()->groups->id; 471 471 $time = time(); … … 483 483 ) ); 484 484 485 $this->factory->activity->create( array(485 self::factory()->activity->create( array( 486 486 'component' => $c, 487 487 'type' => 'activity_update', … … 491 491 ) ); 492 492 493 $this->factory->activity->create( array(493 self::factory()->activity->create( array( 494 494 'component' => $c, 495 495 'type' => 'activity_update', … … 499 499 ) ); 500 500 501 $this->factory->activity->create( array(501 self::factory()->activity->create( array( 502 502 'component' => $c, 503 503 'type' => 'activity_update', … … 521 521 */ 522 522 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(); 525 525 $c = buddypress()->groups->id; 526 526 $time = time(); … … 530 530 ) ); 531 531 532 $this->factory->activity->create( array(532 self::factory()->activity->create( array( 533 533 'component' => $c, 534 534 'type' => 'activity_update', … … 538 538 ) ); 539 539 540 $this->factory->activity->create( array(540 self::factory()->activity->create( array( 541 541 'component' => $c, 542 542 'type' => 'activity_update', … … 558 558 */ 559 559 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( 562 562 'display_name' => 'AAA', 563 563 ) ); 564 $u2 = $this->factory->user->create( array(564 $u2 = self::factory()->user->create( array( 565 565 'display_name' => 'CCC', 566 566 ) ); 567 $u3 = $this->factory->user->create( array(567 $u3 = self::factory()->user->create( array( 568 568 'display_name' => 'BBB', 569 569 ) ); … … 595 595 */ 596 596 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(); 600 600 $time = time(); 601 601 … … 626 626 */ 627 627 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(); 631 631 $time = time(); 632 632 … … 657 657 */ 658 658 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(); 662 662 $time = time(); 663 663 … … 685 685 */ 686 686 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(); 692 692 $time = time(); 693 693 … … 725 725 */ 726 726 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(); 732 732 $time = time(); 733 733 -
trunk/tests/phpunit/testcases/groups/class-bp-groups-group.php
r11533 r11737 22 22 */ 23 23 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(); 26 26 groups_update_groupmeta( $g1, 'foo', 'bar' ); 27 27 … … 40 40 */ 41 41 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(); 44 44 groups_update_groupmeta( $g1, 'foo', 'bar' ); 45 45 … … 59 59 */ 60 60 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(); 63 63 groups_update_groupmeta( $g1, 'foo', 'bar' ); 64 64 … … 80 80 */ 81 81 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(); 84 84 groups_update_groupmeta( $g1, 'foo', 'bar' ); 85 85 … … 97 97 public function test_get_with_meta_query_multiple_clauses() { 98 98 $now = time(); 99 $g1 = $this->factory->group->create( array(99 $g1 = self::factory()->group->create( array( 100 100 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ), 101 101 ) ); 102 $g2 = $this->factory->group->create( array(102 $g2 = self::factory()->group->create( array( 103 103 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ), 104 104 ) ); 105 $g3 = $this->factory->group->create( array(105 $g3 = self::factory()->group->create( array( 106 106 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ), 107 107 ) ); … … 134 134 public function test_get_with_meta_query_multiple_clauses_relation_or() { 135 135 $now = time(); 136 $g1 = $this->factory->group->create( array(136 $g1 = self::factory()->group->create( array( 137 137 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ), 138 138 ) ); 139 $g2 = $this->factory->group->create( array(139 $g2 = self::factory()->group->create( array( 140 140 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ), 141 141 ) ); 142 $g3 = $this->factory->group->create( array(142 $g3 = self::factory()->group->create( array( 143 143 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ), 144 144 ) ); … … 172 172 public function test_get_with_meta_query_multiple_clauses_relation_or_shared_meta_key() { 173 173 $now = time(); 174 $g1 = $this->factory->group->create( array(174 $g1 = self::factory()->group->create( array( 175 175 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ), 176 176 ) ); 177 $g2 = $this->factory->group->create( array(177 $g2 = self::factory()->group->create( array( 178 178 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ), 179 179 ) ); 180 $g3 = $this->factory->group->create( array(180 $g3 = self::factory()->group->create( array( 181 181 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*3 ), 182 182 ) ); … … 210 210 public function test_get_with_meta_query_multiple_keys_with_same_value() { 211 211 $now = time(); 212 $g1 = $this->factory->group->create( array(212 $g1 = self::factory()->group->create( array( 213 213 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60 ), 214 214 ) ); 215 $g2 = $this->factory->group->create( array(215 $g2 = self::factory()->group->create( array( 216 216 'last_activity' => date( 'Y-m-d H:i:s', $now - 60*60*2 ), 217 217 ) ); … … 237 237 */ 238 238 public function test_get_normal_search() { 239 $g1 = $this->factory->group->create( array(239 $g1 = self::factory()->group->create( array( 240 240 'name' => 'Cool Group', 241 241 'description' => 'This is one cool group', 242 242 ) ); 243 $g2 = $this->factory->group->create();243 $g2 = self::factory()->group->create(); 244 244 245 245 $groups = BP_Groups_Group::get( array( … … 255 255 */ 256 256 public function test_get_search_with_underscores() { 257 $g1 = $this->factory->group->create( array(257 $g1 = self::factory()->group->create( array( 258 258 'name' => 'Cool Group', 259 259 'description' => '_cool_ dude', 260 260 ) ); 261 $g2 = $this->factory->group->create();261 $g2 = self::factory()->group->create(); 262 262 263 263 $groups = BP_Groups_Group::get( array( … … 273 273 */ 274 274 public function test_get_search_with_percent_sign() { 275 $g1 = $this->factory->group->create( array(275 $g1 = self::factory()->group->create( array( 276 276 'name' => 'Cool Group', 277 277 'description' => '100% awesome', 278 278 ) ); 279 $g2 = $this->factory->group->create();279 $g2 = self::factory()->group->create(); 280 280 281 281 $groups = BP_Groups_Group::get( array( … … 291 291 */ 292 292 public function test_get_search_with_quotes() { 293 $g1 = $this->factory->group->create( array(293 $g1 = self::factory()->group->create( array( 294 294 'name' => 'Cool Group', 295 295 'description' => "'tis sweet", 296 296 ) ); 297 $g2 = $this->factory->group->create();297 $g2 = self::factory()->group->create(); 298 298 299 299 $groups = BP_Groups_Group::get( array( … … 310 310 */ 311 311 public function test_get_search_with_left_wildcard() { 312 $g1 = $this->factory->group->create( array(312 $g1 = self::factory()->group->create( array( 313 313 'name' => 'Ye Lads', 314 314 'description' => "My Bonnie lies over the ocean", 315 315 ) ); 316 $g2 = $this->factory->group->create();316 $g2 = self::factory()->group->create(); 317 317 318 318 $groups = BP_Groups_Group::get( array( … … 329 329 */ 330 330 public function test_get_search_with_left_wildcard_should_miss() { 331 $g1 = $this->factory->group->create( array(331 $g1 = self::factory()->group->create( array( 332 332 'name' => 'Ye Lads', 333 333 'description' => "My Bonnie lies over the ocean", 334 334 ) ); 335 $g2 = $this->factory->group->create();335 $g2 = self::factory()->group->create(); 336 336 337 337 $groups = BP_Groups_Group::get( array( … … 348 348 */ 349 349 public function test_get_search_with_right_wildcard() { 350 $g1 = $this->factory->group->create( array(350 $g1 = self::factory()->group->create( array( 351 351 'name' => 'Ye Lads', 352 352 'description' => "My Bonnie lies over the ocean", 353 353 ) ); 354 $g2 = $this->factory->group->create();354 $g2 = self::factory()->group->create(); 355 355 356 356 $groups = BP_Groups_Group::get( array( … … 367 367 */ 368 368 public function test_get_search_with_right_wildcard_should_miss() { 369 $g1 = $this->factory->group->create( array(369 $g1 = self::factory()->group->create( array( 370 370 'name' => 'Ye Lads', 371 371 'description' => "My Bonnie lies over the ocean", 372 372 ) ); 373 $g2 = $this->factory->group->create();373 $g2 = self::factory()->group->create(); 374 374 375 375 $groups = BP_Groups_Group::get( array( … … 386 386 */ 387 387 public function test_get_search_with_both_wildcard() { 388 $g1 = $this->factory->group->create( array(388 $g1 = self::factory()->group->create( array( 389 389 'name' => 'Ye Lads', 390 390 'description' => "My Bonnie lies over the ocean", 391 391 ) ); 392 $g2 = $this->factory->group->create();392 $g2 = self::factory()->group->create(); 393 393 394 394 $groups = BP_Groups_Group::get( array( … … 405 405 */ 406 406 public function test_get_search_limited_to_name_column() { 407 $g1 = $this->factory->group->create( array(407 $g1 = self::factory()->group->create( array( 408 408 'name' => 'Ye Lads', 409 409 'description' => "My Bonnie lies over the ocean", 410 410 ) ); 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( 413 413 'name' => 'Bonnie Lasses', 414 414 'description' => "That lad is unknown to me", … … 429 429 */ 430 430 public function test_get_search_limited_to_description_column() { 431 $g1 = $this->factory->group->create( array(431 $g1 = self::factory()->group->create( array( 432 432 'name' => 'Ye Lads', 433 433 'description' => "My Bonnie lies over the ocean", 434 434 ) ); 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( 437 437 'name' => 'Bonnie Lasses', 438 438 'description' => "That lad is unknown to me", … … 457 457 */ 458 458 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( 460 460 'name' => 'A Group', 461 461 'date_created' => bp_core_current_time(), 462 462 ) ); 463 $g2 = $this->factory->group->create( array(463 $g2 = self::factory()->group->create( array( 464 464 'name' => 'D Group', 465 465 'date_created' => gmdate( 'Y-m-d H:i:s', time() - 100 ), 466 466 ) ); 467 $g3 = $this->factory->group->create( array(467 $g3 = self::factory()->group->create( array( 468 468 'name' => 'B Group', 469 469 'date_created' => gmdate( 'Y-m-d H:i:s', time() - 100000 ), 470 470 ) ); 471 $g4 = $this->factory->group->create( array(471 $g4 = self::factory()->group->create( array( 472 472 'name' => 'C Group', 473 473 'date_created' => gmdate( 'Y-m-d H:i:s', time() - 1000 ), … … 484 484 public function test_get_with_type_newest() { 485 485 $time = time(); 486 $g1 = $this->factory->group->create( array(486 $g1 = self::factory()->group->create( array( 487 487 'name' => 'A Group', 488 488 'date_created' => bp_core_current_time(), 489 489 ) ); 490 $g2 = $this->factory->group->create( array(490 $g2 = self::factory()->group->create( array( 491 491 'name' => 'D Group', 492 492 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ), 493 493 ) ); 494 $g3 = $this->factory->group->create( array(494 $g3 = self::factory()->group->create( array( 495 495 'name' => 'B Group', 496 496 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ), 497 497 ) ); 498 $g4 = $this->factory->group->create( array(498 $g4 = self::factory()->group->create( array( 499 499 'name' => 'C Group', 500 500 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ), … … 511 511 public function test_get_with_type_popular() { 512 512 $time = time(); 513 $g1 = $this->factory->group->create( array(513 $g1 = self::factory()->group->create( array( 514 514 'name' => 'A Group', 515 515 'date_created' => bp_core_current_time(), 516 516 ) ); 517 $g2 = $this->factory->group->create( array(517 $g2 = self::factory()->group->create( array( 518 518 'name' => 'D Group', 519 519 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ), 520 520 ) ); 521 $g3 = $this->factory->group->create( array(521 $g3 = self::factory()->group->create( array( 522 522 'name' => 'B Group', 523 523 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ), 524 524 ) ); 525 $g4 = $this->factory->group->create( array(525 $g4 = self::factory()->group->create( array( 526 526 'name' => 'C Group', 527 527 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ), … … 543 543 public function test_get_with_type_alphabetical() { 544 544 $time = time(); 545 $g1 = $this->factory->group->create( array(545 $g1 = self::factory()->group->create( array( 546 546 'name' => 'A Group', 547 547 'date_created' => bp_core_current_time(), 548 548 ) ); 549 $g2 = $this->factory->group->create( array(549 $g2 = self::factory()->group->create( array( 550 550 'name' => 'D Group', 551 551 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ), 552 552 ) ); 553 $g3 = $this->factory->group->create( array(553 $g3 = self::factory()->group->create( array( 554 554 'name' => 'B Group', 555 555 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ), 556 556 ) ); 557 $g4 = $this->factory->group->create( array(557 $g4 = self::factory()->group->create( array( 558 558 'name' => 'C Group', 559 559 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ), … … 573 573 $time = time(); 574 574 575 $g1 = $this->factory->group->create( array(575 $g1 = self::factory()->group->create( array( 576 576 'name' => 'A Group', 577 577 'date_created' => bp_core_current_time(), 578 578 ) ); 579 $g2 = $this->factory->group->create( array(579 $g2 = self::factory()->group->create( array( 580 580 'name' => 'D Group', 581 581 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ), 582 582 ) ); 583 $g3 = $this->factory->group->create( array(583 $g3 = self::factory()->group->create( array( 584 584 'name' => 'B Group', 585 585 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100000 ), 586 586 ) ); 587 $g4 = $this->factory->group->create( array(587 $g4 = self::factory()->group->create( array( 588 588 'name' => 'C Group', 589 589 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ), … … 616 616 617 617 for ( $i = 1; $i <= 25; $i++ ) { 618 $group_ids[] = $this->factory->group->create();618 $group_ids[] = self::factory()->group->create(); 619 619 } 620 620 … … 659 659 global $wpdb; 660 660 661 $g = $this->factory->group->create();661 $g = self::factory()->group->create(); 662 662 663 663 $found1 = BP_Groups_Group::get(); … … 679 679 global $wpdb; 680 680 681 $groups = $this->factory->group->create_many( 2 );681 $groups = self::factory()->group->create_many( 2 ); 682 682 groups_update_groupmeta( $groups[0], 'foo', 'bar' ); 683 683 groups_update_groupmeta( $groups[1], 'foo', 'bar' ); … … 720 720 bp_groups_register_group_type( 'bar' ); 721 721 722 $groups = $this->factory->group->create_many( 2 );722 $groups = self::factory()->group->create_many( 2 ); 723 723 bp_groups_set_group_type( $groups[0], 'foo' ); 724 724 bp_groups_set_group_type( $groups[1], 'bar' ); … … 750 750 bp_groups_register_group_type( 'foo' ); 751 751 752 $groups = $this->factory->group->create_many( 2 );752 $groups = self::factory()->group->create_many( 2 ); 753 753 bp_groups_set_group_type( $groups[0], 'foo' ); 754 754 bp_groups_set_group_type( $groups[1], 'foo' ); … … 777 777 global $wpdb; 778 778 779 $groups = $this->factory->group->create_many( 2 );779 $groups = self::factory()->group->create_many( 2 ); 780 780 groups_update_groupmeta( $groups[0], 'foo', 'bar' ); 781 781 groups_update_groupmeta( $groups[1], 'foo', 'bar' ); … … 806 806 global $wpdb; 807 807 808 $groups = $this->factory->group->create_many( 2 );808 $groups = self::factory()->group->create_many( 2 ); 809 809 810 810 $found1 = BP_Groups_Group::get(); … … 826 826 $this->old_current_user = get_current_user_id(); 827 827 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 ) ); 830 830 831 831 // Instantiate group object. … … 961 961 */ 962 962 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(); 966 966 967 967 groups_update_groupmeta( $g2, 'orderup', 'sammy' ); … … 989 989 public function test_get_orderby_meta_id_invalid_fallback_to_date_created() { 990 990 $time = time(); 991 $g1 = $this->factory->group->create( array(991 $g1 = self::factory()->group->create( array( 992 992 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 10000 ), 993 993 ) ); 994 $g2 = $this->factory->group->create( array(994 $g2 = self::factory()->group->create( array( 995 995 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 1000 ), 996 996 ) ); 997 $g3 = $this->factory->group->create( array(997 $g3 = self::factory()->group->create( array( 998 998 'date_created' => gmdate( 'Y-m-d H:i:s', $time - 100 ), 999 999 ) ); … … 1010 1010 1011 1011 public function test_filter_user_groups_normal_search() { 1012 $g1 = $this->factory->group->create( array(1012 $g1 = self::factory()->group->create( array( 1013 1013 'name' => 'Cool Group', 1014 1014 'description' => 'This is one cool group', 1015 1015 ) ); 1016 $g2 = $this->factory->group->create();1017 $u = $this->factory->user->create();1016 $g2 = self::factory()->group->create(); 1017 $u = self::factory()->user->create(); 1018 1018 self::add_user_to_group( $u, $g1 ); 1019 1019 … … 1025 1025 1026 1026 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( 1028 1028 'name' => 'Cool Group', 1029 1029 'description' => 'This group is for mandocellos and oboes.', 1030 1030 ) ); 1031 $g2 = $this->factory->group->create();1032 $u = $this->factory->user->create();1031 $g2 = self::factory()->group->create(); 1032 $u = self::factory()->user->create(); 1033 1033 self::add_user_to_group( $u, $g1 ); 1034 1034 … … 1040 1040 1041 1041 public function test_filter_user_groups_search_with_underscores() { 1042 $g1 = $this->factory->group->create( array(1042 $g1 = self::factory()->group->create( array( 1043 1043 'name' => 'Cool Group', 1044 1044 'description' => '_cool_ dude', 1045 1045 ) ); 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(); 1049 1049 self::add_user_to_group( $u, $g1 ); 1050 1050 self::add_user_to_group( $u, $g2 ); … … 1057 1057 1058 1058 public function test_filter_user_groups_search_with_percent_sign() { 1059 $g1 = $this->factory->group->create( array(1059 $g1 = self::factory()->group->create( array( 1060 1060 'name' => 'Cool Group', 1061 1061 'description' => '100% awesome', 1062 1062 ) ); 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(); 1066 1066 self::add_user_to_group( $u, $g1 ); 1067 1067 self::add_user_to_group( $u, $g2 ); … … 1074 1074 1075 1075 public function test_filter_user_groups_search_with_quotes() { 1076 $g1 = $this->factory->group->create( array(1076 $g1 = self::factory()->group->create( array( 1077 1077 'name' => 'Cool Group', 1078 1078 'description' => "'tis sweet", 1079 1079 ) ); 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(); 1083 1083 self::add_user_to_group( $u, $g1 ); 1084 1084 self::add_user_to_group( $u, $g2 ); … … 1093 1093 1094 1094 public function test_search_groups_normal_search() { 1095 $g1 = $this->factory->group->create( array(1095 $g1 = self::factory()->group->create( array( 1096 1096 'name' => 'Cool Group', 1097 1097 'description' => 'This is one cool group', 1098 1098 ) ); 1099 $g2 = $this->factory->group->create();1099 $g2 = self::factory()->group->create(); 1100 1100 1101 1101 $groups = BP_Groups_Group::search_groups( 'Cool' ); … … 1106 1106 1107 1107 public function test_search_groups_search_with_underscores() { 1108 $g1 = $this->factory->group->create( array(1108 $g1 = self::factory()->group->create( array( 1109 1109 'name' => 'Cool Group', 1110 1110 'description' => '_cool_ dude', 1111 1111 ) ); 1112 $g2 = $this->factory->group->create();1112 $g2 = self::factory()->group->create(); 1113 1113 1114 1114 $groups = BP_Groups_Group::search_groups( '_cool_' ); … … 1119 1119 1120 1120 public function test_search_groups_search_with_percent_sign() { 1121 $g1 = $this->factory->group->create( array(1121 $g1 = self::factory()->group->create( array( 1122 1122 'name' => 'Cool Group', 1123 1123 'description' => '100% awesome', 1124 1124 ) ); 1125 $g2 = $this->factory->group->create();1125 $g2 = self::factory()->group->create(); 1126 1126 1127 1127 $groups = BP_Groups_Group::search_groups( '100%' ); … … 1132 1132 1133 1133 public function test_search_groups_search_with_quotes() { 1134 $g1 = $this->factory->group->create( array(1134 $g1 = self::factory()->group->create( array( 1135 1135 'name' => 'Cool Group', 1136 1136 'description' => "'tis sweet", 1137 1137 ) ); 1138 $g2 = $this->factory->group->create();1138 $g2 = self::factory()->group->create(); 1139 1139 1140 1140 $groups = BP_Groups_Group::search_groups( "'tis " ); … … 1146 1146 1147 1147 public function test_get_by_letter_typical_use() { 1148 $g1 = $this->factory->group->create( array(1148 $g1 = self::factory()->group->create( array( 1149 1149 'name' => 'Awesome Cool Group', 1150 1150 'description' => 'Neat', 1151 1151 ) ); 1152 $g2 = $this->factory->group->create( array(1152 $g2 = self::factory()->group->create( array( 1153 1153 'name' => 'Babylon Kong', 1154 1154 'description' => 'Awesome', … … 1164 1164 1165 1165 public function test_get_by_letter_with_exclude() { 1166 $g1 = $this->factory->group->create( array(1166 $g1 = self::factory()->group->create( array( 1167 1167 'name' => 'Awesome Cool Group', 1168 1168 'description' => 'Neat', 1169 1169 ) ); 1170 $g2 = $this->factory->group->create( array(1170 $g2 = self::factory()->group->create( array( 1171 1171 'name' => 'Another Cool Group', 1172 1172 'description' => 'Awesome', … … 1182 1182 1183 1183 public function test_get_by_letter_starts_with_apostrophe() { 1184 $g1 = $this->factory->group->create( array(1184 $g1 = self::factory()->group->create( array( 1185 1185 'name' => "'Tis Sweet", 1186 1186 'description' => 'Neat', 1187 1187 ) ); 1188 $g2 = $this->factory->group->create( array(1188 $g2 = self::factory()->group->create( array( 1189 1189 'name' => 'Another Cool Group', 1190 1190 'description' => 'Awesome', … … 1201 1201 1202 1202 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(); 1205 1205 1206 1206 // There are only two groups, so excluding one should give us the other … … 1213 1213 1214 1214 public function test_get_random_with_search_terms() { 1215 $g1 = $this->factory->group->create( array(1215 $g1 = self::factory()->group->create( array( 1216 1216 'name' => 'Bodacious', 1217 1217 ) ); 1218 $g2 = $this->factory->group->create( array(1218 $g2 = self::factory()->group->create( array( 1219 1219 'name' => 'Crummy group', 1220 1220 ) ); … … 1233 1233 */ 1234 1234 public function test_delete_clear_cache() { 1235 $g = $this->factory->group->create();1235 $g = self::factory()->group->create(); 1236 1236 1237 1237 // Prime cache … … 1251 1251 */ 1252 1252 public function test_save_clear_cache() { 1253 $g = $this->factory->group->create();1253 $g = self::factory()->group->create(); 1254 1254 1255 1255 // Prime cache … … 1299 1299 */ 1300 1300 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(); 1303 1303 1304 1304 $paged_groups = array(); … … 1330 1330 */ 1331 1331 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(); 1334 1334 $this->add_user_to_group( $u, $g ); 1335 1335 … … 1362 1362 */ 1363 1363 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(); 1366 1366 1367 1367 $invite = new BP_Groups_Member; … … 1401 1401 */ 1402 1402 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(); 1405 1405 1406 1406 $invite = new BP_Groups_Member; … … 1440 1440 */ 1441 1441 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(); 1444 1444 1445 1445 $member = new BP_Groups_Member; … … 1478 1478 */ 1479 1479 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( 1482 1482 'creator_id' => $user_1->ID, 1483 1483 ) ); … … 1504 1504 */ 1505 1505 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( 1508 1508 'creator_id' => $user_1->ID, 1509 1509 ) ); … … 1520 1520 */ 1521 1521 public function test_mods_property() { 1522 $users = $this->factory->user->create_many( 2 );1522 $users = self::factory()->user->create_many( 2 ); 1523 1523 $user_1 = new WP_User( $users[0] ); 1524 1524 $user_2 = new WP_User( $users[1] ); 1525 1525 1526 $g = $this->factory->group->create( array(1526 $g = self::factory()->group->create( array( 1527 1527 'creator_id' => $user_1->ID, 1528 1528 ) ); … … 1551 1551 */ 1552 1552 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( 1556 1556 'creator_id' => $users[0], 1557 1557 ) ); … … 1571 1571 */ 1572 1572 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( 1576 1576 'creator_id' => $users[0], 1577 1577 ) ); … … 1595 1595 */ 1596 1596 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( 1600 1600 'creator_id' => $users[0], 1601 1601 ) ); … … 1620 1620 */ 1621 1621 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(); 1624 1624 bp_groups_register_group_type( 'foo' ); 1625 1625 bp_groups_register_group_type( 'bar' ); … … 1639 1639 */ 1640 1640 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(); 1643 1643 bp_groups_register_group_type( 'foo' ); 1644 1644 bp_groups_register_group_type( 'bar' ); … … 1658 1658 */ 1659 1659 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(); 1662 1662 bp_groups_register_group_type( 'foo' ); 1663 1663 bp_groups_register_group_type( 'bar' ); … … 1677 1677 */ 1678 1678 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(); 1681 1681 bp_groups_register_group_type( 'foo' ); 1682 1682 bp_groups_register_group_type( 'bar' ); … … 1696 1696 */ 1697 1697 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(); 1700 1700 bp_groups_register_group_type( 'foo' ); 1701 1701 bp_groups_register_group_type( 'bar' ); … … 1715 1715 */ 1716 1716 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(); 1719 1719 1720 1720 $groups = BP_Groups_Group::get( array( … … 1729 1729 */ 1730 1730 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(); 1733 1733 bp_groups_register_group_type( 'foo' ); 1734 1734 bp_groups_register_group_type( 'bar' ); … … 1748 1748 */ 1749 1749 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(); 1752 1752 bp_groups_register_group_type( 'foo' ); 1753 1753 bp_groups_register_group_type( 'bar' ); … … 1767 1767 */ 1768 1768 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(); 1771 1771 bp_groups_register_group_type( 'foo' ); 1772 1772 bp_groups_register_group_type( 'bar' ); … … 1786 1786 */ 1787 1787 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(); 1790 1790 bp_groups_register_group_type( 'foo' ); 1791 1791 bp_groups_register_group_type( 'bar' ); … … 1805 1805 */ 1806 1806 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(); 1809 1809 bp_groups_register_group_type( 'foo' ); 1810 1810 bp_groups_register_group_type( 'bar' ); … … 1824 1824 */ 1825 1825 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(); 1828 1828 1829 1829 $groups = BP_Groups_Group::get( array( … … 1838 1838 */ 1839 1839 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(); 1842 1842 bp_groups_register_group_type( 'foo' ); 1843 1843 bp_groups_register_group_type( 'bar' ); … … 1858 1858 */ 1859 1859 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(); 1863 1863 bp_groups_register_group_type( 'foo' ); 1864 1864 bp_groups_register_group_type( 'bar' ); … … 1878 1878 */ 1879 1879 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(); 1883 1883 bp_groups_register_group_type( 'foo' ); 1884 1884 bp_groups_register_group_type( 'bar' ); … … 1899 1899 */ 1900 1900 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(); 1904 1904 bp_groups_register_group_type( 'foo' ); 1905 1905 bp_groups_register_group_type( 'bar' ); … … 1920 1920 */ 1921 1921 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(); 1925 1925 bp_groups_register_group_type( 'foo' ); 1926 1926 bp_groups_set_group_type( $g1, 'foo' ); … … 1939 1939 */ 1940 1940 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(); 1944 1944 bp_groups_register_group_type( 'foo' ); 1945 1945 bp_groups_set_group_type( $g1, 'foo' ); … … 1959 1959 */ 1960 1960 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( 1963 1963 'parent_id' => $g1, 1964 1964 ) ); 1965 $g3 = $this->factory->group->create( array(1965 $g3 = self::factory()->group->create( array( 1966 1966 'parent_id' => $g2, 1967 1967 ) ); 1968 $g4 = $this->factory->group->create();1968 $g4 = self::factory()->group->create(); 1969 1969 1970 1970 $groups = BP_Groups_Group::get( array( … … 1980 1980 */ 1981 1981 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( 1984 1984 'parent_id' => $g1, 1985 1985 ) ); 1986 $g3 = $this->factory->group->create( array(1986 $g3 = self::factory()->group->create( array( 1987 1987 'parent_id' => $g2, 1988 1988 ) ); 1989 $g4 = $this->factory->group->create();1989 $g4 = self::factory()->group->create(); 1990 1990 1991 1991 $groups = BP_Groups_Group::get( array( … … 2001 2001 */ 2002 2002 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( 2005 2005 'parent_id' => $g1, 2006 2006 ) ); 2007 $g3 = $this->factory->group->create( array(2007 $g3 = self::factory()->group->create( array( 2008 2008 'parent_id' => $g2, 2009 2009 ) ); 2010 $g4 = $this->factory->group->create();2010 $g4 = self::factory()->group->create(); 2011 2011 2012 2012 $groups = BP_Groups_Group::get( array( … … 2022 2022 */ 2023 2023 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( 2026 2026 'parent_id' => $g1, 2027 2027 ) ); 2028 $g3 = $this->factory->group->create( array(2028 $g3 = self::factory()->group->create( array( 2029 2029 'parent_id' => $g2, 2030 2030 ) ); 2031 $g4 = $this->factory->group->create();2031 $g4 = self::factory()->group->create(); 2032 2032 2033 2033 $groups = BP_Groups_Group::get( array( … … 2043 2043 */ 2044 2044 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( 2047 2047 'parent_id' => $g1, 2048 2048 ) ); 2049 $g3 = $this->factory->group->create( array(2049 $g3 = self::factory()->group->create( array( 2050 2050 'parent_id' => $g2, 2051 2051 ) ); 2052 $g4 = $this->factory->group->create();2052 $g4 = self::factory()->group->create(); 2053 2053 2054 2054 $groups = BP_Groups_Group::get( array( … … 2064 2064 */ 2065 2065 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( 2068 2068 'parent_id' => $g1, 2069 2069 ) ); 2070 $g3 = $this->factory->group->create( array(2070 $g3 = self::factory()->group->create( array( 2071 2071 'parent_id' => $g2, 2072 2072 ) ); 2073 $g4 = $this->factory->group->create();2073 $g4 = self::factory()->group->create(); 2074 2074 2075 2075 $groups = BP_Groups_Group::get( array( … … 2085 2085 */ 2086 2086 public function test_get_by_slug() { 2087 $g1 = $this->factory->group->create(array(2087 $g1 = self::factory()->group->create(array( 2088 2088 'slug' => 'apr' 2089 2089 ) ); 2090 $g2 = $this->factory->group->create( array(2090 $g2 = self::factory()->group->create( array( 2091 2091 'slug' => 'jan' 2092 2092 ) ); 2093 $g3 = $this->factory->group->create( array(2093 $g3 = self::factory()->group->create( array( 2094 2094 'slug' => 'mar' 2095 2095 ) ); … … 2107 2107 */ 2108 2108 public function test_get_by_slug_accept_string() { 2109 $g1 = $this->factory->group->create(array(2109 $g1 = self::factory()->group->create(array( 2110 2110 'slug' => 'apr' 2111 2111 ) ); 2112 $g2 = $this->factory->group->create( array(2112 $g2 = self::factory()->group->create( array( 2113 2113 'slug' => 'jan' 2114 2114 ) ); 2115 $g3 = $this->factory->group->create( array(2115 $g3 = self::factory()->group->create( array( 2116 2116 'slug' => 'mar' 2117 2117 ) ); … … 2129 2129 */ 2130 2130 public function test_get_by_slug_accept_comma_separated_string() { 2131 $g1 = $this->factory->group->create(array(2131 $g1 = self::factory()->group->create(array( 2132 2132 'slug' => 'apr' 2133 2133 ) ); 2134 $g2 = $this->factory->group->create( array(2134 $g2 = self::factory()->group->create( array( 2135 2135 'slug' => 'jan' 2136 2136 ) ); 2137 $g3 = $this->factory->group->create( array(2137 $g3 = self::factory()->group->create( array( 2138 2138 'slug' => 'mar' 2139 2139 ) ); … … 2151 2151 */ 2152 2152 public function test_get_by_slug_accept_space_separated_string() { 2153 $g1 = $this->factory->group->create(array(2153 $g1 = self::factory()->group->create(array( 2154 2154 'slug' => 'apr' 2155 2155 ) ); 2156 $g2 = $this->factory->group->create( array(2156 $g2 = self::factory()->group->create( array( 2157 2157 'slug' => 'jan' 2158 2158 ) ); 2159 $g3 = $this->factory->group->create( array(2159 $g3 = self::factory()->group->create( array( 2160 2160 'slug' => 'mar' 2161 2161 ) ); … … 2173 2173 */ 2174 2174 public function test_get_by_status() { 2175 $g1 = $this->factory->group->create(array(2175 $g1 = self::factory()->group->create(array( 2176 2176 'status' => 'private' 2177 2177 ) ); 2178 $g2 = $this->factory->group->create( array(2178 $g2 = self::factory()->group->create( array( 2179 2179 'status' => 'public' 2180 2180 ) ); 2181 $g3 = $this->factory->group->create( array(2181 $g3 = self::factory()->group->create( array( 2182 2182 'status' => 'hidden' 2183 2183 ) ); … … 2195 2195 */ 2196 2196 public function test_get_by_status_accept_string() { 2197 $g1 = $this->factory->group->create(array(2197 $g1 = self::factory()->group->create(array( 2198 2198 'status' => 'private' 2199 2199 ) ); 2200 $g2 = $this->factory->group->create( array(2200 $g2 = self::factory()->group->create( array( 2201 2201 'status' => 'public' 2202 2202 ) ); 2203 $g3 = $this->factory->group->create( array(2203 $g3 = self::factory()->group->create( array( 2204 2204 'status' => 'hidden' 2205 2205 ) ); … … 2217 2217 */ 2218 2218 public function test_get_by_status_accept_comma_separated_string() { 2219 $g1 = $this->factory->group->create(array(2219 $g1 = self::factory()->group->create(array( 2220 2220 'status' => 'private' 2221 2221 ) ); 2222 $g2 = $this->factory->group->create( array(2222 $g2 = self::factory()->group->create( array( 2223 2223 'status' => 'public' 2224 2224 ) ); 2225 $g3 = $this->factory->group->create( array(2225 $g3 = self::factory()->group->create( array( 2226 2226 'status' => 'hidden' 2227 2227 ) ); -
trunk/tests/phpunit/testcases/groups/class-bp-groups-member.php
r11609 r11737 31 31 32 32 public function test_get_recently_joined_with_filter() { 33 $g1 = $this->factory->group->create( array(33 $g1 = self::factory()->group->create( array( 34 34 'name' => 'Tab', 35 35 ) ); 36 $g2 = $this->factory->group->create( array(36 $g2 = self::factory()->group->create( array( 37 37 'name' => 'Diet Rite', 38 38 ) ); 39 39 40 $u = $this->factory->user->create();40 $u = self::factory()->user->create(); 41 41 self::add_user_to_group( $u, $g1 ); 42 42 self::add_user_to_group( $u, $g2 ); … … 49 49 50 50 public function test_get_is_admin_of_with_filter() { 51 $g1 = $this->factory->group->create( array(51 $g1 = self::factory()->group->create( array( 52 52 'name' => 'RC Cola', 53 53 ) ); 54 $g2 = $this->factory->group->create( array(54 $g2 = self::factory()->group->create( array( 55 55 'name' => 'Pepsi', 56 56 ) ); 57 57 58 $u = $this->factory->user->create();58 $u = self::factory()->user->create(); 59 59 self::add_user_to_group( $u, $g1 ); 60 60 self::add_user_to_group( $u, $g2 ); … … 72 72 73 73 public function test_get_is_mod_of_with_filter() { 74 $g1 = $this->factory->group->create( array(74 $g1 = self::factory()->group->create( array( 75 75 'name' => 'RC Cola', 76 76 ) ); 77 $g2 = $this->factory->group->create( array(77 $g2 = self::factory()->group->create( array( 78 78 'name' => 'Pepsi', 79 79 ) ); 80 80 81 $u = $this->factory->user->create();81 $u = self::factory()->user->create(); 82 82 self::add_user_to_group( $u, $g1 ); 83 83 self::add_user_to_group( $u, $g2 ); … … 95 95 96 96 public function test_get_is_banned_of_with_filter() { 97 $g1 = $this->factory->group->create( array(97 $g1 = self::factory()->group->create( array( 98 98 'name' => 'RC Cola', 99 99 ) ); 100 $g2 = $this->factory->group->create( array(100 $g2 = self::factory()->group->create( array( 101 101 'name' => 'Pepsi', 102 102 ) ); 103 103 104 $u = $this->factory->user->create();104 $u = self::factory()->user->create(); 105 105 self::add_user_to_group( $u, $g1 ); 106 106 self::add_user_to_group( $u, $g2 ); … … 118 118 119 119 public function test_get_invites_with_exclude() { 120 $g1 = $this->factory->group->create( array(120 $g1 = self::factory()->group->create( array( 121 121 'name' => 'RC Cola', 122 122 ) ); 123 $g2 = $this->factory->group->create( array(123 $g2 = self::factory()->group->create( array( 124 124 'name' => 'Pepsi', 125 125 ) ); 126 126 127 $u1 = $this->factory->user->create();128 $u2 = $this->factory->user->create();127 $u1 = self::factory()->user->create(); 128 $u2 = self::factory()->user->create(); 129 129 self::add_user_to_group( $u1, $g1 ); 130 130 self::add_user_to_group( $u1, $g2 ); … … 142 142 */ 143 143 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(); 148 148 self::add_user_to_group( $u1, $g1 ); 149 149 self::add_user_to_group( $u2, $g1 ); … … 160 160 */ 161 161 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(); 167 167 168 168 $user_siteadmin = new WP_User( $u_siteadmin ); 169 169 $user_siteadmin->add_role( 'administrator' ); 170 170 171 $g = $this->factory->group->create();171 $g = self::factory()->group->create(); 172 172 173 173 $time = time() - 60; … … 261 261 */ 262 262 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( 265 265 'status' => 'private', 266 266 ) ); … … 279 279 */ 280 280 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( 283 283 'status' => 'private', 284 284 ) ); … … 298 298 */ 299 299 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( 303 303 'status' => 'private', 304 304 ) ); … … 322 322 */ 323 323 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( 326 326 'status' => 'private', 327 327 ) ); … … 340 340 */ 341 341 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( 344 344 'status' => 'private', 345 345 ) ); … … 359 359 */ 360 360 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( 364 364 'status' => 'private', 365 365 ) ); … … 383 383 */ 384 384 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( 388 388 'status' => 'private', 389 389 ) ); … … 407 407 */ 408 408 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( 411 411 'status' => 'private', 412 412 ) ); … … 429 429 */ 430 430 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( 433 433 'status' => 'private', 434 434 ) ); … … 447 447 */ 448 448 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( 452 452 'status' => 'private', 453 453 ) ); … … 471 471 */ 472 472 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( 476 476 'status' => 'private', 477 477 ) ); … … 505 505 */ 506 506 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( 509 509 'status' => 'private', 510 510 ) ); … … 526 526 */ 527 527 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( 530 530 'status' => 'private', 531 531 ) ); … … 544 544 */ 545 545 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( 549 549 'status' => 'private', 550 550 ) ); … … 568 568 */ 569 569 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( 572 572 'status' => 'private', 573 573 ) ); … … 591 591 */ 592 592 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( 595 595 'status' => 'private', 596 596 ) ); … … 608 608 */ 609 609 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(); 612 612 613 613 groups_join_group( $g, $u1 ); … … 621 621 */ 622 622 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(); 625 625 $old_current_user = get_current_user_id(); 626 626 $this->set_current_user( $u1 ); … … 637 637 */ 638 638 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(); 641 641 $this->add_user_to_group( $u1, $g ); 642 642 … … 649 649 */ 650 650 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(); 654 654 $this->add_user_to_group( $u1, $g ); 655 655 … … 669 669 */ 670 670 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(); 673 673 self::create_group_membership_request( $u1, $g ); 674 674 … … 684 684 public function test_groups_leave_group_basic_leave_self_initiated() { 685 685 $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(); 689 689 $this->add_user_to_group( $u2, $g ); 690 690 … … 704 704 public function test_groups_leave_group_basic_leave_use_current_user() { 705 705 $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(); 709 709 $this->add_user_to_group( $u2, $g ); 710 710 … … 724 724 public function test_groups_leave_group_basic_leave_group_admin_initiated() { 725 725 $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(); 729 729 $this->add_user_to_group( $u2, $g ); 730 730 … … 744 744 public function test_groups_leave_group_basic_leave_site_admin_initiated() { 745 745 $old_current_user = get_current_user_id(); 746 $u1 = $this->factory->user->create();746 $u1 = self::factory()->user->create(); 747 747 $u1_siteadmin = new WP_User( $u1 ); 748 748 $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(); 751 751 $this->add_user_to_group( $u2, $g ); 752 752 … … 766 766 public function test_groups_leave_group_single_admin_prevent_leave() { 767 767 $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(); 771 771 $this->add_user_to_group( $u2, $g ); 772 772 … … 786 786 public function test_groups_leave_group_multiple_admins_allow_leave() { 787 787 $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(); 791 791 $this->add_user_to_group( $u2, $g ); 792 792 $m2 = new BP_Groups_Member( $u2, $g ); … … 808 808 */ 809 809 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 ) ); 815 815 816 816 self::invite_user_to_group( $u2, $g1, $u1 ); … … 831 831 $old_current_user = get_current_user_id(); 832 832 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 ) ); 838 838 839 839 self::invite_user_to_group( $u2, $g1, $u1 ); … … 854 854 */ 855 855 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 ) ); 861 861 862 862 self::invite_user_to_group( $u2, $g1, $u1 ); … … 874 874 */ 875 875 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 ) ); 881 881 882 882 self::invite_user_to_group( $u2, $g1, $u1 ); … … 893 893 */ 894 894 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 ) ); 898 898 899 899 // Create draft invitation. … … 916 916 */ 917 917 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 ) ); 921 921 922 922 // Create draft invitation … … 940 940 */ 941 941 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 ) ); 945 945 946 946 // Create draft invitation … … 967 967 */ 968 968 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 ) ); 972 972 973 973 // Create draft invitation … … 1000 1000 */ 1001 1001 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 ) ); 1005 1005 1006 1006 // Create draft invitation … … 1035 1035 */ 1036 1036 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 ) ); 1040 1040 1041 1041 // Create draft invitation … … 1065 1065 */ 1066 1066 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 ) ); 1071 1071 1072 1072 self::invite_user_to_group( $u2, $g1, $u1 ); … … 1092 1092 */ 1093 1093 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(); 1096 1096 1097 1097 // Create draft invitation with empty inviter_id … … 1113 1113 */ 1114 1114 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 ) ); 1117 1117 1118 1118 // Create draft invitation with empty inviter_id … … 1134 1134 */ 1135 1135 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 ) ); 1139 1139 1140 1140 // Create draft invitation with empty inviter_id … … 1157 1157 */ 1158 1158 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 ) ); 1162 1162 1163 1163 // Create draft invitation … … 1192 1192 */ 1193 1193 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(); 1196 1196 1197 1197 // Create membership request … … 1208 1208 */ 1209 1209 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(); 1212 1212 1213 1213 // Create membership request … … 1231 1231 */ 1232 1232 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(); 1235 1235 1236 1236 // Create membership request … … 1251 1251 */ 1252 1252 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 ) ); 1256 1256 1257 1257 // Create membership request … … 1281 1281 */ 1282 1282 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(); 1287 1287 1288 1288 // Create membership request … … 1310 1310 */ 1311 1311 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 ); 1314 1314 1315 1315 $m0 = $this->add_user_to_group( $users[0], $groups[0] ); … … 1326 1326 */ 1327 1327 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 ); 1330 1330 1331 1331 $m0 = $this->add_user_to_group( $users[0], $groups[0] ); … … 1342 1342 */ 1343 1343 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(); 1346 1346 1347 1347 $this->add_user_to_group( $user, $group ); -
trunk/tests/phpunit/testcases/groups/functions.php
r11558 r11737 7 7 class BP_Tests_Groups_Functions extends BP_UnitTestCase { 8 8 public function test_creating_new_group_as_authenticated_user() { 9 $u = $this->factory->user->create();9 $u = self::factory()->user->create(); 10 10 wp_set_current_user( $u ); 11 11 12 $this->factory->group->create();12 self::factory()->group->create(); 13 13 } 14 14 … … 18 18 */ 19 19 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 ) ); 23 23 24 24 groups_join_group( $g, $u2 ); … … 31 31 */ 32 32 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 ) ); 37 37 groups_join_group( $g1, $u2 ); 38 38 groups_join_group( $g2, $u2 ); … … 49 49 */ 50 50 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 ) ); 55 55 groups_join_group( $g1, $u2 ); 56 56 groups_join_group( $g2, $u2 ); … … 70 70 */ 71 71 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 ) ); 76 76 groups_join_group( $g1, $u2 ); 77 77 groups_join_group( $g2, $u2 ); … … 93 93 */ 94 94 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(); 98 98 groups_invite_user( array( 99 99 'user_id' => $u1, … … 112 112 */ 113 113 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(); 116 116 117 117 $current_user = bp_loggedin_user_id(); 118 118 $this->set_current_user( $u2 ); 119 119 120 $g = $this->factory->group->create();120 $g = self::factory()->group->create(); 121 121 groups_send_membership_request( $u1, $g ); 122 122 … … 133 133 */ 134 134 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 ) ); 139 139 groups_join_group( $g1, $u2 ); 140 140 groups_join_group( $g2, $u2 ); … … 154 154 */ 155 155 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 ) ); 159 159 160 160 groups_join_group( $g, $u2 ); … … 167 167 */ 168 168 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 ) ); 171 171 groups_join_group( $g1, $u1 ); 172 172 … … 180 180 */ 181 181 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 ) ); 185 185 groups_join_group( $g1, $u2 ); 186 186 … … 199 199 */ 200 200 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 ) ); 204 204 groups_join_group( $g1, $u2 ); 205 205 … … 220 220 */ 221 221 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 ) ); 225 225 groups_invite_user( array( 226 226 'user_id' => $u1, … … 239 239 */ 240 240 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 ) ); 244 244 245 245 groups_send_membership_request( $u2, $g ); … … 254 254 */ 255 255 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 ) ); 259 259 groups_join_group( $g1, $u2 ); 260 260 … … 273 273 */ 274 274 public function test_total_member_count_groups_create_group() { 275 $u1 = $this->factory->user->create();275 $u1 = self::factory()->user->create(); 276 276 $g = groups_create_group( array( 277 277 'creator_id' => $u1, … … 291 291 */ 292 292 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(); 294 294 295 295 $group_before = groups_get_group( $g ); … … 308 308 */ 309 309 public function test_groups_update_groupmeta_with_line_breaks() { 310 $g = $this->factory->group->create();310 $g = self::factory()->group->create(); 311 311 $meta_value = 'Foo! 312 312 … … 328 328 */ 329 329 public function test_groups_update_groupmeta_stripslashes() { 330 $g = $this->factory->group->create();330 $g = self::factory()->group->create(); 331 331 $value = "This string is totally slashin\'!"; 332 332 groups_update_groupmeta( $g, 'foo', $value ); … … 339 339 */ 340 340 public function test_groups_update_groupmeta_new() { 341 $g = $this->factory->group->create();341 $g = self::factory()->group->create(); 342 342 $this->assertSame( '', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be empty for this group.' ); 343 343 $this->assertNotEmpty( groups_update_groupmeta( $g, 'foo', 'bar' ) ); … … 349 349 */ 350 350 public function test_groups_update_groupmeta_existing() { 351 $g = $this->factory->group->create();351 $g = self::factory()->group->create(); 352 352 groups_update_groupmeta( $g, 'foo', 'bar' ); 353 353 $this->assertSame( 'bar', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be set already for this group.' ); … … 360 360 */ 361 361 public function test_groups_update_groupmeta_existing_same_value() { 362 $g = $this->factory->group->create();362 $g = self::factory()->group->create(); 363 363 groups_update_groupmeta( $g, 'foo', 'bar' ); 364 364 $this->assertSame( 'bar', groups_get_groupmeta( $g, 'foo' ), '"foo" meta should be set already for this group.' ); … … 372 372 */ 373 373 public function test_groups_update_groupmeta_prev_value() { 374 $g = $this->factory->group->create();374 $g = self::factory()->group->create(); 375 375 groups_add_groupmeta( $g, 'foo', 'bar' ); 376 376 … … 393 393 */ 394 394 public function test_groups_get_groupmeta_with_illegal_key_characters() { 395 $g = $this->factory->group->create();395 $g = self::factory()->group->create(); 396 396 groups_update_groupmeta( $g, 'foo', 'bar' ); 397 397 … … 404 404 */ 405 405 public function test_groups_get_groupmeta_all_metas() { 406 $g = $this->factory->group->create();406 $g = self::factory()->group->create(); 407 407 groups_update_groupmeta( $g, 'foo', 'bar' ); 408 408 groups_update_groupmeta( $g, 'Boone', 'is cool' ); … … 430 430 */ 431 431 public function test_groups_get_groupmeta_all_metas_empty() { 432 $g = $this->factory->group->create();432 $g = self::factory()->group->create(); 433 433 434 434 // Get rid of any auto-created values … … 447 447 */ 448 448 public function test_groups_get_groupmeta_empty() { 449 $g = $this->factory->group->create();449 $g = self::factory()->group->create(); 450 450 $this->assertSame( '', groups_get_groupmeta( $g, 'foo' ) ); 451 451 } … … 456 456 */ 457 457 public function test_bp_activity_get_meta_single_true() { 458 $g = $this->factory->group->create();458 $g = self::factory()->group->create(); 459 459 groups_add_groupmeta( $g, 'foo', 'bar' ); 460 460 groups_add_groupmeta( $g, 'foo', 'baz' ); … … 468 468 */ 469 469 public function test_bp_activity_get_meta_single_false() { 470 $g = $this->factory->group->create();470 $g = self::factory()->group->create(); 471 471 groups_add_groupmeta( $g, 'foo', 'bar' ); 472 472 groups_add_groupmeta( $g, 'foo', 'baz' ); … … 480 480 */ 481 481 public function test_groups_get_groupmeta_cache_all_on_get() { 482 $g = $this->factory->group->create();482 $g = self::factory()->group->create(); 483 483 groups_add_groupmeta( $g, 'foo', 'bar' ); 484 484 groups_add_groupmeta( $g, 'foo1', 'baz' ); … … 505 505 */ 506 506 public function test_groups_delete_groupmeta_with_illegal_key_characters() { 507 $g = $this->factory->group->create();507 $g = self::factory()->group->create(); 508 508 $this->assertNotEmpty( groups_update_groupmeta( $g, 'foo', 'bar' ), 'Value of "foo" should be set at this point.' ); 509 509 … … 520 520 global $wpdb; 521 521 522 $g = $this->factory->group->create();522 $g = self::factory()->group->create(); 523 523 $m = groups_get_groupmeta( $g ); 524 524 foreach ( $m as $mk => $mv ) { … … 537 537 // With no meta key, don't delete for all items - just delete 538 538 // 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(); 541 541 groups_add_groupmeta( $g1, 'foo', 'bar' ); 542 542 groups_add_groupmeta( $g1, 'foo1', 'bar1' ); … … 557 557 // With no meta key, don't delete for all items - just delete 558 558 // 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(); 561 561 groups_add_groupmeta( $g1, 'foo', 'bar' ); 562 562 groups_add_groupmeta( $g1, 'foo1', 'bar1' ); … … 592 592 */ 593 593 public function test_groups_add_groupmeta_existing_unique() { 594 $g = $this->factory->group->create();594 $g = self::factory()->group->create(); 595 595 groups_add_groupmeta( $g, 'foo', 'bar' ); 596 596 $this->assertFalse( groups_add_groupmeta( $g, 'foo', 'baz', true ) ); … … 602 602 */ 603 603 public function test_groups_add_groupmeta_existing_not_unique() { 604 $g = $this->factory->group->create();604 $g = self::factory()->group->create(); 605 605 groups_add_groupmeta( $g, 'foo', 'bar' ); 606 606 $this->assertNotEmpty( groups_add_groupmeta( $g, 'foo', 'baz' ) ); … … 611 611 */ 612 612 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 ) ); 616 616 617 617 // create invitation … … 640 640 */ 641 641 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( 644 644 'parent_id' => $g1, 645 645 ) ); … … 655 655 */ 656 656 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( 659 659 'parent_id' => $g1, 660 660 ) ); 661 $g3 = $this->factory->group->create( array(661 $g3 = self::factory()->group->create( array( 662 662 'parent_id' => $g2, 663 663 ) ); … … 674 674 */ 675 675 public function test_groups_get_group_accept_integer() { 676 $g1 = $this->factory->group->create();676 $g1 = self::factory()->group->create(); 677 677 $group = groups_get_group( $g1 ); 678 678 … … 685 685 */ 686 686 public function test_groups_get_group_accept_numeric() { 687 $g1 = $this->factory->group->create();687 $g1 = self::factory()->group->create(); 688 688 $group = groups_get_group( (string) $g1 ); 689 689 … … 696 696 */ 697 697 public function test_groups_get_group_accept_array() { 698 $g1 = $this->factory->group->create();698 $g1 = self::factory()->group->create(); 699 699 $group = groups_get_group( array( 'group_id' => $g1 ) ); 700 700 … … 707 707 */ 708 708 public function test_groups_get_group_accept_query_string() { 709 $g1 = $this->factory->group->create();709 $g1 = self::factory()->group->create(); 710 710 $group = groups_get_group( 'group_id=' . $g1 ); 711 711 … … 718 718 */ 719 719 public function test_groups_edit_base_group_details_test_backcompat_arguments() { 720 $g1 = $this->factory->group->create();720 $g1 = self::factory()->group->create(); 721 721 $name = 'Great Scott'; 722 722 $description = 'A must-see in time for the holidays!'; … … 742 742 */ 743 743 public function test_groups_edit_base_group_details_test_new_arguments() { 744 $g1 = $this->factory->group->create();744 $g1 = self::factory()->group->create(); 745 745 $name = 'Great Scott'; 746 746 $slug = 'what-about-it'; … … 776 776 public function test_groups_edit_base_group_details_avoid_slug_collisions() { 777 777 $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' ) ); 780 780 781 781 // Attempt to use a duplicate slug. … … 795 795 public function test_groups_edit_base_group_details_slug_no_change() { 796 796 $slug = 'circe'; 797 $g1 = $this->factory->group->create( array( 'slug' => $slug ) );797 $g1 = self::factory()->group->create( array( 'slug' => $slug ) ); 798 798 799 799 // Make sure the slug doesn't get incremented when there's no change. … … 813 813 public function test_groups_edit_base_group_details_slug_null_value() { 814 814 $slug = 'circe'; 815 $g1 = $this->factory->group->create( array( 'slug' => $slug ) );815 $g1 = self::factory()->group->create( array( 'slug' => $slug ) ); 816 816 817 817 // Make sure the slug doesn't get changed when null is passed. … … 831 831 public function test_groups_get_id_by_previous_slug() { 832 832 $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' ) ); 835 835 836 836 groups_edit_base_group_details( array( -
trunk/tests/phpunit/testcases/groups/functions/groupsCreateGroup.php
r11735 r11737 54 54 */ 55 55 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( 57 57 'creator_id' => self::$user_id + 1, 58 58 ) ); -
trunk/tests/phpunit/testcases/groups/notifications.php
r11278 r11737 14 14 parent::setUp(); 15 15 $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(); 20 20 $this->filter_fired = ''; 21 21 } … … 167 167 168 168 // Admin 169 $n = $this->factory->notification->create( array(169 $n = self::factory()->notification->create( array( 170 170 'component_name' => 'groups', 171 171 'user_id' => $u, … … 191 191 192 192 // Mod 193 $n = $this->factory->notification->create( array(193 $n = self::factory()->notification->create( array( 194 194 'component_name' => 'groups', 195 195 'user_id' => $u, … … 224 224 */ 225 225 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 ); 227 227 228 228 $this->add_user_to_group( $users[0], $this->group, array( -
trunk/tests/phpunit/testcases/groups/template.php
r11095 r11737 11 11 */ 12 12 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(); 15 15 groups_update_groupmeta( $g1, 'foo', 'bar' ); 16 16 … … 37 37 public function test_bp_has_groups_with_order_orderby_with_null_type() { 38 38 $now = time(); 39 $g1 = $this->factory->group->create( array(39 $g1 = self::factory()->group->create( array( 40 40 'name' => 'AAAAA', 41 41 'date_created' => gmdate( 'Y-m-d H:i:s', $now - 100 ), 42 42 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ), 43 43 ) ); 44 $g2 = $this->factory->group->create( array(44 $g2 = self::factory()->group->create( array( 45 45 'name' => 'BBBBB', 46 46 'date_created' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ), 47 47 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 10000 ), 48 48 ) ); 49 $g3 = $this->factory->group->create( array(49 $g3 = self::factory()->group->create( array( 50 50 'name' => 'CCCCC', 51 51 'date_created' => gmdate( 'Y-m-d H:i:s', $now - 10000 ), … … 73 73 public function test_bp_has_groups_defaults_to_DESC_last_activity_for_default_type_active_backpat() { 74 74 $now = time(); 75 $g1 = $this->factory->group->create( array(75 $g1 = self::factory()->group->create( array( 76 76 'name' => 'AAAAA', 77 77 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 100 ), 78 78 ) ); 79 $g2 = $this->factory->group->create( array(79 $g2 = self::factory()->group->create( array( 80 80 'name' => 'BBBBB', 81 81 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 1000000 ), 82 82 ) ); 83 $g3 = $this->factory->group->create( array(83 $g3 = self::factory()->group->create( array( 84 84 'name' => 'CCCCC', 85 85 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 10000 ), … … 102 102 */ 103 103 public function test_bp_has_groups_single_group_with_slug() { 104 $g1 = $this->factory->group->create( array(104 $g1 = self::factory()->group->create( array( 105 105 'name' => 'Test Group', 106 106 'slug' => 'test-group', … … 124 124 */ 125 125 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( 128 128 'parent_id' => $g1, 129 129 ) ); 130 $g3 = $this->factory->group->create( array(130 $g3 = self::factory()->group->create( array( 131 131 'parent_id' => $g2, 132 132 ) ); 133 $g4 = $this->factory->group->create();133 $g4 = self::factory()->group->create(); 134 134 135 135 global $groups_template; … … 146 146 */ 147 147 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( 150 150 'parent_id' => $g1, 151 151 ) ); 152 $g3 = $this->factory->group->create( array(152 $g3 = self::factory()->group->create( array( 153 153 'parent_id' => $g2, 154 154 ) ); 155 $g4 = $this->factory->group->create();155 $g4 = self::factory()->group->create(); 156 156 157 157 global $groups_template; … … 168 168 */ 169 169 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( 172 172 'parent_id' => $g1, 173 173 ) ); 174 $g3 = $this->factory->group->create( array(174 $g3 = self::factory()->group->create( array( 175 175 'parent_id' => $g2, 176 176 ) ); 177 $g4 = $this->factory->group->create();177 $g4 = self::factory()->group->create(); 178 178 179 179 global $groups_template; … … 190 190 */ 191 191 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( 194 194 'parent_id' => $g1, 195 195 ) ); 196 $g3 = $this->factory->group->create( array(196 $g3 = self::factory()->group->create( array( 197 197 'parent_id' => $g2, 198 198 ) ); 199 $g4 = $this->factory->group->create();199 $g4 = self::factory()->group->create(); 200 200 201 201 global $groups_template; … … 212 212 */ 213 213 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( 216 216 'parent_id' => $g1, 217 217 ) ); 218 $g3 = $this->factory->group->create( array(218 $g3 = self::factory()->group->create( array( 219 219 'parent_id' => $g2, 220 220 ) ); 221 $g4 = $this->factory->group->create();221 $g4 = self::factory()->group->create(); 222 222 223 223 global $groups_template; … … 234 234 */ 235 235 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( 238 238 'parent_id' => $g1, 239 239 ) ); 240 $g3 = $this->factory->group->create( array(240 $g3 = self::factory()->group->create( array( 241 241 'parent_id' => $g2, 242 242 ) ); 243 $g4 = $this->factory->group->create();243 $g4 = self::factory()->group->create(); 244 244 245 245 global $groups_template; … … 256 256 */ 257 257 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( 261 261 'creator_id' => $u1, 262 262 ) ); … … 284 284 */ 285 285 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 ) ); 289 289 290 290 $date_modified = gmdate( 'Y-m-d H:i:s', time() - 100 ); … … 324 324 */ 325 325 public function test_bp_group_has_members_with_per_page() { 326 $g = $this->factory->group->create();326 $g = self::factory()->group->create(); 327 327 328 328 $users = array(); 329 329 for ( $i = 1; $i <= 5; $i++ ) { 330 $users[ $i ] = $this->factory->user->create();330 $users[ $i ] = self::factory()->user->create(); 331 331 } 332 332 … … 362 362 */ 363 363 public function test_bp_group_has_members_with_max() { 364 $g = $this->factory->group->create();364 $g = self::factory()->group->create(); 365 365 366 366 $users = array(); 367 367 for ( $i = 1; $i <= 5; $i++ ) { 368 $users[ $i ] = $this->factory->user->create();368 $users[ $i ] = self::factory()->user->create(); 369 369 } 370 370 … … 388 388 */ 389 389 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(); 393 393 394 394 $this->add_user_to_group( $u1, $g ); … … 409 409 */ 410 410 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(); 415 415 416 416 $this->add_user_to_group( $u1, $g ); … … 437 437 */ 438 438 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( 443 443 'creator_id' => $u1, 444 444 ) ); … … 471 471 */ 472 472 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(); 476 476 477 477 $this->add_user_to_group( $u1, $g ); … … 495 495 */ 496 496 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( 502 502 'creator_id' => $u1, 503 503 ) ); … … 533 533 public function test_bp_group_has_members_default_order() { 534 534 $now = time(); 535 $u1 = $this->factory->user->create( array(535 $u1 = self::factory()->user->create( array( 536 536 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ), 537 537 ) ); 538 $u2 = $this->factory->user->create( array(538 $u2 = self::factory()->user->create( array( 539 539 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 600 ), 540 540 ) ); 541 $u3 = $this->factory->user->create( array(541 $u3 = self::factory()->user->create( array( 542 542 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 6000 ), 543 543 ) ); 544 544 545 $g = $this->factory->group->create( array(545 $g = self::factory()->group->create( array( 546 546 'creator_id' => $u1, 547 547 ) ); … … 572 572 public function test_bp_group_has_invites_template_structure() { 573 573 $now = time(); 574 $u1 = $this->factory->user->create( array(574 $u1 = self::factory()->user->create( array( 575 575 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ), 576 576 ) ); 577 $u2 = $this->factory->user->create( array(577 $u2 = self::factory()->user->create( array( 578 578 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 600 ), 579 579 ) ); 580 $u3 = $this->factory->user->create( array(580 $u3 = self::factory()->user->create( array( 581 581 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 6000 ), 582 582 ) ); 583 $u4 = $this->factory->user->create( array(583 $u4 = self::factory()->user->create( array( 584 584 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60000 ), 585 585 ) ); 586 586 587 587 588 $g = $this->factory->group->create( array(588 $g = self::factory()->group->create( array( 589 589 'creator_id' => $u1, 590 590 ) ); … … 652 652 */ 653 653 public function test_bp_group_has_invites_pagination() { 654 $u1 = $this->factory->user->create( array(654 $u1 = self::factory()->user->create( array( 655 655 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 60 ), 656 656 ) ); 657 657 658 $g = $this->factory->group->create( array(658 $g = self::factory()->group->create( array( 659 659 'creator_id' => $u1, 660 660 ) ); … … 663 663 $now = time(); 664 664 for ( $i = 1; $i < 6; $i++ ) { 665 $users[ $i ] = $this->factory->user->create( array(665 $users[ $i ] = self::factory()->user->create( array( 666 666 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - $i ), 667 667 ) ); … … 696 696 public function test_bp_group_has_membership_requests_results() { 697 697 $now = time(); 698 $u1 = $this->factory->user->create( array(698 $u1 = self::factory()->user->create( array( 699 699 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - 60 ), 700 700 ) ); 701 701 702 $g = $this->factory->group->create( array(702 $g = self::factory()->group->create( array( 703 703 'creator_id' => $u1, 704 704 ) ); … … 707 707 $memberships = array(); 708 708 for ( $i = 1; $i < 5; $i++ ) { 709 $users[ $i ] = $this->factory->user->create( array(709 $users[ $i ] = self::factory()->user->create( array( 710 710 'last_activity' => gmdate( 'Y-m-d H:i:s', $now - ( 100 - $i ) ), 711 711 ) ); … … 761 761 */ 762 762 public function test_bp_group_has_membership_requests_format() { 763 $u1 = $this->factory->user->create( array(763 $u1 = self::factory()->user->create( array( 764 764 'last_activity' => gmdate( 'Y-m-d H:i:s', time() - 60 ), 765 765 ) ); 766 766 767 $g = $this->factory->group->create( array(767 $g = self::factory()->group->create( array( 768 768 'creator_id' => $u1, 769 769 ) ); … … 771 771 $time = time(); 772 772 773 $user = $this->factory->user->create( array(773 $user = self::factory()->user->create( array( 774 774 'last_activity' => gmdate( 'Y-m-d H:i:s', $time ), 775 775 ) ); … … 830 830 public function test_bp_group_is_user_banned_in_groups_loop() { 831 831 $now = time(); 832 $u1 = $this->factory->user->create( array(832 $u1 = self::factory()->user->create( array( 833 833 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 834 834 ) ); 835 $u2 = $this->factory->user->create( array(835 $u2 = self::factory()->user->create( array( 836 836 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 837 837 ) ); 838 838 839 $g1 = $this->factory->group->create( array(839 $g1 = self::factory()->group->create( array( 840 840 'creator_id' => $u1, 841 841 'last_activity' => $now - 100, 842 842 ) ); 843 $g2 = $this->factory->group->create( array(843 $g2 = self::factory()->group->create( array( 844 844 'creator_id' => $u2, 845 845 'last_activity' => $now - 200, … … 883 883 public function test_bp_group_is_user_banned_not_in_groups_loop() { 884 884 $now = time(); 885 $u1 = $this->factory->user->create( array(885 $u1 = self::factory()->user->create( array( 886 886 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 887 887 ) ); 888 $u2 = $this->factory->user->create( array(888 $u2 = self::factory()->user->create( array( 889 889 'last_activity' => date( 'Y-m-d H:i:s', $now - 100 ), 890 890 ) ); 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 ) ); 893 893 894 894 $this->add_user_to_group( $u1, $g2, array( -
trunk/tests/phpunit/testcases/groups/template/bpGroupStatusMessage.php
r11091 r11737 31 31 */ 32 32 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' ) ); 35 35 36 36 $this->set_current_user( $users[0] ); … … 57 57 */ 58 58 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' ) ); 61 61 62 62 $this->set_current_user( $u ); … … 77 77 */ 78 78 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' ) ); 80 80 81 81 if ( bp_has_groups( array( 'include' => array( $g ) ) ) ) { … … 94 94 */ 95 95 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' ) ); 98 98 99 99 $this->set_current_user( $u ); … … 116 116 */ 117 117 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' ) ); 120 120 121 121 $this->set_current_user( $u ); … … 133 133 */ 134 134 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' ) ); 137 137 138 138 $this->set_current_user( $u ); -
trunk/tests/phpunit/testcases/groups/types.php
r11144 r11737 107 107 108 108 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 ) ); 110 110 bp_groups_register_group_type( 'foo' ); 111 111 … … 114 114 115 115 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 ) ); 117 117 bp_groups_register_group_type( 'foo' ); 118 118 bp_groups_set_group_type( $g, 'foo' ); … … 126 126 127 127 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 ) ); 129 129 bp_groups_register_group_type( 'foo' ); 130 130 bp_groups_register_group_type( 'bar' ); … … 136 136 137 137 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 ) ); 139 139 bp_groups_register_group_type( 'foo' ); 140 140 bp_groups_register_group_type( 'bar' ); … … 146 146 147 147 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 ) ); 149 149 bp_groups_register_group_type( 'foo' ); 150 150 bp_groups_register_group_type( 'bar' ); … … 156 156 157 157 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 ) ); 159 159 bp_groups_register_group_type( 'foo' ); 160 160 … … 171 171 172 172 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 ) ); 174 174 bp_groups_register_group_type( 'foo' ); 175 175 bp_groups_register_group_type( 'bar' ); … … 181 181 182 182 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 ) ); 184 184 bp_groups_register_group_type( 'foo' ); 185 185 bp_groups_register_group_type( 'bar' ); … … 206 206 207 207 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 ) ); 209 209 bp_groups_register_group_type( 'foo' ); 210 210 bp_groups_register_group_type( 'bar' ); … … 215 215 216 216 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 ) ); 218 218 bp_groups_register_group_type( 'foo' ); 219 219 bp_groups_register_group_type( 'bar' ); … … 229 229 */ 230 230 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 ) ); 232 232 bp_groups_register_group_type( 'foo' ); 233 233 bp_groups_set_group_type( $g, 'foo' ); … … 254 254 255 255 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 ) ); 257 257 bp_groups_register_group_type( 'foo' ); 258 258 bp_groups_set_group_type( $g, 'foo' ); … … 291 291 292 292 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 ) ); 294 294 bp_groups_register_group_type( 'foo' ); 295 295 bp_groups_set_group_type( $g, 'foo' ); … … 303 303 304 304 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 ) ); 306 306 bp_groups_register_group_type( 'foo' ); 307 307 bp_groups_register_group_type( 'bar' ); -
trunk/tests/phpunit/testcases/members/activity.php
r9819 r11737 12 12 */ 13 13 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( 16 16 'component' => buddypress()->members->id, 17 17 'type' => 'new_member', … … 33 33 $bp = buddypress(); 34 34 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(); 38 38 39 $au1 = $this->factory->activity->create( array(39 $au1 = self::factory()->activity->create( array( 40 40 'component' => 'xprofile', 41 41 'type' => 'new_member', … … 43 43 ) ); 44 44 45 $au2 = $this->factory->activity->create( array(45 $au2 = self::factory()->activity->create( array( 46 46 'component' => 'xprofile', 47 47 'type' => 'new_member', … … 49 49 ) ); 50 50 51 $au3 = $this->factory->activity->create( array(51 $au3 = self::factory()->activity->create( array( 52 52 'component' => 'xprofile', 53 53 'type' => 'new_member', -
trunk/tests/phpunit/testcases/members/cache.php
r11706 r11737 32 32 global $wpdb; 33 33 34 $u1 = $this->factory->user->create();35 $u2 = $this->factory->user->create();34 $u1 = self::factory()->user->create(); 35 $u2 = self::factory()->user->create(); 36 36 37 37 $time_1 = date( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS ); -
trunk/tests/phpunit/testcases/members/class-bp-signup.php
r11639 r11737 102 102 */ 103 103 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(); 107 107 108 108 $ss = BP_Signup::get( array( … … 117 117 */ 118 118 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(); 122 122 123 123 $ss = BP_Signup::get( array( … … 132 132 */ 133 133 public function test_get_with_usersearch() { 134 $s1 = $this->factory->signup->create( array(134 $s1 = self::factory()->signup->create( array( 135 135 'user_email' => 'fghij@example.com', 136 136 ) ); 137 $s2 = $this->factory->signup->create();138 $s3 = $this->factory->signup->create();137 $s2 = self::factory()->signup->create(); 138 $s3 = self::factory()->signup->create(); 139 139 140 140 $ss = BP_Signup::get( array( … … 149 149 */ 150 150 public function test_get_with_orderby_email() { 151 $s1 = $this->factory->signup->create( array(151 $s1 = self::factory()->signup->create( array( 152 152 'user_email' => 'fghij@example.com', 153 153 ) ); 154 $s2 = $this->factory->signup->create( array(154 $s2 = self::factory()->signup->create( array( 155 155 'user_email' => 'abcde@example.com', 156 156 ) ); 157 $s3 = $this->factory->signup->create( array(157 $s3 = self::factory()->signup->create( array( 158 158 'user_email' => 'zzzzz@example.com', 159 159 ) ); … … 172 172 */ 173 173 public function test_get_with_orderby_email_asc() { 174 $s1 = $this->factory->signup->create( array(174 $s1 = self::factory()->signup->create( array( 175 175 'user_email' => 'fghij@example.com', 176 176 ) ); 177 $s2 = $this->factory->signup->create( array(177 $s2 = self::factory()->signup->create( array( 178 178 'user_email' => 'abcde@example.com', 179 179 ) ); 180 $s3 = $this->factory->signup->create( array(180 $s3 = self::factory()->signup->create( array( 181 181 'user_email' => 'zzzzz@example.com', 182 182 ) ); … … 195 195 */ 196 196 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(); 200 200 201 201 $ss = BP_Signup::get( array( … … 210 210 */ 211 211 public function test_get_with_activation_key() { 212 $s1 = $this->factory->signup->create( array(212 $s1 = self::factory()->signup->create( array( 213 213 'activation_key' => 'foo', 214 214 ) ); 215 $s2 = $this->factory->signup->create( array(215 $s2 = self::factory()->signup->create( array( 216 216 'activation_key' => 'bar', 217 217 ) ); 218 $s3 = $this->factory->signup->create( array(218 $s3 = self::factory()->signup->create( array( 219 219 'activation_key' => 'baz', 220 220 ) ); … … 231 231 */ 232 232 public function test_get_with_user_login() { 233 $s1 = $this->factory->signup->create( array(233 $s1 = self::factory()->signup->create( array( 234 234 'user_login' => 'aaaafoo', 235 235 ) ); 236 $s2 = $this->factory->signup->create( array(236 $s2 = self::factory()->signup->create( array( 237 237 'user_login' => 'zzzzfoo', 238 238 ) ); 239 $s3 = $this->factory->signup->create( array(239 $s3 = self::factory()->signup->create( array( 240 240 'user_login' => 'jjjjfoo', 241 241 ) ); … … 254 254 $signups = array(); 255 255 256 $signups['accountone'] = $this->factory->signup->create( array(256 $signups['accountone'] = self::factory()->signup->create( array( 257 257 'user_login' => 'accountone', 258 258 'user_email' => 'accountone@example.com', … … 260 260 ) ); 261 261 262 $signups['accounttwo'] = $this->factory->signup->create( array(262 $signups['accounttwo'] = self::factory()->signup->create( array( 263 263 'user_login' => 'accounttwo', 264 264 'user_email' => 'accounttwo@example.com', … … 266 266 ) ); 267 267 268 $signups['accountthree'] = $this->factory->signup->create( array(268 $signups['accountthree'] = self::factory()->signup->create( array( 269 269 'user_login' => 'accountthree', 270 270 'user_email' => 'accountthree@example.com', … … 297 297 298 298 // Can't trust this first signup :( 299 $signups['testpath1'] = $this->factory->signup->create( array(299 $signups['testpath1'] = self::factory()->signup->create( array( 300 300 'user_login' => 'testpath1', 301 301 'user_email' => 'blogone@example.com', … … 306 306 ) ); 307 307 308 $signups['blogtwo'] = $this->factory->signup->create( array(308 $signups['blogtwo'] = self::factory()->signup->create( array( 309 309 'user_login' => 'blogtwo', 310 310 'user_email' => 'blogtwo@example.com', … … 315 315 ) ); 316 316 317 $signups['blogthree'] = $this->factory->signup->create( array(317 $signups['blogthree'] = self::factory()->signup->create( array( 318 318 'user_login' => 'blogthree', 319 319 'user_email' => 'blogthree@example.com', … … 324 324 ) ); 325 325 326 $signups['blogfour'] = $this->factory->signup->create( array(326 $signups['blogfour'] = self::factory()->signup->create( array( 327 327 'user_login' => 'blogfour', 328 328 'user_email' => 'blogfour@example.com', -
trunk/tests/phpunit/testcases/members/functions.php
r11217 r11737 15 15 16 16 // 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' ) ); 18 18 $this->grant_super_admin( $admin_user ); 19 19 20 20 // 1. Admin can delete user account 21 21 $this->set_current_user( $admin_user ); 22 $user1 = $this->factory->user->create( array( 'role' => 'subscriber' ) );22 $user1 = self::factory()->user->create( array( 'role' => 'subscriber' ) ); 23 23 bp_core_delete_account( $user1 ); 24 24 $maybe_user = new WP_User( $user1 ); … … 28 28 29 29 // 2. Admin cannot delete superadmin account 30 $user2 = $this->factory->user->create( array( 'role' => 'administrator' ) );30 $user2 = self::factory()->user->create( array( 'role' => 'administrator' ) ); 31 31 $this->grant_super_admin( $user2 ); 32 32 bp_core_delete_account( $user2 ); … … 36 36 37 37 // 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' ) ); 40 40 $this->set_current_user( $user3 ); 41 41 bp_core_delete_account( $user4 ); … … 55 55 public function test_bp_core_get_user_domain_after_directory_page_update() { 56 56 // Generate user 57 $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );57 $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) ); 58 58 59 59 // Set object cache first for user domain … … 84 84 */ 85 85 public function test_bp_core_get_user_displayname_translate_username() { 86 $u = $this->factory->user->create();86 $u = self::factory()->user->create(); 87 87 88 88 $user = new WP_User( $u ); … … 108 108 buddypress()->active_components['xprofile'] = '1'; 109 109 110 $u = $this->factory->user->create( array(110 $u = self::factory()->user->create( array( 111 111 'display_name' => 'Foo', 112 112 ) ); … … 128 128 buddypress()->active_components['xprofile'] = '1'; 129 129 130 $u = $this->factory->user->create();130 $u = self::factory()->user->create(); 131 131 xprofile_set_field_data( 1, $u, 'Foo Foo' ); 132 132 … … 145 145 buddypress()->active_components['xprofile'] = '1'; 146 146 147 $u = $this->factory->user->create();147 $u = self::factory()->user->create(); 148 148 xprofile_set_field_data( 1, $u, 'Foo Foo' ); 149 149 … … 163 163 $bp->active_components['xprofile'] = '1'; 164 164 165 $u = $this->factory->user->create( array(165 $u = self::factory()->user->create( array( 166 166 'display_name' => 'Foo Foo', 167 167 ) ); … … 194 194 */ 195 195 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(); 198 198 199 199 xprofile_set_field_data( 1, $u1, 'Foo' ); … … 212 212 */ 213 213 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( 216 216 'display_name' => 'Bar', 217 217 ) ); … … 239 239 */ 240 240 public function test_bp_core_get_user_displaynames_one_in_cache() { 241 $u1 = $this->factory->user->create();241 $u1 = self::factory()->user->create(); 242 242 xprofile_set_field_data( 1, $u1, 'Foo' ); 243 243 … … 258 258 */ 259 259 public function test_bp_members_migrate_signups_standard() { 260 $u = $this->factory->user->create();260 $u = self::factory()->user->create(); 261 261 $u_obj = new WP_User( $u ); 262 262 … … 292 292 */ 293 293 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(); 295 295 $u_obj = new WP_User( $u ); 296 296 … … 323 323 */ 324 324 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(); 326 326 $u_obj = new WP_User( $u ); 327 327 … … 353 353 // We explicitly do not want last_activity created, so use the 354 354 // 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(); 358 358 359 359 $time = time(); … … 414 414 // We explicitly do not want last_activity created, so use the 415 415 // WP factory methods 416 $user = $this->factory->user->create();416 $user = self::factory()->user->create(); 417 417 $time = date( 'Y-m-d H:i:s', time() - 50 ); 418 418 … … 449 449 $displayed_user = $bp->displayed_user; 450 450 451 $u1 = $this->factory->user->create();451 $u1 = self::factory()->user->create(); 452 452 $bp->displayed_user->id = $u1; 453 453 … … 477 477 $displayed_user = $bp->displayed_user; 478 478 479 $u1 = $this->factory->user->create();479 $u1 = self::factory()->user->create(); 480 480 $bp->displayed_user->id = $u1; 481 481 … … 505 505 $displayed_user = $bp->displayed_user; 506 506 507 $u1 = $this->factory->user->create();507 $u1 = self::factory()->user->create(); 508 508 $bp->displayed_user->id = $u1; 509 509 … … 528 528 add_filter( 'make_spam_user', array( $this, 'notification_filter_callback' ) ); 529 529 530 $u1 = $this->factory->user->create();530 $u1 = self::factory()->user->create(); 531 531 $n = bp_core_process_spammer_status( $u1, 'spam' ); 532 532 … … 540 540 add_filter( 'make_ham_user', array( $this, 'notification_filter_callback' ) ); 541 541 542 $u1 = $this->factory->user->create();542 $u1 = self::factory()->user->create(); 543 543 $n = bp_core_process_spammer_status( $u1, 'ham' ); 544 544 … … 552 552 add_filter( 'bp_make_spam_user', array( $this, 'notification_filter_callback' ) ); 553 553 554 $u1 = $this->factory->user->create();554 $u1 = self::factory()->user->create(); 555 555 $n = bp_core_process_spammer_status( $u1, 'spam' ); 556 556 … … 564 564 add_filter( 'bp_make_ham_user', array( $this, 'notification_filter_callback' ) ); 565 565 566 $u1 = $this->factory->user->create();566 $u1 = self::factory()->user->create(); 567 567 $n = bp_core_process_spammer_status( $u1, 'ham' ); 568 568 … … 597 597 598 598 $signups = array( 'no-blog' => 599 array( 'signup_id' => $this->factory->signup->create( array(599 array( 'signup_id' => self::factory()->signup->create( array( 600 600 'user_login' => 'noblog', 601 601 'user_email' => 'noblog@example.com', … … 611 611 612 612 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( 614 614 'user_login' => 'msblog', 615 615 'user_email' => 'msblog@example.com', -
trunk/tests/phpunit/testcases/members/template.php
r10382 r11737 5 5 class BP_Tests_Members_Template extends BP_UnitTestCase { 6 6 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(); 9 9 10 10 $this->go_to( bp_core_get_user_domain( $u1 ) ); … … 30 30 */ 31 31 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' ) ); 34 34 35 35 $template_args = array( … … 52 52 53 53 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(); 56 56 57 57 friends_add_friend( $u1, $u2 ); … … 81 81 */ 82 82 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(); 85 85 86 86 $old_user = get_current_user_id(); … … 114 114 bp_register_member_type( 'foo' ); 115 115 bp_register_member_type( 'bar' ); 116 $users = $this->factory->user->create_many( 3 );116 $users = self::factory()->user->create_many( 3 ); 117 117 bp_set_member_type( $users[0], 'foo' ); 118 118 bp_set_member_type( $users[1], 'bar' ); … … 139 139 bp_register_member_type( 'foo' ); 140 140 bp_register_member_type( 'bar' ); 141 $users = $this->factory->user->create_many( 3 );141 $users = self::factory()->user->create_many( 3 ); 142 142 bp_set_member_type( $users[0], 'foo' ); 143 143 bp_set_member_type( $users[1], 'bar' ); … … 166 166 bp_register_member_type( 'bar' ); 167 167 bp_register_member_type( 'baz' ); 168 $users = $this->factory->user->create_many( 4 );168 $users = self::factory()->user->create_many( 4 ); 169 169 bp_set_member_type( $users[0], 'foo' ); 170 170 bp_set_member_type( $users[1], 'bar' ); -
trunk/tests/phpunit/testcases/members/template/bpGetMemberClass.php
r10690 r11737 13 13 bp_register_member_type( 'bar' ); 14 14 15 $u = $this->factory->user->create();15 $u = self::factory()->user->create(); 16 16 bp_set_member_type( $u, 'bar' ); 17 17 -
trunk/tests/phpunit/testcases/members/types.php
r11110 r11737 152 152 153 153 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(); 155 155 bp_register_member_type( 'foo' ); 156 156 bp_set_member_type( $u, 'foo' ); … … 164 164 165 165 public function test_bp_set_member_type_success() { 166 $u = $this->factory->user->create();166 $u = self::factory()->user->create(); 167 167 bp_register_member_type( 'foo' ); 168 168 … … 171 171 172 172 public function test_bp_get_member_type_with_default_value_for_single() { 173 $u = $this->factory->user->create();173 $u = self::factory()->user->create(); 174 174 bp_register_member_type( 'foo' ); 175 175 bp_register_member_type( 'bar' ); … … 181 181 182 182 public function test_bp_get_member_type_with_single_true() { 183 $u = $this->factory->user->create();183 $u = self::factory()->user->create(); 184 184 bp_register_member_type( 'foo' ); 185 185 bp_register_member_type( 'bar' ); … … 191 191 192 192 public function test_bp_get_member_type_with_single_false() { 193 $u = $this->factory->user->create();193 $u = self::factory()->user->create(); 194 194 bp_register_member_type( 'foo' ); 195 195 bp_register_member_type( 'bar' ); … … 201 201 202 202 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(); 204 204 bp_register_member_type( 'foo' ); 205 205 … … 211 211 */ 212 212 public function test_bp_get_member_type_should_hit_cache() { 213 $u = $this->factory->user->create();213 $u = self::factory()->user->create(); 214 214 bp_register_member_type( 'foo' ); 215 215 bp_set_member_type( $u, 'foo' ); … … 230 230 */ 231 231 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(); 234 234 bp_register_member_type( 'foo' ); 235 235 bp_register_member_type( 'bar' ); … … 254 254 */ 255 255 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(); 257 257 bp_register_member_type( 'foo' ); 258 258 bp_set_member_type( $u, 'foo' ); … … 279 279 280 280 // 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(); 284 284 bp_register_member_type( 'foo' ); 285 285 bp_set_member_type( $u1, 'foo' ); … … 289 289 290 290 // 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(); 292 292 $new_user_id = $terms[0]->term_id; 293 293 $wpdb->update( $wpdb->users, array( 'ID' => $new_user_id ), array( 'ID' => $u2 ) ); … … 319 319 */ 320 320 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(); 322 322 bp_register_member_type( 'foo' ); 323 323 bp_register_member_type( 'bar' ); … … 333 333 */ 334 334 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(); 336 336 bp_register_member_type( 'foo' ); 337 337 bp_register_member_type( 'bar' ); … … 371 371 */ 372 372 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(); 374 374 bp_register_member_type( 'foo' ); 375 375 bp_register_member_type( 'bar' ); … … 383 383 */ 384 384 public function test_bp_has_member_type_should_return_true_on_success() { 385 $u1 = $this->factory->user->create();385 $u1 = self::factory()->user->create(); 386 386 bp_register_member_type( 'foo' ); 387 387 bp_register_member_type( 'bar' ); … … 395 395 396 396 public function test_bp_get_member_type_should_not_return_unregistered_types() { 397 $u1 = $this->factory->user->create();397 $u1 = self::factory()->user->create(); 398 398 bp_register_member_type( 'foo' ); 399 399 bp_set_member_type( $u1, 'foo' ); -
trunk/tests/phpunit/testcases/messages/cache.php
r11044 r11737 10 10 */ 11 11 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(); 14 14 15 15 // create the thread 16 $message_1 = $this->factory->message->create_and_get( array(16 $message_1 = self::factory()->message->create_and_get( array( 17 17 'sender_id' => $u1, 18 18 'recipients' => array( $u2 ), … … 21 21 22 22 // create a reply 23 $message_2 = $this->factory->message->create_and_get( array(23 $message_2 = self::factory()->message->create_and_get( array( 24 24 'thread_id' => $message_1->thread_id, 25 25 'sender_id' => $u2, … … 83 83 */ 84 84 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(); 87 87 88 88 // create the message and thread 89 $m = $this->factory->message->create_and_get( array(89 $m = self::factory()->message->create_and_get( array( 90 90 'sender_id' => $u1, 91 91 'recipients' => array( $u2 ), … … 112 112 $this->old_current_user = get_current_user_id(); 113 113 114 $u1 = $this->factory->user->create();115 $u2 = $this->factory->user->create();114 $u1 = self::factory()->user->create(); 115 $u2 = self::factory()->user->create(); 116 116 117 117 // create the thread 118 $message_1 = $this->factory->message->create_and_get( array(118 $message_1 = self::factory()->message->create_and_get( array( 119 119 'sender_id' => $u1, 120 120 'recipients' => array( $u2 ), … … 123 123 124 124 // create a reply 125 $message_2 = $this->factory->message->create_and_get( array(125 $message_2 = self::factory()->message->create_and_get( array( 126 126 'thread_id' => $message_1->thread_id, 127 127 'sender_id' => $u2, -
trunk/tests/phpunit/testcases/messages/class.bp-messages-notice.php
r9819 r11737 11 11 parent::setUp(); 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php
r11044 r11737 11 11 */ 12 12 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( 17 17 'sender_id' => $u1, 18 18 'recipients' => array( $u2 ), … … 35 35 */ 36 36 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(); 39 39 40 40 // create thread 41 $message_1 = $this->factory->message->create_and_get( array(41 $message_1 = self::factory()->message->create_and_get( array( 42 42 'sender_id' => $u1, 43 43 'recipients' => array( $u2 ), … … 47 47 48 48 // create reply 49 $message_2 = $this->factory->message->create_and_get( array(49 $message_2 = self::factory()->message->create_and_get( array( 50 50 'thread_id' => $message_1->thread_id, 51 51 'sender_id' => $u1, … … 69 69 */ 70 70 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( 81 81 'sender_id' => $u1, 82 82 'recipients' => array( $u2 ), … … 99 99 */ 100 100 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( 111 111 'sender_id' => $u1, 112 112 'recipients' => array( $u2 ), … … 131 131 */ 132 132 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( 143 143 'sender_id' => $u1, 144 144 'recipients' => array( $u2 ), … … 161 161 global $wpdb; 162 162 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( 167 167 'sender_id' => $u1, 168 168 'recipients' => array( $u2 ), … … 187 187 global $wpdb; 188 188 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( 193 193 'sender_id' => $u1, 194 194 'recipients' => array( $u2 ), … … 225 225 global $wpdb; 226 226 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( 231 231 'sender_id' => $u1, 232 232 'recipients' => array( $u2 ), … … 257 257 global $wpdb; 258 258 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( 263 263 'sender_id' => $u1, 264 264 'recipients' => array( $u2 ), … … 289 289 global $wpdb; 290 290 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( 295 295 'sender_id' => $u1, 296 296 'recipients' => array( $u2 ), … … 326 326 global $wpdb; 327 327 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( 332 332 'sender_id' => $u1, 333 333 'recipients' => array( $u2 ), … … 360 360 */ 361 361 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( 366 366 'sender_id' => $u1, 367 367 'recipients' => array( $u2 ), … … 390 390 */ 391 391 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( 396 396 'sender_id' => $u1, 397 397 'recipients' => array( $u2 ), … … 415 415 */ 416 416 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(); 419 419 420 420 $date = bp_core_current_time(); 421 421 422 $message = $this->factory->message->create_and_get( array(422 $message = self::factory()->message->create_and_get( array( 423 423 'sender_id' => $u1, 424 424 'recipients' => array( $u2 ), -
trunk/tests/phpunit/testcases/messages/functions.php
r10585 r11737 11 11 */ 12 12 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(); 15 15 16 16 // send a private message … … 46 46 */ 47 47 public function test_messages_new_message_invalid_recipient_error_message() { 48 $u1 = $this->factory->user->create();48 $u1 = self::factory()->user->create(); 49 49 50 50 // attempt to send a private message to an invalid username … … 64 64 */ 65 65 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(); 68 68 69 69 // Emulate a plugin disabling messages. -
trunk/tests/phpunit/testcases/messages/notifications.php
r9819 r11737 21 21 // Dummy thread ID 22 22 $t = 12; 23 $u = $this->factory->user->create();23 $u = self::factory()->user->create(); 24 24 $this->set_current_user( $u ); 25 25 26 26 // Admin 27 $n = $this->factory->notification->create( array(27 $n = self::factory()->notification->create( array( 28 28 'component_name' => 'messages', 29 29 'user_id' => $u, … … 45 45 // Dummy thread ID 46 46 $t = 12; 47 $u = $this->factory->user->create();47 $u = self::factory()->user->create(); 48 48 $this->set_current_user( $u ); 49 49 50 50 // Admin 51 $n = $this->factory->notification->create( array(51 $n = self::factory()->notification->create( array( 52 52 'component_name' => 'messages', 53 53 'user_id' => $u, … … 69 69 // Dummy thread ID 70 70 $t = 12; 71 $u = $this->factory->user->create();71 $u = self::factory()->user->create(); 72 72 $this->set_current_user( $u ); 73 73 74 74 // Admin 75 $n = $this->factory->notification->create( array(75 $n = self::factory()->notification->create( array( 76 76 'component_name' => 'messages', 77 77 'user_id' => $u, … … 93 93 // Dummy thread ID 94 94 $t = 12; 95 $u = $this->factory->user->create();95 $u = self::factory()->user->create(); 96 96 $this->set_current_user( $u ); 97 97 98 98 // Admin 99 $n = $this->factory->notification->create( array(99 $n = self::factory()->notification->create( array( 100 100 'component_name' => 'messages', 101 101 'user_id' => $u, … … 119 119 } 120 120 121 $u1 = $this->factory->user->create();122 $u2 = $this->factory->user->create();121 $u1 = self::factory()->user->create(); 122 $u2 = self::factory()->user->create(); 123 123 124 124 $t1 = messages_new_message( array( -
trunk/tests/phpunit/testcases/messages/star.php
r11044 r11737 11 11 */ 12 12 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(); 15 15 16 16 // create the thread 17 $message_1 = $this->factory->message->create_and_get( array(17 $message_1 = self::factory()->message->create_and_get( array( 18 18 'sender_id' => $u1, 19 19 'recipients' => array( $u2 ), … … 22 22 23 23 // create a reply 24 $message_2 = $this->factory->message->create_and_get( array(24 $message_2 = self::factory()->message->create_and_get( array( 25 25 'thread_id' => $message_1->thread_id, 26 26 'sender_id' => $u2, … … 59 59 */ 60 60 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(); 63 63 64 64 // create the thread 65 $message_1 = $this->factory->message->create_and_get( array(65 $message_1 = self::factory()->message->create_and_get( array( 66 66 'sender_id' => $u1, 67 67 'recipients' => array( $u2 ), … … 70 70 71 71 // create a reply 72 $message_2 = $this->factory->message->create_and_get( array(72 $message_2 = self::factory()->message->create_and_get( array( 73 73 'thread_id' => $message_1->thread_id, 74 74 'sender_id' => $u2, … … 113 113 public function test_get_starred_threads_should_not_include_deleted_thread() { 114 114 $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(); 117 117 118 118 // create three threads 119 $message_1 = $this->factory->message->create_and_get( array(119 $message_1 = self::factory()->message->create_and_get( array( 120 120 'sender_id' => $u1, 121 121 'recipients' => array( $u2 ), 122 122 'subject' => 'A', 123 123 ) ); 124 $message_2 = $this->factory->message->create_and_get( array(124 $message_2 = self::factory()->message->create_and_get( array( 125 125 'sender_id' => $u1, 126 126 'recipients' => array( $u2 ), 127 127 'subject' => 'B', 128 128 ) ); 129 $message_3 = $this->factory->message->create_and_get( array(129 $message_3 = self::factory()->message->create_and_get( array( 130 130 'sender_id' => $u1, 131 131 'recipients' => array( $u2 ), -
trunk/tests/phpunit/testcases/messages/template.php
r11044 r11737 10 10 */ 11 11 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(); 14 14 15 15 // create initial thread 16 $message_1 = $this->factory->message->create_and_get( array(16 $message_1 = self::factory()->message->create_and_get( array( 17 17 'sender_id' => $u1, 18 18 'recipients' => array( $u2 ), … … 20 20 21 21 // 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( 23 23 'thread_id' => $message_1->thread_id, 24 24 'sender_id' => $u2, 25 25 'recipients' => array( $u1 ), 26 26 ) ); 27 $message_3 = $this->factory->message->create_and_get( array(27 $message_3 = self::factory()->message->create_and_get( array( 28 28 'thread_id' => $message_1->thread_id, 29 29 'sender_id' => $u2, … … 43 43 */ 44 44 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(); 47 47 48 48 // create initial thread 49 $message_1 = $this->factory->message->create_and_get( array(49 $message_1 = self::factory()->message->create_and_get( array( 50 50 'sender_id' => $u1, 51 51 'recipients' => array( $u2 ), … … 53 53 54 54 // 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( 56 56 'thread_id' => $message_1->thread_id, 57 57 'sender_id' => $u2, 58 58 'recipients' => array( $u1 ), 59 59 ) ); 60 $message_3 = $this->factory->message->create_and_get( array(60 $message_3 = self::factory()->message->create_and_get( array( 61 61 'thread_id' => $message_1->thread_id, 62 62 'sender_id' => $u2, … … 75 75 */ 76 76 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(); 79 79 80 80 // create some threads 81 $message_1 = $this->factory->message->create_and_get( array(81 $message_1 = self::factory()->message->create_and_get( array( 82 82 'sender_id' => $u1, 83 83 'recipients' => array( $u2 ), 84 84 'subject' => 'This is a knive', 85 85 ) ); 86 $message_2 = $this->factory->message->create_and_get( array(86 $message_2 = self::factory()->message->create_and_get( array( 87 87 'sender_id' => $u1, 88 88 'recipients' => array( $u2 ), … … 91 91 92 92 // misc threads 93 $this->factory->message->create_many( 3, array(93 self::factory()->message->create_many( 3, array( 94 94 'sender_id' => $u1, 95 95 'recipients' => array( $u2 ), … … 100 100 101 101 // 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( 103 103 'thread_id' => $t1, 104 104 'sender_id' => $u2, … … 106 106 'content' => "That's a spoon", 107 107 ) ); 108 $message_4 = $this->factory->message->create_and_get( array(108 $message_4 = self::factory()->message->create_and_get( array( 109 109 'thread_id' => $t1, 110 110 'sender_id' => $u1, … … 112 112 'content' => "I see you've played knivey-spooney before.", 113 113 ) ); 114 $message_5 = $this->factory->message->create_and_get( array(114 $message_5 = self::factory()->message->create_and_get( array( 115 115 'thread_id' => $t1, 116 116 'sender_id' => $u2, … … 120 120 121 121 // 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( 123 123 'thread_id' => $t2, 124 124 'sender_id' => $u2, … … 170 170 */ 171 171 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(); 174 174 175 175 // create some threads 176 $message_1 = $this->factory->message->create_and_get( array(176 $message_1 = self::factory()->message->create_and_get( array( 177 177 'sender_id' => $u1, 178 178 'recipients' => array( $u2 ), 179 179 'subject' => 'This is a knive', 180 180 ) ); 181 $message_2 = $this->factory->message->create_and_get( array(181 $message_2 = self::factory()->message->create_and_get( array( 182 182 'sender_id' => $u1, 183 183 'recipients' => array( $u2 ), … … 186 186 187 187 // misc threads 188 $this->factory->message->create_many( 3, array(188 self::factory()->message->create_many( 3, array( 189 189 'sender_id' => $u1, 190 190 'recipients' => array( $u2 ), … … 195 195 196 196 // 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( 198 198 'thread_id' => $t1, 199 199 'sender_id' => $u2, … … 201 201 'content' => "That's a spoon", 202 202 ) ); 203 $message_4 = $this->factory->message->create_and_get( array(203 $message_4 = self::factory()->message->create_and_get( array( 204 204 'thread_id' => $t1, 205 205 'sender_id' => $u1, … … 207 207 'content' => "I see you've played knivey-spooney before.", 208 208 ) ); 209 $message_5 = $this->factory->message->create_and_get( array(209 $message_5 = self::factory()->message->create_and_get( array( 210 210 'thread_id' => $t1, 211 211 'sender_id' => $u2, … … 215 215 216 216 // 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( 218 218 'thread_id' => $t2, 219 219 'sender_id' => $u2, … … 269 269 */ 270 270 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(); 273 273 274 274 // create initial thread 275 $this->factory->message->create( array(275 self::factory()->message->create( array( 276 276 'sender_id' => $u1, 277 277 'recipients' => array( $u2 ), -
trunk/tests/phpunit/testcases/notifications/class-bp-notifications-notification.php
r9819 r11737 9 9 */ 10 10 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( 17 17 'component_name' => 'messages', 18 18 'user_id' => $u, … … 53 53 */ 54 54 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( 61 61 'component_name' => 'messages', 62 62 'user_id' => $u, … … 95 95 */ 96 96 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( 107 107 'component_name' => 'messages', 108 108 'user_id' => $u, … … 123 123 public function test_order_by_date() { 124 124 $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( 127 127 'component_name' => 'friends', 128 128 'user_id' => $u, 129 129 'date_notified' => date( 'Y-m-d H:i:s', $now - 500 ), 130 130 ) ); 131 $n2 = $this->factory->notification->create( array(131 $n2 = self::factory()->notification->create( array( 132 132 'component_name' => 'groups', 133 133 'user_id' => $u, 134 134 'date_notified' => date( 'Y-m-d H:i:s', $now - 100 ), 135 135 ) ); 136 $n3 = $this->factory->notification->create( array(136 $n3 = self::factory()->notification->create( array( 137 137 'component_name' => 'messages', 138 138 'user_id' => $u, … … 156 156 */ 157 157 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( 170 170 'component_name' => 'messages', 171 171 'user_id' => $u, … … 188 188 */ 189 189 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( 202 202 'component_name' => 'messages', 203 203 'user_id' => $u, … … 220 220 */ 221 221 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( 234 234 'component_name' => 'messages', 235 235 'user_id' => $u, … … 253 253 */ 254 254 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( 267 267 'component_name' => 'messages', 268 268 'user_id' => $u, … … 286 286 */ 287 287 public function test_get_paged_sql() { 288 $u = $this->factory->user->create();288 $u = self::factory()->user->create(); 289 289 290 290 $notifications = array(); 291 291 for ( $i = 1; $i <= 6; $i++ ) { 292 $notifications[] = $this->factory->notification->create( array(292 $notifications[] = self::factory()->notification->create( array( 293 293 'component_name' => 'activity', 294 294 'secondary_item_id' => $i, -
trunk/tests/phpunit/testcases/notifications/class-bp-notifications-template.php
r10487 r11737 12 12 */ 13 13 public function test_pagination_params_in_url_should_be_passed_to_query() { 14 $u = $this->factory->user->create();14 $u = self::factory()->user->create(); 15 15 16 16 $notifications = array(); 17 17 for ( $i = 1; $i <= 6; $i++ ) { 18 $notifications[] = $this->factory->notification->create( array(18 $notifications[] = self::factory()->notification->create( array( 19 19 'component_name' => 'activity', 20 20 'secondary_item_id' => $i, -
trunk/tests/phpunit/testcases/notifications/functions.php
r10911 r11737 10 10 */ 11 11 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( 19 19 'component_name' => 'messages', 20 20 'user_id' => $u, … … 29 29 30 30 // Trigger invalidation via save 31 $this->factory->notification->create( array(31 self::factory()->notification->create( array( 32 32 'component_name' => 'messages', 33 33 'user_id' => $u, … … 42 42 */ 43 43 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( 50 50 'component_name' => 'messages', 51 51 'user_id' => $u … … 68 68 */ 69 69 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( 77 77 'component_name' => 'messages', 78 78 'user_id' => $u … … 98 98 */ 99 99 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( 107 107 'component_name' => 'messages', 108 108 'user_id' => $u … … 128 128 */ 129 129 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( 138 138 'component_name' => 'groups', 139 139 'user_id' => $u … … 190 190 ); 191 191 192 $this->factory->notification->create( $args );192 self::factory()->notification->create( $args ); 193 193 194 194 $this->assertFalse( bp_notifications_add_notification( $args ) ); … … 207 207 ); 208 208 209 $this->factory->notification->create( $args );209 self::factory()->notification->create( $args ); 210 210 211 211 $args['allow_duplicate'] = true; … … 219 219 */ 220 220 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( 225 225 'component_name' => 'messages', 226 226 'component_action' => 'new_message', … … 248 248 */ 249 249 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(); 252 252 253 253 // create a mixture of different notifications 254 $this->factory->notification->create( array(254 self::factory()->notification->create( array( 255 255 'component_name' => 'messages', 256 256 'component_action' => 'new_message', … … 261 261 ) ); 262 262 263 $this->factory->notification->create( array(263 self::factory()->notification->create( array( 264 264 'component_name' => 'activity', 265 265 'component_action' => 'new_at_mention', … … 270 270 ) ); 271 271 272 $this->factory->notification->create( array(272 self::factory()->notification->create( array( 273 273 'component_name' => 'activity', 274 274 'component_action' => 'new_at_mention', … … 294 294 */ 295 295 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(); 297 297 298 298 // Create notifications 299 $n1 = $this->factory->notification->create( array(299 $n1 = self::factory()->notification->create( array( 300 300 'component_name' => 'messages', 301 301 'component_action' => 'new_message', … … 304 304 ) ); 305 305 306 $n2 = $this->factory->notification->create( array(306 $n2 = self::factory()->notification->create( array( 307 307 'component_name' => 'activity', 308 308 'component_action' => 'new_at_mention', … … 311 311 ) ); 312 312 313 $n3 = $this->factory->notification->create( array(313 $n3 = self::factory()->notification->create( array( 314 314 'component_name' => 'groups', 315 315 'user_id' => $u, 316 316 ) ); 317 317 318 $n4 = $this->factory->notification->create( array(318 $n4 = self::factory()->notification->create( array( 319 319 'component_name' => 'friends', 320 320 'component_action' => 'friendship_request', … … 323 323 324 324 // Create notification for non-core component 325 $n5 = $this->factory->notification->create( array(325 $n5 = self::factory()->notification->create( array( 326 326 'component_name' => 'foo', 327 327 'component_action' => 'bar', … … 355 355 */ 356 356 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( 360 360 'component_name' => 'activity', 361 361 'component_action' => 'new_at_mention', -
trunk/tests/phpunit/testcases/routing/activity.php
r9819 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 … … 28 28 */ 29 29 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 ); 32 32 33 33 $url = bp_core_get_user_domain( $activity->user_id ) . bp_get_activity_slug() . '/' . $activity->id . '/'; -
trunk/tests/phpunit/testcases/routing/core.php
r10753 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/routing/friends.php
r9819 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/routing/groups.php
r11559 r11737 12 12 buddypress()->members->types = array(); 13 13 $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' ) ) ); 15 15 } 16 16 … … 69 69 */ 70 70 public function test_group_previous_slug_current_slug_should_resolve() { 71 $g1 = $this->factory->group->create( array(71 $g1 = self::factory()->group->create( array( 72 72 'slug' => 'george', 73 73 ) ); … … 86 86 */ 87 87 public function test_group_previous_slug_should_resolve() { 88 $g1 = $this->factory->group->create( array(88 $g1 = self::factory()->group->create( array( 89 89 'slug' => 'george', 90 90 ) ); … … 104 104 */ 105 105 public function test_group_previous_slug_most_recent_takes_precedence() { 106 $g1 = $this->factory->group->create( array(106 $g1 = self::factory()->group->create( array( 107 107 'slug' => 'george', 108 108 ) ); … … 112 112 'notify_members' => false, 113 113 ) ); 114 $g2 = $this->factory->group->create( array(114 $g2 = self::factory()->group->create( array( 115 115 'slug' => 'george', 116 116 ) ); -
trunk/tests/phpunit/testcases/routing/members.php
r10791 r11737 12 12 buddypress()->members->types = array(); 13 13 $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' ) ) ); 15 15 } 16 16 … … 34 34 */ 35 35 public function test_member_directory_when_nested_under_wp_page() { 36 $p = $this->factory->post->create( array(36 $p = self::factory()->post->create( array( 37 37 'post_type' => 'page', 38 38 'post_name' => 'foo', … … 95 95 */ 96 96 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' ) ); 98 98 bp_register_member_type( 'foo' ); 99 99 $this->go_to( bp_get_members_directory_permalink() . 'type/foo/' ); -
trunk/tests/phpunit/testcases/routing/messages.php
r9819 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/routing/root-profiles.php
r10212 r11737 15 15 16 16 $this->old_current_user = get_current_user_id(); 17 $uid = $this->factory->user->create( array(17 $uid = self::factory()->user->create( array( 18 18 'user_login' => 'boone', 19 19 'user_nicename' => 'boone', … … 47 47 */ 48 48 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( 50 50 'post_type' => 'page', 51 51 'post_name' => 'foo', -
trunk/tests/phpunit/testcases/routing/settings.php
r9819 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/routing/url.php
r11255 r11737 43 43 if ( is_multisite() ) { 44 44 $original_root_blog = bp_get_root_blog_id(); 45 $blog_id = $this->factory->blog->create( array(45 $blog_id = self::factory()->blog->create( array( 46 46 'path' => '/path' . rand() . time() . '/', 47 47 ) ); -
trunk/tests/phpunit/testcases/routing/xprofile.php
r9936 r11737 11 11 12 12 $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' ) ) ); 14 14 } 15 15 -
trunk/tests/phpunit/testcases/testsuite/factory.php
r11063 r11737 9 9 */ 10 10 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(); 12 12 13 13 $this->assertTrue( $m instanceof BP_Messages_Message ); … … 18 18 */ 19 19 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(); 21 21 22 22 $this->assertNotEmpty( $m->sender_id ); … … 28 28 */ 29 29 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(); 31 31 32 32 $u1 = new WP_User( $f->initiator_user_id ); … … 41 41 */ 42 42 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(); 45 45 46 $f = $this->factory->friendship->create_and_get( array(46 $f = self::factory()->friendship->create_and_get( array( 47 47 'initiator_user_id' => $u1, 48 48 'friend_user_id' => $u2, -
trunk/tests/phpunit/testcases/xprofile/BP_XProfile_Field/member_types.php
r10022 r11737 16 16 bp_register_member_type( 'bar' ); 17 17 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 ) ); 20 20 $this->field = new BP_XProfile_Field( $this->field_id ); 21 21 } … … 120 120 121 121 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 ) ); 123 123 124 124 $field_2 = new BP_XProfile_Field( $f2 ); … … 130 130 131 131 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 ) ); 133 133 134 134 $field_2 = new BP_XProfile_Field( $f2 ); … … 146 146 147 147 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 ) ); 149 149 bp_xprofile_add_meta( $this->field_id, 'field', 'member_type', 'foo' ); 150 150 bp_xprofile_add_meta( $f2, 'field', 'member_type', 'bar' ); -
trunk/tests/phpunit/testcases/xprofile/activity.php
r10276 r11737 41 41 $now_time = date( 'Y-m-d H:i:s', $time ); 42 42 43 $this->factory->activity->create( array(43 self::factory()->activity->create( array( 44 44 'user_id' => $d['u'], 45 45 'component' => buddypress()->profile->id, … … 75 75 $now_time = date( 'Y-m-d H:i:s', $time ); 76 76 77 $this->factory->activity->create( array(77 self::factory()->activity->create( array( 78 78 'user_id' => $d['u'], 79 79 'component' => buddypress()->profile->id, … … 278 278 */ 279 279 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( 282 282 'component' => 'profile', 283 283 'type' => 'new_avatar', … … 297 297 */ 298 298 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( 301 301 'component' => buddypress()->profile->id, 302 302 'type' => 'updated_profile', … … 312 312 313 313 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( 317 317 'field_group_id' => $this->updated_profile_data['g'], 318 318 ) ); -
trunk/tests/phpunit/testcases/xprofile/cache.php
r11352 r11737 10 10 */ 11 11 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( 15 15 'field_group_id' => $g, 16 16 ) ); … … 64 64 */ 65 65 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( 69 69 'field_group_id' => $g, 70 70 ) ); … … 117 117 */ 118 118 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( 122 122 'field_group_id' => $g, 123 123 ) ); … … 150 150 */ 151 151 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( 154 154 'field_group_id' => $g, 155 155 'name' => 'Foo', … … 172 172 global $wpdb; 173 173 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( 176 176 'field_group_id' => $g, 177 177 'name' => 'Foo', … … 191 191 */ 192 192 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( 199 199 'field_group_id' => $g, 200 200 'name' => 'Bar', … … 222 222 */ 223 223 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( 226 226 'field_group_id' => $g, 227 227 'name' => 'Foo', -
trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php
r11253 r11737 10 10 */ 11 11 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( 14 14 'field_group_id' => $group, 15 15 ) ); … … 27 27 */ 28 28 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(); 30 30 31 31 // force some checkbox options for our profile field … … 36 36 37 37 // checkbox field 38 $f1 = $this->factory->xprofile_field->create( array(38 $f1 = self::factory()->xprofile_field->create( array( 39 39 'field_group_id' => $group, 40 40 'type' => 'checkbox', … … 43 43 44 44 // 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( 46 46 'field_group_id' => $group, 47 47 'type' => 'textbox', … … 128 128 global $wpdb; 129 129 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( 132 132 'field_group_id' => $group, 133 133 ) ); … … 155 155 global $wpdb; 156 156 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( 159 159 'field_group_id' => $group, 160 160 ) ); … … 189 189 */ 190 190 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( 193 193 'field_group_id' => $group, 194 194 ) ); … … 210 210 */ 211 211 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( 215 215 'field_group_id' => $group, 216 216 'type' => 'datebox', -
trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-group.php
r10242 r11737 11 11 */ 12 12 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(); 14 14 $group = new BP_XProfile_Group( $g ); 15 15 … … 23 23 */ 24 24 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( 28 28 'field_group_id' => $g, 29 29 ) ); … … 85 85 */ 86 86 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(); 90 90 91 91 $all = BP_XProfile_Group::get(); … … 118 118 */ 119 119 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 ) ); 122 122 bp_register_member_type( 'foo' ); 123 123 … … 145 145 */ 146 146 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 ) ); 149 149 bp_register_member_type( 'foo' ); 150 150 … … 173 173 */ 174 174 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 ) ); 180 180 bp_register_member_type( 'foo' ); 181 181 bp_register_member_type( 'bar' ); … … 196 196 197 197 // User is in 'foo', so should have f1 and f3 only. 198 $u = $this->factory->user->create();198 $u = self::factory()->user->create(); 199 199 bp_set_member_type( $u, 'foo' ); 200 200 … … 222 222 */ 223 223 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 ) ); 228 228 bp_register_member_type( 'foo' ); 229 229 bp_register_member_type( 'bar' ); … … 240 240 241 241 // User has no member types, so should see f2 and f3 . 242 $u = $this->factory->user->create();242 $u = self::factory()->user->create(); 243 243 244 244 $found_groups = BP_XProfile_Group::get( array( … … 264 264 */ 265 265 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 ) ); 269 269 bp_register_member_type( 'foo' ); 270 270 bp_register_member_type( 'bar' ); … … 275 275 $field2->set_member_types( array( 'bar' ) ); 276 276 277 $u = $this->factory->user->create();277 $u = self::factory()->user->create(); 278 278 bp_set_member_type( $u, 'foo' ); 279 279 … … 299 299 */ 300 300 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 ) ); 304 304 bp_register_member_type( 'foo' ); 305 305 bp_register_member_type( 'bar' ); … … 331 331 */ 332 332 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 ) ); 336 336 bp_register_member_type( 'foo' ); 337 337 bp_register_member_type( 'bar' ); … … 363 363 */ 364 364 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 ) ); 368 368 bp_register_member_type( 'foo' ); 369 369 bp_register_member_type( 'bar' ); … … 392 392 */ 393 393 public function test_save_xprofile_group_name() { 394 $g1 = $this->factory->xprofile_group->create( array(394 $g1 = self::factory()->xprofile_group->create( array( 395 395 'name' => "Test ' Name" 396 396 ) ); … … 415 415 416 416 // Create a group 417 $g1 = $this->factory->xprofile_group->create( array(417 $g1 = self::factory()->xprofile_group->create( array( 418 418 'name' => $pristine_name 419 419 ) ); -
trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-profiledata.php
r10004 r11737 10 10 */ 11 11 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( 15 15 'field_group_id' => $g, 16 16 ) ); … … 25 25 */ 26 26 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( 30 30 'field_group_id' => $g, 31 31 ) ); … … 44 44 */ 45 45 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( 49 49 'field_group_id' => $g, 50 50 ) ); … … 63 63 */ 64 64 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( 68 68 'field_group_id' => $g, 69 69 ) ); … … 79 79 */ 80 80 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( 84 84 'field_group_id' => $g, 85 85 ) ); … … 101 101 */ 102 102 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( 106 106 'field_group_id' => $g, 107 107 ) ); … … 119 119 */ 120 120 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( 124 124 'field_group_id' => $g, 125 125 ) ); … … 143 143 $time = date( 'Y-m-d H:i:s', time() - 60*60*24 ); 144 144 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( 149 149 'field_group_id' => $g, 150 150 ) ); … … 198 198 */ 199 199 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( 203 203 'field_group_id' => $g, 204 204 ) ); … … 221 221 $time = date( 'Y-m-d H:i:s', time() - 60*60*24 ); 222 222 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( 227 227 'field_group_id' => $g, 228 228 ) ); … … 269 269 */ 270 270 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( 275 275 'type' => 'textbox', 276 276 'field_group_id' => $g1, 277 277 ) ); 278 $f2 = $this->factory->xprofile_field->create( array(278 $f2 = self::factory()->xprofile_field->create( array( 279 279 'type' => 'radio', 280 280 'field_group_id' => $g2, … … 348 348 */ 349 349 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( 354 354 'type' => 'textbox', 355 355 'field_group_id' => $g1, 356 356 ) ); 357 $f2 = $this->factory->xprofile_field->create( array(357 $f2 = self::factory()->xprofile_field->create( array( 358 358 'type' => 'radio', 359 359 'field_group_id' => $g2, -
trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-query.php
r11018 r11737 59 59 public function test_translate_field_name_to_field_id() { 60 60 $this->create_fields( 0 ); 61 $f = $this->factory->xprofile_field->create( array(61 $f = self::factory()->xprofile_field->create( array( 62 62 'field_group_id' => $this->group, 63 63 'type' => 'textbox', … … 628 628 629 629 protected function create_fields( $count ) { 630 $this->group = $this->factory->xprofile_group->create();630 $this->group = self::factory()->xprofile_group->create(); 631 631 for ( $i = 0; $i < $count; $i++ ) { 632 $this->fields[] = $this->factory->xprofile_field->create( array(632 $this->fields[] = self::factory()->xprofile_field->create( array( 633 633 'field_group_id' => $this->group, 634 634 'type' => 'textbox', … … 639 639 protected function create_users( $count ) { 640 640 for ( $i = 0; $i < $count; $i++ ) { 641 $this->users[] = $this->factory->user->create();641 $this->users[] = self::factory()->user->create(); 642 642 } 643 643 } -
trunk/tests/phpunit/testcases/xprofile/functions.php
r11288 r11737 7 7 class BP_Tests_XProfile_Functions extends BP_UnitTestCase { 8 8 public function test_get_hidden_field_types_for_user_loggedout() { 9 $duser = $this->factory->user->create();9 $duser = self::factory()->user->create(); 10 10 11 11 $old_current_user = bp_loggedin_user_id(); … … 18 18 19 19 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(); 22 22 23 23 $old_current_user = bp_loggedin_user_id(); … … 30 30 31 31 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(); 34 34 friends_add_friend( $duser, $cuser, true ); 35 35 … … 43 43 44 44 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(); 47 47 $this->grant_bp_moderate( $cuser ); 48 48 … … 61 61 */ 62 62 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( 65 65 'field_group_id' => $g, 66 66 ) ); … … 98 98 */ 99 99 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( 103 103 'field_group_id' => $g, 104 104 ) ); … … 116 116 */ 117 117 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( 121 121 'field_group_id' => $g, 122 122 ) ); … … 133 133 */ 134 134 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( 138 138 'field_group_id' => $g, 139 139 ) ); … … 177 177 */ 178 178 public function test_bp_xprofile_delete_meta_illegal_characters() { 179 $g = $this->factory->xprofile_group->create();179 $g = self::factory()->xprofile_group->create(); 180 180 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 181 181 $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); … … 192 192 */ 193 193 public function test_bp_xprofile_delete_meta_trim_meta_value() { 194 $g = $this->factory->xprofile_group->create();194 $g = self::factory()->xprofile_group->create(); 195 195 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 196 196 $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); … … 205 205 */ 206 206 public function test_bp_xprofile_delete_meta_meta_value_match() { 207 $g = $this->factory->xprofile_group->create();207 $g = self::factory()->xprofile_group->create(); 208 208 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 209 209 $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); … … 217 217 */ 218 218 public function test_bp_xprofile_delete_meta_delete_all() { 219 $g = $this->factory->xprofile_group->create();219 $g = self::factory()->xprofile_group->create(); 220 220 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 221 221 bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' ); … … 236 236 // With no meta key, don't delete for all items - just delete 237 237 // 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(); 240 240 bp_xprofile_add_meta( $g1, 'group', 'foo', 'bar' ); 241 241 bp_xprofile_add_meta( $g1, 'group', 'foo1', 'bar1' ); … … 256 256 // With no meta key, don't delete for all items - just delete 257 257 // 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(); 260 260 bp_xprofile_add_meta( $g1, 'group', 'foo', 'bar' ); 261 261 bp_xprofile_add_meta( $g1, 'group', 'foo1', 'bar1' ); … … 299 299 */ 300 300 public function test_bp_xprofile_get_meta_no_meta_key() { 301 $g = $this->factory->xprofile_group->create();301 $g = self::factory()->xprofile_group->create(); 302 302 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 303 303 bp_xprofile_update_meta( $g, 'group', 'foo2', 'bar' ); … … 319 319 */ 320 320 public function test_bp_xprofile_get_meta_single_true() { 321 $g = $this->factory->xprofile_group->create();321 $g = self::factory()->xprofile_group->create(); 322 322 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); 323 323 bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' ); … … 331 331 */ 332 332 public function test_bp_xprofile_get_meta_single_false() { 333 $g = $this->factory->xprofile_group->create();333 $g = self::factory()->xprofile_group->create(); 334 334 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); 335 335 bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' ); … … 342 342 */ 343 343 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(); 345 345 346 346 $expected = array(); … … 378 378 */ 379 379 public function test_bp_xprofile_update_meta_illegal_characters() { 380 $g = $this->factory->xprofile_group->create();380 $g = self::factory()->xprofile_group->create(); 381 381 $krazy_key = ' f!@#$%^o *(){}o?+'; 382 382 bp_xprofile_update_meta( $g, 'group', $krazy_key, 'bar' ); … … 389 389 */ 390 390 public function test_bp_xprofile_update_meta_stripslashes() { 391 $g = $this->factory->xprofile_group->create();391 $g = self::factory()->xprofile_group->create(); 392 392 $v = "Totally \'tubular\'"; 393 393 bp_xprofile_update_meta( $g, 'group', 'foo', $v ); … … 400 400 */ 401 401 public function test_bp_xprofile_update_meta_empty_value_delete() { 402 $g = $this->factory->xprofile_group->create();402 $g = self::factory()->xprofile_group->create(); 403 403 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 404 404 bp_xprofile_update_meta( $g, 'group', 'foo', '' ); … … 411 411 */ 412 412 public function test_bp_xprofile_update_meta_new() { 413 $g = $this->factory->xprofile_group->create();413 $g = self::factory()->xprofile_group->create(); 414 414 $this->assertSame( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); 415 415 $this->assertNotEmpty( bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ) ); … … 422 422 */ 423 423 public function test_bp_xprofile_update_meta_existing() { 424 $g = $this->factory->xprofile_group->create();424 $g = self::factory()->xprofile_group->create(); 425 425 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 426 426 $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); … … 434 434 */ 435 435 public function test_bp_xprofile_update_meta_same_value() { 436 $g = $this->factory->xprofile_group->create();436 $g = self::factory()->xprofile_group->create(); 437 437 bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' ); 438 438 $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) ); … … 445 445 */ 446 446 public function test_bp_xprofile_update_meta_prev_value() { 447 $g = $this->factory->xprofile_group->create();447 $g = self::factory()->xprofile_group->create(); 448 448 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); 449 449 … … 466 466 */ 467 467 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(); 469 469 $value = "SELECT object_id FROM wp_bp_xprofile_groups WHERE \"foo\" VALUES (foo = 'bar'"; 470 470 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); … … 479 479 */ 480 480 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(); 482 482 $value = "foo meta_id bar"; 483 483 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); … … 507 507 */ 508 508 public function test_bp_xprofile_add_meta_existing_unique() { 509 $g = $this->factory->xprofile_group->create();509 $g = self::factory()->xprofile_group->create(); 510 510 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); 511 511 $this->assertFalse( bp_xprofile_add_meta( $g, 'group', 'foo', 'baz', true ) ); … … 517 517 */ 518 518 public function test_bp_xprofile_add_meta_existing_not_unique() { 519 $g = $this->factory->xprofile_group->create();519 $g = self::factory()->xprofile_group->create(); 520 520 bp_xprofile_add_meta( $g, 'group', 'foo', 'bar' ); 521 521 $this->assertNotEmpty( bp_xprofile_add_meta( $g, 'group', 'foo', 'baz' ) ); … … 526 526 */ 527 527 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( 531 531 'field_group_id' => $g, 532 532 'name' => 'Neato', … … 550 550 */ 551 551 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( 555 555 'field_group_id' => $g, 556 556 'name' => 'Kewl', … … 570 570 */ 571 571 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( 575 575 'field_group_id' => $g, 576 576 'type' => 'number', … … 621 621 */ 622 622 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( 625 625 'field_group_id' => $g, 626 626 'type' => 'selectbox', … … 644 644 */ 645 645 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(); 647 647 $f = xprofile_insert_field( array( 648 648 'field_group_id' => $g, … … 702 702 */ 703 703 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( 706 706 'field_group_id' => $g, 707 707 'type' => 'selectbox', … … 727 727 */ 728 728 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( 731 731 'field_group_id' => $g, 732 732 'type' => 'selectbox', … … 753 753 */ 754 754 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( 757 757 'field_group_id' => $g, 758 758 'type' => 'selectbox', … … 779 779 */ 780 780 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( 783 783 'field_group_id' => $g, 784 784 'type' => 'selectbox', … … 815 815 */ 816 816 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( 819 819 'field_group_id' => $g, 820 820 'type' => 'selectbox', … … 852 852 */ 853 853 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(); 857 857 858 858 // prime the cache … … 876 876 global $wpdb; 877 877 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( 880 880 'field_group_id' => $g, 881 881 'type' => 'selectbox', … … 895 895 global $wpdb; 896 896 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( 899 899 'field_group_id' => $g, 900 900 'type' => 'selectbox', … … 919 919 */ 920 920 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( 923 923 'field_group_id' => $g, 924 924 'type' => 'textarea', … … 932 932 */ 933 933 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( 936 936 'field_group_id' => $g, 937 937 'type' => 'radio', … … 1048 1048 */ 1049 1049 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 ) ); 1052 1052 $GLOBALS['field'] = new BP_XProfile_Field( $field_id ); 1053 1053 $GLOBALS['field']->do_autolink = true; … … 1064 1064 */ 1065 1065 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 ) ); 1068 1068 $GLOBALS['field'] = new BP_XProfile_Field( $field_id ); 1069 1069 $GLOBALS['field']->do_autolink = true;
Note: See TracChangeset
for help on using the changeset viewer.