Changeset 11737 for trunk/tests/phpunit/testcases/activity/notifications.php

Timestamp:

11/03/2017 07:44:10 PM (7 years ago)

Author:

boonebgorges

Message:

Use static factory method throughout PHPUnit tests.

See #7620.

File:

• trunk/tests/phpunit/testcases/activity/notifications.php (modified) (10 diffs)

trunk/tests/phpunit/testcases/activity/notifications.php

@@ -15 +15 @@
         parent::setUp();
         $this->current_user = get_current_user_id();
-        $this->u1 = $this->factory->user->create();
-        $this->u2 = $this->factory->user->create();
+        $this->u1 = self::factory()->user->create();
+        $this->u2 = self::factory()->user->create();
         $this->set_current_user( $this->u1 );
 
@@ -274 +274 @@
     protected function create_notifications() {
         $u1_mentionname = bp_activity_get_user_mentionname( $this->u1 );
-        $this->a1 = $this->factory->activity->create( array(
+        $this->a1 = self::factory()->activity->create( array(
             'user_id' => $this->u2,
             'component' => buddypress()->activity->id,
@@ -281 +281 @@
         ) );
         $u2_mentionname = bp_activity_get_user_mentionname( $this->u2 );
-        $this->a2 = $this->factory->activity->create( array(
+        $this->a2 = self::factory()->activity->create( array(
             'user_id' => $this->u1,
             'component' => buddypress()->activity->id,
@@ -296 +296 @@
 
         // Current user is $this->u1, so $this->u2 posted the mention
-        $a = $this->factory->activity->create( array(
+        $a = self::factory()->activity->create( array(
             'user_id' => $this->u2,
             'component' => buddypress()->activity->id,
@@ -338 +338 @@
      */
     public function test_bp_activity_comment_add_notification() {
-        $a = $this->factory->activity->create( array(
+        $a = self::factory()->activity->create( array(
             'user_id' => $this->u1,
             'component' => buddypress()->activity->id,
@@ -352 +352 @@
         ) );
 
-        $u3 = $this->factory->user->create();
+        $u3 = self::factory()->user->create();
 
         $r3 = bp_activity_new_comment( array(
@@ -381 +381 @@
     public function test_activity_reply_notifications_for_blog_comment_to_activity_comment_sync() {
         $old_user = get_current_user_id();
-        $u1 = $this->factory->user->create();
-        $u2 = $this->factory->user->create();
-        $u3 = $this->factory->user->create();
+        $u1 = self::factory()->user->create();
+        $u2 = self::factory()->user->create();
+        $u3 = self::factory()->user->create();
 
         $this->set_current_user( $u1 );
@@ -395 +395 @@
 
         // create the blog post
-        $post_id = $this->factory->post->create( array(
+        $post_id = self::factory()->post->create( array(
             'post_status' => 'publish',
             'post_type'   => 'post',
@@ -415 +415 @@
         ) );
         // Approve the comment
-        $this->factory->comment->update_object( $c1, array( 'comment_approved' => 1 ) );
+        self::factory()->comment->update_object( $c1, array( 'comment_approved' => 1 ) );
 
         $this->set_current_user( $u3 );
@@ -431 +431 @@
         ) );
         // Approve the comment
-        $this->factory->comment->update_object( $c2, array( 'comment_approved' => 1 ) );
+        self::factory()->comment->update_object( $c2, array( 'comment_approved' => 1 ) );
 
         // Get activity IDs.