Changeset 13623 for trunk/psLib/test/astro/tap_psTime_01.c

Timestamp:

Jun 4, 2007, 3:10:22 PM (19 years ago)

Author:

gusciora

Message:

Improved test coverage, added memory leak checks, etc.

File:

• trunk/psLib/test/astro/tap_psTime_01.c (modified) (13 diffs)

trunk/psLib/test/astro/tap_psTime_01.c

@@ -23 +23 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-06-04 20:25:32 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-06-05 01:10:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -709 +709 @@
 
     // psTimeFromISO()
+    // Convert valid ISO string
+    {
+        psMemId id = psMemGetId();
+        psTime *time = psTimeFromISO(testTime1Str, PS_TIME_TAI);
+        ok(time->type == PS_TIME_TAI, "psTimeFromISO() returned the correct type");
+        is_long(time->sec, testTime1SecondsUTC, "psTimeFromISO()->sec");
+        psFree(time);
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // psTimeFromISO()
     // Attempt to convert NULL string
     // Following should generate error message for NULL ISO string");
@@ -714 +726 @@
         psMemId id = psMemGetId();
         psTime *time = psTimeFromISO(NULL, PS_TIME_TAI);
-
         ok(time == NULL, "psTimeFromISO(NULL, PS_TIME_TAI) returned NULL");
-
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
-
-
-    // psTimeFromISO()
-    // Convert valid ISO string
-    {
-        psMemId id = psMemGetId();
-        psTime *time = psTimeFromISO(testTime1Str, PS_TIME_TAI);
-
-        ok(time->type == PS_TIME_TAI, "psTimeFromISO() returned the correct type");
-        is_long(time->sec, testTime1SecondsUTC, "psTimeFromISO()->sec");
-
-        psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -742 +738 @@
         psMemId id = psMemGetId();
         psTime *time = psTimeFromISO("Here I am", PS_TIME_TAI);
-
         ok(time == NULL, "psTimeFromISO() returned NULL for incorrect ISO string");
-
         psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -757 +751 @@
         psMemId id = psMemGetId();
         psTime *time = psTimeFromTimeval(NULL);
-
         ok(time == NULL, "psTimeFromTimeval(NULL) returned NULL");
-
         psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -773 +765 @@
         timevalTime->tv_usec = testTime1NanosecondsTAI / 1000;
         psTime *time = psTimeFromTimeval(timevalTime);
-
-        ok(time != NULL, "psTimeFromTimeval() returned NULL for correct timeval structure");
+        ok(time != NULL, "psTimeFromTimeval() returned non-NULL for correct timeval structure");
         skip_start(time == NULL, 3, "Skipping tests because psTimeFromTimeval() returned NULL");
         ok(time->type == PS_TIME_TAI, "psTimeFromTimeval() returned the correct type");
@@ -780 +771 @@
         is_long(time->nsec, testTime1NanosecondsTAI, "psTimeFromTimeval() returned the correct ->nsec");
         skip_end();
-
         psFree(timevalTime);
         psFree(time);
@@ -794 +784 @@
         psMemId id = psMemGetId();
         psTime *time = psTimeFromTM(NULL);
-
         ok(time == NULL, "psTimeFromTM(NULL) returned NULL");
-
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -802 +790 @@
 
     // psTimeFromTM()
-    {
-        psMemId id = psMemGetId();
-        // Verify convert for valid tm structure
+    // Verify convert for valid tm structure
+    {
+        psMemId id = psMemGetId();
         struct tm *tmTime = (struct tm*)psAlloc(sizeof(struct tm));
         tmTime->tm_year = testTime7TmYear;
@@ -813 +801 @@
         tmTime->tm_sec  = testTime7TmSec;
         psTime *time = psTimeFromTM(tmTime);
-
         ok(time != NULL, "psTimeFromTM(NULL) returned non-NULL");
         skip_start(time == NULL, 2, "Skipping tests because psTimeFromTM() returned NULL");
@@ -819 +806 @@
         is_long(time->nsec, testTime7Nanoseconds, "psTimeFromTM() returned the correct ->nsec");
         skip_end();
-
         psFree(tmTime);
         psFree(time);
@@ -838 +824 @@
         tmTime->tm_sec  = testTime8TmSec;
         psTime *time = psTimeFromTM(tmTime);
-
         // XXX should test all fields here
         ok(time != NULL, "psTimeFromTM(NULL) returned non-NULL");
@@ -845 +830 @@
         is_long(time->nsec, testTime8Nanoseconds, "psTimeFromTM() returned the correct ->nsec");
         skip_end();
-
         psFree(tmTime);
         psFree(time);