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

swissspidy · web-flow · commit 2d1da4751f47 · 2024-05-22T22:20:04.000+02:00
Fix unit tests
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,13 +1,11 @@
 PHP Command Line Tools
 ======================
 
-[![Build Status](https://travis-ci.org/wp-cli/php-cli-tools.png?branch=master)](https://travis-ci.org/wp-cli/php-cli-tools)
-
 A collection of functions and classes to assist with command line development.
 
 Requirements
 
- * PHP >= 5.3
+ * PHP >= 5.6
 
 Suggested PHP extensions
  
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">= 5.3.0"
+        "php": ">= 5.6.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",
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/php-cli-tools tests">
+		<directory prefix="Test" suffix=".php">tests/</directory>
+	</testsuite>
+
+	<filter>
+		<whitelist processUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">lib/</directory>
+		</whitelist>
+	</filter>
 </phpunit>
diff --git a/tests/Test_Arguments.php b/tests/Test_Arguments.php
@@ -4,12 +4,12 @@
 use WP_CLI\Tests\TestCase;
 
 /**
- * Class TestArguments
+ * Class Test_Arguments
  * @todo add more tests to increase coverage
  *
  * @backupGlobals enabled
  */
-class TestArguments extends TestCase
+class Test_Arguments extends TestCase
 {
     /**
      * Array of expected settings
@@ -91,6 +91,13 @@ public function set_up()
             'flags' => $this->flags,
             'options' => $this->options
         );
+
+	    set_error_handler(
+	      static function ( $errno, $errstr ) {
+		      throw new \Exception( $errstr, $errno );
+	      },
+	      E_ALL
+	    );
     }
 
     /**
@@ -102,6 +109,7 @@ public function tear_down()
         $this->options = null;
         $this->settings = null;
         self::clearArgv();
+	    restore_error_handler();
     }
 
     /**
@@ -151,7 +159,7 @@ public function testAddOptions()
      *
      * @return array set of args and expected parsed values
      */
-    public function settingsWithValidOptions()
+    public static function settingsWithValidOptions()
     {
         return array(
             array(
@@ -174,7 +182,7 @@ public function settingsWithValidOptions()
      *
      * @return array set of args and expected parsed values
      */
-    public function settingsWithMissingOptions()
+    public static function settingsWithMissingOptions()
     {
         return array(
             array(
@@ -193,7 +201,7 @@ public function settingsWithMissingOptions()
      *
      * @return array set of args and expected parsed values
      */
-    public function settingsWithMissingOptionsWithDefault()
+    public static function settingsWithMissingOptionsWithDefault()
     {
         return array(
             array(
@@ -207,7 +215,7 @@ public function settingsWithMissingOptionsWithDefault()
         );
     }
 
-    public function settingsWithNoOptionsWithDefault()
+    public static function settingsWithNoOptionsWithDefault()
     {
         return array(
             array(
@@ -259,8 +267,8 @@ public function testParseWithValidOptions($cliParams, $expectedValues)
      */
     public function testParseWithMissingOptions($cliParams, $expectedValues)
     {
-        $this->expectWarning();
-        $this->expectWarningMessage('no value given for --option1');
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('no value given for --option1');
         $this->_testParse($cliParams, $expectedValues);
     }
 
diff --git a/tests/Test_Cli.php b/tests/Test_Cli.php
@@ -2,7 +2,8 @@
 
 use cli\Colors;
 use WP_CLI\Tests\TestCase;
-class testsCli extends TestCase {
+
+class Test_Cli extends TestCase {
 
 	function set_up() {
 		// Reset enable state
diff --git a/tests/Test_Colors.php b/tests/Test_Colors.php
@@ -3,12 +3,12 @@
 use cli\Colors;
 use WP_CLI\Tests\TestCase;
 
-class testsColors extends TestCase {
+class Test_Colors extends TestCase {
 
 	/**
      * @dataProvider dataColors
-	 */ 
-	function testColors( $str, $color ) {
+	 */
+	public function testColors( $str, $color ) {
 		// Colors enabled.
 		Colors::enable( true );
 
@@ -21,7 +21,7 @@ function testColors( $str, $color ) {
 		}
 	}
 
-	function dataColors() {
+	public static function dataColors() {
 		$ret = array();
 		foreach ( Colors::getColors() as $str => $color ) {
 			$ret[] = array( $str, $color );
diff --git a/tests/Test_Shell.php b/tests/Test_Shell.php
@@ -4,9 +4,9 @@
 use WP_CLI\Tests\TestCase;
 
 /**
- * Class TestShell
+ * Class Test_Shell
  */
-class TestShell extends TestCase {
+class Test_Shell extends TestCase {
 
     /**
      * Test getting TERM columns.
diff --git a/tests/Test_Table.php b/tests/Test_Table.php
@@ -1,6 +1,8 @@
 <?php
 
-use cli\Colors, cli\Table, cli\Table\Ascii;
+use cli\Colors;
+use cli\Table;
+use cli\Table\Ascii;
 use WP_CLI\Tests\TestCase;
 
 /**
diff --git a/tests/Test_Table_Ascii.php b/tests/Test_Table_Ascii.php
@@ -1,9 +1,9 @@
 <?php
 
+use cli\Colors;
 use cli\Streams;
 use cli\Table;
 use cli\table\Ascii;
-use cli\Colors;
 use WP_CLI\Tests\TestCase;
 
 /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -6,7 +6,7 @@ function cli_autoload( $className ) {
 	$fileName  = '';
 	$namespace = '';
 	if ($lastNsPos = strrpos($className, '\\')) {
-		$namespace = substr($className, 0, $lastNsPos);
+		$namespace = strtolower(substr($className, 0, $lastNsPos));
 		$className = substr($className, $lastNsPos + 1);
 		$fileName  = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
 	}
@@ -16,7 +16,7 @@ function cli_autoload( $className ) {
 		return;
 	}
 
-	require dirname( dirname( __FILE__ ) ) . '/lib/' . $fileName;
+	require dirname( __DIR__ ) . '/lib/' . $fileName;
 }
 
 spl_autoload_register( 'cli_autoload' );

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`}`
`19`	`19`	`],`
`20`	`20`	`"require": {`
`21`		`- "php": ">= 5.3.0"`
	`21`	`+ "php": ">= 5.6.0"`
`22`	`22`	`},`
`23`	`23`	`"require-dev": {`
`24`	`24`	`"roave/security-advisories": "dev-latest",`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`	`use WP_CLI\Tests\TestCase;`
`5`	`5`
`6`	`6`	`/**`
`7`		`- * Class TestArguments`
	`7`	`+ * Class Test_Arguments`
`8`	`8`	`* @todo add more tests to increase coverage`
`9`	`9`	`*`
`10`	`10`	`* @backupGlobals enabled`
`11`	`11`	`*/`
`12`		`-class TestArguments extends TestCase`
	`12`	`+class Test_Arguments extends TestCase`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`	`15`	`* Array of expected settings`
`@@ -91,6 +91,13 @@ public function set_up()`
`91`	`91`	`'flags' => $this->flags,`
`92`	`92`	`'options' => $this->options`
`93`	`93`	`);`
	`94`	`+`
	`95`	`+ set_error_handler(`
	`96`	`+ static function ( $errno, $errstr ) {`
	`97`	`+ throw new \Exception( $errstr, $errno );`
	`98`	`+ },`
	`99`	`+ E_ALL`
	`100`	`+ );`
`94`	`101`	`}`
`95`	`102`
`96`	`103`	`/**`
`@@ -102,6 +109,7 @@ public function tear_down()`
`102`	`109`	`$this->options = null;`
`103`	`110`	`$this->settings = null;`
`104`	`111`	`self::clearArgv();`
	`112`	`+ restore_error_handler();`
`105`	`113`	`}`
`106`	`114`
`107`	`115`	`/**`
`@@ -151,7 +159,7 @@ public function testAddOptions()`
`151`	`159`	`*`
`152`	`160`	`* @return array set of args and expected parsed values`
`153`	`161`	`*/`
`154`		`- public function settingsWithValidOptions()`
	`162`	`+ public static function settingsWithValidOptions()`
`155`	`163`	`{`
`156`	`164`	`return array(`
`157`	`165`	`array(`
`@@ -174,7 +182,7 @@ public function settingsWithValidOptions()`
`174`	`182`	`*`
`175`	`183`	`* @return array set of args and expected parsed values`
`176`	`184`	`*/`
`177`		`- public function settingsWithMissingOptions()`
	`185`	`+ public static function settingsWithMissingOptions()`
`178`	`186`	`{`
`179`	`187`	`return array(`
`180`	`188`	`array(`
`@@ -193,7 +201,7 @@ public function settingsWithMissingOptions()`
`193`	`201`	`*`
`194`	`202`	`* @return array set of args and expected parsed values`
`195`	`203`	`*/`
`196`		`- public function settingsWithMissingOptionsWithDefault()`
	`204`	`+ public static function settingsWithMissingOptionsWithDefault()`
`197`	`205`	`{`
`198`	`206`	`return array(`
`199`	`207`	`array(`
`@@ -207,7 +215,7 @@ public function settingsWithMissingOptionsWithDefault()`
`207`	`215`	`);`
`208`	`216`	`}`
`209`	`217`
`210`		`- public function settingsWithNoOptionsWithDefault()`
	`218`	`+ public static function settingsWithNoOptionsWithDefault()`
`211`	`219`	`{`
`212`	`220`	`return array(`
`213`	`221`	`array(`
`@@ -259,8 +267,8 @@ public function testParseWithValidOptions($cliParams, $expectedValues)`
`259`	`267`	`*/`
`260`	`268`	`public function testParseWithMissingOptions($cliParams, $expectedValues)`
`261`	`269`	`{`
`262`		`- $this->expectWarning();`
`263`		`- $this->expectWarningMessage('no value given for --option1');`
	`270`	`+ $this->expectException(\Exception::class);`
	`271`	`+ $this->expectExceptionMessage('no value given for --option1');`
`264`	`272`	`$this->_testParse($cliParams, $expectedValues);`
`265`	`273`	`}`
`266`	`274`