Changeset 4590 for trunk/psLib/test/types

Timestamp:

Jul 20, 2005, 4:39:58 PM (21 years ago)

Author:

drobbin

Message:

made minor changes according to most recent api-delta report from IFA

Location:

trunk/psLib/test/types

Files:

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

trunk/psLib/test/types/tst_psMetadata_01.c

@@ -18 +18 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-13 02:47:01 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-07-21 02:39:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
     printMetadataList(metadata->list, " ");
     printf("\nContents of metadata table:\n");
-    printMetadataTable(metadata->table);
+    printMetadataTable(metadata->hash);
 }
 

trunk/psLib/test/types/tst_psMetadata_03.c

@@ -18 +18 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-13 02:47:01 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-07-21 02:39:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -164 +164 @@
                             "Couldn't add item to invalid metadata structure.",0);
     errMetadata = psMetadataAlloc();
-    mdTable = errMetadata->table;
-    errMetadata->table = NULL;
+    mdTable = errMetadata->hash;
+    errMetadata->hash = NULL;
     if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
@@ -174 +174 @@
         return 31;
     }
-    errMetadata->table = mdTable;
+    errMetadata->hash = mdTable;
     printFooter(stdout,"psMetadata","Test G - Attempt to add item to invalid metadata w/o hash table", true);
 
@@ -208 +208 @@
     printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o hash table",
                             "Couldn't add item to invalid metadata structure.",0);
-    mdTable = errMetadata->table;
-    errMetadata->table = NULL;
+    mdTable = errMetadata->hash;
+    errMetadata->hash = NULL;
     if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
         return 24;
     }
-    errMetadata->table = mdTable;
+    errMetadata->hash = mdTable;
     printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o hash table", true);
 

trunk/psLib/test/types/tst_psMetadata_04.c

@@ -23 +23 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-07-13 02:47:01 $
+*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-07-21 02:39:57 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -219 +219 @@
     printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata",
                             "Lookup item with invalid metadata object.", 0 );
-    tmpTable = metadata->table;
-    metadata->table = NULL;
+    tmpTable = metadata->hash;
+    metadata->hash = NULL;
     if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
         psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
         return 20;
     }
-    metadata->table = tmpTable;
+    metadata->hash = tmpTable;
     printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true);
 

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

@@ -6 +6 @@
     Could not find metadata item at index 22.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
-    Unallowable operation: md->table is NULL.
+    Unallowable operation: md->hash is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
-    Unallowable operation: md->table is NULL.
+    Unallowable operation: md->hash is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md->list is NULL.
@@ -16 +16 @@
     Unallowable operation: item->name is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
-    Unallowable operation: md->table is NULL.
+    Unallowable operation: md->hash is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataAddV (FILE:LINENO)
     Failed to add metadata item to metadata collection list.

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

@@ -12 +12 @@
     Could not find metadata item at index 22.
 <DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
-    Unallowable operation: md->table is NULL.
+    Unallowable operation: md->hash is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
     Unallowable operation: md->list is NULL.