X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=unit_tests%2Fmisc.php;h=bb61794fac59f807a476e7e57a43138e86ea6916;hb=56892b42cb4895e601c8de375d833806772673e9;hp=05826494362f13e38578b79a4ef9dcb6e52fd809;hpb=4701b125596e7f9da31a9f0954f22b018a4994cf;p=wfpl.git

diff --git a/unit_tests/misc.php b/unit_tests/misc.php
index 0582649..bb61794 100644
--- a/unit_tests/misc.php
+++ b/unit_tests/misc.php
@@ -16,41 +16,53 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# This file contains tests for functions in code/wfpl/misc.php
+# This file contains tests for functions in wfpl/misc.php
 #
-# See code/wfpl/unit_tests.php for details on how to run or create tests
+# See wfpl/unit_tests.php for details on how to run or create tests
 
 
-require_once('code/wfpl/misc.php');
+require_once(__DIR__.'/../'.'misc.php');
 
-# returns number of errors
 function test_ordinalize() {
-	$errors = 0;
-
 	$tests = array(
 		'', '',
 		0, "0th",
 		1, "1st",
 		2, "2nd",
 		3, "3rd",
+		4, "4th",
+		5, "5th",
+		6, "6th",
+		7, "7th",
+		8, "8th",
+		9, "9th",
+		10, "10th",
+		11, "11th",
+		12, "12th",
+		13, "13th",
+		14, "14th",
+		15, "15th",
+		16, "16th",
+		17, "17th",
+		18, "18th",
+		19, "19th",
+		20, "20th",
+		21, "21st",
+		22, "22nd",
+		23, "23rd",
+		24, "24th",
+		25, "25th",
+		26, "26th",
+		27, "27th",
 		111, "111th",
 		"62", "62nd");
 	for($i = 0; $i < count($tests); $i += 2) {
 		$arg = $tests[$i];
 		$correct = $tests[$i + 1];
-		$ret = ordinalize($arg);
-		if($ret !== $correct) {
-			message("ordinalize($arg) returned \"$ret\" instead of \"$correct\"");
-			$errors += 1;
-		}
+		unit_test_func('ordinalize', $arg, $correct);
 	}
-
-	return $errors;
 }
 
-# returns number of errors
 function misc_unit_tests_main() {
-	$errors = 0;
-	$errors += test_ordinalize();
-	return $errors;
+	test_ordinalize();
 }