X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=unit_tests.php;h=ee62e20e3e0100cd6b84722d5d202a60a4e04656;hb=e9646530d44ce4d74fc4c8e39f9080360689c517;hp=62f7d6b48b4511fbe801366aef7f94b0b7e91085;hpb=f920d084acbf8c53c996a6fee26530a41e7e0559;p=wfpl.git

diff --git a/unit_tests.php b/unit_tests.php
index 62f7d6b..ee62e20 100644
--- a/unit_tests.php
+++ b/unit_tests.php
@@ -23,15 +23,13 @@ require_once('code/wfpl/messages.php');
 
 # call this to declare that a unit test has passed
 function unit_test_passed($msg) {
-	if(isset($GLOBALS['unit_tests_verbose']) && $GLOBALS['unit_tests_verbose'] > 1) {
-		message("PASSED: $msg");
-	}
+	$GLOBALS['unit_tests_passed_msgs'][] = $msg;
 	$GLOBALS['unit_tests_passed'] += 1;
 }
 
 # call this to declare that a unit test has failed
 function unit_test_failed($msg) {
-	message("FAILED: $msg");
+	$GLOBALS['unit_tests_failed_msgs'][] = $msg;
 	$GLOBALS['unit_tests_failed'] += 1;
 }
 
@@ -79,17 +77,32 @@ function file_run_unit_tests($filename) {
 # tests in that file. It should print a message() about each test that failed,
 # and return the number of tests that failed.
 function run_unit_tests($directory, $basenames) {
+	$files = array();
 	$GLOBALS['unit_tests_passed'] = 0;
 	$GLOBALS['unit_tests_failed'] = 0;
 	$basenames = explode(' ', $basenames);
 	foreach($basenames as $basename) {
+		$GLOBALS['unit_tests_passed_msgs'] = array();
+		$GLOBALS['unit_tests_failed_msgs'] = array();
+		$already_passed = $GLOBALS['unit_tests_passed'];
+		$already_failed = $GLOBALS['unit_tests_failed'];
 		$filename = "$directory/$basename.php";
-		message("running tests in $filename");
 		file_run_unit_tests($filename);
+		$files[] = array(
+			'file' => $filename,
+			'fails' => columnize($GLOBALS['unit_tests_failed_msgs']),
+			'passes' => columnize($GLOBALS['unit_tests_passed_msgs']),
+			'count_passed' => $GLOBALS['unit_tests_passed'] - $already_passed,
+			'count_failed' => $GLOBALS['unit_tests_failed'] - $already_failed
+		);
 	}
 	$passed = $GLOBALS['unit_tests_passed'];
 	$failed = $GLOBALS['unit_tests_failed'];
-	message("tests finished with $passed test" . enc_s($passed) . " passed and $GLOBALS[unit_tests_failed] test" . enc_s($failed) . " failed");
+	tem_set('unit_tests', array(
+		'files' => $files,
+		'total_passed' => $passed,
+		'total_failed' => $failed
+	));
 }
 
 # Call this to unit test wfpl. By default it tests everything, or you can pass