From 451b3fd18d9a9e4da0ed33a126afd6a11b98af01 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 13 Feb 2011 15:01:00 -0500
Subject: [PATCH] Going back to using the old time and memory
 calculations/output.

---
 cake/tests/lib/reporter/cake_html_reporter.php | 3 ++-
 cake/tests/lib/reporter/cake_text_reporter.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
index 671c4000a..6af5c6029 100755
--- a/cake/tests/lib/reporter/cake_html_reporter.php
+++ b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -140,7 +140,8 @@ class CakeHtmlReporter extends CakeBaseReporter {
 		echo "<strong>" . $result->errorCount() . "</strong> exceptions.";
 		echo "</div>\n";
 		echo '<div style="padding:0 0 5px;">';
-		echo '<p><strong>' . PHP_Timer::resourceUsage() . '</strong>';
+		echo '<p><strong>Time:</strong> ' . $result->time() . ' seconds</p>';
+        echo '<p><strong>Peak memory:</strong> ' . number_format(memory_get_peak_usage()) . ' bytes</p>';
 		echo $this->_paintLinks();
 		echo '</div>';
 		if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) {
diff --git a/cake/tests/lib/reporter/cake_text_reporter.php b/cake/tests/lib/reporter/cake_text_reporter.php
index c82b7829f..17d9ee5d2 100644
--- a/cake/tests/lib/reporter/cake_text_reporter.php
+++ b/cake/tests/lib/reporter/cake_text_reporter.php
@@ -87,7 +87,8 @@ class CakeTextReporter extends CakeBaseReporter {
 			', Failures: ' . $result->failureCount() .
 			', Exceptions: ' . $result->errorCount() . "\n";
 
-		echo PHP_Timer::resourceUsage();
+		echo 'Time: ' . $result->time() . " seconds\n";
+        echo 'Peak memory: ' . number_format(memory_get_peak_usage()) . " bytes\n";
 
 		if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) {
 			$coverage = $result->getCodeCoverageInformation();