Fixes #1526: Big honking warning added to unit tests. Getter test also deletes its subtypes now.

git-svn-id: http://code.elgg.org/elgg/trunk@3945 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 11 insertions, 6 deletions

diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index 9a7b66191..0cae3743c 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg diagnostics
- * 
+ *
  * @package ElggDiagnostics
  * @author Curverider Ltd
  * @link http://elgg.com/
@@ -14,23 +14,28 @@ set_context('admin');
 
 // system diagnostics
 $body = elgg_view_title(elgg_echo('diagnostics'));
-$body .= elgg_view('page_elements/contentwrapper', array('body' => 
+$body .= elgg_view('page_elements/contentwrapper', array('body' =>
 	elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'))
 );
 
 // unit tests
 $body .= elgg_view_title(elgg_echo('diagnostics:unittester'));
+
+$test_body = '<p>' . elgg_echo('diagnostics:unittester:description') . '</p>';
+$test_body .= '<h3>' . elgg_echo('diagnostics:unittester:warning') . '</h3>';
+
 if (isset($CONFIG->debug)) {
 	// create a button to run tests
 	$js = "onclick=\"window.location='{$CONFIG->wwwroot}engine/tests/suite.php'\"";
 	$params = array('type' => 'button', 'value' => elgg_echo('diagnostics:test:executeall'), 'js' => $js);
-	$button = elgg_view('input/button', $params);
+	$test_body .= elgg_view('input/button', $params);
 } else {
 	// no tests when not in debug mode
-	$button = elgg_echo('diagnostics:unittester:debug');
+	$test_body .= elgg_echo('diagnostics:unittester:debug');
 }
-$body .= elgg_view('page_elements/contentwrapper', array('body' => 
-	elgg_echo('diagnostics:unittester:description') . "<br />$button")
+
+$body .= elgg_view('page_elements/contentwrapper', array(
+	'body' => $test_body)
 );
 
 // create page