Changeset 13623 for trunk/psLib/test/astro/tap_psTime_02.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_02.c (modified) (6 diffs)

trunk/psLib/test/astro/tap_psTime_02.c

@@ -12 +12 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.5 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-06-04 20:25:32 $
+ *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-06-05 01:10:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -332 +332 @@
     {
         psMemId id = psMemGetId();
-
         psTime *time = psTimeFromTT(0,2e9);
         ok(time == NULL, "psTimeFromTT() returned NULL with incorrect time");
-
         psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -345 +343 @@
     {
         psMemId id = psMemGetId();
-
         psTime *time = psTimeFromTT(testTime1SecondsUTC,testTime1NanosecondsUTC);
         ok(time != NULL, "psTimeFromTT() returned non-NULL with valid time");
         skip_start(time == NULL, 2, "Skipping tests because psTimeFromTT() returned NULL");
-
         ok(time->type == PS_TIME_TT, "psTimeFromTT() returned correct type");
         is_long(time->sec, testTime1SecondsUTC, "psTimeFromTT() returned correct ->sec"); 
         is_long(time->nsec, testTime1NanosecondsUTC, "psTimeFromTT() returned correct ->nsec");
-        is_bool(time->leapsecond, false, "psTimeFromUTC() returned the correct leapsecond flag");
+        is_bool(time->leapsecond, false, "psTimeFromTT() returned the correct leapsecond flag");
         skip_end();
-
         psFree(time);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -367 +362 @@
     {
         psMemId id = psMemGetId();
-
         psTime *time = psTimeFromUTC(0, 2e9, true);
         ok(time == NULL, "psTimeFromUTC() returned NULL with incorrect time input");
-
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -376 +369 @@
 
     // psTimeFromUTC()
-    // Attempt to create psTime with valid non-leapsecond time and leapsecond flag true
+    // Attempt to create psTime with valid leapsecond time but leapsecond
+    // flag false
+    {
+        psMemId id = psMemGetId();
+
+        psTime *time = psTimeFromUTC(testTime3SecondsUTC, testTime3NanosecondsUTC, false);
+        ok(time != NULL, "psTimeFromUTC() returned non-NULL with correct input");
+        skip_start(time == NULL, 5, "Skipping tests because psTimeFromUTC() returned NULL");
+        ok(time->type == PS_TIME_UTC, "psTimeFromUTC() returned the correct type");
+        is_long(time->sec, testTime3SecondsUTC, "psTimeFromUTC() returned the correct ->sec");
+        is_long(time->nsec, testTime3NanosecondsUTC, "psTimeFromUTC() returned the correct ->nsec");
+        is_bool(time->leapsecond, true, "psTimeFromUTC() returned the correct leapsecond flag");
+        psFree(time);
+        skip_end();
+
+        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
+    }
+
+
+    // psTimeFromUTC()
+    // Attempt to create psTime with valid non-leapsecond time and
+    // leapsecond flag true
     {
         psMemId id = psMemGetId();
@@ -391 +405 @@
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
-
-
-    // psTimeFromUTC()
-    // Attempt to create psTime with valid leapsecond time but leapsecond flag false
-    {
-        psMemId id = psMemGetId();
-
-        psTime *time = psTimeFromUTC(testTime3SecondsUTC, testTime3NanosecondsUTC, false);
-        ok(time != NULL, "psTimeFromUTC() returned non-NULL with correct input");
-        skip_start(time == NULL, 5, "Skipping tests because psTimeFromUTC() returned NULL");
-        ok(time->type == PS_TIME_UTC, "psTimeFromUTC() returned the correct type");
-        is_long(time->sec, testTime3SecondsUTC, "psTimeFromUTC() returned the correct ->sec");
-        is_long(time->nsec, testTime3NanosecondsUTC, "psTimeFromUTC() returned the correct ->nsec");
-        is_bool(time->leapsecond, true, "psTimeFromUTC() returned the correct leapsecond flag");
-        psFree(time);
-        skip_end();
-
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
-    }
 }