Build/Test Tools: Avoid using wp_delete_user() in PHPUnit tests unl…

…ess explicitly acknowledging or ignoring Multisite.

`wp_delete_user()` does not actually delete the entire user when using WordPress Multisite. Therefore tests should typically use the test helper method to fully delete the user, unless explicitly ignoring Multisite or testing the `wp_delete_user()` function while taking Multisite behavior into account.

Fixes #61851.


git-svn-id: https://develop.svn.wordpress.org/trunk@58876 602fd350-edb4-49c9-b593-d223f7449a82

tests/phpunit/tests/admin/includesPlugin.php

@@ -96,7 +96,7 @@ public function test_submenu_position( $position, $expected_position ) {
 		wp_set_current_user( $current_user );
 
 		// Clean up the temporary user.
-		wp_delete_user( $admin_user );
+		self::delete_user( $admin_user );
 
 		// Verify the menu was inserted at the expected position.
 		$this->assertSame( 'custom-position', $submenu[ $parent ][ $expected_position ][2] );
@@ -204,7 +204,7 @@ public function test_submenu_helpers_position( $position, $expected_position ) {
 		}
 
 		// Clean up the temporary user.
-		wp_delete_user( $admin_user );
+		self::delete_user( $admin_user );
 
 		foreach ( $actual_positions as $test => $actual_position ) {
 			// Verify the menu was inserted at the expected position.
@@ -295,7 +295,7 @@ public function test_position_when_parent_slug_child_slug_are_the_same() {
 
 		// Clean up the temporary user.
 		wp_set_current_user( $current_user );
-		wp_delete_user( $admin_user );
+		self::delete_user( $admin_user );
 
 		// Verify the menu was inserted at the expected position.
 		$this->assertSame( 'main_slug', $submenu['main_slug'][0][2] );
@@ -326,7 +326,7 @@ public function test_passing_string_as_position_fires_doing_it_wrong_submenu() {
 
 		// Clean up the temporary user.
 		wp_set_current_user( $current_user );
-		wp_delete_user( $admin_user );
+		self::delete_user( $admin_user );
 
 		// Verify the menu was inserted at the expected position.
 		$this->assertSame( 'submenu_page_1', $submenu['main_slug'][1][2] );
@@ -355,7 +355,7 @@ public function test_passing_float_as_position_does_not_override_int() {
 
 		// Clean up the temporary user.
 		wp_set_current_user( $current_user );
-		wp_delete_user( $admin_user );
+		self::delete_user( $admin_user );
 
 		// Verify the menus were inserted.
 		$this->assertSame( 'main_slug_1', $menu[1][2] );

tests/phpunit/tests/link/getDashboardUrl.php

@@ -12,11 +12,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 	}
 
 	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 );
 	}
 
 	/**

tests/phpunit/tests/rest-api/rest-sidebars-controller.php

@@ -43,8 +43,8 @@ public static function wpSetUpBeforeClass( $factory ) {
 	}
 
 	public static function wpTearDownAfterClass() {
-		wp_delete_user( self::$admin_id );
-		wp_delete_user( self::$author_id );
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$author_id );
 	}
 
 	public function set_up() {

tests/phpunit/tests/user/queryCache.php

@@ -388,7 +388,7 @@ public function test_query_cache_delete_user() {
 
 		$this->assertSameSets( $expected, $found, 'Find author in returned values' );
 
-		wp_delete_user( $user_id );
+		self::delete_user( $user_id );
 
 		$q2 = new WP_User_Query(
 			array(

tests/phpunit/tests/xmlrpc/wp/getUser.php

@@ -98,7 +98,7 @@ public function test_valid_user() {
 		$this->assertSame( $user_data['user_login'], $result['username'] );
 		$this->assertContains( $user_data['role'], $result['roles'] );
 
-		wp_delete_user( $user_id );
+		self::delete_user( $user_id );
 	}
 
 	public function test_no_fields() {