X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=unit_tests.php;h=ee62e20e3e0100cd6b84722d5d202a60a4e04656;hp=0808fa4e4be5befa06600d5e65c68e32f47edccf;hb=eecd5e3576866afc8091abe9b74352130fd8e6cc;hpb=0e820ee53af5142bd6774ee415ccdb9627bcdbb6

diff --git a/unit_tests.php b/unit_tests.php
index 0808fa4..ee62e20 100644
--- a/unit_tests.php
+++ b/unit_tests.php
@@ -21,6 +21,47 @@
 require_once('code/wfpl/template.php');
 require_once('code/wfpl/messages.php');
 
+# call this to declare that a unit test has passed
+function unit_test_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) {
+	$GLOBALS['unit_tests_failed_msgs'][] = $msg;
+	$GLOBALS['unit_tests_failed'] += 1;
+}
+
+function backslashinate($str) {
+	return '"' . addcslashes($str, "\0..\37\"\\\177..\377") . '"';
+}
+
+function backslashinate_each($a) {
+	foreach($a as &$v) {
+		$v = backslashinate($v);
+	}
+
+	return $a;
+}
+	
+
+# use this function to unit-test a function
+# real prototype: ($name, $args..., $correct)
+function unit_test_func() {
+	$args = func_get_args();
+	$function = array_shift($args);
+	$correct = array_pop($args);
+	$result = call_user_func_array($function, $args);
+	$message = "$function(" . join(', ', backslashinate_each($args)) . ") returned " . backslashinate($result);
+	if($result === $correct) {
+		unit_test_passed($message);
+	} else {
+		unit_test_failed($message . " instead of " . backslashinate($correct));
+	}
+}
+
+
 function file_run_unit_tests($filename) {
 	require_once($filename);
 	$func = basename($filename, '.php') . '_unit_tests_main';
@@ -36,20 +77,38 @@ 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) {
-	$errors = 0;
+	$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");
-		$errors += file_run_unit_tests($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
+		);
 	}
-	message("tests finished with $errors error" . enc_s($errors));
+	$passed = $GLOBALS['unit_tests_passed'];
+	$failed = $GLOBALS['unit_tests_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/
 # that you'd like to run.
-function unit_test_wfpl($basenames = 'format db') {
+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);
 	display_messages();