Merge pull request #5950 from wp-cli/fix/unit-tests

swissspidy · web-flow · commit 2cf9ec80f316 · 2024-05-23T17:57:41.000+02:00
Fix unit tests
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,5 @@ phpunit.xml
 phpcs.xml
 .phpcs.xml
 composer.lock
+.phpunit.result.cache
+.phpunit.cache
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -98,12 +98,12 @@
 
 	<!-- These are all to do with file-system related tests. Just ignore them. -->
 	<rule ref="WordPress.WP.CapitalPDangit">
-		<exclude-pattern>*/tests/test-(extractor|utils)\.php$</exclude-pattern>
+		<exclude-pattern>*/tests/(Extractor|Utils)Test\.php$</exclude-pattern>
 	</rule>
 
 	<!-- Allow for select data providers for tests to use single-line associative arrays. -->
 	<rule ref="WordPress.Arrays.ArrayDeclarationSpacing.AssociativeArrayFound">
-		<exclude-pattern>*/tests/test-(process|utils)\.php$</exclude-pattern>
+		<exclude-pattern>*/tests/(Process|Utils)Test\.php$</exclude-pattern>
 	</rule>
 
 	<!-- This is a procedural stand-alone file that is never loaded in a WordPress context,
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,20 @@
 <phpunit xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
-         bootstrap="tests/bootstrap.php"
-         colors="always"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTestSize="true"
-         beStrictAboutChangesToGlobalState="false">
-	<testsuites>
-		<testsuite>
-			<directory prefix="spec-" suffix=".php">tests/</directory>
-			<directory prefix="test-" suffix=".php">tests/</directory>
-			<directory suffix="Test.php">tests/</directory>
-		</testsuite>
-	</testsuites>
+		 xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/4.8/phpunit.xsd"
+		 bootstrap="tests/bootstrap.php"
+		 backupGlobals="false"
+		 beStrictAboutCoversAnnotation="true"
+		 beStrictAboutOutputDuringTests="true"
+		 beStrictAboutTestsThatDoNotTestAnything="true"
+		 beStrictAboutTodoAnnotatedTests="true"
+		 colors="true"
+		 verbose="true">
+	<testsuite name="wp-cli/wp-cli tests">
+		<directory suffix="Test.php">tests</directory>
+	</testsuite>
+
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">src</directory>
+		</whitelist>
+	</filter>
 </phpunit>
diff --git a/tests/ArgValidationTest.php b/tests/ArgValidationTest.php
@@ -3,7 +3,7 @@
 use WP_CLI\SynopsisValidator;
 use WP_CLI\Tests\TestCase;
 
