X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=unit_tests%2Fdb.php;h=569ed0e97fe035658610ee25d9a258221506d329;hb=cc3a6b27d3a041f1a8f351df2941b705191aadee;hp=f6b532507b00a7f4ed0619a332983c382db7a8b1;hpb=f920d084acbf8c53c996a6fee26530a41e7e0559;p=wfpl.git

diff --git a/unit_tests/db.php b/unit_tests/db.php
index f6b5325..569ed0e 100644
--- a/unit_tests/db.php
+++ b/unit_tests/db.php
@@ -23,10 +23,7 @@
 
 require_once('code/wfpl/db.php');
 
-# returns number of errors
-function test_db_reposition() {
-	$table = 'reposition';
-	$errors = 0;
+function test_db_reposition($table = 'reposition') {
 	db_delete($table);
 	db_insert($table, 'ord', '2');
 	$a = db_auto_id();
@@ -72,21 +69,18 @@ function test_db_reposition() {
 		db_update($table, 'ord', $ord, 'where id=%i', $before[$src]);
 		$after = db_get_column($table, 'id', 'order by ord');
 		$ords = db_get_column($table, 'ord', 'order by ord');
-		if($before[$c1] != $after[0] || $before[$c2] != $after[1] || $before[$c3] != $after[2]) {
-			message("db_reposition($before[$src], $dest) did: ($before[0]:$before_ords[0], $before[1]:$before_ords[1], $before[2]:$before_ords[2]) -> ($after[0]:$ords[0]), $after[1]:$ords[1], $after[2]:$ords[2])");
-			$errors += 1;
+		$message = "db_reposition($before[$src], $dest) did: ($before[0]:$before_ords[0], $before[1]:$before_ords[1], $before[2]:$before_ords[2]) -> ($after[0]:$ords[0]), $after[1]:$ords[1], $after[2]:$ords[2])";
+		if($before[$c1] == $after[0] && $before[$c2] == $after[1] && $before[$c3] == $after[2]) {
+			unit_test_passed($message);
+		} else {
+			unit_test_failed($message);
 		}
 		$before = $after;
 		$before_ords = $ords;
 	}
-
-	return $errors;
 }
 
-# returns number of errors
 function db_unit_tests_main() {
 	db_connect('test');
-	$errors = 0;
-	$errors += test_db_reposition();
-	return $errors;
+	test_db_reposition();
 }