Changeset 12431 for trunk/psLib/test/types

Timestamp:

Mar 13, 2007, 2:39:51 PM (19 years ago)

Author:

Paul Price

Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

Location:

trunk/psLib/test/types

Files:

• tap_psMetadataConfigFormat.c (modified) (1 diff)
• tap_psMetadata_printing.c (modified) (2 diffs)

trunk/psLib/test/types/tap_psMetadataConfigFormat.c

@@ -67 +67 @@
         psFree(list);
         psFree(md);
-    }
-
-
-    //Return NULL for attempting to format vector with type = complex
-    {
-        psMemId id = psMemGetId();
-        psVector *vec = psVectorAlloc(60, PS_TYPE_C64);
-        for (int i = 0; i < 5; i++)
-        {
-            vec->data.C64[i] = i+1;
-        }
-        md = psMetadataAlloc();
-        psMetadataAddVector(md, PS_LIST_TAIL, "vectorC64", 0, "", vec);
-        out = psMetadataConfigFormat(md);
-        ok( out == NULL,
-            "psMetadataConfigFormat:         return NULL for metadata containing a "
-            "Complex vector.");
-        psFree(vec);
-        psFree(md);
-        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
 

trunk/psLib/test/types/tap_psMetadata_printing.c

@@ -153 +153 @@
         psImageSet(image, 0, 0, 1);
         psMetadataAddImage(md, PS_LIST_TAIL, "image1", 0, "I am an Image", image);
-     
+
         psHash *hash = psHashAlloc(1);
         psHashAdd(hash, "hash", image);
         psMetadataAddHash(md, PS_LIST_TAIL, "hash1", 0, "I am a Hash", hash);
-     
+
         psLookupTable *lookup = psLookupTableAlloc("table2.dat", "%s", 0);
         psMetadataAddLookupTable(md, PS_LIST_TAIL, "lookup", 0, "I am a LookupTable", lookup);
-     
+
         psArray *array = psArrayAlloc(1);
         psArraySet(array, 0, image);
         psMetadataAddArray(md, PS_LIST_TAIL, "array", 0, "I am an Array", array);
-     
+
         psFree(array);
         psFree(lookup);
@@ -230 +230 @@
     psFree(md2);
 
-    //Return false for unsupported vector type (C32)
-    md2 = psMetadataAlloc();
-    psVector *vector = psVectorAlloc(2, PS_TYPE_C32);
-    psMetadataAddVector(md2, PS_LIST_HEAD, "name here", 0, "I vector", vector);
-    {
-        ok ( !psMetadataPrint(NULL, md2, 2),
-             "psMetadataPrint:            return false for metadata with unknown vector-type.");
-    }
-    psFree(vector);
-    psFree(md2);
-
     //Valid case where fd is NULL -> stdout
     md2 = psMetadataAlloc();