Changeset 1615 for trunk/psLib/test/astronomy/tst_psTime_02.c

Timestamp:

Aug 24, 2004, 3:38:48 PM (22 years ago)

Author:

harman

Message:

Updated psTime for new version of SDRS

File:

• trunk/psLib/test/astronomy/tst_psTime_02.c (modified) (3 diffs)

trunk/psLib/test/astronomy/tst_psTime_02.c

@@ -4 +4 @@
  *
  *  This test driver contains the following tests for psTime:
- *     A) Attempt to use negative seconds
- *     B) Attempt to use negative microseconds
- *     C) Attempt to use negative time
- *     D) Incorrect ISO time data
- *     E) Attempt to use null timeval
- *     F) Incorrect timeval time data
+ *     A) Incorrect ISO time data
+ *     B) Attempt to use null timeval
  *
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-06 22:34:05 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-08-25 01:38:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -25 +21 @@
 int main(int argc, char* argv[])
 {
-    psTime testTime;
-    struct timeval timevalTime;
 
-
-    // Test A - Attempt to use negative seconds
-    testTime.tv_sec = -1;
-    testTime.tv_usec = 1;
-    timevalTime.tv_sec = -1;
-    timevalTime.tv_usec = 1;
-    printNegativeTestHeader(stdout,"psTime", "Attempt to use negative seconds",
-                            "Negative seconds are not allowed: -1", 0);
-    psTimeToISO(testTime);
-    psTimeToUTC(testTime);
-    psUTCToTime(testTime);
-    psTimeToMJD(testTime);
-    psTimeToJD(testTime);
-    psTimeToTimeval(testTime);
-    psTimevalToTime(&timevalTime);
-    psTimeToTM(testTime);
-    printFooter(stdout, "psTime", "Attempt to use negative seconds", true);
-
-
-    // Test B - Attempt to use negative microseconds
-    testTime.tv_sec = 1;
-    testTime.tv_usec = -1;
-    timevalTime.tv_sec = 1;
-    timevalTime.tv_usec = -1;
-    printNegativeTestHeader(stdout,"psTime", "Attempt to use negative microseconds",
-                            "Negative microseconds are not allowed: -1", 0);
-    psTimeToISO(testTime);
-    psTimeToUTC(testTime);
-    psUTCToTime(testTime);
-    psTimeToMJD(testTime);
-    psTimeToJD(testTime);
-    psTimeToTimeval(testTime);
-    psTimevalToTime(&timevalTime);
-    psTimeToTM(testTime);
-    printFooter(stdout, "psTime", "Attempt to use negative microseconds", true);
-
-
-    // Test C - Attempt to use negative time
-    printNegativeTestHeader(stdout,"psTime", "Attempt to use negative time",
-                            "Negative time is not allowed: -1.000000", 0);
-    psJDToTime(-1.0);
-    psMJDToTime(-1.0);
-    printFooter(stdout, "psTime", "Attempt to use negative time", true);
-
-
-    // Test D - Incorrect ISO time data
+    // Test A - Incorrect ISO time data
     printNegativeTestHeader(stdout,"psTime", "Incorrect ISO time data", "Time not allowed", 0);
-    psISOToTime("1800/2/2,12:12:12.122");
-    psISOToTime("2004/-2/2,12:12:12.122");
-    psISOToTime("2004/2/-2,12:12:12.122");
-    psISOToTime("2004/2/2,-12:12:12.122");
-    psISOToTime("2004/2/2,12:-12:12.122");
-    psISOToTime("2004/2/2,12:12:-12.122");
-    psISOToTime("2004/2/2,12:12:12.-122");
+    psISOToTime("2004-99-21T18:22:24.272Z");
+    psISOToTime("2004-07-99T18:22:24.272Z");
+    psISOToTime("2004-07-21T99:22:24.272Z");
+    psISOToTime("2004-07-21T18:99:24.272Z");
+    psISOToTime("2004-07-21T18:22:99.272Z");
+    psISOToTime("2004-07-21T18:22:24.-999Z");
     printFooter(stdout, "psTime", "Incorrect ISO time data", true);
 
 
-    // Test E - Attempt to use null timeval
+    // Test B - Attempt to use null timeval
     printNegativeTestHeader(stdout,"psTime", "Attempt to use null timeval",
                             "Null value for timeval arg not allowed", 0);
@@ -91 +39 @@
     printFooter(stdout, "psTime", "Attempt to use null timeval", true);
 
-
-    // Test F - Incorrect timeval time data
-    printNegativeTestHeader(stdout,"psTime", "Incorrect timeval time data", "Time not allowed", 0);
-    struct tm tmTime;
-    tmTime.tm_year = -2;
-    tmTime.tm_mon  = 2;
-    tmTime.tm_mday = 2;
-    tmTime.tm_hour = 2;
-    tmTime.tm_min  = 2;
-    tmTime.tm_sec  = 2;
-    psTMToTime(&tmTime);
-    tmTime.tm_year = 100;
-    tmTime.tm_mon  = -2;
-    psTMToTime(&tmTime);
-    tmTime.tm_mon  = 2;
-    tmTime.tm_mday = -2;
-    psTMToTime(&tmTime);
-    tmTime.tm_hour = -2;
-    tmTime.tm_mday = 2;
-    psTMToTime(&tmTime);
-    tmTime.tm_hour = 2;
-    tmTime.tm_min = -2;
-    psTMToTime(&tmTime);
-    tmTime.tm_min = 2;
-    tmTime.tm_sec = -2;
-    psTMToTime(&tmTime);
-    printFooter(stdout, "psTime", "Incorrect timeval time data", true);
-
     return 0;
 }