From e2b15c0566887da39d18ef5663d375ff2e658be3 Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sat, 31 Mar 2007 17:12:55 +0000 Subject: [PATCH] Keep track of global success or failure and print out a summary success or failure when the tests are complete. Makes it less likely that a test failure will be missed. --- unit_test/run_tests.php | 11 +++++++++++ unit_test/test_appData.php | 6 +++++- unit_test/test_application.php | 12 ++++++++++-- unit_test/test_error_log.php | 6 +++++- unit_test/test_filter.php | 6 +++++- unit_test/test_image.php | 36 ++++++++++++++++++++++++++++------ unit_test/test_maintainer.php | 30 +++++++++++++++++++++++----- unit_test/test_om_objects.php | 6 +++++- unit_test/test_query.php | 6 +++++- unit_test/test_url.php | 6 +++++- unit_test/test_user.php | 36 ++++++++++++++++++++++++++++------ 11 files changed, 136 insertions(+), 25 deletions(-) diff --git a/unit_test/run_tests.php b/unit_test/run_tests.php index 0536822..d374041 100644 --- a/unit_test/run_tests.php +++ b/unit_test/run_tests.php @@ -11,6 +11,9 @@ error_reporting(E_ALL); if(!defined("DISABLE_EMAIL")) define("DISABLE_EMAIL", true); +// default to the tests being successful +$bTestSuccess = true; + include_once("test_user.php"); echo "\n"; include_once("test_query.php"); @@ -28,4 +31,12 @@ echo "\n"; include_once("test_om_objects.php"); echo "\n"; include_once("test_appData.php"); + +if($bTestSuccess == true) +{ + echo "\nAll tests were successful\n"; +} else +{ + echo "\nSome test(s) failed!\n"; +} ?> diff --git a/unit_test/test_appData.php b/unit_test/test_appData.php index 1cbf535..3176678 100644 --- a/unit_test/test_appData.php +++ b/unit_test/test_appData.php @@ -44,8 +44,12 @@ function test_appData_listSubmittedBy() } if(!test_appData_listSubmittedBy()) +{ echo "test_appData_listSubmittedBy() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_appData_listSubmittedBy() passed\n"; +} ?> diff --git a/unit_test/test_application.php b/unit_test/test_application.php index f46e267..cf8c4cd 100644 --- a/unit_test/test_application.php +++ b/unit_test/test_application.php @@ -249,15 +249,23 @@ function create_and_login_user() } if(!test_application_delete()) +{ echo "test_application_delete() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_application_delete() passed\n"; +} if(!test_application_getWithRating()) +{ echo "test_application_getWithRating() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_application_getWithRating() passed\n"; +} ?> diff --git a/unit_test/test_error_log.php b/unit_test/test_error_log.php index 26f2b81..f853e2f 100644 --- a/unit_test/test_error_log.php +++ b/unit_test/test_error_log.php @@ -35,8 +35,12 @@ function test_error_log_log_error() if(!test_error_log_log_error()) +{ echo "test_error_log_log_error() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_error_log_log_error() passed\n"; +} ?> diff --git a/unit_test/test_filter.php b/unit_test/test_filter.php index 0eaf3d5..30531b3 100644 --- a/unit_test/test_filter.php +++ b/unit_test/test_filter.php @@ -125,9 +125,13 @@ function test_filter() /* Main test routines */ if(!test_filter()) +{ echo "test_filter() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_filter() passed\n"; +} ?> diff --git a/unit_test/test_image.php b/unit_test/test_image.php index d1f7c35..292a070 100644 --- a/unit_test/test_image.php +++ b/unit_test/test_image.php @@ -237,32 +237,56 @@ function test_resize_image_border() if(!test_image_constructor()) +{ echo "test_image_constructor() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_image_constructor() passed\n"; +} if(!test_image_make_thumbnail()) +{ echo "test_image_make_thumbnail() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_image_make_thumbnail() passed\n"; +} if(!test_image_make_full()) +{ echo "test_image_make_full() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_image_make_full() passed\n"; +} if(!test_image_output_to_file()) +{ echo "test_image_output_to_file() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_image_output_to_file() passed\n"; +} if(!test_image_add_watermark()) +{ echo "test_image_add_watermark() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_image_add_watermark() passed\n"; +} if(!test_resize_image_border()) +{ echo "test_resize_image_border() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_resize_image_border() passed\n"; +} ?> diff --git a/unit_test/test_maintainer.php b/unit_test/test_maintainer.php index a7c75dc..8198c50 100644 --- a/unit_test/test_maintainer.php +++ b/unit_test/test_maintainer.php @@ -340,30 +340,50 @@ function test_maintainer_deleteMaintainersForVersion() } if(!test_maintainer_getMaintainerCountForUser()) +{ echo "test_maintainer_getMaintainerCountForUser() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_maintainer_getMaintainerCountForUser() passed\n"; +} if(!test_maintainer_getAppsMaintained()) +{ echo "test_maintainer_getAppsMaintained() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_maintainer_getAppsMaintained() passed\n"; +} if(!test_maintainer_unQueue()) +{ echo "test_maintainer_unQueue() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_maintainer_unQueue() passed\n"; +} if(!test_superMaintainerOnAppSubmit()) +{ echo "test_superMaintainerOnAppSubmit() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_superMaintainerOnAppSubmit() passed\n"; +} if(!test_maintainer_deleteMaintainersForVersion()) +{ echo "test_maintainer_deleteMaintainersForVersion() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_maintainer_deleteMaintianersForVersion() passed\n"; +} ?> diff --git a/unit_test/test_om_objects.php b/unit_test/test_om_objects.php index c6abdd0..cd752e6 100644 --- a/unit_test/test_om_objects.php +++ b/unit_test/test_om_objects.php @@ -149,8 +149,12 @@ function test_object_methods() } if(!test_object_methods()) +{ echo "test_object_methods() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_object_methods() passed\n"; +} ?> diff --git a/unit_test/test_query.php b/unit_test/test_query.php index 7754d3b..69e89de 100644 --- a/unit_test/test_query.php +++ b/unit_test/test_query.php @@ -119,9 +119,13 @@ function test_query_parameters() if(!test_query_parameters()) +{ echo "test_query_parameters() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_query_parameters() passed\n"; +} ?> diff --git a/unit_test/test_url.php b/unit_test/test_url.php index c4758ff..a6f5adc 100644 --- a/unit_test/test_url.php +++ b/unit_test/test_url.php @@ -66,8 +66,12 @@ function test_url_update() } if(!test_url_update()) +{ echo "test_url_update() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_url_update() passed\n"; +} ?> diff --git a/unit_test/test_user.php b/unit_test/test_user.php index 4efd833..0885aaa 100644 --- a/unit_test/test_user.php +++ b/unit_test/test_user.php @@ -287,34 +287,58 @@ function test_user_update_password() /* Main test routines */ if(!test_user_create()) +{ echo "test_user_create() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_create() passed\n"; +} if(!test_user_login()) +{ echo "test_user_login() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_login() passed\n"; +} if(!test_user_update()) +{ echo "test_user_update() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_update() passed\n"; +} if(!test_user_delete()) +{ echo "test_user_delete() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_delete() passed\n"; +} if(!test_user_getpref_setpref()) +{ echo "test_user_getpref_setpref() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_getpref_setpref() passed\n"; +} if(!test_user_update_password()) +{ echo "test_user_update_password() failed!\n"; -else + $bTestSuccess = false; +} else +{ echo "test_user_update_password() passed\n"; +} /* Perform the maintainer tests here because they require that a user we can log into */ /* and we want to save on having to clean up the user by duplicating the cleanup code below */