X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=unit_tests%2Fformat.php;h=6d5de1515028f5aa51a9645313e5f39627378b28;hb=fe9a487e1b5ed0700481aee4609055dc6c47505d;hp=0869a7eb79158076b6b09069e2bc9142b7205b17;hpb=005535291b8acf5b0f9843cc7df22db941f8fd57;p=wfpl.git

diff --git a/unit_tests/format.php b/unit_tests/format.php
index 0869a7e..6d5de15 100644
--- a/unit_tests/format.php
+++ b/unit_tests/format.php
@@ -16,12 +16,12 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-# This file contains tests for functions in code/wfpl/format.php
+# This file contains tests for functions in wfpl/format.php
 #
-# See code/wfpl/test.php for details on how to run or create tests
+# See wfpl/test.php for details on how to run or create tests
 
 
-require_once('code/wfpl/format.php');
+require_once(__DIR__.'/../'.'format.php');
 
 function _test_format_money($arg, $dollars_correct, $money_correct) {
 	unit_test_func('format_dollars', $arg, $dollars_correct);
@@ -70,7 +70,6 @@ function _test_format_int($arg, $correct) {
 	unit_test_func('format_decimal', $arg, $correct);
 }
 
-# returns number of errors
 function test_format_misc() {
 	unit_test_func('format_caption', 'something', 'Something');
 	unit_test_func('format_caption', 'two_words', 'Two Words');
@@ -183,47 +182,9 @@ function test_format_misc() {
 	format_12hr_to_hours($str)
 	format_phone($str)
 	*/
-
-	return $errors;
-}
-
-# returns number of errors
-function _test_format_options($field, $value, $correct) {
-	$ret = format_options($value, $field);
-	if($ret !== $correct) {
-		message("format_options($value, $field) returned \"$ret\" instead of \"$correct\"");
-		return 1;
-	}
-	return 0;
-}
-
-
-function test_format_options() {
-	$errors = 0;
-	pulldown('array', array('one', 'two', "symbols&amp;'\""), PULLDOWN_ARRAY);
-	$errors +=_test_format_options('array', 'one', 'one');
-	$errors +=_test_format_options('array', 'One', '');
-	$errors +=_test_format_options('array', 'two', 'two');
-	$errors +=_test_format_options('array', 'symbols&amp;\'"', 'symbols&amp;\'"');
-	pulldown('hash', array('one' => 'Eno', 'two' => 'Owt', 'symbols&amp;\'"' => 'Slobmys'), PULLDOWN_HASH);
-	$errors +=_test_format_options('hash', 'one', 'one');
-	$errors +=_test_format_options('hash', 'One', '');
-	$errors +=_test_format_options('hash', 'two', 'two');
-	$errors +=_test_format_options('hash', 'symbols&\'"', '');
-	pulldown('array_2d', array(array('one', 'Eno'), array('two', 'Owt'), array('symbols&amp;\'"', 'Slobmys')), PULLDOWN_2D);
-	$errors +=_test_format_options('array_2d', 'one', 'one');
-	$errors +=_test_format_options('array_2d', 'One', '');
-	$errors +=_test_format_options('array_2d', 'two', 'two');
-	$errors +=_test_format_options('array_2d', 'symbols&amp;amp;\'"', '');
-
-	return $errors;
 }
 
-# returns number of errors
 function format_unit_tests_main() {
-	$errors = 0;
-	$errors += test_format_money();
-	$errors += test_format_misc();
-	$errors += test_format_options();
-	return $errors;
+	test_format_money();
+	test_format_misc();
 }