Changeset 4059 for trunk/psLib/test/astronomy/tst_psTime_04.c

Timestamp:

May 31, 2005, 12:02:28 PM (21 years ago)

Author:

evanalst

Message:

Updates to time functions for SDR-14.

File:

• trunk/psLib/test/astronomy/tst_psTime_04.c (modified) (2 diffs)

trunk/psLib/test/astronomy/tst_psTime_04.c

@@ -13 +13 @@
  *
  *  @author  Ross Harman, MHPCC
+ *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-04-07 20:27:41 $
+ *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-05-31 22:02:25 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -25 +26 @@
 #include "psTest.h"
 
+static psS32 testTimeInit1(void);
+static psS32 testTimeInit2(void);
+static psS32 testTimeInit3(void);
+static psS32 testTimeInit4(void);
+static psS32 testTimeInit5(void);
+static psS32 testTimeInit6(void);
 
-int main(int argc, char* argv[])
+testDescription tests[] = {
+                              {testTimeInit1,000,"p_psTimeInit",0,false},
+                              {testTimeInit2,000,"p_psTimeInit",0,false},
+                              {testTimeInit3,000,"p_psTimeInit",0,false},
+                              {testTimeInit4,000,"p_psTimeInit",0,false},
+                              {testTimeInit5,000,"p_psTimeInit",0,false},
+                              {testTimeInit6,000,"p_psTimeInit",0,false},
+                              {NULL}
+                          };
+
+psS32 main(psS32 argc, char* argv[])
 {
-    // Test A - Initialize time
-    printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time");
-    psLibInit(true, "psTime.config");
-    psLibFinalize();
-    printFooter(stdout, "psTime", "Test A - Initialize time", true);
-
-
-    // Test B - Attempt to open non-existant time config file
-    printNegativeTestHeader(stdout,"psTime", "Test B - Attempt to open non-existant time config file",
-                            "Failed to open file 'zzz'.  Check if it exists and it has the proper permissions.", 0);
-    psLibInit(true, "zzz");
-    printFooter(stdout, "psTime", "Test B - Attempt to open non-existant time config file", true);
-
-
-    // Test C - Attempt to open non-existant time data files
-    printNegativeTestHeader(stdout,"psTime", "Test C - Attempt to open non-existant time data files",
-                            "Failed to open file 'zzz'.  Check if it exists and it has the proper permissions.", 0);
-    psLibInit(true, "test.psTime.config1");
-    psLibFinalize();
-    printFooter(stdout, "psTime", "Test C - Attempt to open non-existant time data files", true);
-
-
-    // Test D - Attempt to read incorrect number of files
-    printNegativeTestHeader(stdout,"psTime", "Test D - Attempt to read incorrect number of files",
-                            "Incorrect number of table files entered. Found: 3. Expected: 4.", 0);
-    psLibInit(true, "test.psTime.config2");
-    psLibFinalize();
-    printFooter(stdout, "psTime", "Test D - Attempt to read incorrect number of files", true);
-
-
-    // Test E - Attempt to read incorrect number of from values
-    printNegativeTestHeader(stdout,"psTime", "Test E - Attempt to read incorrect number of from values",
-                            "Incorrect vector size. Size: 3, Expected 4.", 0);
-    psLibInit(true, "test.psTime.config3");
-    psLibFinalize();
-    printFooter(stdout, "psTime", "Test E - Attempt to read incorrect number of from values", true);
-
-
-    // Test F - Attempt to read data file with typo in number
-    printNegativeTestHeader(stdout,"psTime", "Test F - Attempt to read data file with typo in number",
-                            "Unable to parse string, number on line 16.", 0);
-    psLibInit(true, "test.psTime.config4");
-    psLibFinalize();
-    printFooter(stdout, "psTime", "Test F - Attempt to read data file with typo in number", true);
-
-
-    // Test G - Free data
-    printPositiveTestHeader(stdout, "psTime", "Test G - Free data");
-    psLibFinalize();
-    if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
-        psError(PS_ERR_UNKNOWN,true,"Memory leak detected.");
-        return 10;
+    if(!runTestSuite(stderr,"psTime",tests,argc,argv)) {
+        return 1;
     }
-    psMemCheckCorruption(0);
-    int nBad = psMemCheckCorruption(0);
-    if(nBad) {
-        printf("ERROR: Found %d bad memory blocks\n", nBad);
-    }
-    printFooter(stdout, "psTime", "Test G - Free data", true);
 
     return 0;
 }
 
+psS32 testTimeInit1(void)
+{
+    // Test A - Initialize time
+    psLibInit(true, "psTime.config");
+    psLibFinalize();
+
+    return 0;
+}
+
+psS32 testTimeInit2(void)
+{
+    // Test B - Attempt to open non-existant time config file
+    psLibInit(true, "zzz");
+
+    return 0;
+}
+
+psS32 testTimeInit3(void)
+{
+    // Test C - Attempt to open non-existant time data files
+    psLibInit(true, "test.psTime.config1");
+    psLibFinalize();
+
+    return 0;
+}
+
+psS32 testTimeInit4(void)
+{
+    // Test D - Attempt to read incorrect number of files
+    psLibInit(true, "test.psTime.config2");
+    psLibFinalize();
+
+    return 0;
+}
+
+psS32 testTimeInit5(void)
+{
+    // Test E - Attempt to read incorrect number of from values
+    psLibInit(true, "test.psTime.config3");
+    psLibFinalize();
+
+    return 0;
+}
+
+psS32 testTimeInit6(void)
+{
+    // Test F - Attempt to read data file with typo in number
+    psLibInit(true, "test.psTime.config4");
+    psLibFinalize();
+
+    return 0;
+}
+