Changeset 11737
- Timestamp:
- 11/03/2017 07:44:10 PM (6 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(