Changeset 526

Timestamp:

Apr 26, 2004, 4:20:28 PM (22 years ago)

Author:

evanalst

Message:

Modified psTest to specify file pointer to send output.

Location:

trunk/psLib/test

Files:

• Makefile (added)
• psTest.c (modified) (3 diffs)
• psTest.h (modified) (1 diff)

trunk/psLib/test/psTest.c

@@ -18 +18 @@
 #define HEADER_BOTTOM "\\------------------------------------------------------------------------/\n\n"
 
-void p_printPositiveTestHeader(const char* testPointFile, const char* packageName, const char* testPointName)
+void p_printPositiveTestHeader(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName)
 {
     char TP[80];
@@ -24 +24 @@
     snprintf(TP,80,"%s{%s}",packageName,testPointName);
 
-    printf(HEADER_TOP);
-    printf(HEADER_LINE_STRING, "TestFile", testPointFile);
-    printf(HEADER_LINE_STRING, "TestPoint", TP);
-    printf(HEADER_LINE_STRING, "TestType","Positive");
-    printf(HEADER_BOTTOM);
+    fprintf(fp, HEADER_TOP);
+    fprintf(fp, HEADER_LINE_STRING, "TestFile", testPointFile);
+    fprintf(fp, HEADER_LINE_STRING, "TestPoint", TP);
+    fprintf(fp, HEADER_LINE_STRING, "TestType","Positive");
+    fprintf(fp, HEADER_BOTTOM);
 }
 
-void p_printNegativeTestHeader(const char* testPointFile, const char* packageName,
+void p_printNegativeTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
                                const char* testPointName,const char* expectedError, int exitValue)
 {
@@ -38 +38 @@
     snprintf(TP,80,"%s{%s}",packageName,testPointName);
 
-    printf(HEADER_TOP);
-    printf(HEADER_LINE_STRING, "TestFile", testPointFile);
-    printf(HEADER_LINE_STRING, "TestPoint", TP);
-    printf(HEADER_LINE_STRING,"TestType","Negative");
-    printf(HEADER_LINE_STRING,"ExpectedErrorText",expectedError);
-    printf(HEADER_LINE_INT,"ExpectedStatusValue",exitValue);
-    printf(HEADER_BOTTOM);
+    fprintf(fp, HEADER_TOP);
+    fprintf(fp, HEADER_LINE_STRING, "TestFile", testPointFile);
+    fprintf(fp, HEADER_LINE_STRING, "TestPoint", TP);
+    fprintf(fp, HEADER_LINE_STRING,"TestType","Negative");
+    fprintf(fp, HEADER_LINE_STRING,"ExpectedErrorText",expectedError);
+    fprintf(fp, HEADER_LINE_INT,"ExpectedStatusValue",exitValue);
+    fprintf(fp, HEADER_BOTTOM);
 }
 
 
-void p_printFooter(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)
 {
     if (success) {
-        printf("\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName,testPointName, testPointFile);
+        fprintf(fp, "\n---> TESTPOINT PASSED (%s{%s} | %s)\n\n", packageName,testPointName, testPointFile);
     } else {
-        printf("\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName,testPointName,testPointFile);
+        fprintf(fp, "\n---> TESTPOINT FAILED (%s{%s} | %s)\n\n", packageName,testPointName,testPointFile);
     }
 }

trunk/psLib/test/psTest.h

@@ -6 +6 @@
 #include <stdbool.h>
 
-#define printPositiveTestHeader(packageName, testPointName) \
-p_printPositiveTestHeader(__FILE__, packageName, testPointName)
+#define printPositiveTestHeader(filePtr, packageName, testPointName) \
+p_printPositiveTestHeader(filePtr, __FILE__, packageName, testPointName)
 
-#define printNegativeTestHeader(packageName, testPointName, expectedError, exitValue) \
-p_printNegativeTestHeader(__FILE__, packageName, testPointName, expectedError, exitValue)
+#define printNegativeTestHeader(filePtr, packageName, testPointName, expectedError, exitValue) \
+p_printNegativeTestHeader(filePtr, __FILE__, packageName, testPointName, expectedError, exitValue)
 
-#define printFooter(packageName, testPointName, success) \
-p_printFooter(__FILE__, packageName, testPointName, success)
+#define printFooter(filePtr, packageName, testPointName, success) \
+p_printFooter(filePtr, __FILE__, packageName, testPointName, success)
 
 
 /////////////////////////// PRIVATE FUNCTIONS //////////////////////////////
 
-void p_printPositiveTestHeader(const char* testPointFile, const char* packageName, const char* testPointName);
+void p_printPositiveTestHeader(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName);
 
-void p_printNegativeTestHeader(const char* testPointFile, const char* packageName,
+void p_printNegativeTestHeader(FILE *fp, const char* testPointFile, const char* packageName,
                                const char* testPointName,const char* expectedError, int exitValue);
 
-void p_printFooter(const char* testPointFile, const char* packageName, const char* testPointName, bool
+void p_printFooter(FILE *fp, const char* testPointFile, const char* packageName, const char* testPointName, bool
                    success);
 #endif