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

diff --git a/unit_tests.php b/unit_tests.php
index 62f7d6b..c0f101b 100644
--- a/unit_tests.php
+++ b/unit_tests.php
@@ -1,37 +1,25 @@
 <?php
 
-#  Copyright (C) 2009 Jason Woofenden
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This file is for running unit tests. Either on wfpl or your own code.
 
-require_once('code/wfpl/template.php');
-require_once('code/wfpl/messages.php');
+require_once(__DIR__.'/'.'template.php');
+require_once(__DIR__.'/'.'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,25 +67,40 @@ 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
-# a space-separated list of the basenames of the files in code/wfpl/unit_tests/
+# a space-separated list of the basenames of the files in wfpl/unit_tests/
 # that you'd like to run.
 function unit_test_wfpl($basenames = 'format db misc encode') {
-	tem_load('code/wfpl/unit_tests/template.html');
-	run_unit_tests('code/wfpl/unit_tests', $basenames);
+	tem_load(__DIR__.'/'.'unit_tests/template.html');
+	run_unit_tests(__DIR__.'/'.'unit_tests', $basenames);
 	display_messages();
 	tem_output();
 	exit();