ChangeSet ID:	31017
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner@winehq.org	2007/03/31 12:12:55

Modified files:
	unit_test      : run_tests.php test_appData.php 
	                 test_application.php test_error_log.php 
	                 test_filter.php test_image.php 
	                 test_maintainer.php test_om_objects.php 
	                 test_query.php test_url.php test_user.php 

Log message:
	Chris Morgan <cmorgan@alum.wpi.edu>
	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.

Patch: http://cvs.winehq.org/patch.py?id=31017

Old revision  New revision  Changes     Path
 1.12          1.13          +11 -0      appdb/unit_test/run_tests.php
 1.1           1.2           +5 -1       appdb/unit_test/test_appData.php
 1.5           1.6           +10 -2      appdb/unit_test/test_application.php
 1.2           1.3           +5 -1       appdb/unit_test/test_error_log.php
 1.1           1.2           +5 -1       appdb/unit_test/test_filter.php
 1.3           1.4           +30 -6      appdb/unit_test/test_image.php
 1.6           1.7           +25 -5      appdb/unit_test/test_maintainer.php
 1.6           1.7           +5 -1       appdb/unit_test/test_om_objects.php
 1.2           1.3           +5 -1       appdb/unit_test/test_query.php
 1.2           1.3           +5 -1       appdb/unit_test/test_url.php
 1.9           1.10          +30 -6      appdb/unit_test/test_user.php

Index: appdb/unit_test/run_tests.php
diff -u -p appdb/unit_test/run_tests.php:1.12 appdb/unit_test/run_tests.php:1.13
--- appdb/unit_test/run_tests.php:1.12	Thu May 23 17:07:49 2013
+++ appdb/unit_test/run_tests.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 ?>

Index: appdb/unit_test/test_appData.php
diff -u -p appdb/unit_test/test_appData.php:1.1 appdb/unit_test/test_appData.php:1.2
--- appdb/unit_test/test_appData.php:1.1	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_appData.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 ?>

Index: appdb/unit_test/test_application.php
diff -u -p appdb/unit_test/test_application.php:1.5 appdb/unit_test/test_application.php:1.6
--- appdb/unit_test/test_application.php:1.5	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_application.php	Thu May 23 17:07:49 2013
@@ -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"; 
+}
     
 ?>
 

Index: appdb/unit_test/test_error_log.php
diff -u -p appdb/unit_test/test_error_log.php:1.2 appdb/unit_test/test_error_log.php:1.3
--- appdb/unit_test/test_error_log.php:1.2	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_error_log.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 ?>

Index: appdb/unit_test/test_filter.php
diff -u -p appdb/unit_test/test_filter.php:1.1 appdb/unit_test/test_filter.php:1.2
--- appdb/unit_test/test_filter.php:1.1	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_filter.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 
 ?>

Index: appdb/unit_test/test_image.php
diff -u -p appdb/unit_test/test_image.php:1.3 appdb/unit_test/test_image.php:1.4
--- appdb/unit_test/test_image.php:1.3	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_image.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 ?>

Index: appdb/unit_test/test_maintainer.php
diff -u -p appdb/unit_test/test_maintainer.php:1.6 appdb/unit_test/test_maintainer.php:1.7
--- appdb/unit_test/test_maintainer.php:1.6	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_maintainer.php	Thu May 23 17:07:49 2013
@@ -340,30 +340,50 @@ function test_maintainer_deleteMaintaine
 }
 
 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";
+}
 
 ?>

Index: appdb/unit_test/test_om_objects.php
diff -u -p appdb/unit_test/test_om_objects.php:1.6 appdb/unit_test/test_om_objects.php:1.7
--- appdb/unit_test/test_om_objects.php:1.6	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_om_objects.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 ?>

Index: appdb/unit_test/test_query.php
diff -u -p appdb/unit_test/test_query.php:1.2 appdb/unit_test/test_query.php:1.3
--- appdb/unit_test/test_query.php:1.2	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_query.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 
 ?>

Index: appdb/unit_test/test_url.php
diff -u -p appdb/unit_test/test_url.php:1.2 appdb/unit_test/test_url.php:1.3
--- appdb/unit_test/test_url.php:1.2	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_url.php	Thu May 23 17:07:49 2013
@@ -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";
+}
 
 ?>

Index: appdb/unit_test/test_user.php
diff -u -p appdb/unit_test/test_user.php:1.9 appdb/unit_test/test_user.php:1.10
--- appdb/unit_test/test_user.php:1.9	Thu May 23 17:07:49 2013
+++ appdb/unit_test/test_user.php	Thu May 23 17:07:49 2013
@@ -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 */