From c6be7af88f68923156cb9a9ad3b9692a573f9784 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 9 Nov 2008 15:34:29 +0000
Subject: [PATCH] ENHANCEMENT Better CLI output for browsing dev/tests

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@65464 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 dev/DebugView.php  |  2 +-
 dev/TestRunner.php | 31 ++++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/dev/DebugView.php b/dev/DebugView.php
index c19658ae4..5adbdf11f 100644
--- a/dev/DebugView.php
+++ b/dev/DebugView.php
@@ -97,7 +97,7 @@ class DebugView {
 	public function writeInfo($title, $subtitle, $description=false) {
 		echo '<div class="info">';
 		echo "<h1>" . Convert::raw2xml($title) . "</h1>";
-		echo "<h3>" . Convert::raw2xml($subtitle) . "</h3>";
+		if($subtitle) echo "<h3>" . Convert::raw2xml($subtitle) . "</h3>";
 		if ($description) {
 			echo "<p>$description</p>";
 		} else {
diff --git a/dev/TestRunner.php b/dev/TestRunner.php
index d41c6220f..ad96963fb 100644
--- a/dev/TestRunner.php
+++ b/dev/TestRunner.php
@@ -79,18 +79,27 @@ class TestRunner extends Controller {
 	 */
 	function browse() {
 		self::$default_reporter->writeHeader();
-		echo '<div class="info">';
-		echo '<h1>Available Tests</h1>';
-		echo '</div>';
-		echo '<div class="trace">';
-		$tests = ClassInfo::subclassesFor('SapphireTest');
-		echo "<h3><a href=\"" . $this->Link() . "all\">Run all " . count($tests) . " tests</a></h3>";
-		echo "<h3><a href=\"" . $this->Link() . "coverage\">Runs all tests and make test coverage report</a></h3>";
-		echo "<hr />";
-		foreach ($tests as $test) {
-			echo "<h3><a href=\"" . $this->Link() . "$test\">Run $test</a></h3>";
+		self::$default_reporter->writeInfo('Available Tests', false);
+		if(Director::is_cli()) {
+			$tests = ClassInfo::subclassesFor('SapphireTest');
+			$relativeLink = Director::makeRelative($this->Link());
+			echo "sake {$relativeLink}all: Run all " . count($tests) . " tests\n";
+			echo "sake {$relativeLink}coverage: Runs all tests and make test coverage report\n";
+			foreach ($tests as $test) {
+				echo "sake {$relativeLink}$test: Run $test\n";
+			}
+		} else {
+			echo '<div class="trace">';
+			$tests = ClassInfo::subclassesFor('SapphireTest');
+			echo "<h3><a href=\"" . $this->Link() . "all\">Run all " . count($tests) . " tests</a></h3>";
+			echo "<h3><a href=\"" . $this->Link() . "coverage\">Runs all tests and make test coverage report</a></h3>";
+			echo "<hr />";
+			foreach ($tests as $test) {
+				echo "<h3><a href=\"" . $this->Link() . "$test\">Run $test</a></h3>";
+			}
+			echo '</div>';
 		}
-		echo '</div>';
+		
 		self::$default_reporter->writeFooter();
 	}