Changeset 1193 for trunk/psLib/test/image

Timestamp:

Jul 7, 2004, 3:05:01 PM (22 years ago)

Author:

desonia

Message:

rewrote psImageCopy so that macro need not be expanded.

Location:

trunk/psLib/test/image

Files:

• tst_psImage.c (modified) (3 diffs)
• tst_psImageFFT.c (modified) (2 diffs)
• tst_psImageIO.c (modified) (2 diffs)

trunk/psLib/test/image/tst_psImage.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-08 01:05:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 
 testDescription tests[] = {
-                              {testImageAlloc,"546/548-testImageAlloc/Free",0},
-                              {testImageSubset,"547/550-testImageSubset",0},
-                              {testImageCopy,"551-testImageCopy",0},
-                              {testImageClip,"571-testImageClip",0},
-                              {testImageClipNAN,"572-testImageClipNAN",0},
-                              {testImageOverlay,"573-testImageOverlay",0},
+                              {testImageAlloc,546,"psImageAlloc",0,false},
+                              {testImageAlloc,548,"psImageFree",0,true},
+                              {testImageSubset,547,"psImageSubset",0,false},
+                              {testImageSubset,550,"psImageSubset",0,true},
+                              {testImageCopy,551,"psImageCopy",0,false},
+                              {testImageClip,571,"psImageClip",0,false},
+                              {testImageClipNAN,572,"psImageClipNAN",0,false},
+                              {testImageOverlay,573,"psImageOverlay",0,false},
                               {NULL}
                           };
 
-int main()
+int main(int argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
-    testImageOverlay();
-    if (! runTestSuite(stderr,"psImage",tests)) {
+
+    if (! runTestSuite(stderr,"psImage",tests,argc,argv)) {
         psError(__FILE__,"One or more tests failed");
         return 1;
@@ -572 +574 @@
 
     #define testImageCopyTypes(IN) \
+    printf("to psF32\n"); \
+    testImageCopyType(IN,F32);\
+    printf("to psF64\n"); \
+    testImageCopyType(IN,F64); \
+    printf("to psU8\n"); \
     testImageCopyType(IN,U8); \
+    printf("to psU16\n"); \
     testImageCopyType(IN,U16); \
+    printf("to psU32\n"); \
     testImageCopyType(IN,U32); \
+    printf("to psS8\n"); \
     testImageCopyType(IN,S8);\
+    printf("to psS16\n"); \
     testImageCopyType(IN,S16);\
-    testImageCopyType(IN,S32);\
-    testImageCopyType(IN,F32);\
-    testImageCopyType(IN,F64);
-
+    printf("to psS32\n"); \
+    testImageCopyType(IN,S32);
+
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psU8");
     testImageCopyTypes(U8);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psU16");
     testImageCopyTypes(U16);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psU32");
     testImageCopyTypes(U32);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psS8");
     testImageCopyTypes(S8);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psS16");
     testImageCopyTypes(S16);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psS32");
     testImageCopyTypes(S32);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psF32");
     testImageCopyTypes(F32);
+    psLogMsg(__func__,PS_LOG_INFO,"Image Copy Test for psF64");
     testImageCopyTypes(F64);
 

trunk/psLib/test/image/tst_psImageFFT.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:17 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-08 01:05:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 
 testDescription tests[] = {
-                              {testImageFFT,"600-testImageFFT",0},
-                              {testImageRealImaginary,"601-testImageRealImaginary",0},
-                              {testImageComplex,"602-testImageComplex",0},
-                              {testImageConjugate,"603-testImageConjugate",0},
-                              {testImagePowerSpectrum,"604-testImagePowerSpectrum",0},
+                              {testImageFFT,600,"psImageFFT",0,false},
+                              {testImageRealImaginary,601,"psImageRealImaginary",0,false},
+                              {testImageComplex,602,"psImageComplex",0,false},
+                              {testImageConjugate,603,"psImageConjugate",0,false},
+                              {testImagePowerSpectrum,604,"psImagePowerSpectrum",0,false},
                               {NULL}
                           };
 
-int main()
+int main(int argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
 
-    if (! runTestSuite(stderr,"psFFT",tests)) {
+    if (! runTestSuite(stderr,"psFFT",tests,argc,argv) ) {
         psAbort(__FILE__,"One or more tests failed");
     }

trunk/psLib/test/image/tst_psImageIO.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:17 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-08 01:05:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 
 testDescription tests[] = {
-                              {testImageRead,"567-testImageRead",0},
-                              {testImageWrite,"569-testImageWrite",0},
+                              {testImageRead,567,"psImageReadSection",0,false},
+                              {testImageWrite,569,"psImageWriteSection",0,false},
                               {NULL}
                           };
 
-int main()
+int main(int argc, char* argv[])
 {
     psLogSetLevel(PS_LOG_INFO);
 
-    testImageRead();
-
-    if (! runTestSuite(stderr,"psImage",tests)) {
+    if (! runTestSuite(stderr,"psImage",tests,argc,argv)) {
         psAbort(__FILE__,"One or more tests failed");
     }