Index: trunk/psLib/test/astro/tap_psTime_03.c
===================================================================
--- trunk/psLib/test/astro/tap_psTime_03.c	(revision 12406)
+++ trunk/psLib/test/astro/tap_psTime_03.c	(revision 12407)
@@ -11,6 +11,6 @@
  *  @author  Eric Van Alst, MHPCC
  *
- *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2007-01-30 20:31:11 $
+ *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2007-03-12 21:11:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -176,5 +176,5 @@
     psLogSetFormat("HLNM");
     psLogSetLevel(PS_LOG_INFO);
-    plan_tests(48);
+    plan_tests(72);
     psLibInit("pslib.config");
 
@@ -461,5 +461,4 @@
         for(psS32 i = 0; i < APPB_TESTS; i++)
         {
-            bool errorFlag = false;
             // Initialize time for test time B1
             psTime *time = psTimeAlloc(PS_TIME_TAI);
@@ -469,45 +468,25 @@
             // Verify TAI ISO string
             char *timeStr = psTimeToISO(time);
-            if(strcmp(timeStr,testTimeBStrTAI[i]) != 0) {
-                diag("TEST ERROR: TAI ISO string %s not as expected %s",
-                     timeStr, testTimeBStrTAI[i]);
-                errorFlag = true;
-            }
+            ok_str(timeStr, testTimeBStrTAI[i], "TAI ISO string");
             psFree(timeStr);
 
-            time = psTimeConvert(time,PS_TIME_TT);
+            time = psTimeConvert(time, PS_TIME_TT);
             timeStr = psTimeToISO(time);
-            if(strcmp(timeStr,testTimeBStrTT[i]) != 0) {
-                diag("TEST ERROR: TT ISO string %s not as expected %s",
-                     timeStr, testTimeBStrTT[i]);
-                errorFlag = true;
-            }
+            ok_str(timeStr, testTimeBStrTT[i], "TT ISO string");
             psFree(timeStr);
 
             // Verify UTC ISO string
-            time = psTimeConvert(time,PS_TIME_UTC);
+            time = psTimeConvert(time, PS_TIME_UTC);
             time->leapsecond = testTimeBLeapsecond[i];
             timeStr = psTimeToISO(time);
-            if(strcmp(timeStr,testTimeBStrUTC[i]) != 0) {
-                if(strncmp(timeStr,"1999-01-01T00:00:60.0Z", 10) != 0) {
-                    diag("TEST ERROR: UTC ISO string %s not as expected %s",
-                         timeStr, testTimeBStrUTC[i]);
-                    errorFlag = true;
-                }
-            }
+            ok_str(timeStr, testTimeBStrUTC[i], "UTC ISO string");
             psFree(timeStr);
 
-            time = psTimeConvert(time,PS_TIME_UT1);
+            time = psTimeConvert(time, PS_TIME_UT1);
             timeStr = psTimeToISO(time);
-            if(strcmp(timeStr,testTimeBStrUT1[i]) != 0) {
-                if(strncmp(timeStr,"1999-01-01T00:00:60.2Z", 10) != 0) {
-                    diag("TEST ERROR: UT1 ISO string %s not as expected %s",
-                         timeStr, testTimeBStrUT1[i]);
-                    errorFlag = true;
-                }
-            }
+            ok_str(timeStr, testTimeBStrUT1[i], "UT1 ISO string");
             psFree(timeStr);
+
             psFree(time);
-            ok(!errorFlag, "psTimeConvert() successful on test case %d", i);
         }