metaform: fix download_tar() (stylus not less)

[wfpl.git] / unit_tests.php

diff --git a/unit_tests.php b/unit_tests.php
index d092962..ee62e20 100644 (file)
--- a/unit_tests.php
+++ b/unit_tests.php
@@ -23,18 +23,29 @@ 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;
 }
 
+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() {
@@ -42,11 +53,11 @@ function unit_test_func() {
        $function = array_shift($args);
        $correct = array_pop($args);
        $result = call_user_func_array($function, $args);
-       $message = "$function(" . join(', ', $args) . ") returned $result";
-       if($result == $correct) {
+       $message = "$function(" . join(', ', backslashinate_each($args)) . ") returned " . backslashinate($result);
+       if($result === $correct) {
                unit_test_passed($message);
        } else {
-               unit_test_failed($message . " instead of $correct");
+               unit_test_failed($message . " instead of " . backslashinate($correct));
        }
 }
 
@@ -66,23 +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) {
+       $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/
 # that you'd like to run.
-function unit_test_wfpl($basenames = 'format db misc') {
+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();