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

Timestamp:

Dec 16, 2004, 8:53:35 AM (22 years ago)

Author:

harman

Message:

Added new time math functions

File:

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

trunk/psLib/test/astronomy/tst_psTime_04.c

@@ -14 +14 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-11-22 20:52:45 $
+ *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-12-16 18:53:35 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
     // Test A - Initialize time
     printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time");
-    bool status = true;
-    status = psTimeInit("../../config/psTime.config");
-    psTimeFinalize();
+    psLibInit(true, "../../config/psTime.config");
+    psLibFinalize();
     printFooter(stdout, "psTime", "Test A - Initialize time", true);
 
@@ -38 +37 @@
     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);
-    status = psTimeInit("zzz");
+    psLibInit(true, "zzz");
     printFooter(stdout, "psTime", "Test B - Attempt to open non-existant time config file", true);
 
@@ -45 +44 @@
     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);
-    status = psTimeInit("./test.psTime.config1");
-    psTimeFinalize();
+    psLibInit(true, "./test.psTime.config1");
+    psLibFinalize();
     printFooter(stdout, "psTime", "Test C - Attempt to open non-existant time data files", true);
 
@@ -53 +52 @@
     printNegativeTestHeader(stdout,"psTime", "Test D - Attempt to read incorrect number of files",
                             "Incorrect number of table files entered. Found: 3. Expected: 4.", 0);
-    status = psTimeInit("./test.psTime.config2");
-    psTimeFinalize();
+    psLibInit(true, "./test.psTime.config2");
+    psLibFinalize();
     printFooter(stdout, "psTime", "Test D - Attempt to read incorrect number of files", true);
 
@@ -61 +60 @@
     printNegativeTestHeader(stdout,"psTime", "Test E - Attempt to read incorrect number of from values",
                             "Incorrect vector size. Size: 3, Expected 4.", 0);
-    status = psTimeInit("./test.psTime.config3");
-    psTimeFinalize();
+    psLibInit(true, "./test.psTime.config3");
+    psLibFinalize();
     printFooter(stdout, "psTime", "Test E - Attempt to read incorrect number of from values", true);
 
@@ -69 +68 @@
     printNegativeTestHeader(stdout,"psTime", "Test F - Attempt to read data file with typo in number",
                             "Unable to parse string, number on line 16.", 0);
-    status = psTimeInit("./test.psTime.config4");
-    psTimeFinalize();
+    psLibInit(true, "./test.psTime.config4");
+    psLibFinalize();
     printFooter(stdout, "psTime", "Test F - Attempt to read data file with typo in number", true);
 
@@ -76 +75 @@
     // Test G - Free data
     printPositiveTestHeader(stdout, "psTime", "Test G - Free data");
-    psTimeFinalize();
+    psLibFinalize();
     if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) {
         psError(PS_ERR_UNKNOWN,true,"Memory leak detected.");