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

Fix unit tests

Author: swissspidy

.travis.yml

@@ -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
 

README.md

@@ -18,7 +18,7 @@
         }
     ],
     "require": {
-        "php": ">= 5.3.0"
+        "php": ">= 5.6.0"
     },
     "require-dev": {
         "roave/security-advisories": "dev-latest",

composer.json

@@ -1,16 +1,20 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://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>

phpunit.xml.dist

@@ -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);
     }
 

tests/test-arguments.php renamed to tests/Test_Arguments.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

tests/test-cli.php renamed to tests/Test_Cli.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 );

tests/test-colors.php renamed to tests/Test_Colors.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.

tests/test-shell.php renamed to tests/Test_Shell.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;
 
 /**

tests/test-table.php renamed to tests/Test_Table.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;
 
 /**

tests/test-table-ascii.php renamed to tests/Test_Table_Ascii.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' );