Changeset 7937 for trunk/psLib/test/types

Timestamp:

Jul 18, 2006, 5:43:14 PM (20 years ago)

Author:

drobbin

Message:

Edited psMetadataItemTransfer. Returns false for NULL out input.

Location:

trunk/psLib/test/types

Files:

• tst_psMetadata_01.c (modified) (2 diffs)
• verified/tst_psMetadata_01.stderr (modified) (1 diff)

trunk/psLib/test/types/tst_psMetadata_01.c

@@ -5 +5 @@
 *  @author  dRob, MHPCC
 *
-*  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2006-07-18 21:53:25 $
+*  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2006-07-19 03:43:14 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -100 +100 @@
 psS32 testMetadataItemTransfer(void)
 {
-    //    psMetadataItem *item = psMetadataItemAlloc("metaITEM", PS_DATA_S32, "no Comment");
-    //    item->data.S32 = 666;
-    //    psMetadataItem *item2 = NULL;
+
     psMetadata *md = psMetadataAlloc();
-    //    psMetadata *md2 = psMetadataAlloc();
     psMetadata *out = NULL;
-    //    out = psMetadataAlloc();
-    //  psMetadataAddItem(md, item, PS_LIST_HEAD, PS_META_DEFAULT);
-    psMetadataAddS32(md, PS_LIST_HEAD, "metaITEM", 0, "no Comment", 666);
-
-    //attempt transfer to NULL metadata.
-    out = psMetadataItemTransfer(out, md, "metaITEM");
-    if ( out == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "psMetadataItemTransfer failed to correctly allocate metadata and transfer item.\n");
+    psMetadataAddS32(md, PS_LIST_TAIL, "metaITEM", 0, "no Comment", 666);
+
+    //attempt transfer to NULL 'out' metadata.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psMetadataItemTransfer(out, md, "metaITEM") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed to return false for NULL 'out' metadata.\n");
         return 1;
     }
+    out = psMetadataAlloc();
+    //attempt to transfer using a NULL key.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psMetadataItemTransfer(out, md, NULL) ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed to return false for NULL key input.\n");
+        return 2;
+    }
+    //attempt transfer to NULL 'in' metadata.
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if ( psMetadataItemTransfer(out, NULL, "metaITEM") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed to return false for NULL 'in' metadata.\n");
+        return 3;
+    }
+    //attempt to transfer using an allocated metadata and invalid key
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
+    if (psMetadataItemTransfer(out, md, "metaITEM2") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed to return false for invalid 'key'.\n");
+        return 4;
+    }
+    //attempt to transfer with all valid inputs.
+    psMetadataItem *item = NULL;
+    if ( !psMetadataItemTransfer(out, md, "metaITEM") ) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed with valid inputs.\n");
+        return 7;
+    }
+    item = psMetadataGet(out, PS_LIST_HEAD);
+    if (item->data.S32 != 666 || strncmp(item->comment, "no Comment", 20)) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                "psMetadataItemTransfer failed to correctly transfer item data.\n");
+        return 8;
+    }
+
     psFree(out);
-    /*    //attempt to transfer using a NULL key.
-        psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-        if (psMetadataItemTransfer(mdNULL, md, NULL)) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "psMetadataItemTransfer failed to return false for NULL key input.\n");
-            return 2;
-        }
-        if (mdNULL != NULL) printf("\nERROR HERE\n");
-        //attempt to transfer using an allocated metadata and valid key
-        if (!psMetadataItemTransfer(md2, md, "metaITEM") ){
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "psMetadataItemTransfer failed to correctly transfer item.\n");
-            return 3;
-        }
-    */
-    //    item2 = psMetadataGet(md2, PS_LIST_HEAD);
-    /*    item2 = psMetadataLookup(md2, "metaITEM");
-        if (item2->data.S32 != 666 || strncmp(item2->comment, "no Comment", 20)) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                    "psMetadataItemTransfer failed to correctly transfer item data.\n");
-            return 4;
-        }
-      */
     psFree(md);
-    //    psFree(md2);
-    //    psFree(item);
-    //    psFree(item2);
-    //    psFree(mdNULL);
 
     return 0;

trunk/psLib/test/types/verified/tst_psMetadata_01.stderr

@@ -14 +14 @@
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
+*            TestPoint: psMetadata_01{psMetadataItemTransfer()}                    *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+<DATE><TIME>|<HOST>|I|testMetadataItemTransfer
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataItemTransfer (FILE:LINENO)
+    psMetadataItemTransfer:  'out' cannot be NULL.
+<DATE><TIME>|<HOST>|I|testMetadataItemTransfer
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataItemTransfer (FILE:LINENO)
+    psMetadataItemTransfer:  'key' cannot be NULL.
+<DATE><TIME>|<HOST>|I|testMetadataItemTransfer
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataItemTransfer (FILE:LINENO)
+    psMetadataItemTransfer:  'in' cannot be NULL.
+<DATE><TIME>|<HOST>|I|testMetadataItemTransfer
+    Following should generate error message
+<DATE><TIME>|<HOST>|E|psMetadataItemTransfer (FILE:LINENO)
+    psMetadataItemTransfer:  Could not find 'key' in psMetadata 'in'.
+
+---> TESTPOINT PASSED (psMetadata_01{psMetadataItemTransfer()} | tst_psMetadata_01.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_01.c                                        *
 *            TestPoint: psMetadata_01{psMetadataPrint}                             *
 *             TestType: Positive                                                   *