add unit_test_func(), convert unit_tests/format.php to use it

[wfpl.git] / unit_tests.php

diff --git a/unit_tests.php b/unit_tests.php
index 97df911..d092962 100644 (file)
--- a/unit_tests.php
+++ b/unit_tests.php
@@ -21,6 +21,36 @@
 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) {
+       if(isset($GLOBALS['unit_tests_verbose']) && $GLOBALS['unit_tests_verbose'] > 1) {
+               message("PASSED: $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'] += 1;
+}
+
+# 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(', ', $args) . ") returned $result";
+       if($result == $correct) {
+               unit_test_passed($message);
+       } else {
+               unit_test_failed($message . " instead of $correct");
+       }
+}
+
+
 function file_run_unit_tests($filename) {
        require_once($filename);
        $func = basename($filename, '.php') . '_unit_tests_main';
@@ -36,14 +66,17 @@ 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;
+       $GLOBALS['unit_tests_passed'] = 0;
+       $GLOBALS['unit_tests_failed'] = 0;
        $basenames = explode(' ', $basenames);
        foreach($basenames as $basename) {
                $filename = "$directory/$basename.php";
                message("running tests in $filename");
-               $errors += file_run_unit_tests($filename);
+               file_run_unit_tests($filename);
        }
-       message("tests finished with $errors error" . enc_s($errors));
+       $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");
 }
 
 # Call this to unit test wfpl. By default it tests everything, or you can pass