Changeset 9561 for trunk/tests/phpunit/testcases/activity/functions.php

Timestamp:

02/27/2015 03:00:42 AM (10 years ago)

Author:

boonebgorges

Message:

Don't create a current user by default in most unit tests.

The default state of our tests should be as a logged-out user. BP does pretty
different things with different kinds of logged-in users, so individual tests
should decide for themselves what the current user status should be.

Moreover, the creation of fixture users is fairly resource-intensive. Not
creating users when they're not needed makes the test suite run 5-10% faster.

See #6009.

File:

• trunk/tests/phpunit/testcases/activity/functions.php (modified) (19 diffs)

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

@@ -4 +4 @@
  */
 class BP_Tests_Activity_Functions extends BP_UnitTestCase {
-    protected $old_current_user = 0;
-
-    public function setUp() {
-        parent::setUp();
-
-        $this->old_current_user = get_current_user_id();
-        $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
-    }
-
-    public function tearDown() {
-        parent::tearDown();
-        $this->set_current_user( $this->old_current_user );
-    }
 
     /**
@@ -915 +902 @@
      */
     public function test_bp_activity_new_comment_clear_comment_caches() {
-        $a1 = $this->factory->activity->create();
+        $u = $this->factory->user->create();
+        $a1 = $this->factory->activity->create( array(
+            'user_id' => $u,
+        ) );
         $a2 = bp_activity_new_comment( array(
             'activity_id' => $a1,
             'parent_id' => $a1,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a3 = bp_activity_new_comment( array(
@@ -926 +916 @@
             'parent_id' => $a2,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a4 = bp_activity_new_comment( array(
@@ -932 +922 @@
             'parent_id' => $a3,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a5 = bp_activity_new_comment( array(
@@ -938 +928 @@
             'parent_id' => $a3,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -954 +944 @@
             'parent_id' => $a4,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -966 +956 @@
      */
     public function test_bp_activity_new_comment_clear_activity_caches() {
-        $a1 = $this->factory->activity->create();
+        $u = $this->factory->user->create();
+        $a1 = $this->factory->activity->create( array(
+            'user_id' => $u,
+        ) );
         $a2 = bp_activity_new_comment( array(
             'activity_id' => $a1,
             'parent_id' => $a1,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a3 = bp_activity_new_comment( array(
@@ -977 +970 @@
             'parent_id' => $a2,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a4 = bp_activity_new_comment( array(
@@ -983 +976 @@
             'parent_id' => $a3,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
         $a5 = bp_activity_new_comment( array(
@@ -989 +982 @@
             'parent_id' => $a3,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -1021 +1014 @@
             'parent_id' => $a4,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -1035 +1028 @@
      */
     public function test_bp_activity_delete_comment_clear_cache() {
+        $u = $this->factory->user->create();
         // add new activity update and comment to this update
-        $a1 = $this->factory->activity->create();
+        $a1 = $this->factory->activity->create( array(
+            'user_id' => $u,
+        ) );
         $a2 = bp_activity_new_comment( array(
             'activity_id' => $a1,
             'parent_id' => $a1,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -1062 +1058 @@
      */
     public function test_bp_activity_comment_on_deleted_activity() {
+        $u = $this->factory->user->create();
         $a = $this->factory->activity->create();
 
@@ -1070 +1067 @@
             'parent_id' => $a,
             'content' => 'foo',
-            'user_id' => 1,
+            'user_id' => $u,
         ) );
 
@@ -1083 +1080 @@
         $u = $this->factory->user->create();
         $a = $this->factory->activity->create();
+
+        // bp_activity_add_user_favorite() requires a logged-in user.
+        $current_user = bp_loggedin_user_id();
+        $this->set_current_user( $u );
 
         $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
@@ -1089 +1090 @@
         $this->assertSame( array( $a ), bp_activity_get_user_favorites( $u ) );
         $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+
+        $this->set_current_user( $current_user );
     }
 
@@ -1098 +1101 @@
         $u = $this->factory->user->create();
         $a = $this->factory->activity->create();
+
+        // bp_activity_add_user_favorite() requires a logged-in user.
+        $current_user = bp_loggedin_user_id();
+        $this->set_current_user( $u );
         $this->assertTrue( bp_activity_add_user_favorite( $a, $u ) );
+
+        $this->set_current_user( $current_user );
     }
 
@@ -1110 +1119 @@
         $a = $this->factory->activity->create();
 
+        // bp_activity_add_user_favorite() requires a logged-in user.
+        $current_user = bp_loggedin_user_id();
+        $this->set_current_user( $u1 );
+
         // Only favorite for user 1
         bp_activity_add_user_favorite( $a, $u1 );
@@ -1116 +1129 @@
         $this->assertFalse( bp_activity_remove_user_favorite( $a, $u2 ) );
         $this->assertEquals( 1, bp_activity_get_meta( $a, 'favorite_count' ) );
+
+        $this->set_current_user( $current_user );
     }