Changeset 3976 for trunk/psLib/test/astronomy/tst_psAstrometry01.c

Timestamp:

May 18, 2005, 7:03:48 PM (21 years ago)

Author:

desonia

Message:

modified tests to match new psRegion functions.

File:

• trunk/psLib/test/astronomy/tst_psAstrometry01.c (modified) (7 diffs)

trunk/psLib/test/astronomy/tst_psAstrometry01.c

@@ -5 +5 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-11 22:00:35 $
+*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-05-19 05:03:48 $
 *
 * XXX: Must test
@@ -719 +719 @@
                                     psPlaneTransform *trans3 = NULL;
                                     setCoeffs(trans1, trans2);
-                                    trans3 = psPlaneTransformCombine(NULL, trans1, trans2);
+                                    trans3 = psPlaneTransformCombine(NULL, trans1, trans2,psRegionSet(NAN,NAN,NAN,NAN),0);
+                                    //XXX: the last two parameters are bogus.  Needs to change.  -rdd
 
                                     if (trans3 == NULL) {
@@ -749 +750 @@
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling psPlaneTransformCombine with NULL trans1.  Should generate error and return NULL.\n");
-    trans3 = psPlaneTransformCombine(NULL, NULL, trans2);
+    trans3 = psPlaneTransformCombine(NULL, NULL, trans2, psRegionSet(0,0,0,0), 10);
     if (trans3 != NULL) {
         printf("TEST ERROR: psPlaneTransformCombine() returned a non-NULL psPlaneTransform.\n");
@@ -758 +759 @@
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling psPlaneTransformCombine with NULL trans2.  Should generate error and return NULL.\n");
-    trans3 = psPlaneTransformCombine(NULL, trans1, NULL);
+    trans3 = psPlaneTransformCombine(NULL, trans1, NULL, psRegionSet(0,0,0,0), 10);
     if (trans3 != NULL) {
         printf("TEST ERROR: psPlaneTransformCombine() returned a non-NULL psPlaneTransform.\n");
@@ -908 +909 @@
     psPlaneTransform *trans = psPlaneTransformAlloc(2, 2);
     psPlaneTransform *transOut = NULL;
-    psRegion *myRegion = psRegionAlloc(1.0, 5.0, 1.0, 5.0);
+    psRegion myRegion = psRegionSet(1.0, 5.0, 1.0, 5.0);
 
     //
@@ -931 +932 @@
     }
 
-    printf("----------------------------------------------------------------------------------\n");
-    printf("Calling psPlaneTransformInvert with NULL psRegion.  Should generate error and return NULL.\n");
-    transOut = psPlaneTransformInvert(NULL, trans, NULL, 10);
-    if (transOut != NULL) {
-        printf("TEST ERROR: psPlaneTransformInvert() returned a non-NULL psPlaneTransform.\n");
-        testStatus = false;
-        psFree(transOut);
-    }
     printf("----------------------------------------------------------------------------------\n");
     printf("Calling psPlaneTransformInvert with zero nSamples.  Should generate error and return NULL.\n");
@@ -988 +981 @@
 
     psFree(trans);
-    psFree(myRegion);
 
     fflush(stdout);