Unit Tests: since [32953], we can just use self::delete_user() instead of using if logic for Multisite.

See #30017, #33968.


git-svn-id: https://develop.svn.wordpress.org/trunk@35224 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2015-10-16 19:51:32 +00:00
parent 0d4a7ee029
commit 84272ff8cd
11 changed files with 42 additions and 84 deletions

View File

@@ -34,11 +34,7 @@ class Tests_User_CountUserPosts extends WP_UnitTestCase {
}
public static function wpTearDownAfterClass() {
if ( is_multisite() ) {
wpmu_delete_user( self::$user_id );
} else {
wp_delete_user( self::$user_id );
}
self::delete_user( self::$user_id );
foreach ( self::$post_ids as $post_id ) {
wp_delete_post( $post_id, true );

View File

@@ -42,11 +42,7 @@ class Tests_User_ListAuthors extends WP_UnitTestCase {
public static function wpTearDownAfterClass() {
foreach ( array_merge( self::$users, array( self::$fred_id ) ) as $user_id ) {
if ( is_multisite() ) {
wpmu_delete_user( $user_id );
} else {
wp_delete_user( $user_id );
}
self::delete_user( $user_id );
}
foreach ( self::$posts as $post_id ) {

View File

@@ -46,11 +46,7 @@ class Tests_User_Query extends WP_UnitTestCase {
foreach ( $sets as $set ) {
foreach ( $set as $id ) {
if ( is_multisite() ) {
wpmu_delete_user( $id );
} else {
wp_delete_user( $id );
}
self::delete_user( $id );
}
}
}

View File

@@ -19,10 +19,7 @@ class Tests_User_WpDeleteUser extends WP_UnitTestCase {
$this->assertEquals( array( 1 ), array_keys( $blogs ) );
// Non-existent users don't have blogs.
if ( is_multisite() )
wpmu_delete_user( $user_id );
else
wp_delete_user( $user_id );
self::delete_user( $user_id );
$user = new WP_User( $user_id );
$this->assertFalse( $user->exists(), 'WP_User->exists' );