-class ArgValidationTests extends TestCase {
+class ArgValidationTest extends TestCase {
 
 	public function testMissingPositional() {
 		$validator = new SynopsisValidator( '<foo> <bar> [<baz>]' );
diff --git a/tests/CommandFactoryTest.php b/tests/CommandFactoryTest.php
@@ -4,7 +4,7 @@
 
 require_once dirname( __DIR__ ) . '/php/class-wp-cli-command.php';
 
-class CommandFactoryTests extends TestCase {
+class CommandFactoryTest extends TestCase {
 
 	/**
 	 * @dataProvider dataProviderExtractLastDocComment
@@ -48,7 +48,7 @@ public function testExtractLastDocCommentWin( $content, $expected ) {
 		putenv( false === $is_windows ? 'WP_CLI_TEST_IS_WINDOWS' : "WP_CLI_TEST_IS_WINDOWS=$is_windows" );
 	}
 
-	public function dataProviderExtractLastDocComment() {
+	public static function dataProviderExtractLastDocComment() {
 		return [
 			[ '', false ],
 			[ '*/', false ],
diff --git a/tests/ConfiguratorTest.php b/tests/ConfiguratorTest.php
diff --git a/tests/DocParserTest.php b/tests/DocParserTest.php
@@ -3,7 +3,7 @@
 use WP_CLI\DocParser;
 use WP_CLI\Tests\TestCase;
 
-class DocParserTests extends TestCase {
+class DocParserTest extends TestCase {
 
 	public function test_empty() {
 		$doc = new DocParser( '' );
diff --git a/tests/ExtractorTest.php b/tests/ExtractorTest.php
@@ -5,7 +5,7 @@
 use WP_CLI\Tests\TestCase;
 use WP_CLI\Utils;
 
-class Extractor_Test extends TestCase {
+class ExtractorTest extends TestCase {
 
 	public static $copy_overwrite_files_prefix = 'wp-cli-test-utils-copy-overwrite-files-';
 
diff --git a/tests/FileCacheTest.php b/tests/FileCacheTest.php
diff --git a/tests/HelpTest.php b/tests/HelpTest.php
diff --git a/tests/InflectorTest.php b/tests/InflectorTest.php
@@ -12,7 +12,7 @@ public function testPluralize( $singular, $expected ) {
 		$this->assertEquals( $expected, Inflector::pluralize( $singular ) );
 	}
 
-	public function dataProviderPluralize() {
+	public static function dataProviderPluralize() {
 		return [
 			[ 'string', 'strings' ], // Regular.
 			[ 'person', 'people' ],  // Irregular.
@@ -27,7 +27,7 @@ public function testSingularize( $singular, $expected ) {
 		$this->assertEquals( $expected, Inflector::singularize( $singular ) );
 	}
 
-	public function dataProviderSingularize() {
+	public static function dataProviderSingularize() {
 		return [
 			[ 'strings', 'string' ], // Regular.
 			[ 'people', 'person' ],  // Irregular.
diff --git a/tests/LoggingTest.php b/tests/LoggingTest.php
@@ -30,7 +30,7 @@ protected function get_runner() {
 	}
 }
 
-class LoggingTests extends TestCase {
+class LoggingTest extends TestCase {
 
 	public function testLogDebug() {
 		$message = 'This is a test message.';
diff --git a/tests/ProcessTest.php b/tests/ProcessTest.php
@@ -4,7 +4,7 @@
 use WP_CLI\Tests\TestCase;
 use WP_CLI\Utils;
 
-class ProcessTests extends TestCase {
+class ProcessTest extends TestCase {
 
 	/**
 	 * @dataProvider data_process_env
@@ -18,7 +18,7 @@ public function test_process_env( $cmd_prefix, $env, $expected_env_vars, $expect
 		$this->assertSame( $process_run->stdout, $expected_out );
 	}
 
-	public function data_process_env() {
+	public static function data_process_env() {
 		return [
 			[ '', [], [], '' ],
 			[ 'ENV=blah', [], [ 'ENV' ], 'blah' ],
diff --git a/tests/SynopsisParserTest.php b/tests/SynopsisParserTest.php
diff --git a/tests/UtilsTest.php b/tests/UtilsTest.php
@@ -272,7 +272,7 @@ public function testParseSSHUrl() {
 		$this->assertEquals( null, Utils\parse_ssh_url( $testcase, PHP_URL_PATH ) );
 	}
 
-	public function parseStrToArgvData() {
+	public static function parseStrToArgvData() {
 		return [
 			[ [], '' ],
 			[ [ 'option', 'get', 'home' ], 'option get home' ],
@@ -414,7 +414,7 @@ public function testNormalizePath( $path, $expected ) {
 		$this->assertEquals( $expected, Utils\normalize_path( $path ) );
 	}
 
-	public function dataNormalizePath() {
+	public static function dataNormalizePath() {
 		return [
 			[ '', '' ],
 			// Windows paths.
@@ -476,7 +476,7 @@ public function testHttpRequestBadAddress() {
 		WP_CLI::set_logger( $prev_logger );
 	}
 
-	public function dataHttpRequestBadCAcert() {
+	public static function dataHttpRequestBadCAcert() {
 		return [
 			'default request'  => [
 				[],
@@ -552,7 +552,7 @@ public function testHttpRequestVerify( $expected, $options ) {
 		$this->assertEquals( $expected, $transport_spy->requests[0]['options']['verify'] );
 	}
 
-	public function dataHttpRequestVerify() {
+	public static function dataHttpRequestVerify() {
 		return [
 			'not passed'    => [
 				true,
@@ -589,7 +589,7 @@ public function testPastTenseVerb( $verb, $expected ) {
 		$this->assertSame( $expected, Utils\past_tense_verb( $verb ) );
 	}
 
-	public function dataPastTenseVerb() {
+	public static function dataPastTenseVerb() {
 		return [
 			// Known to be used by commands.
 			[ 'activate', 'activated' ],
@@ -645,7 +645,7 @@ public function testExpandGlobs( $path, $expected ) {
 		putenv( false === $expand_globs_no_glob_brace ? 'WP_CLI_TEST_EXPAND_GLOBS_NO_GLOB_BRACE' : "WP_CLI_TEST_EXPAND_GLOBS_NO_GLOB_BRACE=$expand_globs_no_glob_brace" );
 	}
 
-	public function dataExpandGlobs() {
+	public static function dataExpandGlobs() {
 		// Files in "data/expand_globs": foo.ab1, foo.ab2, foo.efg1, foo.efg2, bar.ab1, bar.ab2, baz.ab1, baz.ac1, baz.efg2.
 		return [
 			[ 'foo.ab1', [ 'foo.ab1' ] ],
@@ -695,7 +695,7 @@ public function testReportBatchOperationResults( $stdout, $stderr, $noun, $verb,
 		WP_CLI::set_logger( $prev_logger );
 	}
 
-	public function dataReportBatchOperationResults() {
+	public static function dataReportBatchOperationResults() {
 		return [
 			[ "Success: Noun already verbed.\n", '', 'noun', 'verb', 1, 0, 0, null ],
 			[ "Success: Verbed 1 of 1 nouns.\n", '', 'noun', 'verb', 1, 1, 0, null ],
@@ -754,7 +754,7 @@ public function testProcOpenCompatWinEnv( $cmd, $env, $expected_cmd, $expected_e
 		putenv( false === $env_is_windows ? 'WP_CLI_TEST_IS_WINDOWS' : "WP_CLI_TEST_IS_WINDOWS=$env_is_windows" );
 	}
 
-	public function dataProcOpenCompatWinEnv() {
+	public static function dataProcOpenCompatWinEnv() {
 		return [
 			[ 'echo', [], 'echo', [] ],
 			[ 'ENV=blah echo', [], 'echo', [ 'ENV' => 'blah' ] ],
@@ -806,7 +806,7 @@ public function testIsJson( $argument, $ignore_scalars, $expected ) {
 		$this->assertEquals( $expected, Utils\is_json( $argument, $ignore_scalars ) );
 	}
 
-	public function dataIsJson() {
+	public static function dataIsJson() {
 		return [
 			[ '42', true, false ],
 			[ '42', false, true ],
@@ -830,7 +830,7 @@ public function testParseShellArray( $assoc_args, $array_arguments, $expected )
 		$this->assertEquals( $expected, Utils\parse_shell_arrays( $assoc_args, $array_arguments ) );
 	}
 
-	public function dataParseShellArray() {
+	public static function dataParseShellArray() {
 		return [
 			[ [ 'alpha' => '{"key":"value"}' ], [], [ 'alpha' => '{"key":"value"}' ] ],
 			[ [ 'alpha' => '{"key":"value"}' ], [ 'alpha' ], [ 'alpha' => [ 'key' => 'value' ] ] ],
@@ -845,7 +845,7 @@ public function testPluralize( $singular, $count, $expected ) {
 		$this->assertEquals( $expected, Utils\pluralize( $singular, $count ) );
 	}
 
-	public function dataPluralize() {
+	public static function dataPluralize() {
 		return [
 			[ 'string', 1, 'string' ],
 			[ 'string', 2, 'strings' ],
@@ -860,7 +860,7 @@ public function testPickFields( $data, $fields, $expected ) {
 		$this->assertEquals( $expected, Utils\pick_fields( $data, $fields ) );
 	}
 
-	public function dataPickFields() {
+	public static function dataPickFields() {
 		return [
 			[ [ 'keyA' => 'valA', 'keyB' => 'valB', 'keyC' => 'valC' ], [ 'keyB' ], [ 'keyB' => 'valB' ] ],
 			[ [ '1' => 'valA', '2' => 'valB', '3' => 'valC' ], [ '2' ], [ '2' => 'valB' ] ],
@@ -879,7 +879,7 @@ public function testParseUrl( $url, $component, $auto_add_scheme, $expected ) {
 		$this->assertEquals( $expected, Utils\parse_url( $url, $component, $auto_add_scheme ) );
 	}
 
-	public function dataParseUrl() {
+	public static function dataParseUrl() {
 		return [
 			[ 'https://user:pass@example.com:9090/path?arg=value#anchor', -1, true, [ 'scheme' => 'http', 'host' => 'example.com', 'port' => 9090, 'user' => 'user', 'pass' => 'pass', 'path' => '/path', 'query' => 'arg=value', 'fragment' => 'anchor' ] ],
 			[ 'example.com:9090/path?arg=value#anchor', -1, true, [ 'scheme' => 'http', 'host' => 'example.com', 'port' => 9090, 'path' => '/path', 'query' => 'arg=value', 'fragment' => 'anchor' ] ],
@@ -902,7 +902,7 @@ public function testValidClassAndMethodPair( $pair, $is_valid ) {
 		$this->assertEquals( $is_valid, Utils\is_valid_class_and_method_pair( $pair ) );
 	}
 
-	public function dataValidClassAndMethodPair() {
+	public static function dataValidClassAndMethodPair() {
 		return [
 			[ 'string', false ],
 			[ [], false ],
diff --git a/tests/WPCLITest.php b/tests/WPCLITest.php
@@ -2,7 +2,7 @@
 
 use WP_CLI\Tests\TestCase;
 
-class WP_CLI_Test extends TestCase {
+class WPCLITest extends TestCase {
 
 	public function testGetPHPBinary() {
 		$this->assertSame( WP_CLI\Utils\get_php_binary(), WP_CLI::get_php_binary() );
diff --git a/tests/WP_CLI/WpOrgApiTest.php b/tests/WP_CLI/WpOrgApiTest.php
@@ -7,7 +7,7 @@
 
 class WpOrgApiTest extends TestCase {
 
-	public function data_http_request_verify() {
+	public static function data_http_request_verify() {
 		return [
 			'can retrieve core checksums'              => [
 				'get_core_checksums',
diff --git a/tests/WpVersionCompareTest.php b/tests/WpVersionCompareTest.php
