Adding test case for TestSuiteShell and refactoring to ease this testing

cake/console/libs/testsuite.php

@@ -113,9 +113,20 @@ class TestSuiteShell extends Shell {
 			$this->available();
 		}
 
+		$this->run($args, $this->runnerOptions());
+	}
+
+/**
+ * Runs the test case from $runnerArgs
+ *
+ * @param array $runnerArgs list of arguments as obtained from parseArgs()
+ * @param array $options list of options as constructed by runnerOptions()
+ * @return void
+ */
+	protected function run($runnerArgs, $options = array()) {
 		require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_runner.php';
-		$testCli = new TestRunner($args);
-		$testCli->run($this->runnerOptions());
+		$testCli = new TestRunner($runnerArgs);
+		$testCli->run($options);
 	}
 
 /**
@@ -140,8 +151,9 @@ class TestSuiteShell extends Shell {
 		}
 
 		if (empty($testCases)) {
-			$this->out(__('No test cases available'));
-			return;
+			$this->out(__("No test cases available \n\n"));
+			$this->help();
+			$this->_stop();
 		}
 
 		$this->out($title);
@@ -160,14 +172,14 @@ class TestSuiteShell extends Shell {
 			if (is_numeric($choice)  && isset($cases[$choice])) {
 				$this->args[0] = $category;
 				$this->args[1] = $cases[$choice];
-				$this->main();
+				$this->run($this->parseArgs(), $this->runnerOptions());
 				break;
 			}
 
 			if (is_string($choice) && in_array($choice, $cases)) {
 				$this->args[0] = $category;
 				$this->args[1] = $choice;
-				$this->main();
+				$this->run($this->parseArgs(), $this->runnerOptions());
 				break;
 			}
 

cake/tests/cases/console/libs/testsuite.test.php

@@ -0,0 +1,119 @@
+<?php
+/**
+ * TestSuiteShell test case
+ *
+ * PHP 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'testsuite.php';
+
+class TestSuiteShellTest extends CakeTestCase {
+
+
+/**
+ * setUp test case
+ *
+ * @return void
+ */
+	public function setUp() {
+		$this->Dispatcher = $this->getMock(
+			'ShellDispatcher', 
+			array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+		);
+		$this->Shell = $this->getMock(
+			'TestSuiteShell',
+			array('in', 'out', 'hr', 'help', 'error', 'err', '_stop', 'initialize', 'run'),
+			array(&$this->Dispatcher)
+		);
+		$this->Shell->Dispatch->shellPaths = App::path('shells');
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		unset($this->Dispatch, $this->Shell);
+	}
+
+/**
+ * test available list of test cases for an empty category
+ *
+ * @return void
+ */
+	public function testAvailableWithEmptyList() {
+		$this->Shell->startup();
+		$this->Shell->args = array('unexistant-category');
+		$this->Shell->expects($this->at(0))->method('out')->with(__("No test cases available \n\n"));
+		$this->Shell->expects($this->once())->method('help');
+		$this->Shell->available();
+	}
+
+/**
+ * test available list of test cases for core category
+ *
+ * @return void
+ */
+	public function testAvailableCoreCategory() {
+		$this->Shell->startup();
+		$this->Shell->args = array('core');
+		$this->Shell->expects($this->at(0))->method('out')->with('Core Test Cases:');
+		$this->Shell->expects($this->at(1))->method('out')
+			->with(new PHPUnit_Framework_Constraint_PCREMatch('/\[1\].*/'));
+		$this->Shell->expects($this->at(2))->method('out')
+			->with(new PHPUnit_Framework_Constraint_PCREMatch('/\[2\].*/'));
+		
+		$this->Shell->expects($this->once())->method('in')
+			->with(__('What test case would you like to run?'), null, 'q')
+			->will($this->returnValue('1'));
+
+		$this->Shell->expects($this->once())->method('run');
+		$this->Shell->available();
+		$this->assertEquals($this->Shell->args, array('core', 'Basics'));
+	}
+
+/**
+ * Tests that correct option for test runner are passed
+ *
+ * @return void
+ */
+	public function testRunnerOptions() {
+		$this->Shell->startup();
+		$this->Shell->args = array('core', 'Basics');
+		$this->Shell->params = array('filter' => 'myFilter', '-colors' => null, '-verbose' => null);
+
+		$this->Shell->expects($this->once())->method('run')
+			->with(
+				array('app' => false, 'plugin' => null, 'output' => 'text', 'case' => 'basics'),
+				array('--colors', '--verbose', '--filter', 'myFilter')
+			);
+		$this->Shell->main();
+	}
+}