Changeset 9561 for trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.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/class.BP_Activity_Activity.php (modified) (2 diffs)

trunk/tests/phpunit/testcases/activity/class.BP_Activity_Activity.php

@@ -4 +4 @@
  */
 class BP_Tests_Activity_Class 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 );
-    }
 
     /**
@@ -259 +244 @@
      */
     public function test_get_with_display_comments_threaded() {
+        $u = $this->factory->user->create();
+
         $now = time();
         $a1 = $this->factory->activity->create( array(
+            'user_id' => $u,
             'content' => 'Life Rules',
             'recorded_time' => date( 'Y-m-d H:i:s', $now ),
         ) );
         $a2 = $this->factory->activity->create( array(
+            'user_id' => $u,
             'content' => 'Life Drools',
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
         ) );
         $a3 = bp_activity_new_comment( array(
+            'user_id' => $u,
             'activity_id' => $a1,
             'content' => 'Candy is good',