From 80b732819ba30afeaaf24f6af49a0189cfdf5892 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 17 Oct 2015 21:18:38 +0000 Subject: [PATCH] Unit Tests: better fixtures for `Tests_User_WpSetCurrentUser`. See #30017, #33968. git-svn-id: https://develop.svn.wordpress.org/trunk@35248 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/user/wpSetCurrentUser.php | 52 ++++++++++--------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/tests/phpunit/tests/user/wpSetCurrentUser.php b/tests/phpunit/tests/user/wpSetCurrentUser.php index 212041c5d4..6fe0814d1a 100644 --- a/tests/phpunit/tests/user/wpSetCurrentUser.php +++ b/tests/phpunit/tests/user/wpSetCurrentUser.php @@ -4,40 +4,46 @@ * @group user */ class Tests_User_WpSetCurrentUser extends WP_UnitTestCase { + protected static $user_id; + protected static $user_id2; + protected static $user_ids = array(); + + public static function wpSetUpBeforeClass( $factory ) { + self::$user_ids[] = self::$user_id = $factory->user->create(); + self::$user_ids[] = self::$user_id2 = $factory->user->create( array( 'user_login' => 'foo', ) ); + } + + public static function wpTearDownAfterClass() { + foreach ( self::$user_ids as $id ) { + self::delete_user( $id ); + } + } + public function test_set_by_id() { - $u = self::factory()->user->create(); + $user = wp_set_current_user( self::$user_id ); - $user = wp_set_current_user( $u ); - - $this->assertSame( $u, $user->ID ); + $this->assertSame( self::$user_id, $user->ID ); $this->assertEquals( $user, wp_get_current_user() ); - $this->assertSame( $u, get_current_user_id() ); + $this->assertSame( self::$user_id, get_current_user_id() ); } public function test_name_should_be_ignored_if_id_is_not_null() { - $u = self::factory()->user->create(); + $user = wp_set_current_user( self::$user_id, 'foo' ); - $user = wp_set_current_user( $u, 'foo' ); - - $this->assertSame( $u, $user->ID ); + $this->assertSame( self::$user_id, $user->ID ); $this->assertEquals( $user, wp_get_current_user() ); - $this->assertSame( $u, get_current_user_id() ); + $this->assertSame( self::$user_id, get_current_user_id() ); } public function test_should_set_by_name_if_id_is_null_and_current_user_is_nonempty() { - $u1 = self::factory()->user->create(); - wp_set_current_user( $u1 ); - $this->assertSame( $u1, get_current_user_id() ); - - $u2 = self::factory()->user->create( array( - 'user_login' => 'foo', - ) ); + wp_set_current_user( self::$user_id ); + $this->assertSame( self::$user_id, get_current_user_id() ); $user = wp_set_current_user( null, 'foo' ); - $this->assertSame( $u2, $user->ID ); + $this->assertSame( self::$user_id2, $user->ID ); $this->assertEquals( $user, wp_get_current_user() ); - $this->assertSame( $u2, get_current_user_id() ); + $this->assertSame( self::$user_id2, get_current_user_id() ); } /** @@ -49,15 +55,11 @@ class Tests_User_WpSetCurrentUser extends WP_UnitTestCase { wp_set_current_user( 0 ); $this->assertSame( 0, get_current_user_id() ); - $u = self::factory()->user->create( array( - 'user_login' => 'foo', - ) ); - $user = wp_set_current_user( null, 'foo' ); - $this->assertSame( $u, $user->ID ); + $this->assertSame( self::$user_id2, $user->ID ); $this->assertEquals( $user, wp_get_current_user() ); - $this->assertSame( $u, get_current_user_id() ); + $this->assertSame( self::$user_id2, get_current_user_id() ); } }