Index: trunk/psLib/test/psTest.h
===================================================================
--- trunk/psLib/test/psTest.h	(revision 526)
+++ trunk/psLib/test/psTest.h	(revision 538)
@@ -15,13 +15,36 @@
 p_printFooter(filePtr, __FILE__, packageName, testPointName, success)
 
+typedef int (*testFcn)(void);
+
+typedef struct
+{
+    testFcn     fcn;
+    const char* testPointName;
+    int         expectedReturn;
+}
+testDescription;
+
+#define runTest(filePtr, packageName, testPointName, fcn, expectedReturn) \
+p_runTest(filePtr, __FILE__, packageName, testPointName, fcn, expectedReturn)
+
+#define runTestSuite(filePtr, packageName, tests) \
+p_runTestSuite(filePtr, __FILE__, packageName, tests)
+
 
 /////////////////////////// PRIVATE FUNCTIONS //////////////////////////////
 
-void p_printPositiveTestHeader(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName);
+bool p_runTest(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
+               testFcn fcn, int expectedReturn);
+
+bool p_runTestSuite(FILE *fp, const char* testPointFile, const char* packageName, testDescription tests[]);
+
+void p_printPositiveTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
+                               const char* testPointName);
 
 void p_printNegativeTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
                                const char* testPointName,const char* expectedError, int exitValue);
 
-void p_printFooter(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName, bool
-                   success);
+void p_printFooter(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName,
+                   bool success);
+
 #endif