Making CakeTextReporter use CakeBaseReporter as its base class, movin…

…g methods from TextReporter.
cakephp · Jan 6, 2010 · 84c2bbd · 84c2bbd
1 parent 0d7875f
commit 84c2bbd
Showing 1 changed file with 113 additions and 34 deletions.
diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php
@@ -1,60 +1,139 @@
 <?php
-class CakeTextReporter extends TextReporter {
+/**
+ * CakeTextReporter contains reporting features used for plain text based output
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
 
-	var $_timeStart = 0;
-	var $_timeEnd = 0;
-	var $_timeDuration = 0;
+/**
+ * CakeTextReporter contains reporting features used for plain text based output
+ *
+ * @package cake
+ * @subpackage cake.tests.lib
+ */
+class CakeTextReporter extends CakeBaseReporter {
+/**
+ * Paints the end of the test with a summary of
+ * the passes and failures.
+ *
+ * @param string $test_name Name class of test.
+ * @access public
+ */
+	function paintFooter($test_name) {
+		if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+			echo "OK\n";
+		} else {
+			echo "FAILURES!!!\n";
+		}
+		echo "Test cases run: " . $this->getTestCaseProgress() .
+				"/" . $this->getTestCaseCount() .
+				", Passes: " . $this->getPassCount() .
+				", Failures: " . $this->getFailCount() .
+				", Exceptions: " . $this->getExceptionCount() . "\n";
 
+		echo 'Time taken by tests (in seconds): ' . $this->_timeDuration . "\n";
+		if (function_exists('memory_get_peak_usage')) {
+			echo 'Peak memory use: (in bytes): ' . number_format(memory_get_peak_usage()) . "\n";
+		}
+	}
 /**
- * Signals / Paints the beginning of a TestSuite executing.
- * Starts the timer for the TestSuite execution time.
+ * Paints the title only.
  *
- * @param 
- * @return void
+ * @param string $test_name Name class of test.
+ * @access public
  */
-	function paintGroupStart($test_name, $size) {
-		if (empty($this->_timeStart)) {
-			$this->_timeStart = $this->_getTime();
+	function paintHeader($test_name) {
+		if (! SimpleReporter::inCli()) {
+			header('Content-type: text/plain');
 		}
-		parent::paintGroupStart($test_name, $size);
+		echo "$test_name\n";
+		flush();
 	}
 
 /**
- * Signals/Paints the end of a TestSuite. All test cases have run
- * and timers are stopped.
+ * Paints the test failure as a stack trace.
  *
- * @return void
+ * @param string $message Failure message displayed in
+ *    the context of the other tests.
+ * @access public
  */
-	function paintGroupEnd($test_name) {
-		$this->_timeEnd = $this->_getTime();
-		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
-		parent::paintGroupEnd($test_name);
+	function paintFail($message) {
+		parent::paintFail($message);
+		echo $this->getFailCount() . ") $message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
 	}
 
 /**
- * Get the current time in microseconds. Similar to getMicrotime in basics.php
- * but in a separate function to reduce dependancies.
+ * Paints a PHP error.
  *
- * @return float Time in microseconds
+ * @param string $message Message to be shown.
+ * @access public
  */
-	function _getTime() {
-		list($usec, $sec) = explode(' ', microtime());
-		return ((float)$sec + (float)$usec);
+	function paintError($message) {
+		parent::paintError($message);
+		echo "Exception " . $this->getExceptionCount() . "!\n$message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
 	}
 
 /**
- * Paints the end of the test with a summary of
- * the passes and failures.
+ * Paints a PHP exception.
  *
- * @param string $test_name Name class of test.
+ * @param Exception $exception Exception to describe.
  * @access public
  */
-	function paintFooter($test_name) {
-		parent::paintFooter($test_name);
-		echo 'Time taken by tests (in seconds): ' . $this->_timeDuration . "\n";
-		if (function_exists('memory_get_peak_usage')) {
-			echo 'Peak memory use: (in bytes): ' . number_format(memory_get_peak_usage()) . "\n";
-		}
+	function paintException($exception) {
+		parent::paintException($exception);
+		$message = 'Unexpected exception of type [' . get_class($exception) .
+				'] with message ['. $exception->getMessage() .
+				'] in ['. $exception->getFile() .
+				' line ' . $exception->getLine() . ']';
+		echo "Exception " . $this->getExceptionCount() . "!\n$message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
+	}
+
+/**
+ * Prints the message for skipping tests.
+ *
+ * @param string $message Text of skip condition.
+ * @access public
+ */
+	function paintSkip($message) {
+		parent::paintSkip($message);
+		echo "Skip: $message\n";
+	}
+
+/**
+ * Paints formatted text such as dumped variables.
+ *
+ * @param string $message Text to show.
+ * @access public
+ */
+	function paintFormattedMessage($message) {
+		echo "$message\n";
+		flush();
 	}
 }
 ?>